initial

Introduce: remove Materialize JS
2020-07-09 17:03:22 +09:00 · 2020-07-05 19:45:21 +09:00
89 changed files with 2973 additions and 4173 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -5,4 +5,4 @@ patreon: cutls
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-custom: https://cutls.fanbox.cc
+custom: https://www.pixiv.net/fanbox/creator/28105985
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,20 +15,6 @@ before_deploy:
  - cd app
  - VERSION=$(cat package.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]')
  - yarn install --no-lockfile --prod
-  - yarn construct:store
-  - if [ "$TRAVIS_OS_NAME" = "osx" ];then electron-builder --mac -p never;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ];then cd ../build;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ];then mv *.dmg TheDesk-$VERSION-store.dmg;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ];then cd ../app;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ];then electron-builder --linux snap:x64 -p never;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../build;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ];then mv *.snap TheDesk-$VERSION-store.snap;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../app;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "windows" ];then yarn add electron-builder;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "windows" ];then electron-builder --win appx:x64 -p never ;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../build;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "windows" ];then mv *.appx TheDesk-$VERSION-store.appx;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../app;else :;fi
  - yarn construct
  - if [ "$TRAVIS_OS_NAME" = "osx" ];then electron-builder --mac -p never;else :;fi
  - if [ "$TRAVIS_OS_NAME" = "linux" ];then electron-builder --linux --x64 -p never;else :;fi
@@ -36,6 +22,7 @@ before_deploy:
  - if [ "$TRAVIS_OS_NAME" = "linux" ];then ls;else :;fi
  - if [ "$TRAVIS_OS_NAME" = "linux" ];then mv thedesk-*.zip thedesk.zip;else :;fi
  - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../app;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then yarn add electron-builder;else :;fi
  - if [ "$TRAVIS_OS_NAME" = "windows" ];then electron-builder --win --ia32 -p never;else :;fi
  - if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../build;else :;fi
  - if [ "$TRAVIS_OS_NAME" = "windows" ];then ls;else :;fi
--- a/README.md
+++ b/README.md
@@ -11,10 +11,7 @@
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
 オープンソースSNSマストドン/MisskeyのPC向けクライアント[日本語はこちら](README_ja.md)  
  
-Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge/?site=thedesk.top)](https://status.cutls.com)
-
-On GitHub Releases, `-store.*` assets are made for some application store or manager(Snapcraft, Homebrew, Microsoft Store). 
-They do not check the latest version(Which you can get the latest ver or not depends on the store)
+Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge/?site=thedesk.top)](https://status.cutls.com)    

 <a href="https://www.patreon.com/cutls"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160"></a>  
 <a href="https://liberapay.com/cutls/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg"></a>
--- a/README_ja.md
+++ b/README_ja.md
@@ -14,8 +14,6 @@ Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge

 [Pixiv FANBOX](https://www.pixiv.net/fanbox/creator/28105985)

-`-store.*`とあるアセットはストアやパッケージマネージャ向けのもので、アップデートの確認をソフト本体で行いません。
-
 ![Screenshots1](https://thedesk.top/img/scr1.png)  

 ## ライセンス
--- a/app/.eslintignore
+++ b/app/.eslintignore
@@ -1,5 +0,0 @@
-js/common/blurhash.js
-js/common/hammer.min.js
-js/common/sha256.js
-js/platform/punycode.js
-js/platform/tj-deck.js
--- a/app/.eslintrc.json
+++ b/app/.eslintrc.json
@@ -1,14 +0,0 @@
-{
-    "extends": "eslint:recommended",
-    "env": {"browser": true},
-    "rules": {
-        "no-console": "off",
-        "semi": ["error", "never"]
-    },
-    "globals": {
-        "$": false,
-        "ver": true,
-        "pwa": true,
-        "lang": true
-    }
-}
--- a/app/css/acct.css
+++ b/app/css/acct.css
@@ -21,15 +21,6 @@ html {
 	align-items: flex-start;
 }

-#acct-list .btn-flat.white-text {
-	color: inherit !important;
-}
-
-#acct-list .btn-flat.red-text {
-	background-color: white !important;
-}
-
-
 .lts {
 	font-size: 150%;
 }
--- a/app/css/master.css
+++ b/app/css/master.css
@@ -6,17 +6,23 @@ body {
 	user-select: none;
 	cursor: default;
 	height: 100vh;
-	color: var(--text);
+	color: var(--color);
 }
 html {
 	font-size: 13px;
 }
+.waves-effect:hover {
+	filter: brightness(80%);
+}
+.waves-effect:focus {
+	filter: brightness(70%);
+}
 .titlebar,
 .menubar-menu-container,
 .action-menu-item {
-	background-color: var(--subcolor) !important;
+	background-color: var(--notfbox) !important;
 	filter: brightness(110%) !important;
-	color: var(--text) !important;
+	color: var(--color) !important;
 }
 .action-menu-item:hover {
 	filter: brightness(80%) !important;
@@ -231,8 +237,7 @@ blockquote:before,
 	width: 100vw;
 	height: calc(100vh - 3rem);
 	background-color: var(--bg);
-	filter: brightness(50%);
-	color: var(--text);
+	color: var(--color);
 	z-index: 99999;
 	justify-content: center;
 	align-items: center;
@@ -243,7 +248,7 @@ blockquote:before,
 	width: 100vw;
 	height: 100vh;
 	background-color: var(--bg);
-	color: var(--text);
+	color: var(--color);
 	z-index: 99999;
 	justify-content: center;
 	align-items: center;
@@ -254,7 +259,7 @@ blockquote:before,
 #pip {
 	z-index: 504;
 	width: 418px;
-	background-color: var(--thirdColor);
+	background-color: var(--subcolor);
 	position: absolute;
 }
 .pip-bottom {
@@ -315,10 +320,10 @@ blockquote:before,
 }
 .collapsible-header,
 .tabs {
-	background-color: var(--thirdColor);
+	background-color: var(--subcolor);
 }
 .collapsible-header:focus {
-	background-color: var(--thirdColor) !important;
+	background-color: var(--subcolor) !important;
 }
 .modal-footer {
 	background-color: var(--modalfooter) !important;
@@ -332,29 +337,16 @@ blockquote:before,
 }
 .release-do {
 	border: solid 2px;
-	border-color: var(--text);
+	border-color: var(--color);
 	padding: 5px;
 }
 #pickers {
 	display: flex;
 	flex-wrap: wrap;
-	flex-direction: column;
-}
-input[type="color"] {
-	-webkit-appearance: none;
-	border: none;
-	width: 32px;
-	height: 32px;
-}
-input[type="color"]::-webkit-color-swatch-wrapper {
-	padding: 0;
-}
-input[type="color"]::-webkit-color-swatch {
-	border: none;
 }
 #menu {
 	position: fixed;
-	z-index: 999;
+	z-index: 9999;
 	background-color: var(--postbox);
 	width: 540px;
 	top: calc(50% - 150px);
@@ -380,7 +372,7 @@ input[type="color"]::-webkit-color-swatch {
 	display: flex;
 	align-items: center;
 	cursor: pointer;
-	color: var(--text);
+	color: var(--color);
 }
 #left-menu a:hover {
 	background-color: var(--beforehover);
@@ -391,9 +383,6 @@ input[type="color"]::-webkit-color-swatch {
 #left-menu a.active {
 	background-color: var(--emphasized);
 }
-#left-menu a.active span {
-	text-decoration: underline;
-}
 #right-menu {
 	width: 100%;
 	overflow-y: scroll;
@@ -411,7 +400,7 @@ input[type="color"]::-webkit-color-swatch {
 	width: 13rem;
 	height: 3.1rem;
 	cursor: pointer;
-	color: var(--text);
+	color: var(--color);
 }
 #tltype .type span {
 	width: calc(100% - 2.3rem);
@@ -438,7 +427,7 @@ input[type="color"]::-webkit-color-swatch {
 	text-align: center;
 	width: calc(100% + 0.8rem);
 	border-radius: 5px;
-	background-color: var(--subcolor);
+	background-color: var(--box);
 	filter: brightness(80%);
 	margin-left: -0.4rem;
 	margin-right: -0.4rem;
@@ -459,7 +448,7 @@ input[type="color"]::-webkit-color-swatch {
 	position: fixed;
 	bottom: -300px;
 	width: 100vw;
-	background-color: var(--subcolor);
+	background-color: var(--box);
 	z-index: 9999;
 	padding: 0.8rem;
 	display: grid;
@@ -485,16 +474,16 @@ input[type="color"]::-webkit-color-swatch {
 }
 input,
 textarea {
-	color: var(--text);
+	color: var(--color);
 	font-size: 1rem !important;
 	font-family: inherit;
 }
 .swal2-popup {
-	background-color: var(--subcolor) !important;
+	background-color: var(--notfbox) !important;
 }
 .swal2-title,
 .swal2-content {
-	color: var(--text) !important;
+	color: var(--color) !important;
 }
 #src-contents svg {
 	margin-right: 0.4rem;
@@ -543,7 +532,7 @@ textarea {
 	left: calc(50vw - 11.53rem);
 	width: 23rem;
 	max-width: 100%;
-	background-color: var(--subcolor);
+	background-color: var(--box);
 	z-index: 501;
 	padding: 0.4rem;
 }
@@ -623,6 +612,3 @@ textarea {
 .darwin .win {
 	display: none;
 }
-.dropdown-content.header:hover {
-	background-color: white;
-}
--- a/app/css/post.css
+++ b/app/css/post.css
@@ -86,7 +86,7 @@ textarea {
 	max-height: 7.7rem;
 }
 #default-emoji a {
-	color: var(--text);
+	color: var(--color);
 	margin-right: 0.15rem;
 }
 .character-counter {
@@ -126,8 +126,8 @@ textarea {
 }
 #posttgl,
 #toot-post-btn {
-	background-color: var(--active);
-	color: var(--text);
+	background-color: var(--accentbtn);
+	color: var(--color);
 }
 /*mini*/
 .mini-post .mize {
--- a/app/css/sort.css
+++ b/app/css/sort.css
@@ -5,7 +5,7 @@
  background-color: var(--modalfooter);
  margin: 0.4rem;
  border-radius: 0.4rem;
-  color: var(--text);
+  color: var(--color);
  padding: 3px;
  display: grid;
  grid-template-columns: 3.3rem 1fr 4.6rem;
--- a/app/css/themes.css
+++ b/app/css/themes.css
@@ -1,22 +1,192 @@
 :root {
+  --bg: white;
+  --drag: rgba(255, 255, 255, 0.8);
+  --color: black;
+  --beforehover: #757575;
+  --modal: white;
+  --subcolor: #e0e0e0;
+  --box: white;
+  --sidebar: #eeeeee;
+  --shared: #cfd8dc;
+  --notfbox: white;
+  --emphasized: #81c784;
+  --his-data: rgba(255, 255, 255, 0.9);
+  --active: #e6ee9c;
+  --postbox: white;
+  --modalfooter: #fafafa;
+  --accentbtn: #009688;
+  --selected: #c0c0c0;
+  --selectedWithShare: #b2babd;
+  --gray: #757575;
+}
+#imagemodal {
+  background: url("../img/pixel.white.svg");
+}
+.blacktheme {
  --bg: #212121;
  --drag: rgba(0, 0, 0, 0.8);
-  --text: white;
+  --color: white;
  --beforehover: #9e9e9e;
  --modal: black;
-  --thirdColor: #212121;
-  --bottom: #424242;
-  --accent: #004d40;
-  --subcolor: #333333;
+  --subcolor: #212121;
+  --box: #424242;
+  --sidebar: #424242;
+  --shared: #004d40;
+  --notfbox: #333333;
  --emphasized: #4e342e;
  --his-data: rgba(0, 0, 0, 0.8);
+  --active: #757575;
  --postbox: #424242;
  --modalfooter: #212121;
-  --active: #3f51b5;
+  --accentbtn: #3f51b5;
  --selected: #3f3f3f;
  --selectedWithShare: #003a30;
  --gray: #cccccc;
 }
-#imagemodal {
+.blacktheme #imagemodal {
  background: url("../img/pixel.svg");
+}
+.indigotheme {
+  --bg: #031833;
+  --drag: rgba(0, 0, 0, 0.8);
+  --color: white;
+  --beforehover: #9e9e9e;
+  --modal: #0d1351;
+  --subcolor: #0d1351;
+  --shared: #004d40;
+  --box: #0d1351;
+  --sidebar: #0d1351;
+  --notfbox: #0d47a1;
+  --emphasized: #4e342e;
+  --his-data: rgba(13, 19, 81, 0.8);
+  --active: #757575;
+  --postbox: #1a237e;
+  --modalfooter: #031833;
+  --accentbtn: #00acc1;
+  --selected: #214f8a;
+  --selectedWithShare: #003a30;
+  --gray: #cccccc ;
+}
+.indigotheme #imagemodal {
+  background: url("../img/pixel.svg");
+}
+.browntheme {
+  --bg: #261411;
+  --drag: rgba(0, 0, 0, 0.8);
+  --color: white;
+  --beforehover: #9e9e9e;
+  --modal: #261411;
+  --subcolor: #4e342e;
+  --shared: #004d40;
+  --box: #4e342e;
+  --sidebar: #4e342e;
+  --notfbox: #4e342e;
+  --emphasized: #0d47a1;
+  --his-data: rgba(62, 39, 35, 0.8);
+  --active: #757575;
+  --postbox: #4e342e;
+  --modalfooter: #261411;
+  --accentbtn: #827717;
+  --selected: #6d352b;
+  --selectedWithShare: #003a30;
+  --gray: #cccccc;
+}
+.browntheme #imagemodal {
+  background: url("../img/pixel.svg");
+}
+.greentheme {
+  --bg: #c8e6c9;
+  --drag: rgba(255, 255, 255, 0.8);
+  --color: black;
+  --beforehover: #757575;
+  --modal: #81c784;
+  --subcolor: #a5d6a7;
+  --box: #81c784;
+  --sidebar: #c5e1a5;
+  --shared: #ffcc80;
+  --notfbox: #a5d6a7;
+  --emphasized: #9e9d24;
+  --his-data: rgba(255, 255, 255, 0.9);
+  --active: #e6ee9c;
+  --postbox: #a5d6a7;
+  --modalfooter: #81c784;
+  --accentbtn: #33691e;
+  --selected: #78c17a;
+  --selectedWithShare: #caa266;
+  --gray: #757575;
+}
+.greentheme #imagemodal {
+  background: url("../img/pixel.white.svg");
+}
+.bluetheme {
+  --bg: #c9e1ec;
+  --drag: rgba(255, 255, 255, 0.8);
+  --color: black;
+  --beforehover: #757575;
+  --modal: #b2ebf2;
+  --subcolor: #90caf9;
+  --box: #90caf9;
+  --sidebar: #b6e6f5;
+  --shared: #e0ffe4;
+  --notfbox: #90caf9;
+  --emphasized: #c5e1a5;
+  --his-data: rgba(255, 255, 255, 0.9);
+  --active: #b39ddb;
+  --postbox: #dff1ff;
+  --modalfooter: #2196f3;
+  --accentbtn: #2f7bb7;
+  --selected: #9dcade;
+  --selectedWithShare: #c1dac4;
+  --gray: #757575;
+}
+.bluetheme #imagemodal {
+  background: url("../img/pixel.white.svg");
+}
+.polartheme {
+  --bg: #2e3440;
+  --drag: rgba(0, 0, 0, 0.8);
+  --color: white;
+  --beforehover: #8d94a0;
+  --modal: #3b4252;
+  --subcolor: #434c5e;
+  --box: #4c566a;
+  --sidebar: #3b4252;
+  --shared: #2d3b58;
+  --notfbox: #2a3857;
+  --emphasized: #2f4b86;
+  --his-data: rgba(0, 0, 0, 0.8);
+  --active: #2a3857;
+  --postbox: #434c5e;
+  --modalfooter: #485166;
+  --accentbtn: #2f4b86;
+  --selected: #464f61;
+  --selectedWithShare: #3e527e;
+  --gray: #cccccc;
+}
+.polartheme #imagemodal {
+  background: url("../img/pixel.svg");
+}
+.snowtheme {
+  --bg: #eceff4;
+  --drag: rgba(255, 255, 255, 0.8);
+  --color: #36425a;
+  --beforehover: #344058;
+  --modal: #e5e9f0;
+  --subcolor: #d8dee9;
+  --box: #c0c8d6;
+  --sidebar: #eeeeee;
+  --shared: #c3d4e6;
+  --notfbox: #d8dee9;
+  --emphasized: #88c0d0;
+  --his-data: rgba(255, 255, 255, 0.9);
+  --active: #8fbcbb;
+  --postbox: #d8dee9;
+  --modalfooter: #b2bed4;
+  --accentbtn: #81a1c1;
+  --selected: #b4bdd0;
+  --selectedWithShare: #a3afbb;
+  --gray: #5c6c8c;
+}
+.snowtheme #imagemodal {
+  background: url("../img/pixel.white.svg");
 }
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -18,7 +18,7 @@
 	padding: 0.23rem;
 	padding-right: 0;
 	padding-left: 3rem;
-	background-color: var(--bottom);
+	background-color: var(--sidebar);
 	display: flex;
 	justify-content: space-between;
 	flex-wrap: wrap;
@@ -62,7 +62,7 @@
 }
 #bottom a,
 #demogroup a {
-	color: var(--text);
+	color: var(--color);
 }
 #bottom i {
 	font-size: 2.3rem;
@@ -157,8 +157,7 @@ iframe,
 }
 .box {
 	overflow: hidden;
-	min-width: 300px;
-	max-width: 600px;
+	min-width: 23rem;
 	flex: 1;
 	border-top: none;
 	display: flex;
@@ -218,14 +217,10 @@ iframe,
 .emoji,
 .emoji-img {
 	width: 1.153rem;
-	height: 1.153rem;
-	object-fit: cover;
 }
 .area-toot .emoji,
 .area-toot .emoji-img {
 	width: 1.538rem;
-	height: 1.538rem;
-	object-fit: cover;
 	vertical-align: middle;
 	margin: -1px 0;
 }
@@ -243,7 +238,6 @@ iframe,
 	flex: 1;
 	overflow-y: scroll;
 	overflow-x: hidden;
-	background-color: var(--bg);
 }
 .additional {
 	overflow-x: scroll;
@@ -436,7 +430,7 @@ iframe,
 }

 .btn-flat {
-	color: var(--text);
+	color: var(--color);
 }
 .area-side i {
 	margin-left: 0.75rem;
@@ -455,15 +449,44 @@ iframe,
 	color: var(--beforehover);
 }
 .actct:hover {
-	color: var(--text);
+	color: var(--color);
 	transition: 0.5s;
 }
-.contextMenu.dropdown-content {
-	padding-top: 5px;
-	overflow-y: hidden;
-	left: calc(100% - 200px) !important;
-	width: 200px !important;
+#contextWrap {
+	position: fixed;
+	width: 199vw;
+	height: 100vh;
+	z-index: 100;
 }
+.contextMenu {
+	position: fixed;
+	background-color: var(--box);
+	z-index: 9999;
+	border-radius: 0.4rem;
+	padding: 0.4rem;
+}
+.contextMenu.bottom:before {
+	content: '';
+	position: absolute;
+	top: 100%;
+	right: 2rem;
+	border: 1.2rem solid transparent;
+	border-top: 1.2rem solid var(--box);
+}
+.contextMenu.top:before {
+	content: '';
+	position: absolute;
+	top: -2.3rem;
+	right: 2rem;
+	border: 1.5rem solid transparent;
+	border-bottom: 1.5rem solid var(--box);
+}
+.contextMenu .btn-flat {
+	text-transform: none !important;
+	width: 100%;
+	text-align: left;
+}
+
 .gray {
 	color: var(--gray);
 }
@@ -502,7 +525,7 @@ iframe,
 	user-select: none;
 }
 .cbadge-hover {
-	color: var(--text);
+	color: var(--color);
 	background-color: transparent;
 }
 .cbadge-hover:hover {
@@ -518,7 +541,7 @@ p:not(:last-child) {
 	margin-bottom: 0.76rem;
 }
 .shared {
-	background-color: var(--accent);
+	background-color: var(--shared);
 }
 .emphasized {
 	background-color: var(--emphasized);
@@ -528,7 +551,7 @@ p:not(:last-child) {
 }
 .notice-box {
 	top: 0;
-	background-color: var(--subcolor);
+	background-color: var(--notfbox);
 	filter: brightness(110%);
 	position: relative;
 	margin-right: 0.7rem;
@@ -597,7 +620,7 @@ p:not(:last-child) {
 .notf-box {
 	position: fixed;
 	right: 5.4rem;
-	background-color: var(--subcolor);
+	background-color: var(--box);
 	border: thin solid gray;
 	z-index: 501;
 	width: 30rem;
@@ -634,29 +657,14 @@ p:not(:last-child) {
 	box-shadow: 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12),
 		0 5px 5px -3px rgba(0, 0, 0, 0.3), 0px -10px 10px 0px rgba(0, 0, 0, 0.3) inset;
 }
-.notf-indv-box label span {
-	padding-left: 23px !important;
-	margin-right: 5px;
-}
-.notf-indv-box .setting {
-	font-size: 1rem;
-	width: calc(25% - 3px);
-	text-align: left;
-	padding: 5px;
-	height: 70px;
-}
-.notf-exclude-btn:hover {
-	background-color: inherit !important;
-	border: 1px solid;
-}
 .type-b {
 	display: none;
 }
 .modal-footer {
-	background-color: var(--subcolor);
+	background-color: var(--box);
 }
 .ballons {
-	background-color: var(--subcolor);
+	background-color: var(--box);
 	position: absolute;
 	bottom: 0px;
 	right: 0px;
@@ -714,11 +722,11 @@ p:not(:last-child) {
 	transition-duration: 0.5s;
 }
 .votebtn:hover {
-	background-color: var(--text);
+	background-color: var(--color);
 }
 .leadPoll {
 	position: absolute;
-	background-color: var(--subcolor);
+	background-color: var(--box);
 	height: 1.5rem;
 	border-radius: 0.23rem;
 }
@@ -780,11 +788,11 @@ audio {
 .cw_btn {
 	margin: 0.23rem;
 	background-color: var(--emphasized);
-	color: var(--text);
+	color: var(--color);
 	padding-left: 0.23rem;
 	padding-right: 0.23rem;
 	border-radius: 0.23rem;
-	border: 1px solid var(--text);
+	border: 1px solid var(--color);
 	user-select: none;
 }
 .vis-data {
@@ -874,7 +882,7 @@ audio {
 	cursor: pointer;
 	border: solid 1px;
 	padding-left: 0.15rem;
-	background-color: var(--subcolor);
+	background-color: var(--notfbox);
 	border-radius: 0.15rem;
 }
 .announReaction img {
--- a/app/css/userdata.css
+++ b/app/css/userdata.css
@@ -87,7 +87,6 @@
  overflow-y: scroll;
  overflow-x: hidden;
  height: calc(100% - 3.4rem);
-  padding-bottom: 60px;
 }
 #my-data-nav .btn {
  width: 10.7rem;
@@ -143,9 +142,6 @@
 #hisdropdown{
  background-color: var(--bg);
 }
-#hisdropdown li a {
-  color: white;
-}
 #hisdropdown li:hover{
  background-color: var(--active);
 }
--- a/app/img/2025.svg
+++ b/app/img/2025.svg
@@ -1,69 +0,0 @@
-<?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 600 600" 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="輝き" transform="matrix(0.892356,0,0,0.892356,36.941,-15.9516)">
-        <g transform="matrix(2.39479,0,0,2.21494,-178.97,-182.183)">
-            <ellipse cx="123.217" cy="151.049" rx="36.923" ry="35.804" style="fill:rgb(84,82,81);"/>
-        </g>
-        <g transform="matrix(1,0,0,1,8.39159,-32.1678)">
-            <ellipse cx="120.479" cy="305.524" rx="112.5" ry="52" style="fill:rgb(84,82,81);"/>
-        </g>
-        <g transform="matrix(0.952046,-0.305955,0.305955,0.952046,-139.881,8.62199)">
-            <ellipse cx="134.479" cy="430.524" rx="46.5" ry="84" style="fill:rgb(84,82,81);"/>
-        </g>
-        <g transform="matrix(1,0,0,1,2.39158,-65.1678)">
-            <ellipse cx="130.479" cy="561.024" rx="72.5" ry="74.5" style="fill:rgb(84,82,81);"/>
-        </g>
-        <g transform="matrix(1,0,0,1,8.39159,-32.1678)">
-            <ellipse cx="156.979" cy="651.76" rx="68" ry="60.235" style="fill:rgb(84,82,81);"/>
-        </g>
-        <g transform="matrix(0.954888,0.296965,-0.296965,0.954888,55.6063,-54.2336)">
-            <ellipse cx="199.479" cy="158.995" rx="98.5" ry="51" style="fill:rgb(240,132,46);"/>
-        </g>
-        <g transform="matrix(0.931851,0.362841,-0.362841,0.931851,63.1962,-89.0819)">
-            <ellipse cx="344.979" cy="135.857" rx="74" ry="90.137" style="fill:rgb(240,132,46);"/>
-        </g>
-        <g transform="matrix(1,0,0,1,-56.6084,-45.1678)">
-            <ellipse cx="493.479" cy="301.22" rx="126.5" ry="55.5" style="fill:rgb(240,132,46);"/>
-        </g>
-        <g transform="matrix(1,0,0,1,-14.6084,-70.1678)">
-            <ellipse cx="531.479" cy="368.22" rx="58.5" ry="54.5" style="fill:rgb(240,132,46);"/>
-        </g>
-        <g transform="matrix(0.973706,-0.227807,0.227807,0.973706,-124.722,44.48)">
-            <ellipse cx="265.479" cy="614.97" rx="98.5" ry="37.5" style="fill:rgb(54,76,159);"/>
-        </g>
-        <g transform="matrix(0.982834,-0.184492,0.184492,0.982834,-148.417,-31.379)">
-            <ellipse cx="407.479" cy="676.47" rx="71.5" ry="96" style="fill:rgb(54,76,159);"/>
-        </g>
-        <g transform="matrix(1,0,0,1,-34.6084,-22.1678)">
-            <ellipse cx="468.979" cy="511.47" rx="48" ry="31" style="fill:rgb(54,76,159);"/>
-        </g>
-        <g transform="matrix(0.880625,0.473815,-0.473815,0.880625,260.236,-235.714)">
-            <ellipse cx="533.979" cy="472.97" rx="46" ry="99.5" style="fill:rgb(54,76,159);"/>
-        </g>
-        <g transform="matrix(1,0,0,1,9.39159,-36.1678)">
-            <circle cx="69.229" cy="310.72" r="24.25" style="fill:white;"/>
-        </g>
-        <g transform="matrix(1,0,0,1,8.39159,-48.1678)">
-            <circle cx="98.229" cy="417.72" r="25.25" style="fill:white;"/>
-        </g>
-        <g transform="matrix(0.76,0,0,0.76,96.9465,101.545)">
-            <circle cx="375.229" cy="646.72" r="56.25" style="fill:white;"/>
-        </g>
-        <g transform="matrix(1,0,0,1,8.39159,-32.1678)">
-            <circle cx="427.729" cy="287.22" r="32.75" style="fill:white;"/>
-        </g>
-        <g id="cat" transform="matrix(0.0249784,0,0,0.0249784,346.146,563.341)">
-            <path 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(5,127,254);"/>
-        </g>
-        <g id="cat1" serif:id="cat" transform="matrix(-0.0249784,0,0,0.0249784,147.519,318.341)">
-            <path 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(5,127,254);"/>
-        </g>
-        <g id="cat2" serif:id="cat" transform="matrix(-0.0249784,0,0,0.0249784,120.519,222.341)">
-            <path 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(5,127,254);"/>
-        </g>
-        <g id="cat3" serif:id="cat" transform="matrix(0.0249784,0,0,0.0249784,390.146,196.341)">
-            <path 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(5,127,254);"/>
-        </g>
-    </g>
-</svg>
--- a/app/js/common/modal.js
+++ b/app/js/common/modal.js
@@ -1,6 +1,7 @@
 //モーダル・ドロップダウンの各種設定
 $(document).ready(function () {
  // the "href" attribute of the modal trigger must specify the modal ID that wants to be triggered
+  return;
  $('.modal').modal({
    inDuration: 300,
    outDuration: 225,
@@ -10,7 +11,7 @@ $(document).ready(function () {
    belowOrigin: false, // Displays dropdown below the button
    alignment: 'left', // Displays dropdown with edge aligned to the left of button
    stopPropagation: false
-  })
+  });
  $('.dropdown-trigger').dropdown({
    inDuration: 300,
    outDuration: 225,
@@ -21,9 +22,9 @@ $(document).ready(function () {
    alignment: 'left', // Displays dropdown with edge aligned to the left of button
    stopPropagation: false // Stops event propagation
  }
-  )
-  $('.collapsible').collapsible()
+  );
+  $('.collapsible').collapsible();
  $('#videomodal').modal({
    onCloseEnd: stopVideo
-  })
-})
+  });
+});
--- a/app/js/common/time.js
+++ b/app/js/common/time.js
@@ -17,26 +17,26 @@
 (function (factory) {
  if (typeof define === 'function' && define.amd) {
    // AMD. Register as an anonymous module.
-    define(['jquery'], factory)
+    define(['jquery'], factory);
  } else if (typeof module === 'object' && typeof module.exports === 'object') {
-    factory(require('jquery'))
+    factory(require('jquery'));
  } else {
    // Browser globals
-    factory(jQuery)
+    factory(jQuery);
  }
 }(function ($) {
  $.timeago = function (timestamp) {
    if (timestamp instanceof Date) {
-      return inWords(timestamp)
+      return inWords(timestamp);
    } else if (typeof timestamp === "string") {
-      return inWords($.timeago.parse(timestamp))
+      return inWords($.timeago.parse(timestamp));
    } else if (typeof timestamp === "number") {
-      return inWords(new Date(timestamp))
+      return inWords(new Date(timestamp));
    } else {
-      return inWords($.timeago.datetime(timestamp))
+      return inWords($.timeago.datetime(timestamp));
    }
-  }
-  var $t = $.timeago
+  };
+  var $t = $.timeago;
  $.extend($.timeago, {
    settings: {
      refreshMillis: 60000,
@@ -69,33 +69,33 @@

    inWords: function (distanceMillis) {
      if (!this.settings.allowPast && !this.settings.allowFuture) {
-        throw 'timeago allowPast and allowFuture settings can not both be set to false.'
+        throw 'timeago allowPast and allowFuture settings can not both be set to false.';
      }

-      var $l = this.settings.strings
-      var prefix = $l.prefixAgo
-      var suffix = $l.suffixAgo
+      var $l = this.settings.strings;
+      var prefix = $l.prefixAgo;
+      var suffix = $l.suffixAgo;
      if (this.settings.allowFuture) {
        if (distanceMillis < 0) {
-          prefix = $l.prefixFromNow
-          suffix = $l.suffixFromNow
+          prefix = $l.prefixFromNow;
+          suffix = $l.suffixFromNow;
        }
      }

      if (!this.settings.allowPast && distanceMillis >= 0) {
-        return this.settings.strings.inPast
+        return this.settings.strings.inPast;
      }

-      var seconds = Math.abs(distanceMillis) / 1000
-      var minutes = seconds / 60
-      var hours = minutes / 60
-      var days = hours / 24
-      var years = days / 365
+      var seconds = Math.abs(distanceMillis) / 1000;
+      var minutes = seconds / 60;
+      var hours = minutes / 60;
+      var days = hours / 24;
+      var years = days / 365;

      function substitute(stringOrFunction, number) {
-        var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction
-        var value = ($l.numbers && $l.numbers[number]) || number
-        return string.replace(/%d/i, value)
+        var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
+        var value = ($l.numbers && $l.numbers[number]) || number;
+        return string.replace(/%d/i, value);
      }

      var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
@@ -108,124 +108,124 @@
        days < 45 && substitute($l.month, 1) ||
        days < 365 && substitute($l.months, Math.round(days / 30)) ||
        years < 1.5 && substitute($l.year, 1) ||
-        substitute($l.years, Math.round(years))
+        substitute($l.years, Math.round(years));

-      var separator = $l.wordSeparator || ""
-      if ($l.wordSeparator === undefined) { separator = " " }
-      return $.trim([prefix, words, suffix].join(separator))
+      var separator = $l.wordSeparator || "";
+      if ($l.wordSeparator === undefined) { separator = " "; }
+      return $.trim([prefix, words, suffix].join(separator));
    },

    parse: function (iso8601) {
-      var s = $.trim(iso8601)
-      s = s.replace(/\.\d+/, "") // remove milliseconds
-      s = s.replace(/-/, "/").replace(/-/, "/")
-      s = s.replace(/T/, " ").replace(/Z/, " UTC")
-      s = s.replace(/([\+\-]\d\d)\:?(\d\d)/, " $1$2") // -04:00 -> -0400
-      s = s.replace(/([\+\-]\d\d)$/, " $100") // +09 -> +0900
-      return new Date(s)
+      var s = $.trim(iso8601);
+      s = s.replace(/\.\d+/, ""); // remove milliseconds
+      s = s.replace(/-/, "/").replace(/-/, "/");
+      s = s.replace(/T/, " ").replace(/Z/, " UTC");
+      s = s.replace(/([\+\-]\d\d)\:?(\d\d)/, " $1$2"); // -04:00 -> -0400
+      s = s.replace(/([\+\-]\d\d)$/, " $100"); // +09 -> +0900
+      return new Date(s);
    },
    datetime: function (elem) {
-      var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title")
-      return $t.parse(iso8601)
+      var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title");
+      return $t.parse(iso8601);
    },
    isTime: function (elem) {
      // jQuery's `is()` doesn't play well with HTML5 in IE
-      return $(elem).get(0).tagName.toLowerCase() === "time" // $(elem).is("time");
+      return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time");
    }
-  })
+  });

  // functions that can be called via $(el).timeago('action')
  // init is default when no action is given
  // functions are called with context of a single element
  var functions = {
    init: function () {
-      functions.dispose.call(this)
-      var refresh_el = $.proxy(refresh, this)
-      refresh_el()
-      var $s = $t.settings
+      functions.dispose.call(this);
+      var refresh_el = $.proxy(refresh, this);
+      refresh_el();
+      var $s = $t.settings;
      if ($s.refreshMillis > 0) {
-        this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis)
+        this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis);
      }
    },
    update: function (timestamp) {
-      var date = (timestamp instanceof Date) ? timestamp : $t.parse(timestamp)
-      $(this).data('timeago', { datetime: date })
+      var date = (timestamp instanceof Date) ? timestamp : $t.parse(timestamp);
+      $(this).data('timeago', { datetime: date });
      if ($t.settings.localeTitle) {
-        $(this).attr("title", date.toLocaleString())
+        $(this).attr("title", date.toLocaleString());
      }
-      refresh.apply(this)
+      refresh.apply(this);
    },
    updateFromDOM: function () {
-      $(this).data('timeago', { datetime: $t.parse($t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title")) })
-      refresh.apply(this)
+      $(this).data('timeago', { datetime: $t.parse($t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title")) });
+      refresh.apply(this);
    },
    dispose: function () {
      if (this._timeagoInterval) {
-        window.clearInterval(this._timeagoInterval)
-        this._timeagoInterval = null
+        window.clearInterval(this._timeagoInterval);
+        this._timeagoInterval = null;
      }
    }
-  }
+  };

  $.fn.timeago = function (action, options) {
-    var fn = action ? functions[action] : functions.init
+    var fn = action ? functions[action] : functions.init;
    if (!fn) {
-      throw new Error("Unknown function name '" + action + "' for timeago")
+      throw new Error("Unknown function name '" + action + "' for timeago");
    }
    // each over objects here and call the requested function
    this.each(function () {
-      fn.call(this, options)
-    })
-    return this
-  }
+      fn.call(this, options);
+    });
+    return this;
+  };

  function refresh() {
-    var $s = $t.settings
+    var $s = $t.settings;

    //check if it's still visible
    if ($s.autoDispose && !$.contains(document.documentElement, this)) {
      //stop if it has been removed
-      $(this).timeago("dispose")
-      return this
+      $(this).timeago("dispose");
+      return this;
    }

-    var data = prepareData(this)
+    var data = prepareData(this);

    if (!isNaN(data.datetime)) {
      if ($s.cutoff === 0 || Math.abs(distance(data.datetime)) < $s.cutoff) {
-        $(this).text(inWords(data.datetime))
+        $(this).text(inWords(data.datetime));
      } else {
        if ($(this).attr('title').length > 0) {
-          $(this).text($(this).attr('title'))
+          $(this).text($(this).attr('title'));
        }
      }
    }
-    return this
+    return this;
  }

  function prepareData(element) {
-    element = $(element)
+    element = $(element);
    if (!element.data("timeago")) {
-      element.data("timeago", { datetime: $t.datetime(element) })
-      var text = $.trim(element.text())
+      element.data("timeago", { datetime: $t.datetime(element) });
+      var text = $.trim(element.text());
      if ($t.settings.localeTitle) {
-        element.attr("title", element.data('timeago').datetime.toLocaleString())
+        element.attr("title", element.data('timeago').datetime.toLocaleString());
      } else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) {
-        element.attr("title", text)
+        element.attr("title", text);
      }
    }
-    return element.data("timeago")
+    return element.data("timeago");
  }

  function inWords(date) {
-    return $t.inWords(distance(date))
+    return $t.inWords(distance(date));
  }

  function distance(date) {
-    return (new Date().getTime() - date.getTime())
+    return (new Date().getTime() - date.getTime());
  }

  // fix for IE6 suckage
-  document.createElement("abbr")
-  document.createElement("time")
-}))
+  document.createElement("abbr");
+  document.createElement("time");
+}));
--- a/app/js/common/version.js
+++ b/app/js/common/version.js
@@ -1,25 +1,21 @@
 //バージョンチェッカー
 function verck(ver, jp) {
-	if (store) return false
 	console.log('%c Welcome😊 ' + ver, 'color: red;font-size:200%;')
 	$('body').addClass(localStorage.getItem('platform'))
 	var date = new Date()
 	var showVer = false
-	//Spotify
-	if (localStorage.getItem('spotify')) {
-		localStorage.removeItem('spotify')
-		localStorage.removeItem('spotify-refresh')
-		var spDc = 'Spotify NowPlaying sysytem was changed, please re-login to Spotify'
-		if(lang.language == 'ja') {
-			spDc = 'Spotify NowPlayingの機能が変更されたため、もう一度ログインしてください'
-		}
-		Swal.fire({
-			type: 'info',
-			title: spDc,
-		})
-	}
-	//Spotify(e)
 	if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
+		//ちょっと削除とリンク解析の都合上アレ(s)
+		//対象外のアプデ:storageが20の最初まで"Usamin (18.6.5)"
+		if (!localStorage.getItem('usamin_18_6_5_flag')) {
+			localStorage.setItem('usamin_18_6_5_flag', true)
+			var multi = localStorage.getItem('column')
+			var obj = JSON.parse(multi)
+			for (var i = 0; i < obj.length; i++) {
+				localStorage.removeItem('card_' + i)
+			}
+		}
+		//ちょっと削除とリンク解析の都合上アレ(e)
 		showVer = true
 		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
 		$(document).ready(function() {
@@ -208,7 +204,7 @@ function verck(ver, jp) {
 									}
 								}
 								if (showVer) {
-									M.toast({
+									Mtoast({
 										html:
 											escapeHTML(obj.text) +
 											toot +
@@ -269,7 +265,7 @@ function infowebsocket() {
 					if (showVer) {
 						console.log(obj.text)
 						console.log(escapeHTML(obj.text))
-						M.toast({
+						Mtoast({
 							html:
 								escapeHTML(obj.text) +
 								toot +
@@ -328,8 +324,82 @@ 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') {
+		var mes = lang.lang_version_platform_linux
+	} else if (platform == 'darwin') {
+		var mes = lang.lang_version_platform_mac
+	} else {
+		var mes = false
+	}
+	if (mes) {
+		Swal.fire({
+			title: 'Select your platform',
+			text: mes,
+			type: 'info',
+			showCancelButton: true,
+			confirmButtonColor: '#3085d6',
+			cancelButtonColor: '#3085d6',
+			confirmButtonText: lang.lang_no,
+			cancelButtonText: lang.lang_yesno
+		}).then(result => {
+			//逆にしてる
+			if (!result.value) {
+				localStorage.setItem('winstore', 'winstore')
+			} else {
+				localStorage.setItem('winstore', 'localinstall')
+			}
+			localStorage.setItem('ver', ver)
+			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')
+				verp = ver.replace('(', '')
+				verp = verp.replace('.', '-')
+				verp = verp.replace('.', '-')
+				verp = verp.replace('[', '-')
+				verp = verp.replace(']', '')
+				verp = verp.replace(')', '')
+				verp = verp.replace(' ', '_')
+				console.log('%c ' + verp, 'color: red;font-size:200%;')
+				if (lang.language == 'ja') {
+					$('#release-' + verp).show()
+				} else {
+					$('#release-en').show()
+				}
+			})
+		})
+	} else {
+		localStorage.setItem('ver', ver)
+			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('.', '-')
+				verp = verp.replace('.', '-')
+				verp = verp.replace('[', '-')
+				verp = verp.replace(']', '')
+				verp = verp.replace(')', '')
+				verp = verp.replace(' ', '_')
+				console.log('%c ' + verp, 'color: red;font-size:200%;')
+				if (lang.language == 'ja') {
+					$('#release-' + verp).show()
+				} else {
+					$('#release-en').show()
+				}
+			})
+	}
+	
+}
 function closeStart() {
 	$('#start').css('display', 'none')
 	var platform = localStorage.getItem('platform')
 	var ver = localStorage.getItem('ver')
+	storeDialog(platform, ver)
 }
--- a/app/js/emoji/emojipack.js
+++ b/app/js/emoji/emojipack.js
@@ -92,7 +92,7 @@ var activity=[
    {shortcode:"man-rowing-boat",css:"95.8333% 14.5833%"},
    {shortcode:"man-biking",css:"95.8333% 39.5833%"},
    {shortcode:"man-mountain-biking",css:"95.8333% 64.5833%"}
-    ]
+    ];
 var flag=[
    {shortcode:"checkered_flag",css:"16.6667% 58.3333%"},
    {shortcode:"crossed_flags",css:"14.5833% 60.4167%"},
@@ -356,7 +356,7 @@ var flag=[
    {shortcode:"rainbow-flag",css:"83.3333% 100%"},
    {shortcode:"triangular_flag_on_post",css:"54.1667% 6.25%"},
    {shortcode:"waving_black_flag",css:"20.8333% 29.1667%"},
-    {shortcode:"waving_white_flag",css:"20.8333% 27.0833%"}]
+    {shortcode:"waving_white_flag",css:"20.8333% 27.0833%"}];
 var food=[
    {shortcode:"green_apple",css:"12.5% 25%"},
    {shortcode:"apple",css:"12.5% 22.9167%"},
@@ -444,7 +444,7 @@ var food=[
    {shortcode:"spoon",css:"62.5% 14.5833%"},
    {shortcode:"fork_and_knife",css:"14.5833% 0%"},
    {shortcode:"knife_fork_plate",css:"14.5833% 18.75%"}
-    ]
+    ];
 var nature=[
    {shortcode:"dog",css:"22.9167% 62.5%"},
    {shortcode:"cat",css:"22.9167% 52.0833%"},
@@ -605,7 +605,7 @@ var nature=[
    {shortcode:"droplet",css:"35.4167% 39.5833%"},
    {shortcode:"sweat_drops",css:"35.4167% 37.5%"},
    {shortcode:"umbrella_with_rain_drops",css:"0% 100%"}
-    ]
+    ];
 var object=[
    {shortcode:"watch",css:"0% 29.1667%"},
    {shortcode:"iphone",css:"39.5833% 0%"},
@@ -780,7 +780,7 @@ var object=[
    {shortcode:"closed_lock_with_key",css:"39.5833% 62.5%"},
    {shortcode:"lock",css:"39.5833% 66.6667%"},
    {shortcode:"unlock",css:"39.5833% 68.75%"}
-    ]
+    ];
 var people=[
    {shortcode:"grinning",css:"45.8333% 68.75%"},
    {shortcode:"smiley",css:"45.8333% 75%"},
@@ -1096,7 +1096,7 @@ var people=[
    {shortcode:"woman-raising-hand",css:"93.75% 29.1667%"},
    {shortcode:"woman-frowning",css:"93.75% 54.1667%"},
    {shortcode:"woman-pouting",css:"93.75% 79.1667%"}
-    ]
+    ];
 var place=[
    {shortcode:"car",css:"52.0833% 60.4167%"},
    {shortcode:"taxi",css:"52.0833% 56.25%"},
@@ -1217,7 +1217,7 @@ var place=[
    {shortcode:"milky_way",css:"8.33333% 93.75%"},
    {shortcode:"bridge_at_night",css:"8.33333% 87.5%"},
    {shortcode:"foggy",css:"8.33333% 70.8333%"}
-    ]
+    ];
 var symbol=[
    {shortcode:"heart",css:"6.25% 62.5%"},
    {shortcode:"yellow_heart",css:"35.4167% 14.5833%"},
@@ -1492,7 +1492,7 @@ var symbol=[
    {shortcode:"female_sign",css:"2.08333% 37.5%"},
    {shortcode:"male_sign",css:"2.08333% 39.5833%"},
    {shortcode:"staff_of_aesculapius",css:"2.08333% 87.5%"}
-]
+];
 var faicons=[
        "fa-500px",
        "fa-address-book",
--- a/app/js/login/instance.js
+++ b/app/js/login/instance.js
@@ -83,6 +83,6 @@ var idata = {
 	"nitiasa.com_quote":"enabled",
 	"biwakodon.com_quote":"enabled",
 	"comm.cx_quote":"enabled"
-}
+};

-localStorage.setItem("instance", JSON.stringify(idata))
+localStorage.setItem("instance", JSON.stringify(idata));
--- a/app/js/login/login.js
+++ b/app/js/login/login.js
@@ -197,7 +197,7 @@ function getdata() {
 		.then(function(json) {
 			if (json.error) {
 				console.error('Error:' + json.error)
-				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+				Mtoast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
 				return
 			}
 			var avatar = json['avatar']
@@ -255,7 +255,7 @@ function getdataAdv(domain, at) {
 		.then(function(json) {
 			if (json.error) {
 				console.error('Error:' + json.error)
-				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+				Mtoast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
 				return
 			}
 			var avatar = json['avatar']
@@ -321,7 +321,7 @@ function refresh(target, loadskip) {
 		.then(function(json) {
 			if (json.error) {
 				console.error('Error:' + json.error)
-				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+				Mtoast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
 				return
 			}
 			var avatar = json['avatar']
@@ -573,7 +573,7 @@ function multiSelector(parseC) {
 		)
 		$('#dir-acct-sel').append('<option value="noauth">' + lang.lang_login_noauth + '</option>')
 	}
-	$('select').formSelect()
+	//$('select').formSelect()
 	if (!parseC) {
 		parseColumn(null, true)
 	}
@@ -590,7 +590,7 @@ function enc(ver) {
 }
 //インスタンスティッカー
 function ticker() {
-	var start = 'https://s.0px.io/json'
+	var start = 'https://toot.app/toot/index.php'
 	fetch(start, {
 		method: 'GET',
 		cors: true,
@@ -611,8 +611,7 @@ function ticker() {
 		})
 		.then(function(json) {
 			if (json) {
-				localStorage.removeItem('ticker')
-				localStorage.setItem('sticker', JSON.stringify(json))
+				localStorage.setItem('ticker', JSON.stringify(json))
 			}
 		})
 }
--- a/app/js/login/logout.js
+++ b/app/js/login/logout.js
@@ -1,7 +1,7 @@
 //ログアウトします
 function logout() {
-	localStorage.removeItem("acct_" + acct_id + "_at")
-	localStorage.removeItem("domain_" + acct_id)
-	location.href = "index.html"
-	todc()
+	localStorage.removeItem("acct_" + acct_id + "_at");
+	localStorage.removeItem("domain_" + acct_id);
+	location.href = "index.html";
+	todc();
 }
--- a/app/js/login/manager.js
+++ b/app/js/login/manager.js
@@ -640,7 +640,7 @@ function code(code) {
 		$('#code').val('')
 	}
 	if (!code || code == '') {
-		M.toast({ html: lang.lang_fatalerroroccured + 'Error: no code', displayLength: 5000 })
+		Mtoast({ html: lang.lang_fatalerroroccured + 'Error: no code', displayLength: 5000 })
 		return false
 	}
 	var url = localStorage.getItem('domain_tmp')
@@ -757,7 +757,7 @@ function getdata(domain, at) {
 		.then(function(json) {
 			if (json.error) {
 				console.error('Error:' + json.error)
-				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+				Mtoast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
 				return
 			}
 			var avatar = json['avatar']
@@ -830,7 +830,7 @@ function atSetup(type) {
 		}
 	}
 	if (!i || i == '') {
-		M.toast({ html: lang.lang_fatalerroroccured + 'Error: access token', displayLength: 5000 })
+		Mtoast({ html: lang.lang_fatalerroroccured + 'Error: access token', displayLength: 5000 })
 		return false
 	}
 	var obj = JSON.parse(multi)
@@ -883,7 +883,7 @@ function refresh(target) {
 		.then(function(json) {
 			if (json.error) {
 				console.error('Error:' + json.error)
-				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+				Mtoast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
 				return
 			}
 			var avatar = json['avatar']
@@ -1007,12 +1007,12 @@ function multisel() {
 			$('.acct-sel').append(template)
 		})
 	}
-	$('select').formSelect()
+	//$('select').formSelect()
 }
 function mainacct() {
 	var acct_id = $('#main-acct-sel').val()
 	localStorage.setItem('main', acct_id)
-	M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 })
+	Mtoast({ html: lang.lang_manager_mainAcct, displayLength: 3000 })
 }
 function colorpicker(key) {
 	temp = `<div onclick="coloradd('${key}','def','def')" class="pointer exc">${lang.lang_manager_none}</div>
--- a/app/js/platform/end.js
+++ b/app/js/platform/end.js
@@ -130,11 +130,17 @@ function playSound() {
 	volumeControl.gain.value = vol
 	source.start(0)
 	soundFile = source
+
+	function newFunction() {
+		var source
+		return source
+	}
 }
 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') {
@@ -147,7 +153,7 @@ onmessage = function(e) {
 		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: showTxt, displayLength: 5000 })
+		Mtoast({ html: showTxt, displayLength: 5000 })
 	} else if (e.data[0] == 'parseColumn') {
 		parseColumn(e.data[1])
 	} else if (e.data[0] == 'exportSettingsCore') {
--- a/app/js/platform/first.js
+++ b/app/js/platform/first.js
@@ -1,11 +1,11 @@
-$.strip_tags = function (str, allowed) {
+$.strip_tags = function(str, allowed) {
 	if (!str) {
 		return ''
 	}
 	allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join('')
 	var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
 		commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi
-	return str.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
+	return str.replace(commentsAndPhpTags, '').replace(tags, function($0, $1) {
 		return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : ''
 	})
 }
@@ -88,18 +88,17 @@ function formattimeutc(date) {
 }
 postMessage(['sendSinmpleIpc', 'custom-css-request'], '*')
 function makeCID() {
-	let chars = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".split("")
-	for (let i = 0, len = chars.length; i < len; i++) {
-		switch (chars[i]) {
-			case "x":
-				chars[i] = Math.floor(Math.random() * 16).toString(16)
-				break
-			case "y":
-				chars[i] = (Math.floor(Math.random() * 4) + 8).toString(16)
-				break
-		}
-	}
-	return chars.join("")
+	return (
+		randomStr(8) +
+		'-' +
+		randomStr(4) +
+		'-' +
+		randomStr(4) +
+		'-' +
+		randomStr(4) +
+		'-' +
+		randomStr(12)
+	)
 }
 function randomStr(l) {
 	// 生成する文字列に含める文字セット
@@ -148,15 +147,15 @@ function rgbToHex(color) {
 	console.error(color + ':第1引数はRGB形式で入力')
 }
 /*マルチバイト用切り出し*/
-$.isSurrogatePear = function (upper, lower) {
+$.isSurrogatePear = function(upper, lower) {
 	return 0xd800 <= upper && upper <= 0xdbff && 0xdc00 <= lower && lower <= 0xdfff
 }
-$.mb_strlen = function (str) {
+$.mb_strlen = function(str) {
 	var splitter = new GraphemeSplitter()
 	var arr = splitter.splitGraphemes(str)
 	return arr.length
 }
-$.mb_substr = function (str, begin, end) {
+$.mb_substr = function(str, begin, end) {
 	//配列にする
 	var splitter = new GraphemeSplitter()
 	var arr = splitter.splitGraphemes(str)
@@ -176,7 +175,7 @@ function object_array_sort(data, key, order, fn) {
 		num_a = 1
 		num_b = -1
 	}
-	data = data.sort(function (a, b) {
+	data = data.sort(function(a, b) {
 		var x = a[key]
 		var y = b[key]
 		if (x > y) return num_a
@@ -226,6 +225,9 @@ function evalAttr(json, attr, lenCk) {
 		return false
 	}
 }
+function Mtoast(obj) {
+	return true
+}
 function statusModel(now) {
 	if (!now) {
 		var now = new Date().toString()
--- a/app/js/platform/preload.js
+++ b/app/js/platform/preload.js
@@ -207,7 +207,6 @@ ipc.on('theme-json-response', function(event, args) {
 	postMessage(['customConnect', args], '*')
 })
 ipc.on('theme-json-create-complete', function(event, args) {
-	if(args != '') alert(args)
 	postMessage(['clearCustomImport', ''], '*')
 	postMessage(['ctLoad', ''], '*')
 })
--- a/app/js/post/bb-md.js
+++ b/app/js/post/bb-md.js
@@ -45,7 +45,7 @@ function mdCheck() {
 		$('#trendtag').html('')
 	}
 	if (localStorage.getItem('mode_' + domain) == 'misskey') {
-		M.toast({ html: lang.lang_bbmd_misskey, displayLength: 5000 })
+		Mtoast({ html: lang.lang_bbmd_misskey, displayLength: 5000 })
 	}
 	if (idata[domain + '_letters']) {
 		$('#textarea').attr('data-length', idata[domain + '_letters'])
--- a/app/js/post/img.js
+++ b/app/js/post/img.js
@@ -154,9 +154,9 @@ async function media(b64, type, no, stamped) {
 					$('#nsfw').addClass('nsfw-avail')
 				}
 				$('.toot-btn-group').prop('disabled', false)
-				$('select').formSelect()
+				//$('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 })
+				Mtoast({ 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')
@@ -176,9 +176,9 @@ async function media(b64, type, no, stamped) {
 			if (this.status !== 200) {
 				setLog(start, this.status, json)
 				$('.toot-btn-group').prop('disabled', false)
-				$('select').formSelect()
+				//$('select').formSelect()
 				$('#mec').text(lang.lang_there)
-				M.toast({ html: this.status + ':' +json, displayLength: 2000 })
+				Mtoast({ html: this.status + ':' +json, displayLength: 2000 })
 				$('#imgup').text('')
 				$('#imgsel').show()
 			}
@@ -187,14 +187,14 @@ async function media(b64, type, no, stamped) {
 				$('#imgup').text('')
 				$('.toot-btn-group').prop('disabled', false)
 				$('#post-acct-sel').prop('disabled', false)
-				$('select').formSelect()
+				//$('select').formSelect()
 				$('#imgsel').show()
-				M.toast({ html: lang.lang_postimg_failupload, displayLength: 5000 })
+				Mtoast({ html: lang.lang_postimg_failupload, displayLength: 5000 })
 				return false
 			}
 			$('#imgup').text('')
 			$('.toot-btn-group').prop('disabled', false)
-			$('select').formSelect()
+			//$('select').formSelect()
 			$('#imgsel').show()
 			var img = localStorage.getItem('img')
 			if (json.type.indexOf('image') != -1) {
--- a/app/js/post/misskeystatus.js
+++ b/app/js/post/misskeystatus.js
@@ -34,7 +34,7 @@ function renoteqt(id, acct_id) {
 	$('#rec').text('Renote')
 	$('#post-acct-sel').val(acct_id)
 	$('#post-acct-sel').prop('disabled', true)
-	$('select').formSelect()
+	//$('select').formSelect()
 	$('#textarea').attr('placeholder', lang.lang_misskeyparse_qt)
 	$('#textarea').focus()
 }
@@ -46,7 +46,7 @@ function misskeyreply(id, acct_id) {
 	$('#rec').text('Renote')
 	$('#post-acct-sel').val(acct_id)
 	$('#post-acct-sel').prop('disabled', true)
-	$('select').formSelect()
+	//$('select').formSelect()
 	$('#textarea').attr('placeholder', lang.lang_misskeyparse_qt)
 	$('#textarea').focus()
 }
@@ -120,7 +120,7 @@ function reactioncustom(acct_id, id) {
 	$('#unreact').hide()
 	$('#addreact').removeClass('hide')
 	$('#post-acct-sel').val(acct_id)
-	$('select').formSelect()
+	//$('select').formSelect()
 	localStorage.setItem('nohide', true)
 	show()
 	emojiToggle(true)
--- a/app/js/post/post.js
+++ b/app/js/post/post.js
@@ -347,7 +347,7 @@ function clear() {
 		$('#post-acct-sel').val(localStorage.getItem('main'))
 	}
 	$('#emoji').addClass('hide')
-	$('select').formSelect()
+	//$('select').formSelect()
 	$('#default-emoji').show()
 	$('#unreact').show()
 	$('#addreact').addClass('hide')
--- a/app/js/post/status.js
+++ b/app/js/post/status.js
@@ -49,7 +49,7 @@ function fav(id, acct_id, remote) {
 					$('.fav_' + id).addClass('yellow-text')
 				}
 			} else {
-				M.toast({ html: lang.lang_status_favWarn, displayLength: 1000 })
+				Mtoast({ html: lang.lang_status_favWarn, displayLength: 1000 })
 			}
 		}
 	}
@@ -240,7 +240,7 @@ async function acctResolve(acct_id, user) {
 	if (idJson.accounts[0]) {
 		var id = idJson.accounts[0].id
 	} else {
-		M.toast({ html: lang.lang_fatalerroroccured, displayLength: 2000 })
+		Mtoast({ html: lang.lang_fatalerroroccured, displayLength: 2000 })
 	}
 	return id
 }
@@ -428,7 +428,7 @@ function redraft(id, acct_id) {
 					var json = httpreq.response
 					$('#post-acct-sel').prop('disabled', true)
 					$('#post-acct-sel').val(acct_id)
-					$('select').formSelect()
+					//$('select').formSelect()
 					mdCheck()
 					var medias = $('[toot-id=' + id + ']').attr('data-medias')
 					var mediack = json.media_attachments[0]
@@ -580,7 +580,7 @@ function empUser() {
 	if (!obj) {
 		var obj = []
 		obj.push(id)
-		M.toast({ html: id + lang.lang_status_emphas, displayLength: 4000 })
+		Mtoast({ html: id + lang.lang_status_emphas, displayLength: 4000 })
 	} else {
 		var can
 		Object.keys(obj).forEach(function(key) {
@@ -590,7 +590,7 @@ function empUser() {
 			} else {
 				can = true
 				obj.splice(key, 1)
-				M.toast({ html: id + lang.lang_status_unemphas, displayLength: 4000 })
+				Mtoast({ html: id + lang.lang_status_unemphas, displayLength: 4000 })
 			}
 		})
 	}
@@ -634,7 +634,7 @@ function pinUser() {
 //URLコピー
 function tootUriCopy(url) {
 	execCopy(url)
-	M.toast({ html: lang.lang_details_url, displayLength: 1500 })
+	Mtoast({ html: lang.lang_details_url, displayLength: 1500 })
 }

 //他のアカウントで…
@@ -680,12 +680,7 @@ function staEx(mode) {
 		})
 	return
 }
-function toggleAction(id) {
-	console.log(document.getElementById(id))
-	var instance = M.Dropdown.init(document.getElementById(id));
-	instance.open()
-	return
-	var height = ct * 39 + 6
+function toggleAction(elem, height) {
 	var cont = elem.parents('.cvo').find('.contextMenu')
 	if (cont.hasClass('hide')) {
 		$('#contextWrap').removeClass('hide')
@@ -696,7 +691,6 @@ function toggleAction(id) {
 			cont.removeClass('bottom')
 			cont.addClass('top')
 		} else {
-			top = elem.offset().top - 105
 			cont.removeClass('top')
 			cont.addClass('bottom')
 		}
--- a/app/js/post/use-txtbox.js
+++ b/app/js/post/use-txtbox.js
@@ -15,7 +15,7 @@ function re(id, ats_cm, acct_id, mode) {
 	$('#rec').text(lang.lang_yesno)
 	$('#post-acct-sel').val(acct_id)
 	$('#post-acct-sel').prop('disabled', true)
-	$('select').formSelect()
+	//$('select').formSelect()
 	mdCheck()
 	$('#textarea').attr('placeholder', lang.lang_usetxtbox_reply)
 	$('#textarea').focus()
@@ -65,7 +65,7 @@ function qt(id, acct_id, at, url) {
 		$('#quote').val(id)
 		$('#post-acct-sel').val(acct_id)
 		$('#post-acct-sel').prop('disabled', true)
-		$('select').formSelect()
+		//$('select').formSelect()
 		$('#textarea').attr('placeholder', lang.lang_usetxtbox_reply)
 		$('#textarea').focus()
 		var profimg = localStorage.getItem('prof_' + acct_id)
@@ -75,7 +75,7 @@ function qt(id, acct_id, at, url) {
 		$('#acct-sel-prof').attr('src', profimg)
 	}
 	$('#post-acct-sel').val(acct_id)
-	$('select').formSelect()
+	//$('select').formSelect()
 	mdCheck()
 	$('#textarea').focus()
 }
--- a/app/js/tl/announParse.js
+++ b/app/js/tl/announParse.js
@@ -121,7 +121,7 @@ function announReactionNew(id, acct_id, tlid) {
 	$('#unreact').hide()
 	$('#addreact').removeClass('hide')
 	$('#post-acct-sel').val(acct_id)
-	$('select').formSelect()
+	//$('select').formSelect()
 	localStorage.setItem('nohide', true)
 	show()
 	emojiToggle(true)
--- a/app/js/tl/datails.js
+++ b/app/js/tl/datails.js
@@ -555,10 +555,10 @@ function cbCopy(mode) {
 			`<iframe src="${url}/embed" class="mastodon-embed" style="max-width: 100%; border: 0" width="400"></iframe>
 			<script src="https://${domain}/embed.js" async="async"></script>`
 		execCopy(emb)
-		M.toast({ html: lang.lang_details_embed, displayLength: 1500 })
+		Mtoast({ html: lang.lang_details_embed, displayLength: 1500 })
 	} else {
 		if (execCopy(url)) {
-			M.toast({ html: lang.lang_details_url, displayLength: 1500 })
+			Mtoast({ html: lang.lang_details_url, displayLength: 1500 })
 		}
 	}
 }
@@ -573,7 +573,7 @@ function staCopy(id) {
 	html = html.replace(/<img[\s\S]*alt="(.+?)"[\s\S]*?>/g, '$1')
 	html = $.strip_tags(html)
 	if (execCopy(html)) {
-		M.toast({ html: lang.lang_details_txt, displayLength: 1500 })
+		Mtoast({ html: lang.lang_details_txt, displayLength: 1500 })
 	}
 }
 //翻訳
--- a/app/js/tl/date.js
+++ b/app/js/tl/date.js
@@ -1,98 +1,95 @@
 //日付パーサー
-function date(str, datetype, lastStatus) {
-	if (lastStatus) {
-		var date = new Date(str)
-		return date.getFullYear() + "/" + (date.getMonth() + 1) + "/" + date.getDate()
-	} else if (datetype == "relative") {
-		return '<time class="timeago" datetime="' + str + '"></time>'
+function date(str, datetype) {
+	if (datetype == "relative") {
+		return '<time class="timeago" datetime="' + str + '"></time>';
 	} else {
-		var date = new Date(str)
+		var date = new Date(str);
 		if (datetype == "unix") {
-			var unixm = date.getTime()
-			return Math.floor(unixm / 1000)
+			var unixm = date.getTime();
+			return Math.floor(unixm / 1000);
 		}
-		var now = new Date()
-		var month = date.getMonth() + 1
+		var now = new Date();
+		var month = date.getMonth() + 1;
 		if (date.getMinutes() < 10) {
-			var min = "0" + date.getMinutes()
+			var min = "0" + date.getMinutes();
 		} else {
-			var min = date.getMinutes()
+			var min = date.getMinutes();
 		}
-		var sec = null
+		var sec = null;
 		if (date.getSeconds() < 10) {
-			sec = "0" + date.getSeconds()
+			sec = "0" + date.getSeconds();
 		} else {
-			sec = date.getSeconds()
+			sec = date.getSeconds();
 		}
 		if (datetype == "full") {
 			var ret = date.getFullYear() + "/" + month + "/" + date.getDate() + "/ " +
-				date.getHours() + ":" + min + ":" + sec
+				date.getHours() + ":" + min + ":" + sec;
 		}
 		if (date.getFullYear() == now.getFullYear()) {
 			if (date.getMonth() == now.getMonth()) {
 				if (date.getDate() == now.getDate()) {
 					if (datetype == "medium") {
-						var ret = '<time class="timeago" datetime="' + str + '"></time>'
+						var ret = '<time class="timeago" datetime="' + str + '"></time>';
 					} else {
-						var ret = date.getHours() + ":" + min + ":" + sec
+						var ret = date.getHours() + ":" + min + ":" + sec;
 					}

 				} else {
 					var ret = month + "/" + date.getDate() + " " + date.getHours() + ":" +
-						min + ":" + sec
+						min + ":" + sec;
 				}
 			} else {
 				var ret = month + "/" + date.getDate() + " " + date.getHours() + ":" + min +
-					":" + sec
+					":" + sec;
 			}
 		} else {
 			var ret = date.getFullYear() + "/" + month + "/" + date.getDate() + " " +
-				date.getHours() + ":" + min + ":" + sec
+				date.getHours() + ":" + min + ":" + sec;
 		}
 		if (datetype == "double") {
-			return '<time class="timeago" datetime="' + str + '"></time>/' + ret
+			return '<time class="timeago" datetime="' + str + '"></time>/' + ret;
 		} else {
-			return ret
+			return ret;
 		}
 	}
 }

 //特殊フォーマット(インスタンス情報で利用)
 function crat(str) {
-	var date = new Date(str)
-	var mnt = null
+	var date = new Date(str);
+	var mnt = null;
 	if (date.getMonth() < 9) {
-		mnt = "0" + (date.getMonth() + 1)
+		mnt = "0" + (date.getMonth() + 1);
 	} else {
-		mnt = date.getMonth() + 1
+		mnt = date.getMonth() + 1;
 	}
 	if (date.getDate() < 10) {
-		var dat = "0" + date.getDate()
+		var dat = "0" + date.getDate();
 	} else {
-		var dat = date.getDate()
+		var dat = date.getDate();
 	}
 	if (date.getHours() < 10) {
-		var hrs = "0" + date.getHours()
+		var hrs = "0" + date.getHours();
 	} else {
-		var hrs = date.getHours()
+		var hrs = date.getHours();
 	}
 	if (date.getMinutes() < 10) {
-		var mns = "0" + date.getMinutes()
+		var mns = "0" + date.getMinutes();
 	} else {
-		var mns = date.getMinutes()
+		var mns = date.getMinutes();
 	}
 	if (date.getSeconds() < 10) {
-		var sec = "0" + date.getSeconds()
+		var sec = "0" + date.getSeconds();
 	} else {
-		var sec = date.getSeconds()
+		var sec = date.getSeconds();
 	}
-	format_str = 'YYYY-MM-DD hh:mm:ss'
-	format_str = format_str.replace(/YYYY/g, date.getFullYear())
-	format_str = format_str.replace(/MM/g, mnt)
-	format_str = format_str.replace(/DD/g, dat)
-	format_str = format_str.replace(/hh/g, hrs)
-	format_str = format_str.replace(/mm/g, mns)
-	format_str = format_str.replace(/ss/g, sec)
+	format_str = 'YYYY-MM-DD hh:mm:ss';
+	format_str = format_str.replace(/YYYY/g, date.getFullYear());
+	format_str = format_str.replace(/MM/g, mnt);
+	format_str = format_str.replace(/DD/g, dat);
+	format_str = format_str.replace(/hh/g, hrs);
+	format_str = format_str.replace(/mm/g, mns);
+	format_str = format_str.replace(/ss/g, sec);

-	return format_str
+	return format_str;
 }
--- a/app/js/tl/directory.js
+++ b/app/js/tl/directory.js
@@ -1,49 +1,49 @@
 //ディレクトリ
 //ディレクトリトグル
 function dirMenu() {
-	$("#dir-contents").html("")
-	directory()
-	$("#left-menu a").removeClass("active")
-	$("#dirMenu").addClass("active")
-	$(".menu-content").addClass("hide")
-	$("#dir-box").removeClass("hide")
+	$("#dir-contents").html("");
+	directory();
+	$("#left-menu a").removeClass("active");
+	$("#dirMenu").addClass("active");
+	$(".menu-content").addClass("hide");
+	$("#dir-box").removeClass("hide");
 }
 function dirselCk() {
-	var acct = $("#dir-acct-sel").val()
+	var acct = $("#dir-acct-sel").val();
 	if (acct == "noauth") {
-		$("#dirNoAuth").removeClass("hide")
+		$("#dirNoAuth").removeClass("hide");
 	} else {
-		$("#dirNoAuth").addClass("hide")
-		directory()
+		$("#dirNoAuth").addClass("hide");
+		directory();
 	}
 }
 function directory(isMore) {
-	var order = $("[name=sort]:checked").val()
+	var order = $("[name=sort]:checked").val();
 	if (!order) {
-		order = "active"
+		order = "active";
 	}
-	var local_only = $("#local_only:checked").val()
+	var local_only = $("#local_only:checked").val();
 	if (local_only) {
-		local_only = "true"
+		local_only = "true";
 	} else {
-		local_only = "false"
+		local_only = "false";
 	}
-	var acct_id = $("#dir-acct-sel").val()
+	var acct_id = $("#dir-acct-sel").val();
 	if (acct_id == "noauth") {
-		var domain = $("#dirNoAuth-url").val()
-		var at = ""
+		var domain = $("#dirNoAuth-url").val();
+		var at = "";
 	} else {
-		var domain = localStorage.getItem("domain_" + acct_id)
-		var at = localStorage.getItem("acct_" + acct_id + "_at")
+		var domain = localStorage.getItem("domain_" + acct_id);
+		var at = localStorage.getItem("acct_" + acct_id + "_at");
 	}
 	if (isMore) {
-		var addOffset = $("#dir-contents .cvo").length
+		var addOffset = $("#dir-contents .cvo").length;
 	} else {
-		var addOffset = 0
-		$("#dir-contents").html("")
+		var addOffset = 0;
+		$("#dir-contents").html("");
 	}
-	var start = "https://" + domain + "/api/v1/directory?order=" + order + "&local=" + local_only + "&offset=" + addOffset
-	console.log(start)
+	var start = "https://" + domain + "/api/v1/directory?order=" + order + "&local=" + local_only + "&offset=" + addOffset;
+	console.log(start);
 	fetch(start, {
 		method: "GET",
 		headers: {
@@ -54,23 +54,23 @@ function directory(isMore) {
 		.then(function(response) {
 			if (!response.ok) {
 				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) {
-			setLog(start, "JSON", error)
-			console.error(error)
+			setLog(start, "JSON", error);
+			console.error(error);
 		})
 		.then(function(json) {
 			if (json) {
-				$("#moreDir").removeClass("disabled")
-				var html = userparse(json, null, acct_id, "dir", null)
-				$("#dir-contents").append(html)
-				jQuery("time.timeago").timeago()
+				$("#moreDir").removeClass("disabled");
+				var html = userparse(json, null, acct_id, "dir", null);
+				$("#dir-contents").append(html);
+				jQuery("time.timeago").timeago();
 			} else {
-				$("#moreDir").addClass("disabled")
+				$("#moreDir").addClass("disabled");
 			}
-		})
+		});
 }
--- a/app/js/tl/dm.js
+++ b/app/js/tl/dm.js
@@ -1,8 +1,8 @@
 //DM(Conv) TL
 function dm(acct_id, tlid, type, delc, voice) {
-	var domain = localStorage.getItem("domain_" + acct_id)
-	var at = localStorage.getItem("acct_" + acct_id + "_at")
-	var start = "https://" + domain + "/api/v1/conversations"
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/conversations";
 	fetch(start, {
 		method: "GET",
 		headers: {
@@ -13,38 +13,38 @@ function dm(acct_id, tlid, type, delc, voice) {
 		.then(function(response) {
 			if (!response.ok) {
 				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) {
-			todo(error)
-			setLog(start, "JSON", error)
-			console.error(error)
+			todo(error);
+			setLog(start, "JSON", error);
+			console.error(error);
 		})
 		.then(function(json) {
-			var templete = '<div id="convList' + tlid + '">' + dmListParse(json, type, acct_id, tlid, "", mute) + "</div>"
-			localStorage.setItem("lastobj_" + tlid, json[0].id)
-			$("#timeline_" + tlid).html(templete)
-			additional(acct_id, tlid)
-			jQuery("time.timeago").timeago()
-			todc()
+			var templete = '<div id="convList' + tlid + '">' + dmListParse(json, type, acct_id, tlid, "", mute) + "</div>";
+			localStorage.setItem("lastobj_" + tlid, json[0].id);
+			$("#timeline_" + tlid).html(templete);
+			additional(acct_id, tlid);
+			jQuery("time.timeago").timeago();
+			todc();
 			//reload(type, '', acct_id, tlid, data, mute, delc,voice);
-			$(window).scrollTop(0)
-		})
+			$(window).scrollTop(0);
+		});
 }
 function dmmore(tlid) {
-	var multi = localStorage.getItem("column")
-	var obj = JSON.parse(multi)
-	var acct_id = obj[tlid].domain
-	var domain = localStorage.getItem("domain_" + acct_id)
-	var at = localStorage.getItem("acct_" + acct_id + "_at")
+	var multi = localStorage.getItem("column");
+	var obj = JSON.parse(multi);
+	var acct_id = obj[tlid].domain;
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var sid = $("#timeline_" + tlid + " .cvo")
 		.last()
-		.attr("unique-id")
-	var start = "https://" + domain + "/api/v1/conversations?max_id=" + sid
-	var type = "dm"
+		.attr("unique-id");
+	var start = "https://" + domain + "/api/v1/conversations?max_id=" + sid;
+	var type = "dm";
 	fetch(start, {
 		method: "GET",
 		headers: {
@@ -55,444 +55,444 @@ function dmmore(tlid) {
 		.then(function(response) {
 			if (!response.ok) {
 				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) {
-			todo(error)
-			setLog(start, "JSON", error)
-			console.error(error)
+			todo(error);
+			setLog(start, "JSON", error);
+			console.error(error);
 		})
 		.then(function(json) {
-			var templete = '<div id="convList' + tlid + '">' + dmListParse(json, type, acct_id, tlid, "", mute) + "</div>"
-			$("#timeline_" + tlid).append(templete)
-			additional(acct_id, tlid)
-			jQuery("time.timeago").timeago()
-			moreloading = false
-		})
+			var templete = '<div id="convList' + tlid + '">' + dmListParse(json, type, acct_id, tlid, "", mute) + "</div>";
+			$("#timeline_" + tlid).append(templete);
+			additional(acct_id, tlid);
+			jQuery("time.timeago").timeago();
+			moreloading = false;
+		});
 }
 //DMオブジェクトパーサー(トゥート)
 function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
-	var templete = ""
+	var templete = "";
 	if (obj[0]) {
-		localStorage.setItem("lastunix_" + tlid, date(obj[0].created_at, "unix"))
+		localStorage.setItem("lastunix_" + tlid, date(obj[0].created_at, "unix"));
 	}

-	var actb = localStorage.getItem("action_btns")
-	var actb = "re,rt,fav,qt,del,pin,red"
+	var actb = localStorage.getItem("action_btns");
+	var actb = "re,rt,fav,qt,del,pin,red";
 	if (actb) {
-		var actb = actb.split(",")
-		var disp = {}
+		var actb = actb.split(",");
+		var disp = {};
 		for (var k = 0; k < actb.length; k++) {
 			if (k < 4) {
-				var tp = "type-a"
+				var tp = "type-a";
 			} else {
-				var tp = "type-b"
+				var tp = "type-b";
 			}
-			disp[actb[k]] = tp
+			disp[actb[k]] = tp;
 		}
 	}
-	var datetype = localStorage.getItem("datetype")
-	var nsfwtype = localStorage.getItem("nsfw")
-	var sent = localStorage.getItem("sentence")
-	var ltr = localStorage.getItem("letters")
-	var gif = localStorage.getItem("gif")
-	var imh = localStorage.getItem("img-height")
+	var datetype = localStorage.getItem("datetype");
+	var nsfwtype = localStorage.getItem("nsfw");
+	var sent = localStorage.getItem("sentence");
+	var ltr = localStorage.getItem("letters");
+	var gif = localStorage.getItem("gif");
+	var imh = localStorage.getItem("img-height");
 	//独自ロケール
-	var locale = localStorage.getItem("locale")
+	var locale = localStorage.getItem("locale");
 	if (locale == "yes") {
-		var locale = false
+		var locale = false;
 	}
 	//ネイティブ通知
-	var native = localStorage.getItem("nativenotf")
+	var native = localStorage.getItem("nativenotf");
 	if (!native) {
-		native = "yes"
+		native = "yes";
 	}
 	//クライアント強調
-	var emp = localStorage.getItem("client_emp")
+	var emp = localStorage.getItem("client_emp");
 	if (emp) {
-		var emp = JSON.parse(emp)
+		var emp = JSON.parse(emp);
 	}
 	//クライアントミュート
-	var mute = localStorage.getItem("client_mute")
+	var mute = localStorage.getItem("client_mute");
 	if (mute) {
-		var mute = JSON.parse(mute)
+		var mute = JSON.parse(mute);
 	}
 	//ユーザー強調
-	var useremp = localStorage.getItem("user_emp")
+	var useremp = localStorage.getItem("user_emp");
 	if (useremp) {
-		var useremp = JSON.parse(useremp)
+		var useremp = JSON.parse(useremp);
 	}
 	//ワード強調
-	var wordemp = localStorage.getItem("word_emp")
+	var wordemp = localStorage.getItem("word_emp");
 	if (wordemp) {
-		var wordemp = JSON.parse(wordemp)
+		var wordemp = JSON.parse(wordemp);
 	}
 	//ワードミュート
-	var wordmute = localStorage.getItem("word_mute")
+	var wordmute = localStorage.getItem("word_mute");
 	if (wordmute) {
-		var wordmute = JSON.parse(wordmute)
-		wordmute = wordmute.concat(mutefilter)
+		var wordmute = JSON.parse(wordmute);
+		wordmute = wordmute.concat(mutefilter);
 	} else {
-		wordmute = mutefilter
+		wordmute = mutefilter;
 	}
 	//Ticker
-	var tickerck = localStorage.getItem("ticker_ok")
+	var tickerck = localStorage.getItem("ticker_ok");
 	if (tickerck) {
-		var ticker = true
+		var ticker = true;
 	} else {
-		var ticker = false
+		var ticker = false;
 	}
 	//Cards
-	var card = localStorage.getItem("card_" + tlid)
+	var card = localStorage.getItem("card_" + tlid);

 	if (!sent) {
-		var sent = 500
+		var sent = 500;
 	}
 	if (!ltr) {
-		var ltr = 500
+		var ltr = 500;
 	}
 	if (!nsfwtype || nsfwtype == "yes") {
-		var nsfw = "ok"
+		var nsfw = "ok";
 	} else {
-		var nsfw
+		var nsfw;
 	}
-	var cwtype = localStorage.getItem("cw")
+	var cwtype = localStorage.getItem("cw");
 	if (!cwtype || cwtype == "yes") {
-		var cw = "ok"
+		var cw = "ok";
 	} else {
-		var cw
+		var cw;
 	}
 	if (!datetype) {
-		datetype = "absolute"
+		datetype = "absolute";
 	}
 	if (!gif) {
-		var gif = "yes"
+		var gif = "yes";
 	}
 	if (!imh) {
-		var imh = "200"
+		var imh = "200";
 	}
 	if (!emp) {
-		var emp = []
+		var emp = [];
 	}
 	if (!mute) {
-		var mute = []
+		var mute = [];
 	}
 	if (!useremp) {
-		var useremp = []
+		var useremp = [];
 	}
 	if (!wordemp) {
-		var wordemp = []
+		var wordemp = [];
 	}
 	if (!wordmute) {
-		var wordmute = []
+		var wordmute = [];
 	}
 	//via通知
-	var viashow = localStorage.getItem("viashow")
+	var viashow = localStorage.getItem("viashow");
 	if (!viashow) {
-		viashow = "via-hide"
+		viashow = "via-hide";
 	}
 	if (viashow == "hide") {
-		viashow = "via-hide"
+		viashow = "via-hide";
 	}
 	//認証なしTL
 	if (mix == "noauth") {
-		var noauth = "hide"
-		var antinoauth = ""
+		var noauth = "hide";
+		var antinoauth = "";
 	} else {
-		var noauth = ""
-		var antinoauth = "hide"
+		var noauth = "";
+		var antinoauth = "hide";
 	}
 	//マウスオーバーのみ
-	var mouseover = localStorage.getItem("mouseover")
+	var mouseover = localStorage.getItem("mouseover");
 	if (!mouseover) {
-		mouseover = ""
+		mouseover = "";
 	} else if (mouseover == "yes" || mouseover == "click") {
-		mouseover = "hide"
+		mouseover = "hide";
 	} else if (mouseover == "no") {
-		mouseover = ""
+		mouseover = "";
 	}
-	var local = []
-	var times = []
+	var local = [];
+	var times = [];
 	Object.keys(obj).forEach(function(key) {
-		var conv_id = obj[key].id
-		var toot = obj[key].last_status
-		var dis_name = escapeHTML(toot.account.display_name)
+		var conv_id = obj[key].id;
+		var toot = obj[key].last_status;
+		var dis_name = escapeHTML(toot.account.display_name);
 		if (toot.account.emojis) {
-			var actemojick = toot.account.emojis[0]
+			var actemojick = toot.account.emojis[0];
 		} else {
-			var actemojick = false
+			var actemojick = false;
 		}
 		//絵文字があれば
 		if (actemojick) {
 			Object.keys(toot.account.emojis).forEach(function(key5) {
-				var emoji = toot.account.emojis[key5]
-				var shortcode = emoji.shortcode
-				var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">'
-				var regExp = new RegExp(":" + shortcode + ":", "g")
-				dis_name = dis_name.replace(regExp, emoji_url)
-			})
+				var emoji = toot.account.emojis[key5];
+				var shortcode = emoji.shortcode;
+				var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
+				var regExp = new RegExp(":" + shortcode + ":", "g");
+				dis_name = dis_name.replace(regExp, emoji_url);
+			});
 		}
-		var noticeavatar = ""
-		var if_notf = ""
-		var uniqueid = toot.id
-		var notice = ""
-		var boostback = ""
+		var noticeavatar = "";
+		var if_notf = "";
+		var uniqueid = toot.id;
+		var notice = "";
+		var boostback = "";
 		//ユーザー強調
 		if (toot.account.username != toot.account.acct) {
-			var fullname = toot.account.acct
+			var fullname = toot.account.acct;
 		} else {
-			var domain = localStorage.getItem("domain_" + acct_id)
-			var fullname = toot.account.acct + "@" + domain
+			var domain = localStorage.getItem("domain_" + acct_id);
+			var fullname = toot.account.acct + "@" + domain;
 		}
 		if (useremp) {
 			Object.keys(useremp).forEach(function(key10) {
-				var user = useremp[key10]
+				var user = useremp[key10];
 				if (user == fullname) {
-					boostback = "emphasized"
+					boostback = "emphasized";
 				}
-			})
+			});
 		}
-		var id = toot.id
-		var home = ""
+		var id = toot.id;
+		var home = "";
 		if (toot.account.locked) {
-			var locked = ' <i class="fas fa-lock red-text"></i>'
+			var locked = ' <i class="fas fa-lock red-text"></i>';
 		} else {
-			var locked = ""
+			var locked = "";
 		}
 		if (!toot.application) {
-			var via = ""
-			viashow = "hide"
+			var via = "";
+			viashow = "hide";
 		} else {
-			var via = escapeHTML(toot.application.name)
+			var via = escapeHTML(toot.application.name);
 			//強調チェック
 			Object.keys(emp).forEach(function(key6) {
-				var cli = emp[key6]
+				var cli = emp[key6];
 				if (cli == via) {
-					boostback = "emphasized"
+					boostback = "emphasized";
 				}
-			})
+			});
 			//ミュートチェック
 			Object.keys(mute).forEach(function(key7) {
-				var cli = mute[key7]
+				var cli = mute[key7];
 				if (cli == via) {
-					boostback = "hide"
+					boostback = "hide";
 				}
-			})
+			});
 		}
 		if (mix == "pinned") {
-			boostback = "emphasized"
+			boostback = "emphasized";
 		}
 		if (toot.spoiler_text && cw) {
-			var content = toot.content
-			var spoil = escapeHTML(toot.spoiler_text)
-			var spoiler = "cw cw_hide_" + toot.id
-			var api_spoil = "gray"
-			var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id + '\')" class="nex parsed">' + lang.lang_parse_cwshow + "</a><br>"
+			var content = toot.content;
+			var spoil = escapeHTML(toot.spoiler_text);
+			var spoiler = "cw cw_hide_" + toot.id;
+			var api_spoil = "gray";
+			var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id + '\')" class="nex parsed">' + lang.lang_parse_cwshow + "</a><br>";
 		} else {
-			var ct1 = toot.content.split("</p>").length + toot.content.split("<br />").length - 2
-			var ct2 = toot.content.split("</p>").length + toot.content.split("<br>").length - 2
+			var ct1 = toot.content.split("</p>").length + toot.content.split("<br />").length - 2;
+			var ct2 = toot.content.split("</p>").length + toot.content.split("<br>").length - 2;
 			if (ct1 > ct2) {
-				var ct = ct1
+				var ct = ct1;
 			} else {
-				var ct = ct2
+				var ct = ct2;
 			}
 			if ((sent < ct && $.mb_strlen($.strip_tags(toot.content)) > 5) || ($.strip_tags(toot.content).length > ltr && $.mb_strlen($.strip_tags(toot.content)) > 5)) {
-				var content = '<span class="gray">' + lang.lang_parse_fulltext + "</span><br>" + toot.content
-				var spoil = '<span class="cw-long-' + toot.id + '">' + $.mb_substr($.strip_tags(toot.content), 0, 100) + '</span><span class="gray">' + lang.lang_parse_autofold + "</span>"
-				var spoiler = "cw cw_hide_" + toot.id
-				var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id + '\')" class="nex parsed">' + lang.lang_parse_more + "</a><br>"
+				var content = '<span class="gray">' + lang.lang_parse_fulltext + "</span><br>" + toot.content;
+				var spoil = '<span class="cw-long-' + toot.id + '">' + $.mb_substr($.strip_tags(toot.content), 0, 100) + '</span><span class="gray">' + lang.lang_parse_autofold + "</span>";
+				var spoiler = "cw cw_hide_" + toot.id;
+				var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id + '\')" class="nex parsed">' + lang.lang_parse_more + "</a><br>";
 			} else {
-				var content = toot.content
-				var spoil = escapeHTML(toot.spoiler_text)
-				var spoiler = ""
-				var spoiler_show = ""
+				var content = toot.content;
+				var spoil = escapeHTML(toot.spoiler_text);
+				var spoiler = "";
+				var spoiler_show = "";
 			}
 		}
 		var urls = $.strip_tags(content)
 			.replace(/\n/g, " ")
-			.match(/https?:\/\/([-a-zA-Z0-9@.]+)\/?(?!.*((media|tags)|mentions)).*([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)?/)
+			.match(/https?:\/\/([-a-zA-Z0-9@.]+)\/?(?!.*((media|tags)|mentions)).*([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)?/);
 		if (urls) {
-			var analyze = "<a onclick=\"additionalIndv('" + tlid + "'," + acct_id + ",'" + id + '\')" class="add-show pointer">' + lang.lang_parse_url + "</a><br>"
+			var analyze = "<a onclick=\"additionalIndv('" + tlid + "'," + acct_id + ",'" + id + '\')" class="add-show pointer">' + lang.lang_parse_url + "</a><br>";
 		} else {
-			var analyze = ""
+			var analyze = "";
 		}
-		var viewer = ""
-		var hasmedia = ""
-		var youtube = ""
+		var viewer = "";
+		var hasmedia = "";
+		var youtube = "";
 		if (toot.emojis) {
-			var emojick = toot.emojis[0]
+			var emojick = toot.emojis[0];
 		} else {
-			var emojick = false
+			var emojick = false;
 		}
 		//絵文字があれば
 		if (emojick) {
 			Object.keys(toot.emojis).forEach(function(key5) {
-				var emoji = toot.emojis[key5]
-				var shortcode = emoji.shortcode
-				var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">'
-				var regExp = new RegExp(":" + shortcode + ":", "g")
-				content = content.replace(regExp, emoji_url)
-				spoil = spoil.replace(regExp, emoji_url)
-			})
+				var emoji = toot.emojis[key5];
+				var shortcode = emoji.shortcode;
+				var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
+				var regExp = new RegExp(":" + shortcode + ":", "g");
+				content = content.replace(regExp, emoji_url);
+				spoil = spoil.replace(regExp, emoji_url);
+			});
 		}
 		//ニコフレ絵文字
 		if (toot.profile_emojis) {
-			var nicoemojick = toot.profile_emojis[0]
+			var nicoemojick = toot.profile_emojis[0];
 		} else {
-			var nicoemojick = false
+			var nicoemojick = false;
 		}
 		//絵文字があれば
 		if (nicoemojick) {
 			Object.keys(toot.profile_emojis).forEach(function(keynico) {
-				var emoji = toot.profile_emojis[keynico]
-				var shortcode = emoji.shortcode
-				var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">'
-				var regExp = new RegExp(":" + shortcode + ":", "g")
-				content = content.replace(regExp, emoji_url)
-				spoil = spoil.replace(regExp, emoji_url)
-			})
+				var emoji = toot.profile_emojis[keynico];
+				var shortcode = emoji.shortcode;
+				var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
+				var regExp = new RegExp(":" + shortcode + ":", "g");
+				content = content.replace(regExp, emoji_url);
+				spoil = spoil.replace(regExp, emoji_url);
+			});
 		}
 		//デフォ絵文字
-		content = twemoji.parse(content)
+		content = twemoji.parse(content);
 		if (dis_name) {
-			dis_name = twemoji.parse(dis_name)
+			dis_name = twemoji.parse(dis_name);
 		}
 		if (spoil) {
-			spoil = twemoji.parse(spoil)
+			spoil = twemoji.parse(spoil);
 		}
-		var mediack = toot.media_attachments[0]
+		var mediack = toot.media_attachments[0];
 		//メディアがあれば
-		var media_ids = ""
+		var media_ids = "";
 		if (mediack) {
-			hasmedia = "hasmedia"
-			var cwdt = 100 / toot.media_attachments.length
+			hasmedia = "hasmedia";
+			var cwdt = 100 / toot.media_attachments.length;
 			Object.keys(toot.media_attachments).forEach(function(key2) {
-				var media = toot.media_attachments[key2]
-				var purl = media.preview_url
-				media_ids = media_ids + media.id + ","
-				var url = media.url
+				var media = toot.media_attachments[key2];
+				var purl = media.preview_url;
+				media_ids = media_ids + media.id + ",";
+				var url = media.url;
 				if (toot.sensitive && nsfw) {
-					var sense = "sensitive"
+					var sense = "sensitive";
 				} else {
-					var sense = ""
+					var sense = "";
 				}
-				viewer = viewer + "<a onclick=\"imgv('" + id + "','" + key2 + "','" + acct_id + '\')" id="' + id + "-image-" + key2 + '" data-url="' + url + '" data-type="' + media.type + '" class="img-parsed"><img src="' + purl + '" class="' + sense + ' toot-img pointer" style="width:' + cwdt + "%; height:" + imh + 'px;"></a></span>'
-			})
-			media_ids = media_ids.slice(0, -1)
+				viewer = viewer + "<a onclick=\"imgv('" + id + "','" + key2 + "','" + acct_id + '\')" id="' + id + "-image-" + key2 + '" data-url="' + url + '" data-type="' + media.type + '" class="img-parsed"><img src="' + purl + '" class="' + sense + ' toot-img pointer" style="width:' + cwdt + "%; height:" + imh + 'px;"></a></span>';
+			});
+			media_ids = media_ids.slice(0, -1);
 		} else {
-			viewer = ""
-			hasmedia = "nomedia"
+			viewer = "";
+			hasmedia = "nomedia";
 		}
-		var menck = toot.mentions[0]
-		var mentions = ""
+		var menck = toot.mentions[0];
+		var mentions = "";
 		//メンションであれば
 		if (menck) {
-			mentions = ""
+			mentions = "";
 			Object.keys(toot.mentions).forEach(function(key3) {
-				var mention = toot.mentions[key3]
-				mentions = mentions + "<a onclick=\"udg('" + mention.id + "'," + acct_id + ')" class="pointer">@' + mention.acct + "</a> "
-			})
-			mentions = '<div style="float:right">' + mentions + "</div>"
+				var mention = toot.mentions[key3];
+				mentions = mentions + "<a onclick=\"udg('" + mention.id + "'," + acct_id + ')" class="pointer">@' + mention.acct + "</a> ";
+			});
+			mentions = '<div style="float:right">' + mentions + "</div>";
 		}
-		var tagck = toot.tags[0]
-		var tags = ""
+		var tagck = toot.tags[0];
+		var tags = "";
 		//タグであれば
 		if (tagck) {
 			Object.keys(toot.tags).forEach(function(key4) {
-				var tag = toot.tags[key4]
-				tags = tags + '<span class="hide" data-tag="' + tag.name + '">#' + tag.name + ":<a onclick=\"tl('tag','" + tag.name + "'," + acct_id + ',\'add\')" class="pointer" title="' + lang.lang_parse_tagTL.replace("{{tag}}", "#" + tag.name) + '">TL</a>　<a onclick="brInsert(\'#' + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", "#" + tag.name) + '">Toot</a>　' + "<a onclick=\"tagPin('" + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagpin.replace("{{tag}}", "#" + tag.name) + '">Pin</a></span> '
-			})
-			tags = '<div style="float:right">' + tags + "</div>"
+				var tag = toot.tags[key4];
+				tags = tags + '<span class="hide" data-tag="' + tag.name + '">#' + tag.name + ":<a onclick=\"tl('tag','" + tag.name + "'," + acct_id + ',\'add\')" class="pointer" title="' + lang.lang_parse_tagTL.replace("{{tag}}", "#" + tag.name) + '">TL</a>　<a onclick="brInsert(\'#' + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", "#" + tag.name) + '">Toot</a>　' + "<a onclick=\"tagPin('" + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagpin.replace("{{tag}}", "#" + tag.name) + '">Pin</a></span> ';
+			});
+			tags = '<div style="float:right">' + tags + "</div>";
 		}
 		//アニメ再生
 		if (gif == "yes") {
-			var avatar = toot.account.avatar
+			var avatar = toot.account.avatar;
 		} else {
-			var avatar = toot.account.avatar_static
+			var avatar = toot.account.avatar_static;
 		}
 		//ワードミュート
 		if (wordmute) {
 			Object.keys(wordmute).forEach(function(key8) {
-				var worde = wordmute[key8]
+				var worde = wordmute[key8];
 				if (worde) {
 					if (worde.tag) {
-						var word = worde.tag
+						var word = worde.tag;
 					} else {
-						var word = worde
+						var word = worde;
 					}
-					var regExp = new RegExp(word, "g")
+					var regExp = new RegExp(word, "g");
 					if ($.strip_tags(content).match(regExp)) {
-						boostback = "hide by_filter"
+						boostback = "hide by_filter";
 					}
 				}
-			})
+			});
 		}
 		//ワード強調
 		if (wordemp) {
 			Object.keys(wordemp).forEach(function(key9) {
-				var word = wordemp[key9]
+				var word = wordemp[key9];
 				if (word) {
-					var word = word.tag
-					var regExp = new RegExp(word, "g")
-					content = content.replace(regExp, '<span class="emp">' + escapeHTML(word) + "</span>")
+					var word = word.tag;
+					var regExp = new RegExp(word, "g");
+					content = content.replace(regExp, '<span class="emp">' + escapeHTML(word) + "</span>");
 				}
-			})
+			});
 		}
 		//日本語じゃない
 		if (toot.language != "ja") {
-			var trans = '<div class="action pin"><a onclick="trans(\'' + toot.language + '\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_trans + '"><i class="material-icons">g_translate</i></a></div>'
+			var trans = '<div class="action pin"><a onclick="trans(\'' + toot.language + '\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_trans + '"><i class="material-icons">g_translate</i></a></div>';
 		} else {
-			var trans = ""
+			var trans = "";
 		}
 		if (toot.favourited) {
-			var if_fav = " yellow-text"
-			var fav_app = "faved"
+			var if_fav = " yellow-text";
+			var fav_app = "faved";
 		} else {
-			var if_fav = ""
-			var fav_app = ""
+			var if_fav = "";
+			var fav_app = "";
 		}
 		//Cards
 		if (!card && toot.card) {
-			var cards = toot.card
+			var cards = toot.card;
 			if (cards.provider_name == "Twitter") {
 				if (cards.image) {
-					var twiImg = '<br><img src="' + cards.image + '">'
+					var twiImg = '<br><img src="' + cards.image + '">';
 				} else {
-					var twiImg = ""
+					var twiImg = "";
 				}
-				analyze = '<blockquote class="twitter-tweet"><b>' + escapeHTML(cards.author_name) + "</b><br>" + escapeHTML(cards.description) + twiImg + "</blockquote>"
+				analyze = '<blockquote class="twitter-tweet"><b>' + escapeHTML(cards.author_name) + "</b><br>" + escapeHTML(cards.description) + twiImg + "</blockquote>";
 			}
 			if (cards.title) {
-				analyze = '<span class="gray">URL' + lang.lang_cards_check + ":<br>Title:" + escapeHTML(cards.title) + "<br>" + escapeHTML(cards.description) + "</span>"
+				analyze = '<span class="gray">URL' + lang.lang_cards_check + ":<br>Title:" + escapeHTML(cards.title) + "<br>" + escapeHTML(cards.description) + "</span>";
 			}
 			if (cards.html) {
-				analyze = cards.html + '<i class="material-icons" onclick="pip(' + id + ')" title="' + lang.lang_cards_pip + '">picture_in_picture_alt</i>'
+				analyze = cards.html + '<i class="material-icons" onclick="pip(' + id + ')" title="' + lang.lang_cards_pip + '">picture_in_picture_alt</i>';
 			}
 		}
 		//Ticker
-		var tickerdom = ""
+		var tickerdom = "";
 		if (ticker) {
-			var tickerdata = localStorage.getItem("ticker")
+			var tickerdata = localStorage.getItem("ticker");
 			if (tickerdata) {
-				var tickerdata = JSON.parse(tickerdata)
+				var tickerdata = JSON.parse(tickerdata);

-				var thisdomain = toot.account.acct.split("@")
+				var thisdomain = toot.account.acct.split("@");
 				if (thisdomain.length > 1) {
-					thisdomain = thisdomain[1]
+					thisdomain = thisdomain[1];
 				}
 				for (var i = 0; i < tickerdata.length; i++) {
-					var value = tickerdata[i]
+					var value = tickerdata[i];
 					if (value.domain == thisdomain) {
-						var tickerdom = '<div style="background:linear-gradient(to left,transparent, ' + value.bg + " 96%) !important; color:" + value.text + ';width:100%; height:0.9rem; font-size:0.8rem;"><img src="' + value.image + '" style="height:100%;"><span style="position:relative; top:-0.2rem;"> ' + escapeHTML(value.name) + "</span></div>"
-						break
+						var tickerdom = '<div style="background:linear-gradient(to left,transparent, ' + value.bg + " 96%) !important; color:" + value.text + ';width:100%; height:0.9rem; font-size:0.8rem;"><img src="' + value.image + '" style="height:100%;"><span style="position:relative; top:-0.2rem;"> ' + escapeHTML(value.name) + "</span></div>";
+						break;
 					}
 				}
 			}
 		}
-		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' + boostback + " " + fav_app + " " + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="' + media_ids + ' " unixtime="' + date(obj[key].created_at, "unix") + '" ' + if_notf + ' onclick="dmStatus()">' + '<div class="area-notice"><span class="gray sharesta">' + notice + home + "</span></div>" + '<div class="area-icon"><a onclick="udg(\'' + toot.account.id + "'," + acct_id + ');" user="' + toot.account.acct + '" class="udg">' + '<img src="' + avatar + '" width="40" class="prof-img" user="' + toot.account.acct + '"></a>' + noticeavatar + "</div>" + '<div class="area-display_name"><div class="flex-name"><span class="user">' + dis_name + '</span><span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; cursor:text;"> @' + toot.account.acct + locked + "</span></div>" + '<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'' + toot.url + '\');" title="' + date(toot.created_at, "absolute") + "(" + lang.lang_parse_clickcopyurl + ')"><i class="far fa-clock-o"></i>' + date(toot.created_at, datetype) + "</span>" + "</div></div>" + '<div class="area-toot">' + tickerdom + '<span class="' + api_spoil + " cw_text_" + toot.id + '"><span class="cw_text">' + spoil + "</span>" + spoiler_show + '</span><span class="toot ' + spoiler + '">' + content + "</span>" + "" + viewer + "" + "<br><a onclick=\"details('" + toot.id + "'," + acct_id + ",'" + tlid + "','dm')\" class=\"pointer waves-effect\">" + lang.lang_parse_thread + "</a></div>" + '<div class="area-vis"></div>' + "</div></div>"
-	})
-	return templete
+		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' + boostback + " " + fav_app + " " + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="' + media_ids + ' " unixtime="' + date(obj[key].created_at, "unix") + '" ' + if_notf + ' onclick="dmStatus()">' + '<div class="area-notice"><span class="gray sharesta">' + notice + home + "</span></div>" + '<div class="area-icon"><a onclick="udg(\'' + toot.account.id + "'," + acct_id + ');" user="' + toot.account.acct + '" class="udg">' + '<img src="' + avatar + '" width="40" class="prof-img" user="' + toot.account.acct + '"></a>' + noticeavatar + "</div>" + '<div class="area-display_name"><div class="flex-name"><span class="user">' + dis_name + '</span><span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; cursor:text;"> @' + toot.account.acct + locked + "</span></div>" + '<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'' + toot.url + '\');" title="' + date(toot.created_at, "absolute") + "(" + lang.lang_parse_clickcopyurl + ')"><i class="far fa-clock-o"></i>' + date(toot.created_at, datetype) + "</span>" + "</div></div>" + '<div class="area-toot">' + tickerdom + '<span class="' + api_spoil + " cw_text_" + toot.id + '"><span class="cw_text">' + spoil + "</span>" + spoiler_show + '</span><span class="toot ' + spoiler + '">' + content + "</span>" + "" + viewer + "" + "<br><a onclick=\"details('" + toot.id + "'," + acct_id + ",'" + tlid + "','dm')\" class=\"pointer waves-effect\">" + lang.lang_parse_thread + "</a></div>" + '<div class="area-vis"></div>' + "</div></div>";
+	});
+	return templete;
 }
--- a/app/js/tl/misskeyparse.js
+++ b/app/js/tl/misskeyparse.js
--- a/app/js/tl/mix.js
+++ b/app/js/tl/mix.js
@@ -19,22 +19,7 @@ async function mixtl(acct_id, tlid, type, delc, voice) {
 	additional(acct_id, tlid)
 	jQuery('time.timeago').timeago()
 	todc()
-	if(mastodonBaseWsStatus[domain] == 'cannotuse') {
-		mixre(acct_id, tlid, 'mix', mute, voice, '')
-	} else if (mastodonBaseWsStatus[domain] == 'undetected' || mastodonBaseWsStatus[domain] == 'connecting') {
-		const mbws = setInterval(function () {
-			if(mastodonBaseWsStatus[domain] == 'cannotuse') {
-				mixre(acct_id, tlid, 'mix', mute, voice, '')
-				clearInterval(mbws)
-			} else if(mastodonBaseWsStatus[domain] == 'available') {
-				mastodonBaseWs[domain].send(`{"type":"subscribe","stream":"public:local"}`)
-				clearInterval(mbws)
-			}
-		}, 1000)
-	} else if(mastodonBaseWsStatus[domain] == 'available') {
-		mastodonBaseWs[domain].send(`{"type":"subscribe","stream":"public:local"}`)
-	}
-	
+	mixre(acct_id, tlid, 'mix', mute, voice, '')
 	$(window).scrollTop(0)
 	lastId = integrated[0].id
 	beforeLastId = integrated[1].id
--- a/app/js/tl/notification.js
+++ b/app/js/tl/notification.js
@@ -116,7 +116,7 @@ function notfColumn(acct_id, tlid, sys) {
 		var start = 'wss://' + domain + '/?i=' + at
 	}
 }
-function notfCommon(acct_id, tlid, sys, stream) {
+function notfCommon(acct_id, tlid, sys) {
 	todo('Notifications Loading...')
 	var native = localStorage.getItem('nativenotf')
 	var at = localStorage.getItem('acct_' + acct_id + '_at')
@@ -147,10 +147,6 @@ function notfCommon(acct_id, tlid, sys, stream) {
 			}
 		}
 	}
-	if(stream == 'only') {
-		notfWS(misskey, acct_id, tlid, domain, at)
-		return false
-	}
 	fetch(start, i)
 		.then(function(response) {
 			console.log('header to get param:' + response.headers.get('link'))
@@ -207,7 +203,7 @@ function notfCommon(acct_id, tlid, sys, stream) {
 			}
 			$('#notf-box').addClass('fetched')
 			todc()
-			if(stream != 'no') notfWS(misskey, acct_id, tlid, domain, at)
+			notfWS(misskey, acct_id, tlid, domain, at)
 		})
 }
 function notfWS(misskey, acct_id, tlid, domain, at) {
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -194,7 +194,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 	}
 	var local = []
 	var times = []
-	Object.keys(obj).forEach(function (key) {
+	Object.keys(obj).forEach(function(key) {
 		var domain = localStorage.getItem('domain_' + acct_id)
 		var toot = obj[key]
 		if (type == 'dm') {
@@ -214,7 +214,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		}
 		//絵文字があれば
 		if (actemojick) {
-			Object.keys(toot.account.emojis).forEach(function (key5) {
+			Object.keys(toot.account.emojis).forEach(function(key5) {
 				var emoji = toot.account.emojis[key5]
 				var shortcode = emoji.shortcode
 				if (gif == 'yes') {
@@ -273,7 +273,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				</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>
+			})" aria-hidden="true"><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>
@@ -315,7 +315,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					}
 				}
 				if (popup > 0) {
-					M.toast({
+					Mtoast({
 						html: '[' + domain + ']' + escapeHTML(toot.account.display_name) + what,
 						displayLength: popup * 1000
 					})
@@ -369,7 +369,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//絵文字があれば
 			if (actemojick) {
-				Object.keys(toot.account.emojis).forEach(function (key5) {
+				Object.keys(toot.account.emojis).forEach(function(key5) {
 					var emoji = toot.account.emojis[key5]
 					var shortcode = emoji.shortcode
 					if (gif == 'yes') {
@@ -426,7 +426,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				}
 				//絵文字があれば
 				if (actemojick) {
-					Object.keys(toot.account.emojis).forEach(function (key5) {
+					Object.keys(toot.account.emojis).forEach(function(key5) {
 						var emoji = toot.account.emojis[key5]
 						var shortcode = emoji.shortcode
 						if (gif == 'yes') {
@@ -454,7 +454,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					var fullname = toot.account.acct + '@' + domain
 				}
 				if (useremp) {
-					Object.keys(useremp).forEach(function (key10) {
+					Object.keys(useremp).forEach(function(key10) {
 						var user = useremp[key10]
 						if (user == fullname) {
 							boostback = 'emphasized'
@@ -494,7 +494,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var via = escapeHTML(toot.application.name)
 				if (empCli) {
 					//強調チェック
-					Object.keys(empCli).forEach(function (key6) {
+					Object.keys(empCli).forEach(function(key6) {
 						var empCliList = empCli[key6]
 						if (empCliList == via) {
 							boostback = 'emphasized'
@@ -503,7 +503,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				}
 				if (muteCli) {
 					//ミュートチェック
-					Object.keys(muteCli).forEach(function (key7) {
+					Object.keys(muteCli).forEach(function(key7) {
 						var muteCliList = muteCli[key7]
 						if (muteCliList == via) {
 							boostback = 'hide'
@@ -597,7 +597,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			if (mediack) {
 				hasmedia = 'hasmedia'
 				var cwdt = 100 / toot.media_attachments.length
-				Object.keys(toot.media_attachments).forEach(function (key2) {
+				Object.keys(toot.media_attachments).forEach(function(key2) {
 					var media = toot.media_attachments[key2]
 					var purl = media.preview_url
 					media_ids = media_ids + media.id + ','
@@ -628,7 +628,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							var mty = media.remote_url.match(/.+(\..+)$/)[1]
 							viewer =
 								viewer +
-								`<a href="${media.url ? media.url : media.remote_url}" title="${media.remote_url} from ${media.url}">[${lang.lang_parse_unknown}(${mty})]</a> `
+								`<a href="${media.remote_url}" title="${media.remote_url}">[${lang.lang_parse_unknown}(${mty})]</a> `
 						} else if (media.type == 'audio') {
 							viewer =
 								viewer +
@@ -669,7 +669,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			if (menck) {
 				mentions = ''
 				var to_mention = []
-				Object.keys(toot.mentions).forEach(function (key3) {
+				Object.keys(toot.mentions).forEach(function(key3) {
 					var mention = toot.mentions[key3]
 					//自分は除外
 					//自インスタンスかどうかを確認し、IDの一致
@@ -704,19 +704,19 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			var tags = ''
 			//タグであれば
 			if (tagck) {
-				Object.keys(toot.tags).forEach(function (key4) {
+				Object.keys(toot.tags).forEach(function(key4) {
 					var tag = toot.tags[key4]
 					var featured = `　<a onclick="tagFeature('${tag.name}','${acct_id}')" class="pointer" title="add it to Featured tags">Feature</a>　`
 					tags =
 						tags +
 						`<span class="hide" data-tag="${tag.name}" data-regTag="${tag.name.toLowerCase()}">#${
-						tag.name
+							tag.name
 						}:
 							<a onclick="tl('tag','${tag.name}','${acct_id}','add')" class="pointer"
 							 title="${lang.lang_parse_tagTL.replace(
-							'{{tag}}',
-							'#' + tag.name
-						)}">TL</a>　<a onclick="brInsert('#${tag.name}')" 
+									'{{tag}}',
+									'#' + tag.name
+								)}">TL</a>　<a onclick="brInsert('#${tag.name}')" 
 							 class="pointer" title="${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag.name)}">Toot</a>　
 						<a onclick="tagPin('${tag.name}')" class="pointer" title="${lang.lang_parse_tagpin.replace(
 							'{{tag}}',
@@ -812,7 +812,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//ワードミュート
 			if (wordmuteList) {
-				Object.keys(wordmuteList).forEach(function (key8) {
+				Object.keys(wordmuteList).forEach(function(key8) {
 					var worde = wordmuteList[key8]
 					if (worde) {
 						if (worde.tag) {
@@ -829,7 +829,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//ワード強調
 			if (wordempList) {
-				Object.keys(wordempList).forEach(function (key9) {
+				Object.keys(wordempList).forEach(function(key9) {
 					var wordList = wordempList[key9]
 					if (wordList) {
 						var wordList = wordList.tag
@@ -845,7 +845,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//絵文字があれば
 			if (emojick) {
-				Object.keys(toot.emojis).forEach(function (key5) {
+				Object.keys(toot.emojis).forEach(function(key5) {
 					var emoji = toot.emojis[key5]
 					var shortcode = emoji.shortcode
 					if (gif == 'yes') {
@@ -871,7 +871,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//絵文字があれば(nico)
 			if (nicoemojick) {
-				Object.keys(toot.profile_emojis).forEach(function (keynico) {
+				Object.keys(toot.profile_emojis).forEach(function(keynico) {
 					var emoji = toot.profile_emojis[keynico]
 					var shortcode = emoji.shortcode
 					var emoji_url = `<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" alt=" :${shortcode}: "
@@ -901,10 +901,12 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//日本語じゃない
 			if (toot.language != lang.language && toot.language) {
-				var trans = `<li onclick="trans('${toot.language}','${lang.language}', $(this))" 
-							 style="padding:0">
+				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" aria-hidden="true">g_translate</i>${lang.lang_parse_trans}
-					</li>`
+						</a>
+					</div>`
 			} else {
 				var trans = ''
 			}
@@ -916,10 +918,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			//Ticker
 			var tickerdom = ''
 			if (ticker) {
-				var tickerdata = localStorage.getItem('sticker')
+				var tickerdata = localStorage.getItem('ticker')
 				if (tickerdata) {
-					var tickerdataRaw = JSON.parse(tickerdata)
-					var tickerdata = tickerdataRaw.data
+					var tickerdata = JSON.parse(tickerdata)

 					var thisdomain = toot.account.acct.split('@')
 					if (thisdomain.length > 1) {
@@ -928,41 +929,14 @@ 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 bgColor = value.bgColor
-							var fontColor = value.fontColor
-							if (!value.bgColor || !value.fontColor) {
-								if (value.type == 'mastodon') {
-									if (!value.bgColor) bgColor = tickerdataRaw.default.mastodon.bgColor
-									if (!value.fontColor) fontColor = tickerdataRaw.default.mastodon.fontColor
-								} else if (value.type == 'pleroma') {
-									if (!value.bgColor) bgColor = tickerdataRaw.default.pleroma.bgColor
-									if (!value.fontColor) fontColor = tickerdataRaw.default.pleroma.fontColor
-								} else if (value.type == 'misskey') {
-									if (!value.bgColor) bgColor = tickerdataRaw.default.misskey.bgColor
-									if (!value.fontColor) fontColor = tickerdataRaw.default.misskey.fontColor
-								} else if (value.type == 'misskeylegacy') {
-									if (!value.bgColor) bgColor = tickerdataRaw.default.misskeylegacy.bgColor
-									if (!value.fontColor) fontColor = tickerdataRaw.default.misskeylegacy.fontColor
-								} else if (value.type == 'pixelfed') {
-									if (!value.bgColor) bgColor = tickerdataRaw.default.pixelfed.bgColor
-									if (!value.fontColor) fontColor = tickerdataRaw.default.pixelfed.fontColor
-								}
-							} else {
-								var bgColor = value.bgColor
-								var fontColor = value.fontColor
-							}
-							bgColorCSS = ''
-							for (let j = 0; j < bgColor.length; j++) {
-								const bg = bgColor[j]
-								bgColorCSS = bgColorCSS + bg + ','
-							}
-							bgColorCSS = `linear-gradient(90deg, ${bgColorCSS} transparent)`
-							var tickerdom = `<div aria-hidden="true" style="user-select:none;cursor:default;background:${bgColorCSS} !important; color:${
-								fontColor
-								};width:100%; height:0.9rem; font-size:0.8rem;" class="tickers">
+							var tickerdom = `<div aria-hidden="true" style="user-select:none;cursor:default;background:linear-gradient(90deg, ${
+								value.bg
+							}, transparent 96%) !important; color:${
+								value.text
+							};width:100%; height:0.9rem; font-size:0.8rem;" class="tickers">
 									<img draggable="false" src="${
-								value.favicon
-								}" style="height:100%;" onerror="this.src=\'../../img/loading.svg\'">
+										value.image
+									}" style="height:100%;" onerror="this.src=\'../../img/loading.svg\'">
 									<span style="position:relative; top:-0.2rem;">${escapeHTML(value.name)}</span>
 								</div>`
 							break
@@ -976,14 +950,14 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				if (!quoteUser) {
 					quoteUser = toot.quote.account.acct
 				}
-				if (!toot.quote.quote_muted) {
+				if(!toot.quote.quote_muted) {
 					poll =
-						poll +
-						`<div class="quote-renote">
+					poll +
+					`<div class="quote-renote">
 						<div class="renote-icon">
 							<a onclick="udg('${toot.quote.account.id}','${acct_id}');" user="${
 						toot.quote.account.acct
-						}" class="udg">
+					}" class="udg">
 								<img draggable="false" src="${toot.quote.account.avatar}">
 							</a>
 						</div>
@@ -995,18 +969,18 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						</div>
 						<div class="renote-details">
 							<a onclick="details('${
-						toot.quote.id
-						}','${acct_id}','${tlid}','normal')" class="waves-effect waves-dark btn-flat details" style="padding:0">
+								toot.quote.id
+							}','${acct_id}','${tlid}','normal')" class="waves-effect waves-dark btn-flat details" style="padding:0">
 								<i class="text-darken-3 material-icons">more_vert</i>
 							</a>
 						</div>
 					</div>`
 				} else {
 					poll =
-						poll +
-						`<span class="gray sml">${lang.lang_parse_hidden}</span>`
+					poll +
+					`<span class="gray sml">${lang.lang_parse_hidden}</span>`
 				}
-
+				
 			}
 			//menuは何個？
 			var menuct = 2
@@ -1095,8 +1069,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					</div>
 					<div class="action ${can_rt} ${disp['rt']} ${noauth}">
 						<a onclick="rt('${
-				toot.id
-				}','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn"
+							toot.id
+						}','${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>
@@ -1130,8 +1104,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				</div>
 				<div class="area-side">
 					<div class="action ${noauth}">
-						<a onclick="toggleAction('trigger_${tlid}_${uniqueid}')" data-target="dropdown_${tlid}_${uniqueid}"
-							class="ctxMenu waves-effect waves-dark btn-flat" style="padding:0" id="trigger_${tlid}_${uniqueid}">
+						<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" aria-hidden="true">expand_more</i>
 							<span class="voice">Other actions</span>
 						</a>
@@ -1144,33 +1118,45 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						<span class="voice">${lang.lang_parse_detail}</span>
 					</div>
 				</div>
-				<ul class="dropdown-content contextMenu" id="dropdown_${tlid}_${uniqueid}">
-					<li class="${viashow}">
+				<div class="contextMenu hide z-depth-4">
+					<div class="${viashow}">
 						via ${escapeHTML(via)}<br>
 						<a onclick="client('${$.strip_tags(via)}')" class="pointer">${lang.lang_parse_clientop}</a>
-					</li>
+					</div>
 					<div>
-					<li onclick="bkm('${uniqueid}','${acct_id}','${tlid}')"
-						class="bkm-btn bkmStr_${uniqueid}" style="padding:0">
-						<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>${bkmStr}
-					</li>
-					<li class="${if_mine}" onclick="del('${uniqueid}','${acct_id}')"
+					<button onclick="bkm('${uniqueid}','${acct_id}','${tlid}')"
+						class="waves-effect waves-dark btn-flat actct bkm-btn" style="padding:0">
+						<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>
+						<span class="bkmStr_${uniqueid}">${bkmStr}</span>
+					</button>
+					</div>
+					<div class="${if_mine}">
+						<button onclick="del('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
 							style="padding:0">
 							<i class="fas fa-trash"></i>${lang.lang_parse_del}
-					</li>
-					<li class="${if_mine}" onclick="pin('${uniqueid}','${acct_id}')" style="padding:0" class="pinStr_${uniqueid}">
-							<i class="fas fa-map-pin pin_${uniqueid} ${if_pin}"></i>${pinStr}
-					</li>
-					<li class="${if_mine}"  onclick="redraft('${uniqueid}','${acct_id}')"
+						</button>
+					</div>
+					<div class="${if_mine}">
+						<button onclick="pin('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct" style="padding:0">
+							<i class="fas fa-map-pin pin_${uniqueid} ${if_pin}"></i>
+							<span class="pinStr_${uniqueid}">${pinStr}</span>
+						</button>
+					</div>
+					<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" aria-hidden="true">redo</i>${lang.lang_parse_redraft}
-					</li>
+						</button>
+					</div>
 					${trans}
-					<li onclick="postMessage(['openUrl', '${toot.url}'], '*')"
-						 style="padding:0">
-						<i class="fas text-darken-3 fa-globe"></i>${lang.lang_parse_link}
-					</li>
-				</ul>
+					<div>
+					<button onclick="postMessage(['openUrl', '${toot.url}'], '*')"
+						class="waves-effect waves-dark btn-flat actct" style="padding:0">
+						<i class="fas text-darken-3 fa-globe"></i>
+						${lang.lang_parse_link}
+					</button>
+					</div>
+				</div>
 			</div>
 			`
 		}
@@ -1195,7 +1181,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 	}
 	var templete = ''
 	var datetype = localStorage.getItem('datetype')
-	Object.keys(obj).forEach(function (key) {
+	Object.keys(obj).forEach(function(key) {
 		var toot = obj[key]
 		if (toot) {
 			if (!toot.username) {
@@ -1232,6 +1218,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				} else if (auth == 'request') {
 					var ftxt = lang.lang_parse_request
 				}
+				console.log(auth, ftxt)
 				if (popup > 0 || popup == -1 || notf) {
 					var notftext = ftxt + '<br>'
 				} else {
@@ -1239,7 +1226,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				}
 				var memory = localStorage.getItem('notice-mem')
 				if (popup >= 0 && obj.length < 5 && notftext != memory) {
-					M.toast({ html: escapeHTML(toot.display_name) + ':' + ftxt, displayLength: popup * 1000 })
+					Mtoast({ html: escapeHTML(toot.display_name) + ':' + ftxt, displayLength: popup * 1000 })
 					$('.notf-icon_' + tlid).addClass('red-text')
 					localStorage.setItem('notice-mem', notftext)
 					notftext = ''
@@ -1271,7 +1258,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				}
 				//絵文字があれば
 				if (actemojick) {
-					Object.keys(toot.emojis).forEach(function (key5) {
+					Object.keys(toot.emojis).forEach(function(key5) {
 						var emoji = toot.emojis[key5]
 						var shortcode = emoji.shortcode
 						if (gif == 'yes') {
@@ -1304,7 +1291,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				} else {
 					var udg = `<a onclick="udg('${toot.id}','${acct_id}');" user="${toot.acct}" class="udg">`
 				}
-				var latest = date(toot.last_status_at, 'relative', true)
+				var latest = date(toot.last_status_at, 'relative')
 				if (toot.last_status_at) {
 					var latesthtml = `<div class="cbadge" style="width:100px;">Last <span class="voice">toot</span>: ${latest}</div>`
 				} else {
@@ -1357,6 +1344,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 }
 //クライアントダイアログ
 function client(name) {
+	$('#contextWrap').addClass('hide')
 	if (name != 'Unknown') {
 		//聞く
 		Swal.fire({
@@ -1378,22 +1366,22 @@ function client(name) {
 				if (!obj) {
 					var obj = []
 					obj.push(name)
-					M.toast({ html: escapeHTML(name) + lang.lang_status_emphas, displayLength: 2000 })
+					Mtoast({ html: escapeHTML(name) + lang.lang_status_emphas, displayLength: 2000 })
 				} else {
 					var can
-					Object.keys(obj).forEach(function (key) {
+					Object.keys(obj).forEach(function(key) {
 						var cliT = obj[key]
 						if (cliT != name && !can) {
 							can = false
 						} else {
 							can = true
 							obj.splice(key, 1)
-							M.toast({ html: escapeHTML(name) + lang.lang_status_unemphas, displayLength: 2000 })
+							Mtoast({ html: escapeHTML(name) + lang.lang_status_unemphas, displayLength: 2000 })
 						}
 					})
 					if (!can) {
 						obj.push(name)
-						M.toast({ html: escapeHTML(name) + lang.lang_status_emphas, displayLength: 2000 })
+						Mtoast({ html: escapeHTML(name) + lang.lang_status_emphas, displayLength: 2000 })
 					} else {
 					}
 					var json = JSON.stringify(obj)
@@ -1410,7 +1398,7 @@ function client(name) {
 				obj.push(name)
 				var json = JSON.stringify(obj)
 				localStorage.setItem('client_mute', json)
-				M.toast({ html: escapeHTML(name) + lang.lang_parse_mute, displayLength: 2000 })
+				Mtoast({ html: escapeHTML(name) + lang.lang_parse_mute, displayLength: 2000 })
 				parseColumn()
 			}
 		})
@@ -1469,7 +1457,7 @@ function pollParse(poll, acct_id, emojis) {
 		var max = 0
 	}

-	Object.keys(choices).forEach(function (keyc) {
+	Object.keys(choices).forEach(function(keyc) {
 		var choice = choices[keyc]
 		var voteit = ''
 		for (var i = 0; i < minechoice.length; i++) {
@@ -1504,7 +1492,7 @@ function pollParse(poll, acct_id, emojis) {
 		var choiceText = escapeHTML(choice.title)
 		if (emojis) {
 			//絵文字があれば
-			Object.keys(emojis).forEach(function (key5) {
+			Object.keys(emojis).forEach(function(key5) {
 				var emoji = emojis[key5]
 				var shortcode = emoji.shortcode
 				if (gif == 'yes') {
@@ -1544,288 +1532,3 @@ function pollParse(poll, acct_id, emojis) {
 		</div>`
 	return pollHtml
 }
-
-//MastodonBaseStreaming
-var mastodonBaseWs = {}
-var mastodonBaseWsStatus = {}
-function mastodonBaseStreaming(acct_id) {
-	notfCommon(acct_id, 0, null, 'no')
-	const domain = localStorage.getItem(`domain_${acct_id}`)
-	if(mastodonBaseWsStatus[domain]) return
-	mastodonBaseWsStatus[domain] = 'undetected'
-	const at = localStorage.getItem(`acct_${acct_id}_at`)
-	let wss = 'wss://' + domain
-	if (localStorage.getItem('streaming_' + acct_id)) {
-		wss = localStorage.getItem('streaming_' + acct_id)
-	}
-	const start = `${wss}/api/v1/streaming/?access_token=${at}`
-	mastodonBaseWs[domain] = new WebSocket(start)
-	mastodonBaseWs[domain].onopen = function () {
-		mastodonBaseWsStatus[domain] = 'connecting'
-		setTimeout(function () {
-			mastodonBaseWsStatus[domain] = 'available'
-		}, 3000)
-		mastodonBaseWs[domain].send(`{"type":"subscribe","stream":"user"}`)
-		$('.notice_icon_acct_' + acct_id).removeClass('red-text')
-	}
-	mastodonBaseWs[domain].onmessage = function (mess) {
-		const typeA = JSON.parse(mess.data).event
-		if (typeA == 'delete') {
-			$(`[unique-id=${JSON.parse(mess.data).payload}]`).hide()
-			$(`[unique-id=${JSON.parse(mess.data).payload}]`).remove()
-		} else if (typeA == 'update' || typeA == 'conversation') {
-			//markers show中はダメ
-			const tl = JSON.parse(mess.data).stream
-			const obj = JSON.parse(JSON.parse(mess.data).payload)
-			const tls = getTlMeta(tl[0], tl, acct_id, obj)
-			insertTl(obj, tls)
-		} else if (typeA == 'filters_changed') {
-			filterUpdate(acct_id)
-		} else if (~typeA.indexOf('announcement')) {
-			announ(acct_id, tlid)
-		} else if (typeA == 'notification') {
-			const obj = JSON.parse(JSON.parse(mess.data).payload)
-			let template = ''
-			localStorage.setItem('lastnotf_' + acct_id, obj.id)
-			let popup = localStorage.getItem('popup')
-			if (!popup) {
-				popup = 0
-			}
-			if (obj.type != 'follow' && obj.type != 'follow_request') {
-				template = parse([obj], 'notf', acct_id, 'notf', popup)
-			} else if (obj.type == 'follow_request') {
-				template = userparse([obj.account], 'request', acct_id, 'notf', -1)
-			} else {
-				template = userparse([obj], obj.type, acct_id, 'notf', popup)
-			}
-			if (!$('div[data-notfIndv=' + acct_id + '_' + obj.id + ']').length) {
-				$('div[data-notf=' + acct_id + ']').prepend(template)
-				$('div[data-const=notf_' + acct_id + ']').prepend(template)
-			}
-			jQuery('time.timeago').timeago()
-		} else {
-			console.error('unknown type ' + typeA)
-		}
-	}
-	mastodonBaseWs[domain].onerror = function (error) {
-		notfCommon(acct_id, 0, null, 'only') //fallback
-		console.error("Error closing " + domain)
-		console.error(error)
-		if (mastodonBaseWsStatus[domain] == 'available' && !pwa) location.reload()
-		mastodonBaseWsStatus[domain] = 'cannotuse'
-		setTimeout(function () {
-			mastodonBaseWsStatus[domain] = 'cannotuse'
-		}, 3000)
-		mastodonBaseWs[domain] = false
-		return false
-	}
-	mastodonBaseWs[domain].onclose = function () {
-		notfCommon(acct_id, 0, null, 'only') //fallback
-		console.warn("Closing " + domain)
-		if (mastodonBaseWsStatus[domain] == 'available' && !pwa) location.reload()
-		mastodonBaseWs[domain] = false
-		mastodonBaseWsStatus[domain] = 'cannotuse'
-		setTimeout(function () {
-			mastodonBaseWsStatus[domain] = 'cannotuse'
-		}, 3000)
-		return false
-	}
-}
-function insertTl(obj, tls) {
-	for (const timeline of tls) {
-		const { id, voice, type, acct_id } = timeline
-		const mute = getFilterTypeByAcct(acct_id, type)
-		if ($(`#unread_${id} .material-icons`).hasClass('teal-text')) continue
-		if (!$(`#timeline_${id} [toot-id=${obj.id}]`).length) {
-			if (voice) {
-				say(obj.content)
-			}
-			const template = parse([obj], type, acct_id, id, '', mute, type)
-			console.log($(`#timeline_box_${id}_box .tl-box`).scrollTop(), `timeline_box_${id}_box .tl-box`)
-			if (
-				$(`#timeline_box_${id}_box .tl-box`).scrollTop() === 0
-			) {
-				$(`#timeline_${id}`).prepend(template)
-			} else {
-				let pool = localStorage.getItem('pool_' + id)
-				if (pool) {
-					pool = template + pool
-				} else {
-					pool = template
-				}
-				localStorage.setItem('pool_' + id, pool)
-			}
-			scrollck()
-			additional(acct_id, id)
-			jQuery('time.timeago').timeago()
-		}
-	}
-}
-function getTlMeta(type, data, num, status) {
-	const acct_id = num.toString()
-	const columns = localStorage.getItem('column')
-	const obj = JSON.parse(columns)
-	let ret = []
-	let i = 0
-	switch (type) {
-		case 'user':
-			for (const tl of obj) {
-				if (tl.domain != acct_id) continue
-				if (tl.type == 'mix' || tl.type == 'home') {
-					let voice = false
-					if (localStorage.getItem('voice_' + i)) voice = true
-					ret.push({
-						id: i,
-						voice: voice,
-						type: tl.type,
-						acct_id: tl.domain
-					})
-				}
-				i++
-			}
-			break
-		case 'public:local':
-			for (const tl of obj) {
-				if (tl.domain != acct_id) continue
-				if (tl.type == 'mix' || tl.type == 'local') {
-					let voice = false
-					if (localStorage.getItem('voice_' + i)) voice = true
-					ret.push({
-						id: i,
-						voice: voice,
-						type: tl.type,
-						acct_id: tl.domain
-					})
-				}
-				i++
-			}
-			break
-		case 'public:local:media':
-			for (const tl of obj) {
-				if (tl.domain != acct_id) continue
-				if (tl.type == 'local-media') {
-					let voice = false
-					if (localStorage.getItem('voice_' + i)) voice = true
-					ret.push({
-						id: i,
-						voice: voice,
-						type: tl.type,
-						acct_id: tl.domain
-					})
-				}
-				i++
-			}
-			break;
-		case 'public':
-			for (const tl of obj) {
-				if (tl.domain != acct_id) continue
-				if (tl.type == 'pub') {
-					let voice = false
-					if (localStorage.getItem('voice_' + i)) voice = true
-					ret.push({
-						id: i,
-						voice: voice,
-						type: tl.type,
-						acct_id: tl.domain
-					})
-				}
-				i++
-			}
-			break;
-		case 'public:media':
-			for (const tl of obj) {
-				if (tl.domain != acct_id) continue
-				if (tl.type == 'pub-media') {
-					let voice = false
-					if (localStorage.getItem('voice_' + i)) voice = true
-					ret.push({
-						id: i,
-						voice: voice,
-						type: tl.type,
-						acct_id: tl.domain
-					})
-				}
-				i++
-			}
-			break;
-		case 'list':
-			for (const tl of obj) {
-				if (tl.domain != acct_id) continue
-				if (tl.type == 'list' && tl.data == data[1]) {
-					let voice = false
-					if (localStorage.getItem('voice_' + i)) voice = true
-					ret.push({
-						id: i,
-						voice: voice,
-						type: tl.type,
-						acct_id: tl.domain
-					})
-				}
-				i++
-			}
-			break;
-		case 'direct':
-			for (const tl of obj) {
-				if (tl.domain != acct_id) continue
-				if (tl.type == 'dm') {
-					let voice = false
-					if (localStorage.getItem('voice_' + i)) voice = true
-					ret.push({
-						id: i,
-						voice: voice,
-						type: tl.type,
-						acct_id: tl.domain
-					})
-				}
-				i++
-			}
-			break;
-		case 'hashtag':
-			for (const tl of obj) {
-				if (tl.domain != acct_id) continue
-				const columnDataRaw = tl.data
-				let columnData
-				if (!columnDataRaw.name) {
-					columnData = { name: columnDataRaw }
-				} else {
-					columnData = columnDataRaw
-				}
-				if (tl.type == 'tag') {
-					let voice = false
-					let can = false
-					if (columnData.name == data[1]) can = true
-					//any
-					if (columnData.any.split(',').includes(data[1])) can = true
-					//all
-					const { tags } = status
-					if (columnData.all) can = true
-					for (const { name } of tags) {
-						if (!columnData.all.split(',').includes(name)) {
-							can = false
-							break
-						}
-					}
-					//none
-					if (columnData.none) can = true
-					for (const { name } of tags) {
-						if (columnData.none.split(',').includes(name)) {
-							can = false
-							break
-						}
-					}
-					if (localStorage.getItem('voice_' + i)) voice = true
-					ret.push({
-						id: i,
-						voice: voice,
-						type: tl.type,
-						acct_id: tl.domain
-					})
-				}
-				i++
-			}
-			break;
-		default:
-			console.error(`Cannot catch`);
-	}
-	return ret
-}
--- a/app/js/tl/speech.js
+++ b/app/js/tl/speech.js
@@ -143,14 +143,14 @@ function voiceSettings() {
 	var awk = $('[name=bym]:checked').val()
 	if (awk == 'yes') {
 		localStorage.setItem('voice_bouyomi', 'yes')
-		M.toast({ html: 'Bouyomi Chan connection requires WebSocket Plugin', displayLength: 3000 })
+		Mtoast({ html: 'Bouyomi Chan connection requires WebSocket Plugin', displayLength: 3000 })
 	} else {
 		localStorage.removeItem('voice_bouyomi')
 	}
 	localStorage.setItem('voice_speed', $('#voicespeed').val() / 10)
 	localStorage.setItem('voice_pitch', $('#voicepitch').val() / 50)
 	localStorage.setItem('voice_vol', $('#voicevol').val() / 100)
-	M.toast({ html: lang.lang_speech_refresh, displayLength: 3000 })
+	Mtoast({ html: lang.lang_speech_refresh, displayLength: 3000 })
 }
 function voiceSettingLoad() {
 	var flag = localStorage.getItem('voice_bouyomi')
--- a/app/js/tl/src.js
+++ b/app/js/tl/src.js
@@ -219,9 +219,9 @@ function moreTs(tlid, q) {
 function graphDraw(tag, acct_id) {
 	var tags = ''
 	var his = tag.history
-	return graphDrawCore(his, tag, acct_id)
+	return graphDrawCore(his, tag)
 }
-function graphDrawCore(his, tag, acct_id) {
+function graphDrawCore(his, tag) {
 	var max = Math.max.apply(null, [
 		his[0].uses,
 		his[1].uses,
@@ -307,7 +307,7 @@ function trend() {
 			Object.keys(json).forEach(function(keye) {
 				var tag = json[keye]
 				var his = tag.history
-				tags = graphDrawCore(his, tag, acct_id)
+				tags = graphDrawCore(his, tag)

 				$('#src-contents').append(tags)
 			})
--- a/app/js/tl/tag.js
+++ b/app/js/tl/tag.js
@@ -156,10 +156,10 @@ function autoToot(tag) {
 	var nowPT = localStorage.getItem('stable')
 	if (nowPT == tag) {
 		localStorage.removeItem('stable')
-		M.toast({ html: lang.lang_tags_unrealtime, displayLength: 3000 })
+		Mtoast({ html: lang.lang_tags_unrealtime, displayLength: 3000 })
 	} else {
 		localStorage.setItem('stable', tag)
-		M.toast({
+		Mtoast({
 			html: lang.lang_tags_tagwarn.replace('{{tag}}', tag).replace('{{tag}}', tag),
 			displayLength: 3000
 		})
@@ -195,7 +195,7 @@ function tagFeature(name, acct_id) {
 		})
 		.then(function(json) {
 			console.log(json)
-			M.toast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 })
+			Mtoast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 })
 		})
 }
 //タグのフィルタ
--- a/app/js/tl/tl.js
+++ b/app/js/tl/tl.js
@@ -44,10 +44,10 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		//Integratedなら飛ばす
 		$('#notice_' + tlid).text(
 			'Integrated TL(' +
-			localStorage.getItem('user_' + acct_id) +
-			'@' +
-			domain +
-			')'
+				localStorage.getItem('user_' + acct_id) +
+				'@' +
+				domain +
+				')'
 		)
 		$('#notice_icon_' + tlid).text('merge_type')
 		mixtl(acct_id, tlid, 'integrated', delc, voice)
@@ -56,10 +56,10 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		//Local+なら飛ばす
 		$('#notice_' + tlid).text(
 			'Local+ TL(' +
-			localStorage.getItem('user_' + acct_id) +
-			'@' +
-			domain +
-			')'
+				localStorage.getItem('user_' + acct_id) +
+				'@' +
+				domain +
+				')'
 		)
 		$('#notice_icon_' + tlid).text('people_outline')
 		mixtl(acct_id, tlid, 'plus', delc, voice)
@@ -69,11 +69,11 @@ 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 +
-			')'
+				'(' +
+				localStorage.getItem('user_' + acct_id) +
+				'@' +
+				domain +
+				')'
 		)
 		$('#notice_icon_' + tlid).text('notifications')
 		return
@@ -82,11 +82,11 @@ 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 +
-			')'
+				'(' +
+				localStorage.getItem('user_' + acct_id) +
+				'@' +
+				domain +
+				')'
 		)
 		$('#notice_icon_' + tlid).text('bookmark')
 		return
@@ -95,11 +95,11 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		getUtl(acct_id, tlid, data, false)
 		$('#notice_' + tlid).text(
 			cap(type, data, acct_id) +
-			'(' +
-			localStorage.getItem('user_' + acct_id) +
-			'@' +
-			domain +
-			')'
+				'(' +
+				localStorage.getItem('user_' + acct_id) +
+				'@' +
+				domain +
+				')'
 		)
 		$('#notice_icon_' + tlid).text('person')
 		return
@@ -117,11 +117,11 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		}
 		$('#notice_' + tlid).text(
 			cap(type, data, acct_id) +
-			'(' +
-			localStorage.getItem('user_' + acct_id) +
-			'@' +
-			domain +
-			')'
+				'(' +
+				localStorage.getItem('user_' + acct_id) +
+				'@' +
+				domain +
+				')'
 		)
 	} else {
 		var hdr = {
@@ -206,7 +206,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 			additional(acct_id, tlid)
 			jQuery('time.timeago').timeago()
 			todc()
-			reload(type, 'from timeline to reload', acct_id, tlid, data, mute, delc, voice)
+			reload(type, '', acct_id, tlid, data, mute, delc, voice)
 			if (type == 'home' || type == 'notf') {
 				//Markers
 				var markers = localStorage.getItem('markers')
@@ -247,243 +247,194 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 			}
 		}, 100)
 	} else {
-		var domain = localStorage.getItem('domain_' + acct_id)
-		if (mastodonBaseWsStatus[domain] == 'cannotuse') {
-			oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode)
-		} else if (mastodonBaseWsStatus[domain] == 'undetected' || mastodonBaseWsStatus[domain] == 'connecting') {
-			const mbws = setInterval(function () {
-				if (mastodonBaseWsStatus[domain] == 'cannotuse') {
-					oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode)
-					clearInterval(mbws)
-				} else if (mastodonBaseWsStatus[domain] == 'available') {
-					$('#notice_icon_' + tlid).removeClass('red-text')
-					stremaingSubscribe(type, acct_id, data)
-					clearInterval(mbws)
+		var misskey = false
+		if (localStorage.getItem('streaming_' + acct_id)) {
+			var wss = localStorage.getItem('streaming_' + acct_id)
+		} else {
+			var wss = 'wss://' + domain
+		}
+		if (type == 'home') {
+			var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
+		} else if (type == 'pub') {
+			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 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
+		} else if (type == 'local-media') {
+			var start =
+				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')
+				if (tag == 'local') {
+					data = data + '&local=true'
 				}
-			}, 1000)
-		} else if (mastodonBaseWsStatus[domain] == 'available') {
+			}
+			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
+		} 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) {
+			console.table({
+				tlid: tlid,
+				type: 'Connect Streaming API' + type,
+				domain: domain,
+				message: [mess],
+			})
+			errorct = 0
 			$('#notice_icon_' + tlid).removeClass('red-text')
-			stremaingSubscribe(type, acct_id, data)
 		}
-	}
-}
-function stremaingSubscribe(type, acct_id, data, unsubscribe) {
-	let command = 'subscribe'
-	if (unsubscribe) command = 'unsubscribe'
-	let stream
-	const domain = localStorage.getItem('domain_' + acct_id)
-	if(type == 'home') return false
-	if (type === 'local' || type === 'mix') { stream = 'public:local' }
-	else if (type === 'local-media') { stream = 'public:local:media' }
-	else if (type === 'pub') { stream = 'public' }
-	else if (type === 'pub-media') { stream = 'public:media' }
-	else if (type === 'list') {
-		mastodonBaseWs[domain].send(`{"type":"${command}","stream":"list","list":"${data}"}`)
-		return true
-	} else if (type === 'tag') {
-		let arr = []
-		let name = data
-		if (data.name) name = data.name
-		arr.push(name)
-		if (data.any) arr = arr.concat(data.any.split(','))
-		if (data.all) arr = arr.concat(data.all.split(','))
-		for (const tag of arr) {
-			mastodonBaseWs[domain].send(`{"type":"${command}","stream":"hashtag","tag":"${tag}"}`)
-		}
-		return true
-	}
-	mastodonBaseWs[domain].send(`{"type":"${command}","stream":"${stream}"`)
-}
-function oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
-	var misskey = false
-	const domain = localStorage.getItem(`domain_${acct_id}`)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	if (localStorage.getItem('streaming_' + acct_id)) {
-		var wss = localStorage.getItem('streaming_' + acct_id)
-	} else {
-		var wss = 'wss://' + domain
-	}
-	if (type == 'home') {
-		var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
-	} else if (type == 'pub') {
-		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 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
-	} else if (type == 'local-media') {
-		var start =
-			wss +
-			'/api/v1/streaming/?stream=public:local:media&only_media=true&access_token=' +
-			at
-	} else if (type == 'tag') {
-		var tag = localStorage.getItem('tag-range')
-		if (tag == 'local') {
-			data = data + '&local=true'
-		}
-		if (data.name) {
-			data = data.name
-		}
-		var start =
-			wss +
-			'/api/v1/streaming/?stream=hashtag&tag=' +
-			data +
-			'&access_token=' +
-			at + add
-	} 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
-	} 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) {
-		console.table({
-			tlid: tlid,
-			type: 'Connect Streaming API' + type,
-			domain: domain,
-			message: [mess],
-		})
-		errorct = 0
-		$('#notice_icon_' + tlid).removeClass('red-text')
-	}
-	websocket[wsid].onmessage = function (mess) {
-		console.log([tlid + ':Receive Streaming API:', JSON.parse(mess.data)])
-		if (misskey) {
-			if (JSON.parse(mess.data).type == 'note') {
-				var obj = JSON.parse(mess.data).body
-				if (voice) {
-					say(obj.text)
-				}
-				websocketNotf[acct_id].send(
-					JSON.stringify({
-						type: 'capture',
-						id: obj.id,
-					})
-				)
-				var templete = misskeyParse([obj], type, acct_id, tlid, '', mute)
-				var pool = localStorage.getItem('pool_' + tlid)
-				if (pool) {
-					pool = templete + pool
-				} else {
-					pool = templete
-				}
-				localStorage.setItem('pool_' + tlid, pool)
-				scrollck()
-				jQuery('time.timeago').timeago()
-			}
-		} else {
-			var typeA = JSON.parse(mess.data).event
-			if (typeA == 'delete') {
-				var obj = JSON.parse(mess.data).payload
-				if (delc == 'true') {
-					$(
-						'#timeline_' +
-						tlid +
-						' [unique-id=' +
-						JSON.parse(mess.data).payload +
-						']'
-					).addClass('emphasized')
-					$(
-						'#timeline_' +
-						tlid +
-						' [unique-id=' +
-						JSON.parse(mess.data).payload +
-						']'
-					).addClass('by_delcatch')
-				} else {
-					$('[unique-id=' + JSON.parse(mess.data).payload + ']').hide()
-					$('[unique-id=' + JSON.parse(mess.data).payload + ']').remove()
-				}
-			} else if (typeA == 'update' || typeA == 'conversation') {
-				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 (voice) {
-							say(obj.content)
-						}
-						var templete = parse([obj], type, acct_id, tlid, '', mute, type)
-						if (
-							$('timeline_box_' + tlid + '_box .tl-box').scrollTop() === 0
-						) {
-							$('#timeline_' + tlid).prepend(templete)
-						} else {
-							var pool = localStorage.getItem('pool_' + tlid)
-							if (pool) {
-								pool = templete + pool
-							} else {
-								pool = templete
-							}
-							localStorage.setItem('pool_' + tlid, pool)
-						}
-						scrollck()
-						additional(acct_id, tlid)
-						jQuery('time.timeago').timeago()
-					} else {
-						todo('二重取得発生中')
+		websocket[wsid].onmessage = function (mess) {
+			console.log([tlid + ':Receive Streaming API:', JSON.parse(mess.data)])
+			if (misskey) {
+				if (JSON.parse(mess.data).type == 'note') {
+					var obj = JSON.parse(mess.data).body
+					if (voice) {
+						say(obj.text)
 					}
-
-					todc()
+					websocketNotf[acct_id].send(
+						JSON.stringify({
+							type: 'capture',
+							id: obj.id,
+						})
+					)
+					var templete = misskeyParse([obj], type, acct_id, tlid, '', mute)
+					var pool = localStorage.getItem('pool_' + tlid)
+					if (pool) {
+						pool = templete + pool
+					} else {
+						pool = templete
+					}
+					localStorage.setItem('pool_' + tlid, pool)
+					scrollck()
+					jQuery('time.timeago').timeago()
+				}
+			} else {
+				var typeA = JSON.parse(mess.data).event
+				if (typeA == 'delete') {
+					var obj = JSON.parse(mess.data).payload
+					if (delc == 'true') {
+						$(
+							'#timeline_' +
+								tlid +
+								' [unique-id=' +
+								JSON.parse(mess.data).payload +
+								']'
+						).addClass('emphasized')
+						$(
+							'#timeline_' +
+								tlid +
+								' [unique-id=' +
+								JSON.parse(mess.data).payload +
+								']'
+						).addClass('by_delcatch')
+					} else {
+						$('[unique-id=' + JSON.parse(mess.data).payload + ']').hide()
+						$('[unique-id=' + JSON.parse(mess.data).payload + ']').remove()
+					}
+				} else if (typeA == 'update' || typeA == 'conversation') {
+					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 (voice) {
+								say(obj.content)
+							}
+							var templete = parse([obj], type, acct_id, tlid, '', mute, type)
+							if (
+								$('timeline_box_' + tlid + '_box .tl-box').scrollTop() === 0
+							) {
+								$('#timeline_' + tlid).prepend(templete)
+							} else {
+								var pool = localStorage.getItem('pool_' + tlid)
+								if (pool) {
+									pool = templete + pool
+								} else {
+									pool = templete
+								}
+								localStorage.setItem('pool_' + tlid, pool)
+							}
+							scrollck()
+							additional(acct_id, tlid)
+							jQuery('time.timeago').timeago()
+						} else {
+							todo('二重取得発生中')
+						}
+
+						todc()
+					}
+				} else if (typeA == 'filters_changed') {
+					filterUpdate(acct_id)
+				} else if (~typeA.indexOf('announcement')) {
+					announ(acct_id, tlid)
 				}
-			} else if (typeA == 'filters_changed') {
-				filterUpdate(acct_id)
-			} else if (~typeA.indexOf('announcement')) {
-				announ(acct_id, tlid)
 			}
 		}
-	}
-	websocket[wsid].onerror = function (error) {
-		console.error('Error closing')
-		console.error(error)
-		if (mode == 'error') {
-			$('#notice_icon_' + tlid).addClass('red-text')
-			todo('WebSocket Error ' + error)
-		} else {
-			errorct++
-			console.log(errorct)
-			if (errorct < 3) {
-				reconnector(tlid, type, acct_id, data, 'error')
+		websocket[wsid].onerror = function (error) {
+			console.error('Error closing')
+			console.error(error)
+			if (mode == 'error') {
+				$('#notice_icon_' + tlid).addClass('red-text')
+				todo('WebSocket Error ' + error)
+			} else {
+				errorct++
+				console.log(errorct)
+				if (errorct < 3) {
+					reconnector(tlid, type, acct_id, data, 'error')
+				}
 			}
+			return false
 		}
-		return false
-	}
-	websocket[wsid].onclose = function () {
-		console.warn('Closing ' + tlid)
-		if (mode == 'error') {
-			$('#notice_icon_' + tlid).addClass('red-text')
-			todo('WebSocket Closed')
-		} else {
-			errorct++
-			console.log(errorct)
-			if (errorct < 3) {
-				reconnector(tlid, type, acct_id, data, 'error')
+		websocket[wsid].onclose = function () {
+			console.warn('Closing ' + tlid)
+			if (mode == 'error') {
+				$('#notice_icon_' + tlid).addClass('red-text')
+				todo('WebSocket Closed')
+			} else {
+				errorct++
+				console.log(errorct)
+				if (errorct < 3) {
+					reconnector(tlid, type, acct_id, data, 'error')
+				}
 			}
+			return false
 		}
-		return false
 	}
 }
+
 //一定のスクロールで発火
 function moreload(type, tlid) {
 	var multi = localStorage.getItem('column')
@@ -915,13 +866,13 @@ function com(type, data, tlid) {
 		return 'public?local=true&only_media=true&'
 	} else if (type == 'pub') {
 		var add = ''
-		if (remoteOnlyCk(tlid)) {
+		if(remoteOnlyCk(tlid)){
 			add = 'remote=true&'
 		}
 		return 'public?' + add
 	} else if (type == 'pub-media') {
 		var add = ''
-		if (remoteOnlyCk(tlid)) {
+		if(remoteOnlyCk(tlid)){
 			add = 'remote=true&'
 		}
 		return 'public?only_media=true&' + add
@@ -1047,9 +998,9 @@ function reconnector(tlid, type, acct_id, data, mode) {
 			var voice = false
 		}
 		var mute = getFilterTypeByAcct(acct_id, type)
-		var domain = localStorage.getItem('domain_' + acct_id)
+		reload(type, '', acct_id, tlid, data, mute, '', voice, mode)
 	}
-	M.toast({ html: lang.lang_tl_reconnect, displayLength: 2000 })
+	Mtoast({ html: lang.lang_tl_reconnect, displayLength: 2000 })
 }
 function columnReload(tlid, type) {
 	$('#notice_icon_' + tlid).addClass('red-text')
@@ -1057,12 +1008,6 @@ function columnReload(tlid, type) {
 	var multi = localStorage.getItem('column')
 	var obj = JSON.parse(multi)
 	var acct_id = obj[tlid].domain
-	var domain = localStorage.getItem('domain_' + acct_id)
-	if (mastodonBaseWsStatus[domain] == 'available') {
-		stremaingSubscribe(type, acct_id, obj[tlid].data, true)
-		parseColumn(tlid, true)
-		return true
-	}
 	if (type == 'mix' || type == 'integrated' || type == 'plus') {
 		if (localStorage.getItem('voice_' + tlid)) {
 			var voice = true
@@ -1082,10 +1027,15 @@ function columnReload(tlid, type) {
 		$('#notice_icon_' + tlid).removeClass('red-text')
 		getBookmark(acct_id, tlid, false)
 	} else {
-
 		var wss = localStorage.getItem('wss_' + tlid)
 		websocket[wss].close()
-		parseColumn(tlid, false)
+		if (localStorage.getItem('voice_' + tlid)) {
+			var voice = true
+		} else {
+			var voice = false
+		}
+		var mute = getFilterTypeByAcct(acct_id, type)
+		parseColumn(tlid)
 	}
 }
 //Markers
@@ -1128,10 +1078,10 @@ function getMarker(tlid, type, acct_id) {
 					$('#unread_' + tlid).attr(
 						'title',
 						lang.lang_layout_unread +
-						':' +
-						json.updated_at +
-						' v' +
-						json.version
+							':' +
+							json.updated_at +
+							' v' +
+							json.version
 					)
 					$('#unread_' + tlid).attr('data-id', json.last_read_id)
 				} else {
@@ -1335,8 +1285,8 @@ function asReadEnd() {
 			onBeforeOpen: () => {
 				Swal.showLoading()
 			},
-			onClose: () => { },
-		}).then((result) => { })
+			onClose: () => {},
+		}).then((result) => {})
 	} else {
 		postMessage(['asReadComp', ''], '*')
 	}
@@ -1399,8 +1349,8 @@ function getUtl(acct_id, tlid, data, more) {
 	moreloading = true
 	if (more) {
 		var sid = $('#timeline_' + tlid + ' .cvo')
-			.last()
-			.attr('unique-id')
+		.last()
+		.attr('unique-id')
 		var ad = '?max_id=' + sid
 	} else {
 		var ad = ''
@@ -1468,7 +1418,7 @@ function announ(acct_id, tlid) {
 				$('.notf-announ_' + acct_id).addClass('hide')
 			}
 			var templete = announParse(json, acct_id, tlid)
-			$('.announce_' + acct_id).html(templete)
+			$('#announce_' + tlid).html(templete)
 			jQuery('time.timeago').timeago()
 			todc()
 		}
@@ -1476,7 +1426,7 @@ function announ(acct_id, tlid) {
 }
 //buildQuery
 function buildQuery(name, data) {
-	if (!data || data == '') return ''
+	if(!data || data == '') return ''
 	var arr = data.split(',')
 	var str = ''
 	for (var i = 0; i < arr.length; i++) {
--- a/app/js/ui/img.js
+++ b/app/js/ui/img.js
@@ -120,7 +120,7 @@ function imageXhr(id, key, murl) {
 				element.onload = function() {
 					var width = element.naturalWidth
 					if(width < 650) {
-						width = 650
+						width = 650;
 					}
 					var height = element.naturalHeight
 					var windowH = $(window).height()
@@ -182,7 +182,7 @@ function zoom(z) {
 	$('#imagewrap img').css('height', hgt + 'px')
 }
 //スマホ対応ドラッグ移動システム
-(function() {
+;(function() {
 	$.fn.dragScroll = function() {
 		var target = this
 		$(this)
@@ -291,5 +291,5 @@ function stopVideo() {
 function copyImgUrl() {
 	var murl = $('#imagemodal').attr('data-original')
 	execCopy(murl)
-	M.toast({ html: lang.lang_img_copyDone, displayLength: 1500 })
+	Mtoast({ html: lang.lang_img_copyDone, displayLength: 1500 })
 }
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@@ -42,16 +42,18 @@ function parseColumn(target, dontclose) {
 	var multi = localStorage.getItem('multi')
 	if (multi) {
 		var obj = JSON.parse(multi)
+
 		var templete
 		Object.keys(obj).forEach(function (key) {
 			var acct = obj[key]
+
 			localStorage.setItem('name_' + key, acct.name)
 			localStorage.setItem('user_' + key, acct.user)
 			localStorage.setItem('user-id_' + key, acct.id)
 			localStorage.setItem('prof_' + key, acct.prof)
 			localStorage.setItem('domain_' + key, acct.domain)
 			localStorage.setItem('acct_' + key + '_at', acct.at)
-			if(!target) mastodonBaseStreaming(key)
+			notf(key, 0)
 			ckdb(key)
 			//フィルターデータ読もう
 			getFilter(key)
@@ -72,14 +74,10 @@ function parseColumn(target, dontclose) {
 	var col = localStorage.getItem('column')
 	if (!col) {
 		var obj = [
-			{
-				domain: 0,
-				type: 'home',
-			},
 			{
 				domain: 0,
 				type: 'local',
-			}
+			},
 		]
 		var json = JSON.stringify(obj)
 		localStorage.setItem('column', json)
@@ -149,6 +147,7 @@ function parseColumn(target, dontclose) {
 				icnsert = ' style="color: #' + ichex + '" '
 			}
 		}
+		console.log(acct)
 		if (acctlist[acct.domain]) {
 			if (acctlist[acct.domain].background != 'def') {
 				insert = insert + ' border-bottom:medium solid #' + acctlist[acct.domain].background + ';'
@@ -159,21 +158,15 @@ function parseColumn(target, dontclose) {
 		} else {
 			localStorage.removeItem('hasNotfC_' + acct.domain)
 		}
-		var css = ''
 		var width = localStorage.getItem('width')
 		if (width) {
-			css = ' min-width:' + width + 'px;'
-		}
-		var maxWidth = localStorage.getItem('max-width')
-		if (maxWidth) {
-			css = css +'max-width:' + maxWidth + 'px;'
-		}
-		var margin = localStorage.getItem('margin')
-		if (margin) {
-			css = css +'margin-right:' + margin + 'px;'
+			var css = ' min-width:' + width + 'px;'
 		}
 		if (acct.width) {
-			css = css + ' min-width:' + acct.width + 'px !important;max-width:' + acct.width + 'px !important;'
+			var css = ' min-width:' + acct.width + 'px;max-width:' + acct.width + 'px;'
+		}
+		if (!css) {
+			var css = ''
 		}
 		if (acct.type == 'webview') {
 			if (localStorage.getItem('fixwidth')) {
@@ -228,63 +221,65 @@ function parseColumn(target, dontclose) {
 				var animecss = ''
 			}
 			var unread = `<a id="unread_${key}" onclick="showUnread('${key}','${acct.type}','${acct.domain}')"
-					 class="setting nex waves-effect" title="${lang.lang_layout_unread}">
-					<i class="material-icons waves-effect nex">more</i><br />${lang.lang_layout_unread}
-				</a>`
+					 class="setting nex" title="${lang.lang_layout_unread}">
+					<i class="material-icons waves-effect nex">more</i>
+				</a>${lang.lang_layout_unread}<br>`
 			var notfDomain = acct.domain
 			var notfKey = key
 			var if_tag = ''
 			var if_tag_btn = ''
 			if (acct.type == 'notf') {
 				var exclude =
-					`<div style="border: 1px solid; padding: 5px; margin-top: 5px; margin-bottom: 5px;">${lang.lang_layout_excluded}:<br>
+					lang.lang_excluded +
+					`:<br>
 					<label>
 						<input type="checkbox" class="filled-in" id="exc-reply-${key}" ${excludeCk(key, 'mention')} />
 						<span>
-							${lang.lang_layout_mention}
+							<i class="fas fa-share exc-icons"></i>
 						</span>
 					</label>
 					<label>
 						<input type="checkbox" class="filled-in" id="exc-fav-${key}" ${excludeCk(key, 'favourite')} />
 						<span>
-						${lang.lang_layout_fav}
+							<i class="fas fa-star exc-icons"></i>
 						</span>
 					</label> 
 					<label>
 						<input type="checkbox" class="filled-in" id="exc-bt-${key}" ${excludeCk(key, 'reblog')} />
 						<span>
-						${lang.lang_layout_bt}
+							<i class="fas fa-retweet exc-icons"></i>
 						</span>
-					</label>
+					</label> 
 					<label>
 						<input type="checkbox" class="filled-in" id="exc-follow-${key}" ${excludeCk(key, 'follow')} />
 						<span>
-						${lang.lang_status_follow}
+							<i class="fas fa-users exc-icons"></i>
 						</span>
 					</label> 
 					<label>
 						<input type="checkbox" class="filled-in" id="exc-poll-${key}" ${excludeCk(key, 'poll')} />
 						<span>
-						${lang.lang_layout_poll}
+							<i class="fas fa-tasks exc-icons"></i>
 						</span>
-					</label> <br />
-					<button class="btn btn-flat waves-effect notf-exclude-btn waves-light" style="width:calc(50% - 11px); padding:0;" onclick="exclude('${key}')">Filter</button>`
+					</label> 
+					<button class="btn waves-effect" style="width:60px; padding:0;" onclick="exclude('${key}')">Filter</button>`
 				if (checkNotfFilter(key)) {
 					exclude =
 						exclude +
-						`<button class="btn btn-flat red-text waves-effect notf-exclude-btn waves-light" style="width:calc(50% - 11px); padding:0;" onclick="resetNotfFilter('${key}')">
+						`<button class="btn red waves-effect" style="width:60px; padding:0;" onclick="resetNotfFilter('${key}')">
 							Clear all
 						</button>`
 				}
-				exclude = exclude + '</div>'
+				exclude = exclude + '<br>'
 				notfDomain = 'dummy'
 				notfKey = 'dummy'
 			} else if (acct.type == 'home') {
-				var exclude = `<a onclick="ebtToggle('${key}')" class="setting nex waves-effect">
-						<i class="fas fa-retweet nex" title="${lang.lang_layout_excludingbt}" style="font-size: 24px"></i>
-						<span id="sta-bt-${key}">Off</span><br />
+				var exclude = `<a onclick="ebtToggle('${key}')" class="setting nex">
+						<i class="fas fa-retweet waves-effect nex" title="${lang.lang_layout_excludingbt}" style="font-size:24px"></i>
+						<span id="sta-bt-${key}">Off</span>
+					</a>
 					${lang.lang_layout_excludingbt}
-					</a>`
+					<br>`
 			} else if (acct.type == 'tag') {
 				if (acct.data.name) {
 					var name = acct.data.name
@@ -333,13 +328,15 @@ function parseColumn(target, dontclose) {
 					var basehtml = `<div style="${css}" class="box ${animecss}" id="timeline_box_${basekey}_parentBox"></div>`
 					$('#timeline-container').append(basehtml)
 				}
-				var left_hold = `<a onclick="leftFoldSet('${key}')" class="setting nex waves-effect">
-						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftFold}">view_agenda</i><br />
-					${lang.lang_layout_leftFold}</a>`
+				var left_hold = `<a onclick="leftFoldSet('${key}')" class="setting nex">
+						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftFold}">view_agenda</i>
+					</a>
+					${lang.lang_layout_leftFold}<br>`
 			} else {
-				var left_hold = `<a onclick="leftFoldRemove('${key}')" class="setting nex waves-effect">
-						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftUnfold}">view_column</i><br />
-					${lang.lang_layout_leftUnfold}</a>`
+				var left_hold = `<a onclick="leftFoldRemove('${key}')" class="setting nex">
+						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftUnfold}">view_column</i>
+					</a>
+					${lang.lang_layout_leftUnfold}<br>`
 			}
 			if (key === 0) {
 				left_hold = ''
@@ -358,21 +355,22 @@ function parseColumn(target, dontclose) {
 				var addHeight = ''
 			}
 			if (acct.type != 'pub' && acct.type != 'pub-media') {
-				var mediaFil = `<a onclick="mediaToggle('${key}')" class="setting nex waves-effect">
-					<i class="material-icons nex" title="${lang.lang_layout_mediafil}">perm_media</i>
-					<span id="sta-media-${key}">On</span><br />
-				${lang.lang_layout_mediafil}</a>`
+				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 waves-effect">
-					<i class="material-icons nex" title="${lang.lang_layout_remoteOnly}">perm_media</i><br />
+				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>
-				${lang.lang_layout_remoteOnly}</a>`
+				</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}">
 						<div class="area-notice">
-							<i class="material-icons waves-effect ${isMisRed} notice_icon_acct_${acct.domain}" id="notice_icon_${key}" ${notf_attr}
+							<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}" aria-hidden="true">
@@ -415,30 +413,33 @@ function parseColumn(target, dontclose) {
 					</div>
 				</div>
 				<div class="column-hide notf-indv-box z-depth-4" id="notf-box_${notfKey}">
-					<div class="announce_${acct.domain}" style="border: 1px solid"></div>
+					<div id="announce_${notfKey}" style="border: 1px solid"></div>
 					<div id="notifications_${notfKey}" data-notf="${notfDomain}" data-type="notf" class="notf-timeline">
 					</div>
 				</div>
 				<div class="column-hide notf-indv-box" id="util-box_${key}" style="padding:5px;">
-					${exclude}
 					${unread}
-					${left_hold}
-					${mediaFil}
-					<a onclick="cardToggle('${key}')" class="setting nex waves-effect">
-						<i class="material-icons nex" title="${lang.lang_layout_linkanades}">link</i>
-						<span id="sta-card-${key}">On</span><br />
-					${lang.lang_layout_linkana}
+					${exclude}${left_hold}
+					${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>
+					</a>
+					${lang.lang_layout_linkana}
+					<br>
+					<a onclick="voiceToggle('${key}')" class="setting nex">
+						<i class="material-icons waves-effect nex" title="${lang.lang_layout_tts}">hearing</i>
+						<span id="sta-voice-${key}">On</span>
 					</a>
-					<a onclick="voiceToggle('${key}')" class="setting nex waves-effect">
-						<i class="material-icons nex" title="${lang.lang_layout_tts}">hearing</i>
-						<span id="sta-voice-${key}">On</span><br />
 					${lang.lang_layout_tts}
-					TL</a>
-					<a onclick="columnReload('${key}','${acct.type}')" class="setting nex ${if_misskey_hide} waves-effect">
-						<i class="material-icons nex" title="${lang.lang_layout_reconnect}">refresh</i>
-					<br />
+					TL<br>
+					<a onclick="columnReload('${key}','${acct.type}')" class="setting nex ${if_misskey_hide}">
+						<i class="material-icons waves-effect nex" title="${lang.lang_layout_reconnect}">refresh</i>
+					</a>
+					<span>
 						${lang.lang_layout_reconnect}
-					</a><br />
+					</span>
+					<br>
 					${lang.lang_layout_headercolor}
 					<br>
 					<div id="picker_${key}" class="color-picker"></div>
@@ -651,7 +652,7 @@ function removeColumn(tlid) {
 			localStorage.setItem('column', json)
 			sortLoad()
 			$('#timeline_box_' + tlid + '_box').remove()
-			if (!data.left_fold) {
+			if(!data.left_fold) {
 				$('#timeline_box_' + tlid + '_parentBox').remove()
 			}
 		}
@@ -785,8 +786,7 @@ function webviewParse(url, key, insert, icnsert, css) {
 					<i class="fab fa-twitter waves-effect" id="notice_icon_${key}" style="font-size:40px; padding-top:25%;"></i>
 				</div>
 				<div class="area-notice_name tl-title">WebView('${url}')</div>
-				<div class="area-sta">
-				</div>
+				<div class="area-sta"></div>
 				<div class="area-a2">
 					<a onclick="removeColumn('${key}')" class="setting nex">
 						<i class="material-icons waves-effect nex" title="${lang.lang_layout_delthis}" ${icnsert}>cancel</i>
@@ -829,7 +829,7 @@ function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, anim
 			${lang.lang_layout_leftUnfold}
 			</span><br>`
 	}
-	if (type == 'utl') {
+	if(type == 'utl') {
 		var dataHtml = false
 	} else {
 		var dataHtml = data
@@ -899,13 +899,13 @@ function bookmark(key, data) {
 	tl('bookmark', '', data, key, 'false', voice, '')
 }
 function utl(key, acct_id, data) {
-	if (!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
--- a/app/js/ui/menu.js
+++ b/app/js/ui/menu.js
@@ -1,24 +1,24 @@
 function menu() {
-  localStorage.setItem("menu-done", true)
+  localStorage.setItem("menu-done", true);
  $("#fukidashi").addClass("hide")
  if (!$("#menu").hasClass("appear")) {
    $("#menu").addClass("appear")
-    var left = localStorage.getItem("menu-left")
+    var left = localStorage.getItem("menu-left");
    if (left > $('body').width() - $('#menu').width()) {
-      left = $('body').width() - $('#menu').width()
+      left = $('body').width() - $('#menu').width();
    } else if (left < 0) {
-      left = 0
+      left = 0;
    }
-    var top = localStorage.getItem("menu-top")
+    var top = localStorage.getItem("menu-top");
    if (top > $('body').height() - $('#menu').height()) {
-      top = $('body').height() - $('#menu').height()
+      top = $('body').height() - $('#menu').height();
    } else if (top < 0) {
-      top = 0
+      top = 0;
    }
    $('#menu').css("left", left + "px")
    $('#menu').css("top", top + "px")
-    var height = localStorage.getItem("menu-height")
-    var width = localStorage.getItem("menu-width")
+    var height = localStorage.getItem("menu-height");
+    var width = localStorage.getItem("menu-width");
    if(height){
      $('#menu').css("height", height + "px")
    }else{
@@ -27,13 +27,13 @@ function menu() {
    if(width){
      $('#menu').css("width", width + "px")
    }
-    $('#menu').fadeIn()
-    $("#menu-bar").html("TheDesk " + localStorage.getItem("ver"))
-    $(".menu-content").addClass("hide")
-    $("#add-box").removeClass("hide")
-    $("#left-menu div").removeClass("active")
-    $("#addColumnMenu").addClass("active")
-    $("#addColumnMenu").click()
+    $('#menu').fadeIn();
+    $("#menu-bar").html("TheDesk " + localStorage.getItem("ver"));
+    $(".menu-content").addClass("hide");
+    $("#add-box").removeClass("hide");
+    $("#left-menu div").removeClass("active");
+    $("#addColumnMenu").addClass("active");
+    $("#addColumnMenu").click();
  } else {
    $('#menu').fadeOut()
    $("#menu").removeClass("appear")
@@ -44,35 +44,35 @@ $(function () {
  $("#menu").draggable({
    handle: "#menu-bar",
    stop: function () {
-      var left = $('#menu').offset().left
+      var left = $('#menu').offset().left;
      if (left > $('body').width() - $('#menu').width()) {
-        left = $('body').width() - $('#menu').width()
+        left = $('body').width() - $('#menu').width();
      } else if (left < 0) {
-        left = 0
+        left = 0;
      }
-      var top = $('#menu').offset().top
+      var top = $('#menu').offset().top;
      if (top > $('body').height() - $('#menu').height()) {
-        top = $('body').height() - $('#menu').height()
+        top = $('body').height() - $('#menu').height();
      } else if (top < 0) {
-        top = 0
+        top = 0;
      }
-      localStorage.setItem("menu-left", left)
-      localStorage.setItem("menu-top", top)
+      localStorage.setItem("menu-left", left);
+      localStorage.setItem("menu-top", top);
    }
-  })
+  });
  $("#menu").resizable({
    minHeight: 150,
    minWidth: 200,
    stop: function (event, ui) {
-      localStorage.setItem("menu-height", ui.size.height)
-      localStorage.setItem("menu-width", ui.size.width)
+      localStorage.setItem("menu-height", ui.size.height);
+      localStorage.setItem("menu-width", ui.size.width);
    }
-  })
-})
+  });
+});
 function help() {
-  $("#left-menu a").removeClass("active")
-	$("#helpMenu").addClass("active")
-	$(".menu-content").addClass("hide")
-	$("#help-box").removeClass("hide")
+  $("#left-menu a").removeClass("active");
+	$("#helpMenu").addClass("active");
+	$(".menu-content").addClass("hide");
+	$("#help-box").removeClass("hide");
  postMessage(["sendSinmpleIpc", "getLogs"], "*")
 }
--- a/app/js/ui/pip.js
+++ b/app/js/ui/pip.js
@@ -1,32 +1,32 @@
 function pip(id) {
-    $("#pip-content").html($("[toot-id=" + id + "] .additional").html())
-    $("#pip").removeClass("hide")
+    $("#pip-content").html($("[toot-id=" + id + "] .additional").html());
+    $("#pip").removeClass("hide");
 }
 function endPip() {
-    $("#pip-content").html("")
-    $("#pip").addClass("hide")
+    $("#pip-content").html("");
+    $("#pip").addClass("hide");
 }

 function pipHoriz() {
    if ($("#pip").hasClass("pip-left")) {
-        $("#pip").removeClass("pip-left")
-        $(".pip-horiz").text("chevron_left")
-        $("#pip").addClass("pip-right")
+        $("#pip").removeClass("pip-left");
+        $(".pip-horiz").text("chevron_left");
+        $("#pip").addClass("pip-right");
    } else {
-        $("#pip").addClass("pip-left")
-        $("#pip").removeClass("pip-right")
-        $(".pip-horiz").text("chevron_right")
+        $("#pip").addClass("pip-left");
+        $("#pip").removeClass("pip-right");
+        $(".pip-horiz").text("chevron_right");
    }
 }

 function pipVert() {
    if ($("#pip").hasClass("pip-top")) {
-        $("#pip").removeClass("pip-top")
-        $("#pip").addClass("pip-bottom")
-        $(".pip-vert").text("expand_less")
+        $("#pip").removeClass("pip-top");
+        $("#pip").addClass("pip-bottom");
+        $(".pip-vert").text("expand_less");
    } else {
-        $("#pip").addClass("pip-top")
-        $("#pip").removeClass("pip-bottom")
-        $(".pip-vert").text("expand_more")
+        $("#pip").addClass("pip-top");
+        $("#pip").removeClass("pip-bottom");
+        $(".pip-vert").text("expand_more");
    }
 }
--- a/app/js/ui/post-box.js
+++ b/app/js/ui/post-box.js
@@ -126,6 +126,11 @@ function initPostbox() {
 		localStorage.removeItem('nohide')
 		srcBox('close')
 	})
+	$('#contextWrap').click(function (e) {
+		$('#contextWrap').addClass('hide')
+		$('.contextMenu').addClass('hide')
+		$('.act-icon').text('expand_more')
+	})
 	$('#textarea,#cw-text').focusout(function (e) {
 		localStorage.setItem('nohide', true)
 		var countup = function () {
--- a/app/js/ui/radio.js
+++ b/app/js/ui/radio.js
@@ -1,38 +1,38 @@
-var r = document.getElementById("radio")
+var r = document.getElementById("radio");
 function Rtoggle() {
    if ($("#radio").hasClass("play")) {
-        Rstop()
+        Rstop();
    } else {
-        $("#radio-view").toggleClass("hide")
-        $("#radio-view").toggleClass("show")
-        $("#radio-input").addClass("hide")
+        $("#radio-view").toggleClass("hide");
+        $("#radio-view").toggleClass("show");
+        $("#radio-input").addClass("hide");
    }
 }
 function Rplay(url, name) {
-    $("#radio").attr('src', url)
-    r.load()
-    r.play()
-    $("#radio").addClass("play")
-    $("#radio-btn").addClass("teal-text")
-    $("#radio-sta").html("<br>Now Playing:" + name)
+    $("#radio").attr('src', url);
+    r.load();
+    r.play();
+    $("#radio").addClass("play");
+    $("#radio-btn").addClass("teal-text");
+    $("#radio-sta").html("<br>Now Playing:" + name);
 }
 function Rstop() {
-    $("#radio").attr("src", "")
-    r.pause()
-    $("#radio").removeClass("play")
-    $("#radio-btn").removeClass("teal-text")
-    $("#radio-sta").html("")
+    $("#radio").attr("src", "");
+    r.pause();
+    $("#radio").removeClass("play");
+    $("#radio-btn").removeClass("teal-text");
+    $("#radio-sta").html("");
 }
 function Ryourself() {
-    $("#radio-input").removeClass("hide")
-    $("#radio-view").addClass("hide")
+    $("#radio-input").removeClass("hide");
+    $("#radio-view").addClass("hide");
 }
 function Rselect() {
-    $("#radio-input").addClass("hide")
-    $("#radio-view").removeClass("hide")
+    $("#radio-input").addClass("hide");
+    $("#radio-view").removeClass("hide");
 }
 function Rinput() {
-    var url = $("#radio-url").val()
+    var url = $("#radio-url").val();
    Rplay(url, url)
 }
 /*
--- a/app/js/ui/settings.js
+++ b/app/js/ui/settings.js
@@ -5,7 +5,7 @@ var envView = new Vue({
 	methods: {
 		complete: function (i, val) {
 			var ls = envView.config[i].storage
-			M.toast({ html: 'Complete', displayLength: 3000 })
+			Mtoast({ html: 'Complete', displayLength: 3000 })
 			if (!val) {
 				var id = envView.config[i].id
 				var val = $('#' + id).val()
@@ -39,7 +39,7 @@ var tlView = new Vue({
 					ls = ls.data
 				}
 				for (var j = 0; j < ls.length; j++) {
-					M.toast({ html: 'Complete', displayLength: 3000 })
+					Mtoast({ html: 'Complete', displayLength: 3000 })
 					var id = ls[j].id
 					var val = $('#' + id).val()
 					localStorage.setItem(ls[j].storage, val)
@@ -68,7 +68,7 @@ var postView = new Vue({
 					ls = ls.data
 				}
 				for (var j = 0; j < ls.length; j++) {
-					M.toast({ html: 'Complete', displayLength: 3000 })
+					Mtoast({ html: 'Complete', displayLength: 3000 })
 					var id = ls[j].id
 					var val = $('#' + id).val()
 					localStorage.setItem(ls[j].storage, val)
@@ -90,7 +90,7 @@ function settings() {
 		$('#' + theme).prop('checked', true)
 	} else {
 		if (cd != localStorage.getItem('theme')) {
-			M.toast({ html: lang.lang_setting_theme.replace('{{set}}', ct), displayLength: 3000 })
+			Mtoast({ html: lang.lang_setting_theme.replace('{{set}}', ct), displayLength: 3000 })
 		}
 		//テーマはこの場で設定
 		themes(cd)
@@ -99,14 +99,14 @@ function settings() {
 	var fontd = $('#font').val()
 	if (fontd) {
 		if (fontd != localStorage.getItem('font')) {
-			M.toast({ html: lang.lang_setting_font.replace('{{set}}', fontd), displayLength: 3000 })
+			Mtoast({ html: lang.lang_setting_font.replace('{{set}}', fontd), displayLength: 3000 })
 		}
 		localStorage.setItem('font', fontd)
 		themes()
 	} else {
 		if (localStorage.getItem('font')) {
 			localStorage.removeItem('font')
-			M.toast({ html: lang.lang_setting_font.replace('{{set}}', '"default"'), displayLength: 3000 })
+			Mtoast({ html: lang.lang_setting_font.replace('{{set}}', '"default"'), displayLength: 3000 })
 			themes()
 		}
 	}
@@ -167,10 +167,10 @@ function load() {
 		var font = ''
 	}
 	$('#font').val(font)
-	$('#c1-file').text(localStorage.getItem('custom1') != 'null' ? localStorage.getItem('custom1') : '')
-	$('#c2-file').text(localStorage.getItem('custom2') != 'null' ? localStorage.getItem('custom2') : '')
-	$('#c3-file').text(localStorage.getItem('custom3') != 'null' ? localStorage.getItem('custom3') : '')
-	$('#c4-file').text(localStorage.getItem('custom4') != 'null' ? localStorage.getItem('custom4') : '')
+	$('#c1-file').text(localStorage.getItem('custom1'))
+	$('#c2-file').text(localStorage.getItem('custom2'))
+	$('#c3-file').text(localStorage.getItem('custom3'))
+	$('#c4-file').text(localStorage.getItem('custom4'))
 	var cvol = localStorage.getItem('customVol')
 	if (cvol) {
 		$('#soundvol').val(cvol * 100)
@@ -286,7 +286,7 @@ function notftest() {
 function oks(no) {
 	var txt = $('#oks-' + no).val()
 	localStorage.setItem('oks-' + no, txt)
-	M.toast({ html: lang.lang_setting_ksref, displayLength: 3000 })
+	Mtoast({ html: lang.lang_setting_ksref, displayLength: 3000 })
 }
 function oksload() {
 	if (localStorage.getItem('oks-1')) {
@@ -508,39 +508,35 @@ function fontList(arg) {
 function insertFont(name) {
 	$('#font').val(name)
 }
-function copyColor(from, to) {
-	let props = [
-		'background', 'subcolor', 'text', 'accent',
-		'modal', 'modalFooter', 'third', 'forth',
-		'bottom', 'emphasized', 'postbox', 'active',
-		'selected', 'selectedWithShared'
-	]
-	let i = 0
-	let color
-	for (tag of props) {
-		if(tag == from) {
-			let used = $(`#use-color_${i}`).prop('checked')
-			if(!used) {
-				Swal.fire({
-					type: 'error',
-					title: 'Not checked',
-				})
-				break
-			}
-			color = $(`#color-picker${i}_value`).val()
-			break
-		}
-		i++
-	}
-	if(!color) return false
-	for (tag of props) {
-		if(tag == to) {
-			$(`#color-picker${i}_value`).val(color)
-			$(`#use-color_${i}`).prop('checked', true)
-			break
-		}
-		i++
-	}
+$('.color-picker').each(function (i, elem) {
+	pickerDefine(i, 'fff')
+})
+function pickerDefine(i, color) {
+	var pickr = new Pickr({
+		el: '#color-picker' + i,
+		default: color,
+		showAlways: true,
+		appendToBody: true,
+		closeWithKey: 'Escape',
+		comparison: false,
+		components: {
+			preview: true, // Left side color comparison
+			opacity: false, // Opacity slider
+			hue: true, // Hue slider
+			interaction: {
+				rgba: false, // rgba option (red green blue and alpha)
+				input: true, // input / output element
+			},
+		},
+		strings: {
+			save: 'Save', // Default for save button
+			clear: 'Clear', // Default for clear button
+		},
+	})
+	pickr.on('change', (...args) => {
+		var rgb = 'rgb(' + args[0].toRGBA()[0] + ',' + args[0].toRGBA()[1] + ',' + args[0].toRGBA()[2] + ')'
+		$('#color-picker' + i + '_value').val(rgb)
+	})
 }
 function customComp() {
 	var nameC = $('#custom_name').val()
@@ -548,32 +544,59 @@ function customComp() {
 		return false
 	}
 	var descC = $('#custom_desc').val()
-	var bgC = $('#color-picker0_value').val()
-	var subcolorC = $('#color-picker2_value').val()
-	var textC = $('#color-picker1_value').val()
-	var accentC = $('#color-picker3_value').val()
+	var primaryC = $('#color-picker0_value').val()
+	if (!primaryC) {
+		primaryC = 'rgb(255,255,255)'
+	}
+	var secondaryC = $('#color-picker1_value').val()
+	if (!secondaryC) {
+		secondaryC = 'rgb(255,255,255)'
+	}
+	var textC = $('#color-picker2_value').val()
+	if (!textC) {
+		textC = 'rgb(255,255,255)'
+	}
 	var multi = localStorage.getItem('multi')
-	let advanced = [
-		'modal', 'modalFooter', 'third', 'forth',
-		'bottom', 'emphasized', 'postbox', 'active',
-		'selected', 'selectedWithShared'
-	]
-	var advanceTheme = {}
-	let i = 4
-	for (tag of advanced) {
-		let used = $(`#use-color_${i}`).prop('checked')
-		if (used) {
-			advanceTheme[tag] = $(`#color-picker${i}_value`).val()
+	if ($('#pickers').hasClass('advanceTheme')) {
+		var accentC = $('#color-picker3_value').val()
+		if (!accentC) {
+			accentC = null
 		}
-		i++
+		var activeC = $('#color-picker4_value').val()
+		if (!activeC) {
+			activeC = null
+		}
+		var modalC = $('#color-picker5_value').val()
+		if (!modalC) {
+			modalC = null
+		}
+		var bottomC = $('#color-picker6_value').val()
+		if (!bottomC) {
+			bottomC = null
+		}
+		var postboxC = $('#color-picker7_value').val()
+		if (!postboxC) {
+			postboxC = null
+		}
+		var subcolorC = $('#color-picker8_value').val()
+		if (!subcolorC) {
+			subcolorC = null
+		}
+		var advanceTheme = {
+			TheDeskAccent: accentC,
+			TheDeskActive: activeC,
+			TheDeskModal: modalC,
+			TheDeskBottom: bottomC,
+			TheDeskPostbox: postboxC,
+			TheDeskSubcolor: subcolorC,
+		}
+	} else {
+		var advanceTheme = {}
 	}

 	var my = JSON.parse(multi)[0].name
 	var id = $('#custom-edit-sel').val()
-	const defaults = [
-		'black','blue','brown','green','indigo','polar','snow','white'
-	]
-	if (id == 'add_new' || defaults.includes(id)) {
+	if (id == 'add_new') {
 		id = makeCID()
 	}
 	localStorage.setItem('customtheme-id', id)
@@ -582,48 +605,26 @@ function customComp() {
 		author: my,
 		desc: descC,
 		base: $('[name=direction]:checked').val(),
-		primary: {
-			background: bgC,
-			subcolor: subcolorC,
+		vars: {
+			primary: primaryC,
+			secondary: secondaryC,
 			text: textC,
-			accent: accentC
 		},
-		advanced: advanceTheme,
+		props: advanceTheme,
 		id: id,
-		version: '2'
 	}
 	$('#custom_json').val(JSON.stringify(json))
-	let timerInterval
-	Swal.fire({
-		title: 'Saving...',
-		html: '',
-		timer: 1000,
-		timerProgressBar: true,
-		onBeforeOpen: () => {
-			Swal.showLoading()
-		},
-		onClose: () => {
-			clearInterval(timerInterval)
-		}
-	}).then((result) => {
-		themes()
-		ctLoad()
-		Swal.fire({
-			title: 'Refreshing...',
-			html: '',
-			timer: 1000,
-			timerProgressBar: true,
-			onBeforeOpen: () => {
-				Swal.showLoading()
-			},
-			onClose: () => {
-				clearInterval(timerInterval)
-			}
-		}).then((result) => {
-			$('#custom-edit-sel').val(id)
-			$('select').formSelect()
-		})
-	})
+	themes('custom')
+	$('#custom').prop('checked', true)
+	$('#custom_name').val('')
+	$('#custom_desc').val('')
+	$('#dark').prop('checked', true)
+	$('#custom_json').val('')
+	for (var i = 0; i <= 8; i++) {
+		$('#color-picker' + i + '-wrap').html('<div class="color-picker" id="color-picker' + i + '"></div>')
+		$('#color-picker' + i + '_value').val('')
+		pickerDefine(i, 'fff')
+	}
 	postMessage(['themeJsonCreate', JSON.stringify(json)], '*')
 }
 function deleteIt() {
@@ -632,34 +633,34 @@ function deleteIt() {
 	$('#custom_desc').val('')
 	$('#dark').prop('checked', true)
 	$('#custom_json').val('')
-	for (var i = 0; i <= 13; i++) {
-		if (i >= 4) $(`#use-color_${i}`).prop('checked', false)
+	for (var i = 0; i <= 8; i++) {
+		$('#color-picker' + i + '-wrap').html('<div class="color-picker" id="color-picker' + i + '"></div>')
 		$('#color-picker' + i + '_value').val('')
+		pickerDefine(i, 'fff')
 	}
-	postMessage(['themeJsonDelete', id + '.thedesktheme'], '*')
+	postMessage(['themeJsonDelete', id], '*')
 }
 function ctLoad() {
 	postMessage(['sendSinmpleIpc', 'theme-json-list'], '*')
 }
 function ctLoadCore(args) {
-	var template = ''
-	var editTemplate = ''
+	var templete = ''
 	Object.keys(args).forEach(function (key) {
 		var theme = args[key]
 		var themeid = theme.id
-		template = template + `<option value="${themeid}">${theme.name}${theme.compatible ? `(${lang.lang_setting_compat})` : ''}</option>`
-		if (!theme.compatible) editTemplate = editTemplate + `<option value="${themeid}">${theme.name}</option>`
+		templete = templete + '<option value="' + themeid + '">' + theme.name + '</option>'
 	})
-	$('#custom-sel-sel').html(template)
-	editTemplate = '<option value="add_new">' + $('#edit-selector').attr('data-add') + '</option>' + editTemplate
-	$('#custom-edit-sel').html(editTemplate)
-	$('#custom-sel-sel').val(localStorage.getItem('customtheme-id'))
-	$('select').formSelect()
+	if (args[0]) {
+		localStorage.setItem('customtheme-id', args[0].id)
+	}
+	$('#custom-sel-sel').html(templete)
+	templete = '<option value="add_new">' + $('#edit-selector').attr('data-add') + '</option>' + templete
+	$('#custom-edit-sel').html(templete)
+	//$('select').formSelect()
 }
 function customSel() {
 	var id = $('#custom-sel-sel').val()
 	localStorage.setItem('customtheme-id', id)
-	themes(id)
 }
 function custom() {
 	var id = $('#custom-edit-sel').val()
@@ -668,47 +669,58 @@ function custom() {
 		$('#custom_desc').val('')
 		$('#dark').prop('checked', true)
 		$('#custom_json').val('')
-		for (var i = 0; i <= 13; i++) {
-			if (i >= 4) $(`#use-color_${i}`).prop('checked', false)
+		for (var i = 0; i <= 8; i++) {
+			$('#color-picker' + i + '-wrap').html('<div class="color-picker" id="color-picker' + i + '"></div>')
 			$('#color-picker' + i + '_value').val('')
+			pickerDefine(i, 'fff')
 		}
 		$('#delTheme').addClass('disabled')
 	} else {
 		$('#delTheme').removeClass('disabled')
-		postMessage(['themeJsonRequest', id + '.thedesktheme'], '*')
+		postMessage(['themeJsonRequest', id], '*')
 	}
 }
 function customConnect(raw) {
 	var args = raw[0]
-	$('#custom_name').val(`${args.name} ${args.default ? 'Customed' : ''}`)
-	$('#custom_desc').val(args.default ? 'TheDesk default theme with some changes by user' : args.desc)
+	$('#custom_name').val(args.name)
+	$('#custom_desc').val(args.desc)
 	$('#' + args.base).prop('checked', true)
-	//Background
-	$('#color-picker0_value').val(args.primary.background)
+	//Primary
+	$('#color-picker0-wrap').html('<div class="color-picker" id="color-picker0"></div>')
+	pickerDefine(0, rgbToHex(args.vars.primary))
+	$('#color-picker0_value').val(args.vars.primary)
+	//Secondary
+	$('#color-picker1-wrap').html('<div class="color-picker" id="color-picker1"></div>')
+	pickerDefine(1, rgbToHex(args.vars.secondary))
+	$('#color-picker1_value').val(args.vars.secondary)
 	//Text
-	$('#color-picker1_value').val(args.primary.text)
-	//Subcolor
-	$('#color-picker2_value').val(args.primary.subcolor)
-	//Accent
-	$('#color-picker3_value').val(args.primary.accent)
-	let advanced = [
-		'modal', 'modalFooter', 'third', 'forth',
-		'bottom', 'emphasized', 'postbox', 'active',
-		'selected', 'selectedWithShared'
-	]
-	let i = 4
-	for (tag of advanced) {
-		if (args.advanced[tag]) {
-			$(`#color-picker${i}_value`).val(args.advanced[tag])
-
-		}
-		$(`#use-color_${i}`).prop('checked', true)
-		i++
-	}
+	$('#color-picker2-wrap').html('<div class="color-picker" id="color-picker2"></div>')
+	$('#color-picker2_value').val(args.vars.text)
+	pickerDefine(2, rgbToHex(args.vars.text))
+	//TheDesk Only
+	advancedConncet(args, 'TheDeskAccent', 'secondary', 3)
+	advancedConncet(args, 'TheDeskActive', 'primary', 4)
+	advancedConncet(args, 'TheDeskModal', 'secondary', 5)
+	advancedConncet(args, 'TheDeskBottom', 'primary', 6)
+	advancedConncet(args, 'TheDeskPostbox', 'primary', 7)
+	advancedConncet(args, 'TheDeskSubcolor', 'primary', 8)
 	$('#custom_json').val(raw[1])
-	if(args.default) {
-		$('#delTheme').addClass('disabled')
+}
+function advancedConncet(args, tar, sub, i) {
+	if (args.props) {
+		if (args.props[tar]) {
+			var color = args.props[tar]
+			$('#pickers').addClass('advanceTheme')
+			$('.advanced').removeClass('hide')
+		} else {
+			var color = args.vars[sub]
+		}
+	} else {
+		var color = args.vars[sub]
 	}
+	$('#color-picker' + i + '-wrap').html('<div class="color-picker" id="color-picker' + i + '"></div>')
+	$('#color-picker' + i + '_value').val(color)
+	pickerDefine(i, rgbToHex(color))
 }
 function customImp() {
 	var json = $('#custom_import').val()
@@ -742,7 +754,7 @@ function customSound(key) {
 }
 function customSoundSave(key, file) {
 	localStorage.setItem('custom' + key, file)
-	$(`#c${key}-file`).text(file)
+	$('#c1-file').text(file)
 }
 window.onload = function () {
 	//最初に読む
@@ -818,7 +830,5 @@ function lastFmSet() {
 	} else {
 		localStorage.removeItem('lastFmUser')
 	}
-	M.toast({ html: 'Complete: last.fm', displayLength: 3000 })
+	Mtoast({ html: 'Complete: last.fm', displayLength: 3000 })
 }
-
-function stopVideo() { return false }
--- a/app/js/ui/sort.js
+++ b/app/js/ui/sort.js
@@ -1,44 +1,44 @@
 //ソートデータ読み込み
 function sortLoad () {
-	$("#sort").html("")
-	var col = localStorage.getItem("column")
+	$("#sort").html("");
+	var col = localStorage.getItem("column");
 	if (col) {
-		var obj = JSON.parse(col)
+		var obj = JSON.parse(col);
 	}
 	Object.keys(obj).forEach(function (key) {
-		var acct = obj[key]
-		var flag = "false"
+		var acct = obj[key];
+		var flag = "false";
 		if (localStorage.getItem("card_" + key) == "true") {
 			flag = "true"
 		}
-		var insert = ""
+		var insert = "";

 		if (acct.background) {
 			if (acct.text == "def") {

 			} else {
 				if (acct.text == "black") {
-					var txhex = "000000"
+					var txhex = "000000";
 				} else if (acct.text == "white") {
-					var txhex = "ffffff"
+					var txhex = "ffffff";
 				}
-				insert = ' style="background-color:#' + acct.background + '; color: #' + txhex + '" '
+				insert = ' style="background-color:#' + acct.background + '; color: #' + txhex + '" ';
 			}
 		}
-		var user = localStorage.getItem("user_" + acct.domain)
-		var domain = localStorage.getItem("domain_" + acct.domain)
+		var user = localStorage.getItem("user_" + acct.domain);
+		var domain = localStorage.getItem("domain_" + acct.domain);
 		if (!user || !domain) {
-			var acctdata = ""
+			var acctdata = "";
 		} else {
-			var acctdata = user + "@" + domain
+			var acctdata = user + "@" + domain;
 		}

 		var html = '<li class="drag-content" data-id="' + key + '" data-flag="' + flag + '"' + insert + '><div class="sorticon"><i class="material-icons">' + icon(acct.type) + '</i></div><div class="sorttitle">' + cap(acct.type, acct.data, acct.domain) + '</div><div class="sortaction"><a onclick="goColumn(' + key +
 			')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_sort_gothis + '">forward</i></a> <a onclick="removeColumn(' + key +
-			')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a></div><div class="sortacct">' + acctdata + '</div></li>'
-		$("#sort").append(html)
-	})
-	drag()
+			')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a></div><div class="sortacct">' + acctdata + '</div></li>';
+		$("#sort").append(html);
+	});
+	drag();
 }

 //TLのタイトル
@@ -62,59 +62,59 @@ function Scap(type, data) {
 	} else if (type == "tootsearch") {
 		return "tootsearch(" + data + ")"
 	} else {
-		console.error("unknown timeline type: " + type)
+		console.error("unknown timeline type: " + type);
 	}
 }

 //jquery-ui依存
 function drag() {
-	$('#sort').sortable()
-	$('#sort').disableSelection()
+	$('#sort').sortable();
+	$('#sort').disableSelection();
 }

 //ソート指定
 function sort() {
-	var arr = []
-	var flags = []
+	var arr = [];
+	var flags = [];
 	$(".drag-content").each(function (i, elem) {
-		var id = $(this).attr("data-id")
-		var flag = $(this).attr("data-flag")
+		var id = $(this).attr("data-id");
+		var flag = $(this).attr("data-flag");
 		arr.push(id)
-		flags.push(flag)
-	})
-	var col = localStorage.getItem("column")
-	var obj = JSON.parse(col)
-	var newobj = []
+		flags.push(flag);
+	});
+	var col = localStorage.getItem("column");
+	var obj = JSON.parse(col);
+	var newobj = [];
 	for (i = 0; i < arr.length; i++) {
-		var data = obj[arr[i]]
+		var data = obj[arr[i]];
 		var add = {
 			domain: data.domain,
 			type: data.type,
 			data: data.data,
 			background: data.background,
 			text: data.text
-		}
-		newobj.push(add)
+		};
+		newobj.push(add);
 		if (flags[i] == "true") {
-			localStorage.setItem("card_" + i, "true")
+			localStorage.setItem("card_" + i, "true");
 		} else {
-			localStorage.removeItem("card_" + i)
+			localStorage.removeItem("card_" + i);
 		}
 	}
-	var json = JSON.stringify(newobj)
-	localStorage.setItem("column", json)
-	$("#sort").html("")
-	M.toast({ html: "Sorted", displayLength: 3000 })
-	sortLoad()
-	parseColumn()
+	var json = JSON.stringify(newobj);
+	localStorage.setItem("column", json);
+	$("#sort").html("");
+	Mtoast({ html: "Sorted", displayLength: 3000 })
+	sortLoad();
+	parseColumn();
 	sortMenu()
 }
 //ソートボタントグル
 function sortMenu() {
-	$("#left-menu a").removeClass("active")
-	$("#sortMenu").addClass("active")
-	$(".menu-content").addClass("hide")
-	$("#sort-box").removeClass("hide")
-	$("#sort").html("")
-	sortLoad()
+	$("#left-menu a").removeClass("active");
+	$("#sortMenu").addClass("active");
+	$(".menu-content").addClass("hide");
+	$("#sort-box").removeClass("hide");
+	$("#sort").html("");
+	sortLoad();
 }
--- a/app/js/ui/spotify.js
+++ b/app/js/ui/spotify.js
@@ -1,44 +1,30 @@
 function spotifyConnect() {
-	var auth = 'https://spotify.thedesk.top/connect'
-	$('#spotify-code-show').removeClass('hide')
-	postMessage(['openUrl', auth], '*')
+	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')
+	if (platform == 'win32') {
+		postMessage(['openUrl', auth], '*')
+		postMessage(['sendSinmpleIpc', 'quit'], '*')
+	} else {
+		auth = auth + '&state=code'
+		$('#spotify-code-show').removeClass('hide')
+		postMessage(['openUrl', auth], '*')
+	}
 }
 function spotifyAuth() {
 	var code = $('#spotify-code').val()
-	localStorage.setItem('spotify-token', code)
+	localStorage.setItem('spotify', 'code')
+	localStorage.setItem('spotify-refresh', code)
 	$('#spotify-code-show').addClass('hide')
 	$('#spotify-enable').addClass('disabled')
 	$('#spotify-disable').removeClass('disabled')
 }
 function spotifyDisconnect() {
-	var start = 'https://spotify.thedesk.top/disconnect?code=' + localStorage.getItem('spotify-token')
-	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) {
-			if (!json.success) alert('error')
-			localStorage.removeItem('spotify-token')
-			checkSpotify()
-		})
+	localStorage.removeItem('spotify')
+	localStorage.removeItem('spotify-refresh')
+	checkSpotify()
 }
 function checkSpotify() {
-	if (localStorage.getItem('spotify-token')) {
+	if (localStorage.getItem('spotify')) {
 		$('#spotify-enable').addClass('disabled')
 		$('#spotify-disable').removeClass('disabled')
 	} else {
@@ -67,26 +53,26 @@ function spotifyFlagSave() {
 	var awk = $('[name=awk]:checked').val()
 	if (awk == 'yes') {
 		localStorage.setItem('artwork', 'yes')
-		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
+		Mtoast({ html: lang.lang_spotify_img, displayLength: 3000 })
 	} else {
 		localStorage.removeItem('artwork')
-		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
+		Mtoast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
 	}
 }
 function aMusicFlagSave() {
 	var awk = $('[name=amw]:checked').val()
 	if (awk == 'yes') {
 		localStorage.setItem('complete-artwork', 'yes')
-		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
+		Mtoast({ html: lang.lang_spotify_img, displayLength: 3000 })
 	} else {
 		localStorage.removeItem('complete-artwork')
-		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
+		Mtoast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
 	}
 }
 function nowplaying(mode) {
 	if (mode == 'spotify') {
-		var start = 'https://spotify.thedesk.top/current-playing?code=' + localStorage.getItem('spotify-token')
-		var at = localStorage.getItem('spotify-token')
+		var start = 'https://thedesk.top/now-playing?at=' + localStorage.getItem('spotify') + '&rt=' + localStorage.getItem('spotify-refresh')
+		var at = localStorage.getItem('spotify')
 		if (at) {
 			fetch(start, {
 				method: 'GET',
@@ -107,10 +93,7 @@ function nowplaying(mode) {
 					setLog(start, 'JSON', error)
 					console.error(error)
 				})
-				.then(function (jsonRaw) {
-					var code = jsonRaw.token
-					localStorage.setItem('spotify-token', code)
-					var json = jsonRaw.data
+				.then(function (json) {
 					console.table(json)
 					if (json.length < 1) {
 						return false
@@ -186,10 +169,11 @@ function nowplaying(mode) {
 						return false
 					}
 					var item = json.recenttracks.track[0]
-					if (!item['@attr']) return false
+					if(!item['@attr']) return false
 					var img = item.image[3]['#text']
+					var isImg = item.streamable*1
 					var flag = localStorage.getItem('artwork')
-					if (flag && img != 'https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png' && img) {
+					if (flag && isImg && img) {
 						postMessage(['bmpImage', [img, 0]], '*')
 					}
 					var content = localStorage.getItem('np-temp')
@@ -203,7 +187,7 @@ function nowplaying(mode) {
 					var regExp = new RegExp('{artist}', 'g')
 					content = content.replace(regExp, item.artist['#text'])
 					var regExp = new RegExp('{url}', 'g')
-					content = content.replace(regExp, '')
+					content = content.replace(regExp,'')
 					var regExp = new RegExp('{composer}', 'g')
 					content = content.replace(regExp, '')
 					var regExp = new RegExp('{hz}', 'g')
@@ -283,7 +267,7 @@ async function npCore(arg) {
 function spotifySave() {
 	var temp = $('#np-temp').val()
 	localStorage.setItem('np-temp', temp)
-	M.toast({ html: lang.lang_spotify_np, displayLength: 3000 })
+	Mtoast({ html: lang.lang_spotify_np, displayLength: 3000 })
 }
 if (location.search) {
 	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
--- a/app/js/ui/theme.js
+++ b/app/js/ui/theme.js
@@ -1,13 +1,35 @@
 //テーマ適用
 function themes(theme) {
 	if (!theme) {
-		var theme = localStorage.getItem('customtheme-id')
+		var theme = localStorage.getItem('theme')
 		if (!theme) {
-			localStorage.setItem('customtheme-id', 'black')
+			var theme = 'black'
+			localStorage.setItem('theme', 'black')
 		}
 	}
-	postMessage(['themeCSSRequest', theme + '.thedesktheme'], '*')
 	var el = document.getElementsByTagName('html')[0]
+
+	el.classList.remove('indigotheme')
+	el.classList.remove('greentheme')
+	el.classList.remove('browntheme')
+	el.classList.remove('blacktheme')
+	el.classList.remove('bluetheme')
+	el.classList.remove('polartheme')
+	el.classList.remove('snowtheme')
+	el.classList.remove('customtheme')
+	el.classList.add(theme + 'theme')
+	var font = localStorage.getItem('font')
+	if (font) {
+		font = font.replace(/"(.+)"/, '$1')
+		el.style.fontFamily = '"' + font + '"'
+	} else {
+		el.style.fontFamily = ''
+	}
+	if (theme == 'custom') {
+		if (localStorage.getItem('customtheme-id')) {
+			postMessage(['themeCSSRequest', localStorage.getItem('customtheme-id')], '*')
+		}
+	}
 	el.style.backgroundColor = 'var(--bg)'
 }
 themes()
--- a/app/js/ui/tips.js
+++ b/app/js/ui/tips.js
@@ -131,8 +131,12 @@ function trendTagonTip() {
 spotint = null
 function spotifytips() {
 	if (spotint) clearInterval(spotint)
-	var start = 'https://spotify.thedesk.top/current-playing?code=' + localStorage.getItem('spotify-token')
-	var at = localStorage.getItem('spotify-token')
+	var start =
+		'https://thedesk.top/now-playing?at=' +
+		localStorage.getItem('spotify') +
+		'&rt=' +
+		localStorage.getItem('spotify-refresh')
+	var at = localStorage.getItem('spotify')
 	if (at) {
 		fetch(start, {
 			method: 'GET',
@@ -153,10 +157,7 @@ function spotifytips() {
 				setLog(start, 'JSON', error)
 				console.error(error)
 			})
-			.then(function(jsonRaw) {
-				var code = jsonRaw.token
-				localStorage.setItem('spotify-token', code)
-				var json = jsonRaw.data
+			.then(function(json) {
 				var ms = json.progress_ms
 				if(!ms) {
 					tips('ver')
--- a/app/js/userdata/his-data.js
+++ b/app/js/userdata/his-data.js
--- a/app/js/userdata/prof-edit.js
+++ b/app/js/userdata/prof-edit.js
@@ -1,65 +1,65 @@
 //プロフ編集
 //文字系
 function profedit() {
-	var acct_id = $('#his-data').attr("use-acct")
-	todo("Updating...")
-	var domain = localStorage.getItem("domain_" + acct_id)
-	var at = localStorage.getItem("acct_" + acct_id + "_at")
-	var start = "https://" + domain + "/api/v1/accounts/update_credentials"
-	var name = $("#his-name-val").val()
-	var des = $("#his-des-val").val()
-	var httpreq = new XMLHttpRequest()
-	httpreq.open('PATCH', start, true)
-	httpreq.setRequestHeader('Content-Type', 'application/json')
-	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-	httpreq.responseType = "json"
+	var acct_id = $('#his-data').attr("use-acct");
+	todo("Updating...");
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/accounts/update_credentials";
+	var name = $("#his-name-val").val();
+	var des = $("#his-des-val").val();
+	var httpreq = new XMLHttpRequest();
+	httpreq.open('PATCH', start, true);
+	httpreq.setRequestHeader('Content-Type', 'application/json');
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+	httpreq.responseType = "json";
 	httpreq.send(JSON.stringify({
 		display_name: name,
 		note: des,
-	}))
+	}));
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
-			$('#his-data').modal('close')
-			todc()
+			$('#his-data').modal('close');
+			todc();
 		}
 	}
 }

 //画像系
 function imgChange(imgfile, target) {
-	var acct_id = $('#his-data').attr("use-acct")
+	var acct_id = $('#his-data').attr("use-acct");
 	todo("アップロードしています")
 	if (!imgfile.files.length) {
-		console.warn("No Image to upload")
-		return
+		console.warn("No Image to upload");
+		return;
 	}
-	var file = imgfile.files[0]
-	var fr = new FileReader()
+	var file = imgfile.files[0];
+	var fr = new FileReader();
 	fr.onload = function (evt) {
-		var b64 = this.result
-		var blob = toBlob(b64, 'image/png')
-		var fd = new FormData()
-		fd.append(target, blob)
-		var domain = localStorage.getItem("domain_" + acct_id)
-		var at = localStorage.getItem("acct_" + acct_id + "_at")
-		var start = "https://" + domain + "/api/v1/accounts/update_credentials"
-		var httpreq = new XMLHttpRequest()
-		httpreq.open('PATCH', start, true)
-		httpreq.upload.addEventListener("progress", progshow, false)
-		httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-		httpreq.responseType = "json"
-		httpreq.send(fd)
+		var b64 = this.result;
+		var blob = toBlob(b64, 'image/png');
+		var fd = new FormData();
+		fd.append(target, blob);
+		var domain = localStorage.getItem("domain_" + acct_id);
+		var at = localStorage.getItem("acct_" + acct_id + "_at");
+		var start = "https://" + domain + "/api/v1/accounts/update_credentials";
+		var httpreq = new XMLHttpRequest();
+		httpreq.open('PATCH', start, true);
+		httpreq.upload.addEventListener("progress", progshow, false);
+		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+		httpreq.responseType = "json";
+		httpreq.send(fd);
 		httpreq.onreadystatechange = function () {
 			if (httpreq.readyState === 4) {
-				var json = httpreq.response
-				if(this.status!==200){ setLog(start, this.status, this.response) }
-				$('#his-data').modal('close')
-				todc()
-				localStorage.removeItem("image")
+				var json = httpreq.response;
+				if(this.status!==200){ setLog(start, this.status, this.response); }
+				$('#his-data').modal('close');
+				todc();
+				localStorage.removeItem("image");
 			}
 		}
 	}
-	$("#prof-change").html($("#prof-change").html())
-	$("#header-change").html($("#header-change").html())
-	fr.readAsDataURL(file)
+	$("#prof-change").html($("#prof-change").html());
+	$("#header-change").html($("#header-change").html());
+	fr.readAsDataURL(file);
 }
--- a/app/js/userdata/showOnTL.js
+++ b/app/js/userdata/showOnTL.js
@@ -1,31 +1,31 @@
 //ユーザーデータ表示
-localStorage.removeItem("history")
+localStorage.removeItem("history");
 //コード受信
 if (location.search) {
-	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
-	var mode = m[1]
-	var codex = m[2]
+	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
+	var mode = m[1];
+	var codex = m[2];
 	if (mode == "user") {
-		udgEx(codex, "main")
+		udgEx(codex, "main");
 	}
 }
 function udgEx(user, acct_id) {
 	if (user == "selector") {
-		user = $("#his-acct").attr("fullname")
+		user = $("#his-acct").attr("fullname");
 	}
 	if (acct_id == "selector") {
-		acct_id = $("#user-acct-sel").val()
+		acct_id = $("#user-acct-sel").val();
 	}
 	if (acct_id == "main") {
-		acct_id = localStorage.getItem("main")
+		acct_id = localStorage.getItem("main");
 	}
-	console.log("Get user data of " + user)
-	var domain = localStorage.getItem("domain_" + acct_id)
+	console.log("Get user data of " + user);
+	var domain = localStorage.getItem("domain_" + acct_id);
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
-		return false
+		return false;
 	}
-	var at = localStorage.getItem("acct_" + acct_id + "_at")
-	var start = "https://" + domain + "/api/v2/search?resolve=true&q=" + encodeURIComponent(user)
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v2/search?resolve=true&q=" + encodeURIComponent(user);
 	fetch(start, {
 		method: "GET",
 		headers: {
@@ -36,39 +36,39 @@ function udgEx(user, acct_id) {
 		.then(function(response) {
 			if (!response.ok) {
 				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) {
-			todo(error)
-			setLog(start, "JSON", error)
-			console.error(error)
+			todo(error);
+			setLog(start, "JSON", error);
+			console.error(error);
 		})
 		.then(function(json) {
 			if (json.accounts[0]) {
-				var id = json.accounts[0].id
-				udg(id, acct_id)
+				var id = json.accounts[0].id;
+				udg(id, acct_id);
 			} else {
-				postMessage(["openUrl", user], "*")
+				postMessage(["openUrl", user], "*");
 			}
-		})
-	return true
+		});
+	return true;
 }
 function udg(user, acct_id) {
-	reset()
+	reset();
 	if (!user) {
-		user = localStorage.getItem("user-id_" + acct_id)
+		user = localStorage.getItem("user-id_" + acct_id);
 	}
-	todo("User Data Loading...")
-	var domain = localStorage.getItem("domain_" + acct_id)
+	todo("User Data Loading...");
+	var domain = localStorage.getItem("domain_" + acct_id);
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
-		misskeyUdg(user, acct_id)
-		return
+		misskeyUdg(user, acct_id);
+		return;
 	}
-	var at = localStorage.getItem("acct_" + acct_id + "_at")
-	var start = "https://" + domain + "/api/v1/accounts/" + user
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/accounts/" + user;
 	fetch(start, {
 		method: "GET",
 		headers: {
@@ -79,188 +79,188 @@ function udg(user, acct_id) {
 		.then(function(response) {
 			if (!response.ok) {
 				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) {
-			todo(error)
-			setLog(start, "JSON", error)
-			console.error(error)
+			todo(error);
+			setLog(start, "JSON", error);
+			console.error(error);
 		})
 		.then(function(json) {
 			//一つ前のユーザーデータ
 			if (!localStorage.getItem("history")) {
-				$("#his-history-btn").prop("disabled", true)
+				$("#his-history-btn").prop("disabled", true);
 			} else {
-				$("#his-history-btn").prop("disabled", false)
-				$("#his-data").attr("history", localStorage.getItem("history"))
+				$("#his-history-btn").prop("disabled", false);
+				$("#his-data").attr("history", localStorage.getItem("history"));
 			}
 			//moved設定時
 			if (json.moved) {
-				M.toast({
+				Mtoast({
 					html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' + json.moved.id + "','" + acct_id + "')\">" + lang.lang_showontl_movebtn + "</button>",
 					displayLength: 4000
-				})
+				});
 			}
-			$("#his-data").modal("open")
-			$("#his-data").attr("user-id", user)
-			$("#his-data").attr("use-acct", acct_id)
+			$("#his-data").modal("open");
+			$("#his-data").attr("user-id", user);
+			$("#his-data").attr("use-acct", acct_id);
 			if (json.username != json.acct) {
 				//Remote
-				$("#his-data").attr("remote", "true")
-				var fullname = json.acct
+				$("#his-data").attr("remote", "true");
+				var fullname = json.acct;
 			} else {
-				$("#his-data").attr("remote", "false")
-				var fullname = json.acct + "@" + domain
+				$("#his-data").attr("remote", "false");
+				var fullname = json.acct + "@" + domain;
 			}
-			utlShow(json.id, "", acct_id)
-			flw(json.id, "", acct_id)
-			fer(json.id, "", acct_id)
-			var dis_name = escapeHTML(json.display_name)
-			dis_name = twemoji.parse(dis_name)
+			utlShow(json.id, "", acct_id);
+			flw(json.id, "", acct_id);
+			fer(json.id, "", acct_id);
+			var dis_name = escapeHTML(json.display_name);
+			dis_name = twemoji.parse(dis_name);

-			var note = json.note
+			var note = json.note;
 			if (json.emojis) {
-				var actemojick = json.emojis[0]
+				var actemojick = json.emojis[0];
 			} else {
-				var actemojick = false
+				var actemojick = false;
 			}
 			//絵文字があれば
 			if (actemojick) {
 				Object.keys(json.emojis).forEach(function(key5) {
-					var emoji = json.emojis[key5]
-					var shortcode = emoji.shortcode
-					var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" draggable="false">'
-					var regExp = new RegExp(":" + shortcode + ":", "g")
-					dis_name = dis_name.replace(regExp, emoji_url)
-					note = note.replace(regExp, emoji_url)
-				})
+					var emoji = json.emojis[key5];
+					var shortcode = emoji.shortcode;
+					var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" draggable="false">';
+					var regExp = new RegExp(":" + shortcode + ":", "g");
+					dis_name = dis_name.replace(regExp, emoji_url);
+					note = note.replace(regExp, emoji_url);
+				});
 			}
 			//noteの解析
 			//var tags =  '<a onclick="tl(\'tag\',\'$1\',' + acct_id +',\'add\')" class="pointer parsed">#$1</a>';
 			//var mens =  '<a onclick="udgEx(\'$1\',' + acct_id +')" class="pointer parsed">@$1</a>';
 			//note=note.replace(/#(\S+)/gi, tags)
 			//note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens)
-			$("#his-name").html(dis_name)
-			$("#his-acct").text(json.acct)
-			$("#his-acct").attr("fullname", fullname)
-			$("#his-prof").attr("src", json.avatar)
-			$("#his-data").css("background-image", "url(" + json.header + ")")
-			$("#his-sta").text(json.statuses_count)
-			$("#his-follow").text(json.following_count)
-			var flerc = json.followers_count
+			$("#his-name").html(dis_name);
+			$("#his-acct").text(json.acct);
+			$("#his-acct").attr("fullname", fullname);
+			$("#his-prof").attr("src", json.avatar);
+			$("#his-data").css("background-image", "url(" + json.header + ")");
+			$("#his-sta").text(json.statuses_count);
+			$("#his-follow").text(json.following_count);
+			var flerc = json.followers_count;
 			if (flerc < 0) {
-				flerc = "-"
+				flerc = "-";
 			}
-			$("#his-follower").text(flerc)
-			$("#his-since").text(crat(json.created_at))
-			$("#his-openin").attr("data-href", json.url)
+			$("#his-follower").text(flerc);
+			$("#his-since").text(crat(json.created_at));
+			$("#his-openin").attr("data-href", json.url);
 			if (json.fields) {
-				var table = ""
+				var table = "";
 				if (json.fields.length > 0) {
-					$("#his-des").css("max-height", "250px")
-					table = '<table id="his-field">'
+					$("#his-des").css("max-height", "250px");
+					table = '<table id="his-field">';
 					for (var i = 0; i < json.fields.length; i++) {
-						var fname = json.fields[i].name
-						var fval = json.fields[i].value
+						var fname = json.fields[i].name;
+						var fval = json.fields[i].value;
 						if (json.fields[i].verified_at) {
-							var when = lang.lang_showontl_verified + ":" + crat(json.fields[i].verified_at)
-							var color = "rgba(121,189,154,.25);"
+							var when = lang.lang_showontl_verified + ":" + crat(json.fields[i].verified_at);
+							var color = "rgba(121,189,154,.25);";
 						} else {
-							var when = ""
-							var color = "inherit"
+							var when = "";
+							var color = "inherit";
 						}
-						table = table + '<tr><td class="his-field-title">' + escapeHTML(fname) + '</td><td class="his-field-content" title="' + when + '" style="background-color:' + color + '">' + fval + "</td></tr>"
+						table = table + '<tr><td class="his-field-title">' + escapeHTML(fname) + '</td><td class="his-field-content" title="' + when + '" style="background-color:' + color + '">' + fval + "</td></tr>";
 					}
-					table = table + "</table>"
-					$("#his-des").html(twemoji.parse(note))
+					table = table + "</table>";
+					$("#his-des").html(twemoji.parse(note));
 				} else {
-					$("#his-des").css("max-height", "400px")
+					$("#his-des").css("max-height", "400px");
 				}
-				$("#his-table").html(twemoji.parse(table))
+				$("#his-table").html(twemoji.parse(table));
 			} else {
-				$("#his-des").css("max-height", "400px")
+				$("#his-des").css("max-height", "400px");
 			}
-			$("#his-des").html(twemoji.parse(note))
+			$("#his-des").html(twemoji.parse(note));
 			if (json.bot) {
-				$("#his-bot").html(lang.lang_showontl_botacct)
+				$("#his-bot").html(lang.lang_showontl_botacct);
 			}
-			$("#his-des").attr("data-acct", acct_id)
-			$("#his-data").css("background-size", "cover")
-			$("#his-float-timeline").css("height", $("#his-data-show").height() + "px")
-			localStorage.setItem("history", user)
+			$("#his-des").attr("data-acct", acct_id);
+			$("#his-data").css("background-size", "cover");
+			$("#his-float-timeline").css("height", $("#his-data-show").height() + "px");
+			localStorage.setItem("history", user);
 			//自分の時
 			if (json.acct == localStorage.getItem("user_" + acct_id)) {
-				showFav("", acct_id)
-				showBlo("", acct_id)
-				showMut("", acct_id)
-				showDom("", acct_id)
-				showReq("", acct_id)
-				showFrl("", acct_id)
-				$("#his-name-val").val(json.display_name)
+				showFav("", acct_id);
+				showBlo("", acct_id);
+				showMut("", acct_id);
+				showDom("", acct_id);
+				showReq("", acct_id);
+				showFrl("", acct_id);
+				$("#his-name-val").val(json.display_name);
 				if (json.fields.length > 0) {
 					if (json.fields[0]) {
-						$("#his-f1-name").val(json.fields[0].name)
-						$("#his-f1-val").val($.strip_tags(json.fields[0].value))
+						$("#his-f1-name").val(json.fields[0].name);
+						$("#his-f1-val").val($.strip_tags(json.fields[0].value));
 					}
 					if (json.fields[1]) {
-						$("#his-f2-name").val(json.fields[1].name)
-						$("#his-f2-val").val($.strip_tags(json.fields[1].value))
+						$("#his-f2-name").val(json.fields[1].name);
+						$("#his-f2-val").val($.strip_tags(json.fields[1].value));
 					}
 					if (json.fields[2]) {
-						$("#his-f3-name").val(json.fields[2].name)
-						$("#his-f3-val").val($.strip_tags(json.fields[2].value))
+						$("#his-f3-name").val(json.fields[2].name);
+						$("#his-f3-val").val($.strip_tags(json.fields[2].value));
 					}
 					if (json.fields[3]) {
-						$("#his-f4-name").val(json.fields[3].name)
-						$("#his-f4-val").val($.strip_tags(json.fields[3].value))
+						$("#his-f4-name").val(json.fields[3].name);
+						$("#his-f4-val").val($.strip_tags(json.fields[3].value));
 					}
 				}
-				var des = json.note
-				des = des.replace(/<br \/>/g, "\n")
-				des = $.strip_tags(des)
-				$("#his-des-val").val(des)
-				$("#his-follow-btn").hide()
-				$("#his-block-btn").hide()
-				$("#his-mute-btn").hide()
-				$("#his-notf-btn").hide()
-				$("#his-domain-btn").hide()
-				$("#his-emp-btn").hide()
-				$(".only-my-data").show()
-				$(".only-his-data").hide()
+				var des = json.note;
+				des = des.replace(/<br \/>/g, "\n");
+				des = $.strip_tags(des);
+				$("#his-des-val").val(des);
+				$("#his-follow-btn").hide();
+				$("#his-block-btn").hide();
+				$("#his-mute-btn").hide();
+				$("#his-notf-btn").hide();
+				$("#his-domain-btn").hide();
+				$("#his-emp-btn").hide();
+				$(".only-my-data").show();
+				$(".only-his-data").hide();
 				if (localStorage.getItem("main") == acct_id) {
-					$("#his-main-acct").hide()
+					$("#his-main-acct").hide();
 				}
 			} else {
-				relations(user, acct_id)
-				$(".only-my-data").hide()
-				$(".only-his-data").show()
+				relations(user, acct_id);
+				$(".only-my-data").hide();
+				$(".only-his-data").show();
 			}
-			todc()
+			todc();
 			if(json.locked) {
 				$('#his-data').addClass('locked')
 			} else {
 				$('#his-data').removeClass('locked')
 			}
 			//外部データ取得(死かもしれないので)
-			udAdd(acct_id, user, json.url)
-		})
+			udAdd(acct_id, user, json.url);
+		});
 }
 function misskeyUdg(user, acct_id) {
-	reset()
+	reset();
 	if (!user) {
-		user = localStorage.getItem("user-id_" + acct_id)
+		user = localStorage.getItem("user-id_" + acct_id);
 	}
-	todo("User Data Loading...")
-	var domain = localStorage.getItem("domain_" + acct_id)
+	todo("User Data Loading...");
+	var domain = localStorage.getItem("domain_" + acct_id);
 	if (localStorage.getItem("mode_" + domain) != "misskey") {
-		udg(user, acct_id)
-		return
+		udg(user, acct_id);
+		return;
 	}
-	var at = localStorage.getItem("acct_" + acct_id + "_at")
-	var start = "https://" + domain + "/api/users/show"
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/users/show";
 	fetch(start, {
 		method: "POST",
 		headers: {
@@ -274,127 +274,127 @@ function misskeyUdg(user, acct_id) {
 		.then(function(response) {
 			if (!response.ok) {
 				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) {
-			todo(error)
-			setLog(start, "JSON", error)
-			console.error(error)
+			todo(error);
+			setLog(start, "JSON", error);
+			console.error(error);
 		})
 		.then(function(json) {
 			//一つ前のユーザーデータ
 			if (!localStorage.getItem("history")) {
-				$("#his-history-btn").prop("disabled", true)
+				$("#his-history-btn").prop("disabled", true);
 			} else {
-				$("#his-history-btn").prop("disabled", false)
-				$("#his-data").attr("history", localStorage.getItem("history"))
+				$("#his-history-btn").prop("disabled", false);
+				$("#his-data").attr("history", localStorage.getItem("history"));
 			}
-			$("#his-data").modal("open")
-			$("#his-data").attr("user-id", user)
-			$("#his-data").attr("use-acct", acct_id)
+			$("#his-data").modal("open");
+			$("#his-data").attr("user-id", user);
+			$("#his-data").attr("use-acct", acct_id);
 			if (json.host) {
 				//Remote
-				$("#his-data").attr("remote", "false")
-				var fullname = json.username + "@" + json.host
+				$("#his-data").attr("remote", "false");
+				var fullname = json.username + "@" + json.host;
 			} else {
-				$("#his-data").attr("remote", "false")
-				var fullname = json.acct + "@" + domain
+				$("#his-data").attr("remote", "false");
+				var fullname = json.acct + "@" + domain;
 			}
-			utlShow(json.id, "", acct_id)
-			flw(json.id, "", acct_id)
-			fer(json.id, "", acct_id)
+			utlShow(json.id, "", acct_id);
+			flw(json.id, "", acct_id);
+			fer(json.id, "", acct_id);
 			if (json.name) {
-				var dis_name = escapeHTML(json.name)
-				dis_name = twemoji.parse(dis_name)
+				var dis_name = escapeHTML(json.name);
+				dis_name = twemoji.parse(dis_name);
 			} else {
-				var dis_name = json.name
+				var dis_name = json.name;
 			}
-			$("#his-name").html(dis_name)
-			$("#his-acct").text(json.username)
-			$("#his-acct").attr("fullname", fullname)
-			$("#his-prof").attr("src", json.avatarUrl)
-			$("#his-data").css("background-image", "url(" + json.bannerUrl + ")")
-			$("#his-sta").text(json.notesCount)
-			$("#his-follow").text(json.followingCount)
-			$("#his-follower").text(json.followersCount)
-			$("#his-since").text(crat(json.createdAt))
-			var note = escapeHTML(json.description)
-			$("#his-des").html(twemoji.parse(note))
+			$("#his-name").html(dis_name);
+			$("#his-acct").text(json.username);
+			$("#his-acct").attr("fullname", fullname);
+			$("#his-prof").attr("src", json.avatarUrl);
+			$("#his-data").css("background-image", "url(" + json.bannerUrl + ")");
+			$("#his-sta").text(json.notesCount);
+			$("#his-follow").text(json.followingCount);
+			$("#his-follower").text(json.followersCount);
+			$("#his-since").text(crat(json.createdAt));
+			var note = escapeHTML(json.description);
+			$("#his-des").html(twemoji.parse(note));
 			if (json.isCat) {
-				$("#his-bot").html("Cat" + twemoji.parse("😺"))
+				$("#his-bot").html("Cat" + twemoji.parse("😺"));
 			}
-			$("#his-data").css("background-size", "cover")
-			localStorage.setItem("history", user)
+			$("#his-data").css("background-size", "cover");
+			localStorage.setItem("history", user);
 			//自分の時
 			if (json.username == localStorage.getItem("user_" + acct_id) && !json.host) {
 				//showFav('', acct_id);
 				//showMut('', acct_id);
 				//showReq('', acct_id);
-				showFrl("", acct_id)
-				$("#his-name-val").val(json.name)
-				var des = json.note
-				des = nl2br(des)
-				des = $.strip_tags(des)
-				$("#his-des-val").val(des)
-				$("#his-follow-btn").hide()
-				$("#his-block-btn").hide()
-				$("#his-mute-btn").hide()
-				$("#his-notf-btn").hide()
-				$("#his-domain-btn").hide()
-				$("#his-emp-btn").hide()
-				$(".only-my-data").show()
-				$(".only-his-data").hide()
+				showFrl("", acct_id);
+				$("#his-name-val").val(json.name);
+				var des = json.note;
+				des = nl2br(des);
+				des = $.strip_tags(des);
+				$("#his-des-val").val(des);
+				$("#his-follow-btn").hide();
+				$("#his-block-btn").hide();
+				$("#his-mute-btn").hide();
+				$("#his-notf-btn").hide();
+				$("#his-domain-btn").hide();
+				$("#his-emp-btn").hide();
+				$(".only-my-data").show();
+				$(".only-his-data").hide();
 				if (localStorage.getItem("main") == acct_id) {
-					$("#his-main-acct").hide()
+					$("#his-main-acct").hide();
 				}
 			} else {
 				if (json.isFollowing) {
 					//自分がフォローしている
-					$("#his-data").addClass("following")
-					$("#his-follow-btn-text").text(lang.lang_status_unfollow)
-					hisList(user, acct_id)
+					$("#his-data").addClass("following");
+					$("#his-follow-btn-text").text(lang.lang_status_unfollow);
+					hisList(user, acct_id);
 				} else {
-					$("#his-follow-btn-text").text(lang.lang_status_follow)
+					$("#his-follow-btn-text").text(lang.lang_status_follow);
 				}
 				if (json.isFollowed) {
 					//フォローされてる
-					$("#his-relation").text(lang.lang_showontl_followed)
+					$("#his-relation").text(lang.lang_showontl_followed);
 				}
-				$("#his-block-btn").hide()
+				$("#his-block-btn").hide();
 				if (json.isMuted) {
-					$("#his-data").addClass("muting")
-					$("#his-mute-btn-text").text(lang.lang_status_unmute)
+					$("#his-data").addClass("muting");
+					$("#his-mute-btn-text").text(lang.lang_status_unmute);
 				} else {
-					$("#his-mute-btn-text").text(lang.lang_status_mute)
+					$("#his-mute-btn-text").text(lang.lang_status_mute);
 				}
-				$(".only-my-data").hide()
-				$(".only-his-data").show()
+				$(".only-my-data").hide();
+				$(".only-his-data").show();
 			}
-			todc()
-		})
+			todc();
+		});
 }
 //一つ前のユーザーデータ表示
 function historyShow() {
-	var acct_id = $("#his-data").attr("use-acct")
-	var user = $("#his-data").attr("history")
-	udg(user, acct_id, "true")
+	var acct_id = $("#his-data").attr("use-acct");
+	var user = $("#his-data").attr("history");
+	udg(user, acct_id, "true");
 }
 //選択アカウントのプロフ
 function profShow() {
-	var acct_id = $("#post-acct-sel").val()
-	var user = localStorage.getItem("user-id_" + acct_id)
-	udg(user, acct_id)
-	hide()
+	var acct_id = $("#post-acct-sel").val();
+	var user = localStorage.getItem("user-id_" + acct_id);
+	udg(user, acct_id);
+	hide();
 }

 //FF関係取得
 function relations(user, acct_id) {
-	var domain = localStorage.getItem("domain_" + acct_id)
-	var at = localStorage.getItem("acct_" + acct_id + "_at")
-	var start = "https://" + domain + "/api/v1/accounts/relationships?id=" + user
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/accounts/relationships?id=" + user;
 	fetch(start, {
 		method: "GET",
 		headers: {
@@ -405,18 +405,18 @@ function relations(user, acct_id) {
 		.then(function(response) {
 			if (!response.ok) {
 				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) {
-			todo(error)
-			setLog(start, "JSON", error)
-			console.error(error)
+			todo(error);
+			setLog(start, "JSON", error);
+			console.error(error);
 		})
 		.then(function(json) {
-			var json = json[0]
+			var json = json[0];
 			if(json.requested) {
 				//フォロリク中
 				$('#his-data').addClass('following')
@@ -425,138 +425,138 @@ function relations(user, acct_id) {
 			if (json.following) {
 				//自分がフォローしている
 				$("#his-data").addClass("following")
-				$("#his-follow-btn-text").text(lang.lang_status_unfollow)
-				hisList(user, acct_id)
+				$("#his-follow-btn-text").text(lang.lang_status_unfollow);
+				hisList(user, acct_id);
 			} else {
-				$("#his-follow-btn-text").text(lang.lang_status_follow)
+				$("#his-follow-btn-text").text(lang.lang_status_follow);
 			}
 			if (json.followed_by) {
 				//フォローされてる
-				$("#his-relation").text(lang.lang_showontl_followed)
+				$("#his-relation").text(lang.lang_showontl_followed);
 			}
 			if (json.blocking) {
-				$("#his-data").addClass("blocking")
-				$("#his-block-btn-text").text(lang.lang_status_unblock)
+				$("#his-data").addClass("blocking");
+				$("#his-block-btn-text").text(lang.lang_status_unblock);
 			} else {
-				$("#his-block-btn-text").text(lang.lang_status_block)
+				$("#his-block-btn-text").text(lang.lang_status_block);
 			}
 			if (json.muting) {
-				$("#his-data").addClass("muting")
-				$("#his-mute-btn-text").text(lang.lang_status_unmute)
+				$("#his-data").addClass("muting");
+				$("#his-mute-btn-text").text(lang.lang_status_unmute);
 			} else {
-				$("#his-mute-btn-text").text(lang.lang_status_mute)
+				$("#his-mute-btn-text").text(lang.lang_status_mute);
 			}
 			if (json.muting_notifications) {
-				$("#his-data").addClass("mutingNotf")
-				$("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_unmute)
+				$("#his-data").addClass("mutingNotf");
+				$("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_unmute);
 			} else {
-				$("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_mute)
+				$("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_mute);
 			}
 			if (json.domain_blocking) {
-				$("#his-data").addClass("blockingDom")
-				$("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_unblock)
+				$("#his-data").addClass("blockingDom");
+				$("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_unblock);
 			} else {
-				$("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_block)
+				$("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_block);
 			}
 			//Endorsed
 			if (json.endorsed) {
-				$("#his-end-btn").addClass("endorsed")
-				$("#his-end-btn-text").text(lang.lang_status_unendorse)
+				$("#his-end-btn").addClass("endorsed");
+				$("#his-end-btn-text").text(lang.lang_status_unendorse);
 			} else {
-				$("#his-end-btn").removeClass("endorsed")
-				$("#his-end-btn-text").text(lang.lang_status_endorse)
+				$("#his-end-btn").removeClass("endorsed");
+				$("#his-end-btn-text").text(lang.lang_status_endorse);
 			}
 			//Blocked
 			if (json.blocked_by) {
-				$("#my-data-nav .btn").addClass("disabled")
-				$(".his-var-content").hide()
-				$("#his-float-blocked").show()
-				$("#his-follow-btn").hide()
+				$("#my-data-nav .btn").addClass("disabled");
+				$(".his-var-content").hide();
+				$("#his-float-blocked").show();
+				$("#his-follow-btn").hide();
 			}
-		})
+		});
 }
 function profbrws() {
-	var url = $("#his-openin").attr("data-href")
-	postMessage(["openUrl", url], "*")
+	var url = $("#his-openin").attr("data-href");
+	postMessage(["openUrl", url], "*");
 }
 function setMain() {
-	var acct_id = $("#his-data").attr("use-acct")
-	localStorage.setItem("main", acct_id)
-	multiSelector(true)
-	M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 })
+	var acct_id = $("#his-data").attr("use-acct");
+	localStorage.setItem("main", acct_id);
+	multiSelector(true);
+	Mtoast({ html: lang.lang_manager_mainAcct, displayLength: 3000 });
 }
 //オールリセット
 function hisclose() {
-	$("#his-data").modal("close")
-	reset()
-	$("#his-data").attr("history", "")
-	localStorage.removeItem("history")
+	$("#his-data").modal("close");
+	reset();
+	$("#his-data").attr("history", "");
+	localStorage.removeItem("history");
 }
 function reset() {
-	$(".his-var-content:eq(0)").show()
-	$(".his-var-content:gt(0)").hide()
-	$("#my-data-nav .btn").removeClass("disabled")
-	$(".active-back").removeClass("active-back")
-	$(".column-first").addClass("active-back")
-	$("#his-name").text("Loading")
-	$("#his-acct").text("")
-	$("#his-prof").attr("src", "../../img/loading.svg")
-	$("#his-data").css("background-image", "url(../../img/loading.svg)")
-	$("#his-sta").text("")
-	$("#his-follow").text("")
-	$("#his-follower").text("")
-	$("#his-des").html("")
-	$("#his-data").css("background-size", "cover")
-	$("#his-since").text("")
-	$("#his-data").removeClass("following")
-	$("#his-data").removeClass("muting")
-	$("#his-data").removeClass("blocking")
-	$("#his-data").removeClass("mutingNotf")
-	$("#his-data").removeClass("blockingDom")
-	$("#his-end-btn").removeClass("endorsed")
-	$("#his-des").css("max-height", "250px")
-	$("#his-bot").html("")
-	$("#his-follow-btn").show()
-	$("#his-block-btn").show()
-	$("#his-mute-btn").show()
-	$("#his-notf-btn").show()
-	$("#his-domain-btn").show()
-	$("#his-emp-btn").show()
-	$("#his-follow-btn-text").text(lang.lang_status_follow)
-	$("#his-mute-btn-text").text(lang.lang_status_mute)
-	$("#his-block-btn-text").text(lang.lang_status_block)
-	$("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_mute)
-	$("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_block)
-	$("#his-relation").text("")
-	$(".cont-series").html("")
-	$("#domainblock").val("")
-	$("#his-lists-a").html(lang.lang_showontl_listwarn)
-	$("#his-lists-b").html("")
-	$("#his-name-val").val("")
-	$("#his-des-val").val("")
-	$("#his-f1-name").val("")
-	$("#his-f1-val").val("")
-	$("#his-f2-name").val("")
-	$("#his-f2-val").val("")
-	$("#his-f3-name").val("")
-	$("#his-f3-val").val("")
-	$("#his-f4-name").val("")
-	$("#his-f4-val").val("")
-	$("#his-endorse").html("")
-	$("#his-openin").attr("data-href", "")
-	$("#his-float-timeline").show()
-	$("#his-float-blocked").hide()
-	$("#his-main-acct").show()
-	$("#his-proof-prof").html("")
+	$(".his-var-content:eq(0)").show();
+	$(".his-var-content:gt(0)").hide();
+	$("#my-data-nav .btn").removeClass("disabled");
+	$(".active-back").removeClass("active-back");
+	$(".column-first").addClass("active-back");
+	$("#his-name").text("Loading");
+	$("#his-acct").text("");
+	$("#his-prof").attr("src", "../../img/loading.svg");
+	$("#his-data").css("background-image", "url(../../img/loading.svg)");
+	$("#his-sta").text("");
+	$("#his-follow").text("");
+	$("#his-follower").text("");
+	$("#his-des").html("");
+	$("#his-data").css("background-size", "cover");
+	$("#his-since").text("");
+	$("#his-data").removeClass("following");
+	$("#his-data").removeClass("muting");
+	$("#his-data").removeClass("blocking");
+	$("#his-data").removeClass("mutingNotf");
+	$("#his-data").removeClass("blockingDom");
+	$("#his-end-btn").removeClass("endorsed");
+	$("#his-des").css("max-height", "250px");
+	$("#his-bot").html("");
+	$("#his-follow-btn").show();
+	$("#his-block-btn").show();
+	$("#his-mute-btn").show();
+	$("#his-notf-btn").show();
+	$("#his-domain-btn").show();
+	$("#his-emp-btn").show();
+	$("#his-follow-btn-text").text(lang.lang_status_follow);
+	$("#his-mute-btn-text").text(lang.lang_status_mute);
+	$("#his-block-btn-text").text(lang.lang_status_block);
+	$("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_mute);
+	$("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_block);
+	$("#his-relation").text("");
+	$(".cont-series").html("");
+	$("#domainblock").val("");
+	$("#his-lists-a").html(lang.lang_showontl_listwarn);
+	$("#his-lists-b").html("");
+	$("#his-name-val").val("");
+	$("#his-des-val").val("");
+	$("#his-f1-name").val("");
+	$("#his-f1-val").val("");
+	$("#his-f2-name").val("");
+	$("#his-f2-val").val("");
+	$("#his-f3-name").val("");
+	$("#his-f3-val").val("");
+	$("#his-f4-name").val("");
+	$("#his-f4-val").val("");
+	$("#his-endorse").html("");
+	$("#his-openin").attr("data-href", "");
+	$("#his-float-timeline").show();
+	$("#his-float-blocked").hide();
+	$("#his-main-acct").show();
+	$("#his-proof-prof").html("");
 	$('#his-data').removeClass('locked')
 	$('#his-data').removeClass('requesting')
 }
 $("#my-data-nav .anc-link").on("click", function() {
-	var target = $(this).attr("go")
+	var target = $(this).attr("go");
 	if (target) {
-		$("#my-data-nav .anc-link").removeClass("active-back")
-		$(this).addClass("active-back")
-		$(target).show()
-		$(".his-var-content:not(" + target + ")").hide()
+		$("#my-data-nav .anc-link").removeClass("active-back");
+		$(this).addClass("active-back");
+		$(target).show();
+		$(".his-var-content:not(" + target + ")").hide();
 	}
-})
+});
--- a/app/main/css.js
+++ b/app/main/css.js
@@ -31,246 +31,119 @@ function css(mainWindow) {
 		}
 	})
 	ipc.on('theme-json-delete', function (e, arg) {
-		try{
-			var themecss = join(app.getPath("userData"), arg);
-			console.log(themecss);
-			fs.unlink(themecss, function (err) {
-				e.sender.webContents.send('theme-json-delete-complete', "");
-			});
-		} catch {
-			e.sender.webContents.send('theme-json-delete-complete', 'cannot delete');
-		}
-		
+		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
+		console.log(themecss);
+		fs.unlink(themecss, function (err) {
+			e.sender.webContents.send('theme-json-delete-complete', "");
+		});
 	})
 	ipc.on('theme-json-request', function (e, arg) {
-		try {
-			var themecss = join('./source/themes', arg)
-			var raw = fs.readFileSync(themecss, 'utf8')
-			var json = JSON5.parse(raw)
-		} catch {
-			var themecss = join(app.getPath("userData"), arg)
-			var raw = fs.readFileSync(themecss, 'utf8')
-			var json = JSON5.parse(raw)
-		}
+		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
+		var raw = fs.readFileSync(themecss, 'utf8')
+		var json = JSON5.parse(raw);
 		e.sender.webContents.send('theme-json-response', [json, raw]);
 	})
 	ipc.on('theme-css-request', function (e, arg) {
+		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
 		try {
-			var themecss = join('./source/themes', arg)
-			var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'))
-		} catch {
-			var themecss = join(app.getPath("userData"), arg)
-			var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'))
-		}
+			var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));

-		try {
-			var css
-			if (json.version) {
-				var bg = json.primary.background
-				var subcolor = json.primary.subcolor
-				var text = json.primary.text
-				var accent = json.primary.accent
-				if (json.base == "light") {
-					var drag = "rgba(255, 255, 255, 0.8)";
-					var beforehover = "#757575";
-					var selected = "#3f3f3f"
-					var selectedWithShare = "#b2babd"
-					var gray = "#757575"
-					var hisData = 'rgba(255, 255, 255, 0.9)'
-				} else {
-					var drag = "rgba(0, 0, 0, 0.8)";
-					var beforehover = "#9e9e9e";
-					var selected = "#c0c0c0"
-					var selectedWithShare = "#003a30"
-					var gray = "#cccccc"
-					var hisData = 'rgba(0, 0, 0, 0.8)'
-				}
-				if (!json.advanced) {
-					json.advanced = {}
-				}
-				if (json.advanced.modal) {
-					var modal = json.advanced.modal
-				} else {
-					var modal = bg
-				}
-				if (json.advanced.modalFooter) {
-					var modalFooter = json.advanced.modalFooter
-				} else {
-					var modalFooter = bg
-					if (modal != bg) modalFooter = modal
-				}
-				if (json.advanced.thirdColor) {
-					var thirdColor = json.advanced.thirdColor
-				} else {
-					var thirdColor = subcolor
-				}
-				if (json.advanced.forthColor) {
-					var forthColor = json.advanced.forthColor
-				} else {
-					var forthColor = subcolor
-					if (thirdColor != subcolor) forthColor = thirdColor
-				}
-				if (json.advanced.bottom) {
-					var bottom = json.advanced.bottom
-				} else {
-					var bottom = subcolor
-				}
-				if (json.advanced.emphasized) {
-					var emphasized = json.advanced.emphasized
-				} else {
-					var emphasized = accent
-				}
-				if (json.advanced.postbox) {
-					var postbox = json.advanced.postbox
-				} else {
-					var postbox = subcolor
-				}
-				if (json.advanced.active) {
-					var active = json.advanced.active
-				} else {
-					var active = accent
-				}
-				if (json.advanced.selected) {
-					var selected = json.advanced.selected
-				}
-				if (json.advanced.selectedWithShare) {
-					var selectedWithShare = json.advanced.selectedWithShare
-				}
-
-				var css = ":root {--bg:" + bg + ";--drag:" + drag + ";" +
-					"--text:" + text + ";--beforehover:" + beforehover + ";--modal:" +
-					modal + ";--thirdColor:" + thirdColor + ";--subcolor:" + forthColor +
-					";--bottom:" + bottom + ";--accent:" + accent + ";" + ";--emphasized:" + emphasized + ";--his-data:" +
-					hisData +
-					";--active:" + active + ";--postbox:" + postbox + ";--modalfooter:" +
-					modalFooter + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare +
-					"--gray:" + gray + ";}" +
-					".customtheme #imagemodal{background: url(\"../img/pixel.svg\");}";
+			var primary = json.vars.primary;
+			var secondary = json.vars.secondary;
+			var text = json.vars.text;
+			if (json.base == "light") {
+				var drag = "rgba(255, 255, 255, 0.8)";
+				var beforehover = "#757575";
+				var selected = "#3f3f3f"
+				var selectedWithShare = "#b2babd"
+				var gray = "#757575"
 			} else {
-				var css = compatibleTheme(json)
+				var drag = "rgba(0, 0, 0, 0.8)";
+				var beforehover = "#9e9e9e";
+				var selected = "#c0c0c0"
+				var selectedWithShare = "#003a30"
+				var gray = "#cccccc"
 			}
+			if (json.props) {
+				if (json.props.TheDeskAccent) {
+					var emphasized = json.props.TheDeskAccent
+				} else {
+					var emphasized = secondary
+				}
+				if (json.props.TheDeskActive) {
+					var active = json.props.TheDeskActive
+				} else {
+					var active = primary
+				}
+				if (json.props.TheDeskModal) {
+					var modal = json.props.TheDeskModal
+				} else {
+					var modal = secondary
+				}
+				if (json.props.TheDeskBottom) {
+					var bottom = json.props.TheDeskBottom
+				} else {
+					var bottom = primary
+				}
+				if (json.props.TheDeskPostbox) {
+					var postbox = json.props.TheDeskPostbox
+				} else {
+					var postbox = primary
+				}
+				if (json.props.TheDeskSubcolor) {
+					var subcolor = json.props.TheDeskSubcolor
+				} else {
+					var subcolor = primary
+				}
+			} else {
+				var emphasized = primary
+				var acs = secondary
+				var active = primary
+				var modal = secondary
+				var bottom = primary
+				var postbox = primary
+				var subcolor = primary
+			}
+
+			var css = ".customtheme {--bg:" + secondary + ";--drag:" + drag + ";" +
+				"--color:" + text + ";--beforehover:" + beforehover + ";--modal:" +
+				modal + ";--subcolor:" + subcolor + ";--box:" + subcolor +
+				";--sidebar:" + bottom + ";--shared:" + emphasized + ";" +
+				"--notfbox:" + secondary + ";--emphasized:" + active + ";--his-data:" +
+				secondary +
+				";--active:" + active + ";--postbox:" + postbox + ";--modalfooter:" +
+				primary +
+				";--accentbtn:" + subcolor + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}"+
+				"--gray:" + gray + ";"+
+				".customtheme #imagemodal{background: url(\"../img/pixel.svg\");}";
 			e.sender.webContents.send('theme-css-response', css);
 		} catch (e) {
 			var css = "";
 		}

 	})
-	function compatibleTheme(json) {
-		var primary = json.vars.primary;
-		var secondary = json.vars.secondary;
-		var text = json.vars.text;
-		if (json.base == "light") {
-			var drag = "rgba(255, 255, 255, 0.8)";
-			var beforehover = "#757575";
-			var selected = "#3f3f3f"
-			var selectedWithShare = "#b2babd"
-			var gray = "#757575"
-		} else {
-			var drag = "rgba(0, 0, 0, 0.8)";
-			var beforehover = "#9e9e9e";
-			var selected = "#c0c0c0"
-			var selectedWithShare = "#003a30"
-			var gray = "#cccccc"
-		}
-		if (json.advanced) {
-			if (json.advanced.TheDeskAccent) {
-				var emphasized = json.advanced.TheDeskAccent
-			} else {
-				var emphasized = secondary
-			}
-			if (json.advanced.TheDeskActive) {
-				var active = json.advanced.TheDeskActive
-			} else {
-				var active = primary
-			}
-			if (json.advanced.TheDeskModal) {
-				var modal = json.advanced.TheDeskModal
-			} else {
-				var modal = secondary
-			}
-			if (json.advanced.TheDeskBottom) {
-				var bottom = json.advanced.TheDeskBottom
-			} else {
-				var bottom = primary
-			}
-			if (json.advanced.TheDeskPostbox) {
-				var postbox = json.advanced.TheDeskPostbox
-			} else {
-				var postbox = primary
-			}
-			if (json.advanced.TheDeskSubcolor) {
-				var subcolor = json.advanced.TheDeskSubcolor
-			} else {
-				var subcolor = primary
-			}
-		} else {
-			var emphasized = primary
-			var acs = secondary
-			var active = primary
-			var modal = secondary
-			var bottom = primary
-			var postbox = primary
-			var subcolor = primary
-		}
-
-		var css = ".customtheme {--bg:" + secondary + ";--drag:" + drag + ";" +
-			"--text:" + text + ";--beforehover:" + beforehover + ";--modal:" +
-			modal + ";--thirdColor:" + subcolor + ";--subcolor:" + subcolor +
-			";--bottom:" + bottom + ";--accent:" + emphasized + ";" +
-			"--subcolor:" + secondary + ";--emphasized:" + active + ";--his-data:" +
-			secondary +
-			";--active:" + active + ";--postbox:" + postbox + ";--modalfooter:" +
-			primary +
-			";--active:" + subcolor + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}" +
-			"--gray:" + gray + ";" +
-			".customtheme #imagemodal{background: url(\"../img/pixel.svg\");}";
-		return css
-	}
 	ipc.on('theme-json-list', function (e, arg) {
-		var files1 = fs.readdirSync('./source/themes')
-		var file1List = files1.filter(function (file) {
-			if (file.match(/\.thedesktheme$/)) {
-				var tfile = join('./source/themes', file)
-				return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile)
-			} else {
-				return null
-			}
-		})
-		var themes = [];
-		for (var i = 0; i < file1List.length; i++) {
-			var themecss = join('./source/themes', file1List[i]);
-			var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
-			let compat = true
-			if (json.version) compat = false
-			themes.push({
-				name: json.name,
-				id: json.id,
-				compatible: compat,
-				default: true
+		fs.readdir(app.getPath("userData"), function (err, files) {
+			if (err || !files) throw err;
+			var fileList = files.filter(function (file) {
+				if(file.match(/\.thedesktheme$/)){
+					var tfile = join(app.getPath("userData"), file)
+					return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile)
+				}else{
+					return null
+				}
 			})
-		}
-		var files2 = fs.readdirSync(app.getPath("userData"))
-		var file2List = files2.filter(function (file) {
-			if (file.match(/\.thedesktheme$/)) {
-				var tfile = join(app.getPath("userData"), file)
-				return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile)
-			} else {
-				return null
+			var themes = [];
+			for (var i = 0; i < fileList.length; i++) {
+				var themecss = join(app.getPath("userData"), fileList[i]);
+				var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
+				themes.push({
+					name: json.name,
+					id: json.id
+				})
 			}
-		})
-		for (var i = 0; i < file2List.length; i++) {
-			var themecss = join(app.getPath("userData"), file2List[i]);
-			var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
-			let compat = true
-			if (json.version) compat = false
-			themes.push({
-				name: json.name,
-				id: json.id,
-				compatible: compat,
-				default: false
-			})
-		}
-		e.sender.webContents.send('theme-json-list-response', themes);
+			e.sender.webContents.send('theme-json-list-response', themes);
+		});
 	})
 }
 exports.css = css;
--- a/app/main/dl.js
+++ b/app/main/dl.js
@@ -28,7 +28,6 @@ function dl(mainWindow, lang_path, base, dirname) {
 				show: false
 			})
 			var lang = fs.readFileSync(lang_path, 'utf8')
-			//updatewin.toggleDevTools()
 			updatewin.loadURL(base + lang + '/update.html')
 			updatewin.webContents.once('dom-ready', () => {
 				updatewin.show()
--- a/app/maxim.ja.json
+++ b/app/maxim.ja.json
@@ -1,4 +1,5 @@
 [
+    "TheDeskは自称ステイホームの必須アイテム",
    "あと数秒でPCのファンが全力で回り始める",
    "カラムの数だけ夢があるがネットワークは逼迫する",
    "朝起きたらストリーミングが止まっていた…",
@@ -49,11 +50,5 @@
    "N押すとトゥートのボックスが出て、すぐ打ち込める。",
    "Xを押すとトゥートのボックスは出るけど、打ち込めない。その代わりもう一度押すと消せる。",
    "トゥートした後ボックスを閉じるとかそのままにしておくとかは、設定で変えられます。",
-    "OpenStickerへの登録データ募集中",
-    "Microsoft Store版のアップデートは向こうに止められてます",
-    "いのちの輝き版ロゴ",
-    "いのちの輝き版ロゴ",
-    "いのちの輝き版ロゴ",
-    "いのちの輝き版ロゴ",
-    "いのちの輝き版ロゴ"
+    "ヌァ＝スコ゜、ケエンョ゛ハー゛オセム゛ヌトョ！。シレモゥチャスモハァーワ」。チスョ「ラネ゛ワフン（ァクミス"
 ]
--- a/app/nano.html
+++ b/app/nano.html
@@ -6,7 +6,6 @@
 		<link href="./css/tl.css" type="text/css" rel="stylesheet" />
 		<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
 		<link href="./node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
-		<script type="text/javascript" src="./node_modules/grapheme-splitter/index.js"></script>
 		<title>TheDesk Nano</title>
 		<style>
 			html {
@@ -16,7 +15,7 @@
 				height: 100vh;
 				overflow: hidden;
 				font-family: sans-serif;
-				color: var(--text) !important;
+				color: var(--color) !important;
 			}

 			body {
@@ -45,7 +44,7 @@

 			textarea {
 				-webkit-app-region: no-drag;
-				color: var(--text) !important;
+				color: var(--color) !important;
 			}

 			::-webkit-scrollbar {
@@ -83,16 +82,12 @@
 			.cvo {
 				grid-template-rows: auto 1rem 1fr auto 2rem;
 			}
-			.voice {
-				display: none;
-			}
 		</style>
 	</head>

 	<body>
 		<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
 		<script>
-			var pwa = false
 			$.strip_tags = function(str, allowed) {
 				if (!str) {
 					return "";
@@ -146,7 +141,7 @@
 			}
 		</script>
 		<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
-		<script type="text/javascript" src="./js/platform/first.js"></script>
+		<script type="text/javascript" src="view/en/main.js"></script>
 		<script type="text/javascript" src="./js/post/status.js"></script>
 		<script type="text/javascript" src="./js/post/post.js"></script>
 		<script type="text/javascript" src="./js/post/use-txtbox.js"></script>
--- a/app/opening.html
+++ b/app/opening.html
@@ -75,7 +75,7 @@
 	</head>

 	<body class="center" style="overflow: hidden;">
-		<img src="./img/desk-animation.svg" id="leader" style="max-width: 62%;" />
+		<img src="./img/desk-animation.svg" style="max-width: 62%;" />
 		<h1>TheDesk</h1>
 		<span id="ver"></span><br />
 		<span class="loading"></span><br />
@@ -84,12 +84,11 @@
 			<script>
 				if (location.search) {
 					var m = location.search.match(/\?ver=([0-9.]+)&codename=([a-zA-Z]+)&maxim=(.+)/)
-					var maxim = decodeURI(m[3])
-					if(maxim == 'いのちの輝き版ロゴ') document.getElementById('leader').setAttribute('src', './img/2025.svg')
 					var ver = m[1]
 					var code = m[2]
+					var maxim = m[3]
 					document.getElementById('ver').innerText = `${ver}(${code})`
-					document.getElementById('maxim').innerText = maxim
+					document.getElementById('maxim').innerText = `${decodeURI(maxim)}`
 				}
 			</script>
 		</div>
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
    "name": "thedesk",
-    "version": "21.2.0",
+    "version": "21.0.4",
    "codename": "Mayu",
    "description": "TheDesk is a Mastodon client for PC.",
    "repository": "https://github.com/cutls/TheDesk",
@@ -8,21 +8,14 @@
    "scripts": {
        "test": "echo \"Error: no test specified\" && exit 1",
        "construct": "cd view/make && node make --automatic && cd ../../",
-        "construct:store": "cd view/make && node make --automatic --store && cd ../../",
        "dev": "npx electron ./ --dev",
        "dist": "build --linux snap",
        "watchview": "node view/make/make.js --automatic --watch",
        "build:js": "node build.js",
        "build": "node view/make/make.js --automatic && npx electron-builder",
-        "build:pwa": "node view/make/make.js --automatic --pwa",
-        "build:win:web": "node view/make/make.js --automatic && npx electron-builder --win",
-        "build:win:msstore": "node view/make/make.js --automatic --store && npx electron-builder --win appx",
-        "build:linux:web": "node view/make/make.js --automatic && npx electron-builder --linux",
-        "build:linux:snapstore": "node view/make/make.js --automatic --store && npx electron-builder --linux",
-        "build:mac:web": "node view/make/make.js --automatic && npx electron-builder --mac",
-        "build:mac:homebrew": "node view/make/make.js --automatic --store && npx electron-builder --mac",
-        "lint:fix": "eslint js --fix" ,
-        "lint": "eslint js" 
+        "build:all": "npx electron-builder --win --linux",
+        "build:win": "npx electron-builder --win",
+        "build:pwa": "node view/make/make.js --automatic --pwa"
    },
    "keywords": [
        "mastodon",
@@ -40,8 +33,7 @@
        "url": "https://cutls.dev",
        "email": "p@cutls.com"
    },
-    "contributor": [
-        {
+    "contributor": [{
            "name": "とねぢ",
            "url": "https://minohdon.jp/@toneji",
            "email": "solfa.tono@gmail.com"
@@ -59,17 +51,17 @@
    ],
    "license": "GPL-3.0",
    "dependencies": {
-        "@fortawesome/fontawesome-free": "^5.14.0",
-        "custom-electron-titlebar": "^3.2.3",
+        "@fortawesome/fontawesome-free": "^5.13.1",
+        "custom-electron-titlebar": "^3.2.2-hotfix62",
        "electron-dl": "^3.0.1",
        "jimp": "^0.14.0",
        "jquery": "^3.5.1",
        "jquery-ui-dist": "^1.12.1",
        "json5": "^2.1.3",
-        "lodash": "^4.17.19",
+        "lodash": "^4.17.15",
        "materialize-css": "git://github.com/cutls/materialize#v1-dev",
        "sumchecker": "^3.0.1",
-        "sweetalert2": "^9.17.0",
+        "sweetalert2": "^9.15.2",
        "system-font-families": "^0.4.1",
        "vue": "^2.6.11"
    },
@@ -77,11 +69,10 @@
        "itunes-nowplaying-mac": "0.3.1"
    },
    "devDependencies": {
-        "chokidar": "^3.4.1",
-        "electron": "^9.1.1",
+        "chokidar": "^3.4.0",
+        "electron": "^9.0.5",
        "electron-builder": "^22.7.0",
        "electron-rebuild": "^1.11.0",
-        "eslint": "^7.6.0",
        "readline-sync": "1.4.10"
    },
    "build": {
@@ -97,8 +88,8 @@
            "icon": "build/thedesk.ico",
            "target": [
                "nsis",
-                "appx",
-                "portable"
+                "portable",
+                "appx"
            ]
        },
        "appx": {
@@ -120,7 +111,6 @@
            "icon": "build/icons",
            "target": [
                "zip",
-                "appImage",
                "snap",
                "deb"
            ],
@@ -137,4 +127,4 @@
        },
        "electronVersion": "9.0.5"
    }
-}
+}
--- a/app/source/themes/black.thedesktheme
+++ b/app/source/themes/black.thedesktheme
@@ -1,27 +0,0 @@
-{
-	name: 'Black',
-	author: 'TheDesk',
-	desc: 'TheDesk Default Theme',
-	base: 'dark',
-	primary: {
-		background: '#212121',
-		subcolor: '#424242',
-		text: '#fff',
-		accent: '#004d40',
-	},
-	advanced: {
-		modal: '#000',
-		modalFooter: '#212121',
-		third: '#212121',
-		forth: '#333333',
-		bottom: '#424242',
-		emphasized: '#4e342e',
-		postbox: '#424242',
-		active: '#3f51b5',
-		selected: '#3f3f3f',
-		selectedWithShared: '#003a30',
-	},
-	id: 'black',
-	version: '2',
-	default: true
-}
--- a/app/source/themes/blue.thedesktheme
+++ b/app/source/themes/blue.thedesktheme
@@ -1,27 +0,0 @@
-{
-	name: 'Blue',
-	author: 'TheDesk',
-	desc: 'TheDesk Default Theme',
-	base: 'light',
-	primary: {
-		background: '#c9e1ec',
-		subcolor: '#dff1ff',
-		text: '#000',
-		accent: '#e0ffe4',
-	},
-	advanced: {
-		modal: '#b2ebf2',
-		modalFooter: '#2196f3',
-		third: '#90caf9',
-		forth: '#90caf9',
-		bottom: '#b6e6f5',
-		emphasized: '#c5e1a5',
-		postbox: '#dff1ff',
-		active: '#2f7bb7',
-		selected: '#9dcade',
-		selectedWithShared: '#c1dac4',
-	},
-	id: 'blue',
-	version: '2',
-	default: true
-}
--- a/app/source/themes/brown.thedesktheme
+++ b/app/source/themes/brown.thedesktheme
@@ -1,27 +0,0 @@
-{
-	name: 'Brown',
-	author: 'TheDesk',
-	desc: 'TheDesk Default Theme',
-	base: 'dark',
-	primary: {
-		background: '#261411',
-		subcolor: '#4e342e',
-		text: '#fff',
-		accent: '#004d40',
-	},
-	advanced: {
-		modal: '#261411',
-		modalFooter: '#261411',
-		third: '#4e342e',
-		forth: '#4e342e',
-		bottom: '#4e342e',
-		emphasized: '#0d47a1',
-		postbox: '#4e342e',
-		active: '#827717',
-		selected: '#6d352b',
-		selectedWithShared: '#003a30',
-	},
-	id: 'brown',
-	version: '2',
-	default: true
-}
--- a/app/source/themes/green.thedesktheme
+++ b/app/source/themes/green.thedesktheme
@@ -1,27 +0,0 @@
-{
-	name: 'Green',
-	author: 'TheDesk',
-	desc: 'TheDesk Default Theme',
-	base: 'light',
-	primary: {
-		background: '#c8e6c9',
-		subcolor: '#a5d6a7',
-		text: '#000',
-		accent: '#ffcc80',
-	},
-	advanced: {
-		modal: '#81c784',
-		modalFooter: '#81c784',
-		third: '#a5d6a7',
-		forth: '#81c784',
-		bottom: '#c5e1a5',
-		emphasized: '#9e9d24',
-		postbox: '#a5d6a7',
-		active: '#33691e',
-		selected: '#78c17a',
-		selectedWithShared: '#caa266',
-	},
-	id: 'green',
-	version: '2',
-	default: true
-}
--- a/app/source/themes/indigo.thedesktheme
+++ b/app/source/themes/indigo.thedesktheme
@@ -1,27 +0,0 @@
-{
-	name: 'Indigo',
-	author: 'TheDesk',
-	desc: 'TheDesk Default Theme',
-	base: 'dark',
-	primary: {
-		background: '#031833',
-		subcolor: '#1a237e',
-		text: '#fff',
-		accent: '#004d40',
-	},
-	advanced: {
-		modal: '#0d1351',
-		modalFooter: '#031833',
-		third: '#0d1351',
-		forth: '#0d47a1',
-		bottom: '#0d1351',
-		emphasized: '#4e342e',
-		postbox: '#1a237e',
-		active: '#00acc1',
-		selected: '#214f8a',
-		selectedWithShared: '#003a30',
-	},
-	id: 'indigo',
-	version: '2',
-	default: true
-}
--- a/app/source/themes/polar.thedesktheme
+++ b/app/source/themes/polar.thedesktheme
@@ -1,27 +0,0 @@
-{
-	name: 'Polar Night',
-	author: 'TheDesk',
-	desc: 'TheDesk Default Theme',
-	base: 'dark',
-	primary: {
-		background: '#2e3440',
-		subcolor: '#434c5e',
-		text: '#ffffff',
-		accent: '#2d3b58',
-	},
-	advanced: {
-		modal: '#3b4252',
-		modalFooter: '#485166',
-		third: '#434c5e',
-		forth: '#4c566a',
-		bottom: '#3b4252',
-		emphasized: '#2f4b86',
-		postbox: '#434c5e',
-		active: '#2f4b86',
-		selected: '#464f61',
-		selectedWithShared: '#3e527e',
-	},
-	id: 'polar',
-	version: '2',
-	default: true
-}
--- a/app/source/themes/snow.thedesktheme
+++ b/app/source/themes/snow.thedesktheme
@@ -1,27 +0,0 @@
-{
-	name: 'Snow Storm',
-	author: 'TheDesk',
-	desc: 'TheDesk Default Theme',
-	base: 'light',
-	primary: {
-		background: '#eceff4',
-		subcolor: '#d8dee9',
-		text: '#36425a',
-		accent: '#c3d4e6',
-	},
-	advanced: {
-		modal: '#e5e9f0',
-		modalFooter: '#b2bed4',
-		third: '#d8dee9',
-		forth: '#4c566a',
-		bottom: '#eeeeee',
-		emphasized: '#88c0d0',
-		postbox: '#d8dee9',
-		active: '#81a1c1',
-		selected: '#b4bdd0',
-		selectedWithShared: '#a3afbb',
-	},
-	id: 'snow',
-	version: '2',
-	default: true
-}
--- a/app/source/themes/white.thedesktheme
+++ b/app/source/themes/white.thedesktheme
@@ -1,27 +0,0 @@
-{
-	name: 'White',
-	author: 'TheDesk',
-	desc: 'TheDesk Default Theme',
-	base: 'light',
-	primary: {
-		background: '#fff',
-		subcolor: '#fff',
-		text: '#000',
-		accent: '#cfd8dc',
-	},
-	advanced: {
-		modal: '#fff',
-		modalFooter: '#fafafa',
-		third: '#e0e0e0',
-		forth: '#fff',
-		bottom: '#eeeeee',
-		emphasized: '#81c784',
-		postbox: '#fff',
-		active: '#009688',
-		selected: '#c0c0c0',
-		selectedWithShared: '#b2babd',
-	},
-	id: 'white',
-	version: '2',
-	default: true
-}
--- a/app/source/version.json
+++ b/app/source/version.json
@@ -1,7 +1,5 @@
 {
  "latest":[],
-  "3.2.0": [],
-  "3.1.5": [],
  "3.1.4": [
    "リモート限定の連合タイムライン"
  ],
--- a/app/view/make/acct.sample.html
+++ b/app/view/make/acct.sample.html
@@ -3,12 +3,12 @@
 	<head>
 		<title>Account Manager - TheDesk</title>
 		<meta content="width=device-width,initial-scale=1.0" name="viewport" />
-		<link href="../../css/themes.css" type="text/css" rel="stylesheet">
 		<link
 			href="../../@@node_base@@/materialize-css/dist/css/materialize.css"
 			type="text/css"
 			rel="stylesheet"
 		/>
+		<link href="../../css/themes.css" type="text/css" rel="stylesheet" />
 		<link href="../../css/master.css" type="text/css" rel="stylesheet" />
 		<link href="../../css/tl.css" rel="stylesheet" type="text/css" />
 		<link href="../../css/userdata.css" rel="stylesheet" type="text/css" />
@@ -26,7 +26,7 @@
 		</script>
 		<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
 		@@comment-end@@
-		@@pwa@@ @@store@@
+		@@pwa@@
 	</head>

 	<body id="mainView" class="@@pwaClass@@">
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="@@lang@@">
 	<head>
+		<link href="../../css/themes.css" type="text/css" rel="stylesheet" />
 		<script type="text/javascript" src="../../js/ui/theme.js"></script>
-		<link href="../../css/themes.css" type="text/css" rel="stylesheet">
 		<meta content="width=device-width,initial-scale=1.0" name="viewport" />
 		<link
 			href="../../@@node_base@@/materialize-css/dist/css/materialize.css"
@@ -31,7 +31,7 @@
 			_jipt.push(['project', 'thedesk'])
 		</script>
 		<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
-		@@comment-end@@ @@pwa@@ @@store@@
+		@@comment-end@@ @@pwa@@
 	</head>

 	<body class="@@pwaClass@@">
@@ -69,7 +69,7 @@
 					<div id="demobottom">
 						<button
 							class="btn waves-effect"
-							style="width: 23rem;height: 2.5rem;line-height: 0;margin: 0; background-color: var(--active);"
+							style="width: 23rem;height: 2.5rem;line-height: 0;margin: 0; background-color: var(--accentbtn);"
 						>
 							<i
 								class="material-icons"
@@ -123,6 +123,7 @@
 				</div>
 			</div>
 		</div>
+		<div id="contextWrap" class="hide"></div>
 		<div id="post-box" class="z-depth-5">
 			<div id="post-bar" class="drag-bar">
 				<span id="unreact">@@post-new@@</span><span id="addreact" class="hide">Reaction</span>
@@ -416,6 +417,9 @@
 					</div>
 					<!-- 公開範囲 Dropdown Structure -->
 					<ul id="dropdown1" class="dropdown-content">
+						<li style="font-size: 1.2rem; display: block; line-height: 1.69rem; padding: 1.1rem 1.23rem;">
+							@@selectVis@@
+						</li>
 						<li>
 							<a onclick="vis('public')">@@publicJP@@(Public)</a>
 						</li>
@@ -1123,20 +1127,16 @@
 				<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-21-2-0_Mayu" class="release-do" style="display:none; ">
+				<div id="release-21-0-4_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 21.2.0 (Mayu)</h5>
+					<h5>Release Note 21.0.4 (Mayu)</h5>
 					<!--上のdivのidも変えてね-->
-					・テーマが自由かつ高度に編集可能に  <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>
-・カスタム通知音に関するバグの修正  <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>
-・Intgrated TLのストリーミングが古いインスタンスで不可能だった  <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>
-・検索に使用したアカウントと別のアカウントでタグTLが追加されてしまうバグの修正  <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>
+・引用可能なインスタンスで、すべてのトゥートがミュートされた引用になってしまうバグ heguro<br>

 				</div>
 				<div id="release-en" style="display:none">
@@ -1724,10 +1724,10 @@
 		<script type="text/javascript" src="../../@@node_base@@/jquery/dist/jquery.js"></script>
 		<script type="text/javascript" src="../../js/platform/first.js"></script>
 		<script type="text/javascript" src="../../@@node_base@@/grapheme-splitter/index.js"></script>
-		<script
+		<!--script
 			type="text/javascript"
 			src="../../@@node_base@@/materialize-css/dist/js/materialize.js"
-		></script>
+		></script-->
 		<script type="text/javascript" src="../../@@node_base@@/lodash/lodash.min.js"></script>
 		<script type="text/javascript" src="main.js"></script>
 		<script type="text/javascript" src="../../js/common/time.js"></script>
--- a/app/view/make/language/en/index.json
+++ b/app/view/make/language/en/index.json
@@ -130,7 +130,7 @@
    "notf":"Notifications",
    "bookmark": "Bookmarks",
    "showThisTL":"Show this TL:",
-    "webviewWarn":"TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).",
+    "webviewWarn":"TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
    "add":"Add",
    "search":"Search",
    "sortSet":"Sort",
--- a/app/view/make/language/en/main.json
+++ b/app/view/make/language/en/main.json
@@ -131,17 +131,13 @@
    "lang_layout_linkana": "Auto Link Analyzer",
    "lang_layout_linkanades": "Auto link analyzer",
    "lang_layout_tts": "Text to speech ",
-    "lang_layout_reconnect": "Reload",
+    "lang_layout_reconnect": "Reload this column",
    "lang_layout_headercolor": "Header color of this column",
    "lang_layout_nodata": "[No data]<br>F5/⌘+R to reload",
    "lang_layout_dm": "Direct Message",
    "lang_layout_webviewmode": "Prefer WebView",
-    "lang_layout_excluded": "Excluded type of notification",
-    "lang_layout_mention": "Mentions",
-    "lang_layout_fav": "Favourites",
-    "lang_layout_bt": "Boosts",
-    "lang_layout_poll": "Polls",
-    "lang_layout_excludingbt": "Show BT mode",
+    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
    "lang_layout_leftFold": "Stack to the left",
    "lang_layout_leftUnfold": "Dock on the right",
    "lang_layout_deleteColumn": "Delete this column",
@@ -240,7 +236,6 @@
    "lang_misskeyparse_reacted": " reacted your following post.",
    "lang_setting_time": "Time format:{{set}}",
    "lang_setting_theme": "Theme:{{set}}",
-    "lang_setting_compat": "Compatible",
    "lang_setting_nsfw": "Sensitive media:{{set}}",
    "lang_setting_cw": "CW:{{set}}",
    "lang_setting_cwtext": "Default CW text:{{set}}",
--- a/app/view/make/language/en/setting.json
+++ b/app/view/make/language/en/setting.json
@@ -24,11 +24,10 @@
  "nativenotf": "Native notification",
  "nnwarn": "This does not work on Windows Portable ver.",
  "nntest": "Notification test",
-  "width": "Width of columns",
-  "widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
+  "minwidth": "Minimum width of columns",
+  "minwidthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
  "fixwidth": "Minimum width of TweetDeck browser",
  "fixwidthwarn": "",
-  "margin": "Margin between timelines",
  "above": "above",
  "font": "Font",
  "fontwarn": "Select your favorite font to 'Select'(On Linux, it may not work.)",
@@ -44,26 +43,19 @@
  "srcUrl": "Search engine",
  "srcUrlWarn": "{q} will be replaced to query.",
  "themeSel": "Select theme",
-  "customtheme": "Edit and add themes",
+  "customtheme": "Edit and add custom themes",
  "customthemeDirection": "Color scheme",
-  "advanced":"Advanced options",
-  "advancedWarn":"",
-  "use": "Use this",
-  "copyFrom": "Copy from",
-  "bg": "Background color",
-  "subcolor":"Distinguishable from background",
+  "advanced":"Advanced options(6 additional colors)",
+  "advancedWarn":"Advanced options will be <i>null</i> if you set nothing, while basic 3 options will be white(<i>fff</i>). They(adv. options) will be reset if you saved with advanced panel closed.",
+  "active": "Background of Show or CW buttons, selected options...",
+  "modal": "Background of modals",
+  "bottom":"Background of bottom bar",
+  "postbox":"Background of post box and menu",
+  "subcolor":"Subcolor, has harmony with secondary color",
+  "primary": "Background color",
+  "secondarycolor": "Background of components",
  "text": "Text color",
  "accent": "Background of boosts",
-  "modal": "Background of modal window",
-  "modalFooter": "Background of modal window's footer",
-  "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
-  "forthColor": "Title bar(same scheme to Background)",
-  "bottom":"Background of menu-bar at bottom of window",
-  "emphasized": "Emphasized toot's background",
-  "postbox":"Background of post-box and menu",
-  "active": "Background of 'active' elements",
-  "selected": "Background of selected with arrow keys",
-  "selectedWithShare": "Background of selected with arrow keys(boosted toots)",
  "add_new": "Add new",
  "name": "Name",
  "desc": "About this theme",
@@ -109,8 +101,8 @@
  "or": "or",
  "imgheight": "Height of images",
  "imgheightwarn": "Option:Set \"full\" to uncrop.",
-  "ticker": "Enable OpenSticker",
-  "tickerwarn": "Show the instance name and favicon of tooters <a href=\"https://opensticker.0px.io\">About OpenSticker</a>",
+  "ticker": "Enable #InstanceTicker",
+  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
  "animation": "Animation of timelines",
  "markers": "Markers(mark as read) on HTL and notifications",
  "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",
--- a/app/view/make/language/ja-KS/index.json
+++ b/app/view/make/language/ja-KS/index.json
@@ -128,7 +128,7 @@
    "notf":"通知",
    "bookmark": "ブックマーク",
    "showThisTL":"表示するタイムライン",
-    "webviewWarn":"TweetDeckを出すで。TJDeckをカスタムしたものが読み込まれる(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。",
+    "webviewWarn":"TweetDeckを出すで。TJDeckをカスタムしたものが読み込まれる(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。キーボードショートカットと干渉しはるから、文字入れる時はカラムの「WebView優先」にチェック入れてからしてな。",
    "add":"追加",
    "search":"検索",
    "sortSet":"並べ替え設定",
--- a/app/view/make/language/ja-KS/main.json
+++ b/app/view/make/language/ja-KS/main.json
@@ -130,17 +130,13 @@
    "lang_layout_linkanades": "リンクの解析を切り替え",
    "lang_layout_remoteOnly": "リモートのみ",
    "lang_layout_tts": "読み上げ",
-    "lang_layout_reconnect": "再読込",
+    "lang_layout_reconnect": "カラム再読込",
    "lang_layout_headercolor": "TLヘッダーカラー",
    "lang_layout_nodata": "[トゥートあらへん]<br>F5/⌘+Rで再読込してみて。",
    "lang_layout_dm": "ダイレクトメッセージ",
    "lang_layout_webviewmode": "WebView優先",
-    "lang_layout_excluded": "見せへん通知",
-    "lang_layout_mention": "メンション",
-    "lang_layout_fav": "お気に入り",
-    "lang_layout_bt": "ブースト",
-    "lang_layout_poll": "投票",
-    "lang_layout_excludingbt": "BT表示",
+    "lang_excluded": "見せへん通知",
+    "lang_layout_excludingbt": "BT表示(OFF/BT除外/BTだけ)",
    "lang_layout_leftFold": "左へ重ねる",
    "lang_layout_leftUnfold": "右へ出す",
    "lang_layout_deleteColumn": "カラム削除",
@@ -234,7 +230,6 @@
    "lang_misskeyparse_quoted": "が引用",
    "lang_misskeyparse_reacted": "がリアクション",
    "lang_setting_time": "時間設定を{{set}}に設定したで。",
-    "lang_setting_compat": "互換テーマ",
    "lang_setting_theme": "テーマ設定を{{set}}に設定したで。",
    "lang_setting_nsfw": "画像表示設定を{{set}}に設定したで。",
    "lang_setting_cw": "テキスト表示設定を{{set}}に設定したで。",
--- a/app/view/make/language/ja-KS/setting.json
+++ b/app/view/make/language/ja-KS/setting.json
@@ -23,11 +23,10 @@
  "nativenotf": "ネイティブ通知設定",
  "nnwarn": "Portableバージョンでは表示できんかも知れん。",
  "nntest": "通知テスト",
-  "width": "カラムの横幅",
-  "widthwarn": "画面全体の横幅÷カラム数で計算してそれ超してもうたら横スクロール入るで。",
+  "minwidth": "マルチカラムの最低横幅",
+  "minwidthwarn": "画面全体の横幅÷コラム数で計算してそれ超してもうたら横スクロール入るで。",
  "fixwidth": "TweetDeckの限定の最低横幅",
  "fixwidthwarn": "",
-  "margin": "TL間のマージン",
  "above": "以上",
  "font": "フォント",
  "fontwarn": "「選択」を押してフォントを選んでな。(Linuxでは動かんかもしれん。)",
@@ -43,26 +42,19 @@
  "srcUrl": "検索エンジン",
  "srcUrlWarn": "{q}が検索文字列になるで。",
  "themeSel": "テーマの選択",
-  "customtheme": "テーマの作成・編集",
+  "customtheme": "カスタムテーマの作成・編集",
  "customthemeDirection": "色の系統",
-  "advanced":"拡張項目を開く",
-  "advancedWarn":"",
-  "use": "使用",
-  "copyFrom": "設定をコピー",
-  "bg": "全体の背景色など",
-  "subcolor":"各要素に使われる背景と区別できる色",
+  "advanced":"拡張項目(6つ)を開く",
+  "advancedWarn":"拡張項目は設定せんと「指定なし」に、基本3項目は白(fff)になるで。拡張項目を閉じた状態で「変更」すると拡張項目は消してまうで。",
+  "primary": "全体の背景色など",
+  "secondarycolor": "補助要素に使われる背景色",
  "text": "テキストの色",
  "accent": "ブーストの背景色など",
-  "modal": "モーダルウィンドウの背景色",
-  "modalFooter": "モーダルウィンドウのフッターの背景色",
-  "thirdColor": "タブボタンの背景色等(ほぼ背景色)",
-  "forthColor": "リアクションボタンやタイトルバーの色等(背景色と同系)",
-  "bottom":"下のメニューバーの背景色",
-  "emphasized": "強調されたトゥートの背景色",
-  "postbox":"投稿ボックスやメニューの色",
  "active": "CWボタンやメニュー選択時の背景色",
-  "selected": "矢印キーでトゥートを選択したときの背景色",
-  "selectedWithShare": "矢印キーでBTされたトゥートを選択したときの背景色",
+  "modal": "モーダルウィンドウの背景色",
+  "bottom":"下のメニューバーの背景色",
+  "postbox":"投稿ボックスやメニューの色",
+  "subcolor":"背景に準ずる色",
  "add_new": "新規作成",
  "name": "名前",
  "desc": "説明",
@@ -108,8 +100,8 @@
  "or": "または",
  "imgheight": "画像の高さ",
  "imgheightwarn": "オプション:「full」と指定すると全ての画像をクロップせず全部出すで。",
-  "ticker": "OpenStickerを使う",
-  "tickerwarn": "そのトゥートの発信者のサーバー名やFaviconを表示します。<a href=\"https://opensticker.0px.io\">OpenStickerについて</a>",
+  "ticker": "#InstanceTickerを使う",
+  "tickerwarn": "トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">#InstanceTickerってなんや？</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
  "animation": "タイムラインのアニメーション",
  "markers": "ホームと通知の未読管理",
  "markerswarn": "Mastodon 3.0相当以上。WebUIと対応クライアントで共有するやつや。",
--- a/app/view/make/language/ja/index.json
+++ b/app/view/make/language/ja/index.json
@@ -130,7 +130,7 @@
    "notf":"通知",
    "bookmark": "ブックマーク",
    "showThisTL":"表示するタイムライン",
-    "webviewWarn":"TweetDeckを表示します。TJDeckをカスタムしたものが読み込まれます(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。",
+    "webviewWarn":"TweetDeckを表示します。TJDeckをカスタムしたものが読み込まれます(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。キーボードショートカットが邪魔をするので、文字入力時はカラムの「WebView優先」にチェックを入れてください。",
    "add":"追加",
    "search":"検索",
    "sortSet":"並べ替え設定",
--- a/app/view/make/language/ja/main.json
+++ b/app/view/make/language/ja/main.json
@@ -132,17 +132,13 @@
    "lang_layout_linkana": "リンク解析",
    "lang_layout_linkanades": "リンクの解析を切り替え",
    "lang_layout_tts": "読み上げ",
-    "lang_layout_reconnect": "再読込",
+    "lang_layout_reconnect": "カラム再読込",
    "lang_layout_headercolor": "TLヘッダーカラー",
    "lang_layout_nodata": "[ここにトゥートはありません。]<br>F5/⌘+Rで再読込できます。",
    "lang_layout_dm": "ダイレクトメッセージ",
    "lang_layout_webviewmode": "WebView優先",
-    "lang_layout_excluded": "除外する通知",
-    "lang_layout_mention": "メンション",
-    "lang_layout_fav": "お気に入り",
-    "lang_layout_bt": "ブースト",
-    "lang_layout_poll": "投票",
-    "lang_layout_excludingbt": "BT表示",
+    "lang_excluded": "除外する通知",
+    "lang_layout_excludingbt": "BT表示(OFF/BT除外/BTのみ)",
    "lang_layout_leftFold": "左へ重ねる",
    "lang_layout_leftUnfold": "右へ出す",
    "lang_layout_deleteColumn": "カラム削除",
@@ -241,7 +237,6 @@
    "lang_misskeyparse_reacted": "がリアクション",
    "lang_setting_time": "時間設定を{{set}}に設定しました。",
    "lang_setting_theme": "テーマ設定を{{set}}に設定しました。",
-    "lang_setting_compat": "互換テーマ",
    "lang_setting_nsfw": "画像表示設定を{{set}}に設定しました。",
    "lang_setting_cw": "テキスト表示設定を{{set}}に設定しました。",
    "lang_setting_cwtext": "デフォルトの警告文を「{{set}}」に設定しました。",
--- a/app/view/make/language/ja/setting.json
+++ b/app/view/make/language/ja/setting.json
@@ -24,11 +24,10 @@
  "nativenotf": "ネイティブ通知設定",
  "nnwarn": "Portableバージョンでは表示できません。",
  "nntest": "通知テスト",
-  "width": "カラムの横幅",
-  "widthwarn": "画面全体の横幅÷カラム数がこの値を超えた時、横スクロールとなります。",
+  "minwidth": "マルチカラムの最低横幅",
+  "minwidthwarn": "画面全体の横幅÷コラム数がこの値を超えた時、横スクロールとなります。",
  "fixwidth": "TweetDeckの限定の最低横幅",
  "fixwidthwarn": "",
-  "margin": "TL間のマージン",
  "above": "以上",
  "font": "フォント",
  "fontwarn": "「選択」を押してフォントを選んでください。(Linuxでは動かない場合があります。)",
@@ -44,26 +43,19 @@
  "srcUrl": "検索エンジン",
  "srcUrlWarn": "{q}が検索文字列に置換されます。",
  "themeSel": "テーマの選択",
-  "customtheme": "テーマの作成・編集",
+  "customtheme": "カスタムテーマの作成・編集",
  "customthemeDirection": "色の系統",
-  "advanced":"拡張項目を開く",
-  "advancedWarn":"",
-  "use": "使用",
-  "copyFrom": "設定をコピー",
-  "bg": "全体の背景色など",
-  "subcolor":"各要素に使われる背景と区別できる色",
+  "advanced":"拡張項目(6つ)を開く",
+  "advancedWarn":"拡張項目は設定しないと「指定なし」に、基本3項目は白(fff)になります。拡張項目を閉じた状態で「変更」すると拡張項目はすべてリセットされます。",
+  "primary": "全体の背景色など",
+  "secondarycolor": "補助要素に使われる背景色",
  "text": "テキストの色",
  "accent": "ブーストの背景色など",
-  "modal": "モーダルウィンドウの背景色",
-  "modalFooter": "モーダルウィンドウのフッターの背景色",
-  "thirdColor": "タブボタンの背景色等(ほぼ背景色)",
-  "forthColor": "リアクションボタンやタイトルバーの色等(背景色と同系)",
-  "bottom":"下のメニューバーの背景色",
-  "emphasized": "強調されたトゥートの背景色",
-  "postbox":"投稿ボックスやメニューの色",
  "active": "CWボタンやメニュー選択時の背景色",
-  "selected": "矢印キーでトゥートを選択したときの背景色",
-  "selectedWithShare": "矢印キーでBTされたトゥートを選択したときの背景色",
+  "modal": "モーダルウィンドウの背景色",
+  "bottom":"下のメニューバーの背景色",
+  "postbox":"投稿ボックスやメニューの色",
+  "subcolor":"背景に準ずる色",
  "add_new": "新規作成",
  "name": "名前",
  "desc": "説明",
@@ -109,8 +101,8 @@
  "or": "または",
  "imgheight": "画像の高さ",
  "imgheightwarn": "オプション:「full」と指定すると全ての画像をクロップしません。",
-  "ticker": "OpenStickerを使う",
-  "tickerwarn": "そのトゥートの発信者のサーバー名やFaviconを表示します。<a href=\"https://opensticker.0px.io\">OpenStickerについて</a>",
+  "ticker": "#InstanceTickerを使う",
+  "tickerwarn": "トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">#InstanceTickerについて</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
  "animation": "タイムラインのアニメーション",
  "markers": "ホームと通知の未読管理",
  "markerswarn": "Mastodon 3.0相当以上。WebUIと対応クライアントで共有されます。",
--- a/app/view/make/make.js
+++ b/app/view/make/make.js
@@ -16,12 +16,8 @@ var pwa = false
 if (process.argv.indexOf('--pwa') > 0) {
 	var pwa = true
 }
-var store = false
-if (process.argv.indexOf('--store') > 0) {
-	var store = true
-}

-function main(ver, basefile, pwa, store) {
+function main(ver, basefile, pwa) {
 	const execSync = require('child_process').execSync
 	let gitHash = execSync('git rev-parse HEAD')
 		.toString()
@@ -62,7 +58,7 @@ function main(ver, basefile, pwa, store) {
 			langstr +
 			'<a onclick="changelang(\'' +
 			lang +
-			'\')" class="pointer" style="margin:4px;border: 1px solid var(--text); padding: 3px">' +
+			'\')" class="pointer" style="margin:4px;border: 1px solid var(--color); padding: 3px">' +
 			langsh[n] +
 			'</a>'
 		let mainJson = JSON.parse(
@@ -148,7 +144,7 @@ function main(ver, basefile, pwa, store) {
 			source = source.replace(/@@lang@@/g, lang)
 			source = source.replace(/@@langlist@@/g, langstr)
 			if(pwa) {
-				source = source.replace(/@@pwa@@/g, `<link rel="manifest" href="../../manifest.json" />
+				source = source.replace(/@@pwa@@/g, `<link rel="manifest" href="/manifest.json" />
 				<script>var pwa = true;"serviceWorker"in navigator&&navigator.serviceWorker.register("/sw.pwa.js").then(e=>{});</script>`)
 				source = source.replace(/@@node_base@@/g, 'dependencies')
 				source = source.replace(/@@pwaClass@@/g, 'pwaView')
@@ -157,16 +153,11 @@ function main(ver, basefile, pwa, store) {
 				source = source.replace(/@@node_base@@/g, 'node_modules')
 				source = source.replace(/@@pwaClass@@/g, '')
 			}
-			if (store) {
-				source = source.replace(/@@store@@/g, '<script>var store = true;</script>')
-			} else {
-				source = source.replace(/@@store@@/g, '<script>var store = false;</script>')
-			}
 			fs.writeFileSync(basefile + 'view/' + lang + '/' + pages[i], source)
 		}
 	}
 }
-main(ver, basefile, pwa, store)
+main(ver, basefile, pwa)

 //if --watch, to yarn dev
 if (process.argv.indexOf('--watch') !== -1) {
--- a/app/view/make/setting.sample.html
+++ b/app/view/make/setting.sample.html
@@ -25,13 +25,11 @@
 		.pcr-result {
 			height: 1rem !important;
 		}
-
 		.container-after-titlebar {
 			padding: 20px;
 		}
 	</style>
 	@@pwa@@
-	@@store@@
 </head>

 <body id="mainView" style="overflow-y:scroll" class="@@pwaClass@@">
@@ -39,7 +37,7 @@
 	<script type="text/javascript" src="../../js/platform/first.js"></script>
 	<script type="text/javascript" src="../../@@node_base@@/materialize-css/dist/js/materialize.js"></script>
 	<script type="text/javascript" src="main.js"></script>
-	<script src="../../@@node_base@@/json5/dist/index.min.js"></script>
+	<script src="../../@@node_base@@/json5/dist/index.min.js"></script> 
 	<script src="../../@@node_base@@/vue/dist/vue.min.js"></script>
 	<script type="text/javascript" src="setting.vue.js"></script>
 	<script type="text/javascript" src="../../@@node_base@@/sweetalert2/dist/sweetalert2.all.min.js"></script>
@@ -59,8 +57,8 @@
 					style="width:100%; max-width:15rem;">@@export@@</button>
 				<button onclick="importSettings()" class="btn waves-effect cyan darken-3"
 					style="width:100%; max-width:15rem;">@@import@@</button><br>
-				@@backupWarn@@<br>
-				<input type="text" id="imp-exp" style="width: 22rem">
+					@@backupWarn@@<br>
+					<input type="text" id="imp-exp" style="width: 22rem">
 				<div id="envView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
@@ -108,12 +106,50 @@
 				<br>
 			</div>
 		</li>
-		<li class="pwa">
+		<li>
 			<div class="collapsible-header">
 				<i class="material-icons">color_lens</i>@@theme@@
 			</div>
 			<div class="collapsible-body">
 				<h4>@@themeSel@@</h4>
+				<label>
+					<input class="with-gap" onchange="settings()" name="theme" type="radio" id="black" value="black" />
+					<span data-ct="black">Black</span>
+				</label>
+				<label>
+					<input class="with-gap" onchange="settings()" name="theme" type="radio" id="white" value="white" />
+					<span data-ct="white">White</span>
+				</label>
+				<label>
+					<input class="with-gap" onchange="settings()" name="theme" type="radio" id="indigo"
+						value="indigo" />
+					<span data-ct="indigo">Indigo<span class="imas hide">(エンドレスナイト)</span></span>
+				</label>
+				<label>
+					<input class="with-gap" onchange="settings()" name="theme" type="radio" id="brown" value="brown" />
+					<span data-ct="brown">Brown<span class="imas hide">(ビタースイート・タイム)</span></span>
+				</label>
+				<label>
+					<input class="with-gap" onchange="settings()" name="theme" type="radio" id="green" value="green" />
+					<span data-ct="green">Green<span class="imas hide">(ユースフルロマンス)</span></span>
+				</label>
+				<label>
+					<input class="with-gap" onchange="settings()" name="theme" type="radio" id="blue" value="blue" />
+					<span data-ct="blue">Blue<span class="imas hide">(渚の花嫁)</span></span>
+				</label>
+				<label>
+					<input class="with-gap" onchange="settings()" name="theme" type="radio" id="polar" value="polar" />
+					<span data-ct="polar">Polar Night<span class="imas hide">(ひみつの小夜曲)</span></span>
+				</label>
+				<label>
+					<input class="with-gap" onchange="settings()" name="theme" type="radio" id="snow" value="snow" />
+					<span data-ct="snow">Snow Storm<span class="imas hide">(極光のしらべ)</span></span>
+				</label>
+				<label>
+					<input class="with-gap" onchange="settings()" name="theme" type="radio" id="custom"
+						value="custom" />
+					<span data-ct="custom">custom</span>
+				</label>
 				<div style="width:22rem" id="sel-selector">
 					<select id="custom-sel-sel" class="custom-sel" onchange="customSel()"></select>
 				</div>
@@ -138,150 +174,74 @@
 					<input class="with-gap" onchange="settings()" name="direction" type="radio" id="light"
 						value="light" />
 					<span>Light</span>
-				</label><br><br />
+				</label><br>
 				<button class="btn waves-effect" onclick="advanced()">@@advanced@@</button>
 				<span class="advanced hide">@@advancedWarn@@</span>
 				<div id="pickers">
 					<div>
-						<h5>Background</h5>@@bg@@<br />
-						<label>
-							<input type="checkbox" class="filled-in" id="use-color_0" value="1" checked disabled />
-							<span>@@use@@</span>
-						</label><br />
-						<input type="color" id="color-picker0_value">
+						<h5>Primary</h5>@@secondarycolor@@
+						<div id="color-picker0-wrap">
+							<div class="color-picker" id="color-picker0"></div>
+						</div>
+						<input type="hidden" id="color-picker0_value">
 					</div>
 					<div>
-						<h5>Text</h5>@@text@@<br />
-						<label>
-							<input type="checkbox" class="filled-in" id="use-color_1" value="1" checked disabled />
-							<span>@@use@@</span>
-						</label><br />
-						<input type="color"  id="color-picker1_value">
+						<h5>Secondary</h5>@@primary@@
+						<div id="color-picker1-wrap">
+							<div class="color-picker" id="color-picker1"></div>
+						</div>
+						<input type="hidden" id="color-picker1_value">
 					</div>
 					<div>
-						<h5>Subcolor</h5>@@subcolor@@<br />
-						<label>
-							<input type="checkbox" class="filled-in" id="use-color_2" value="1" checked disabled />
-							<span>@@use@@</span>
-						</label><br />
-						<input type="color"  id="color-picker2_value">
-					</div>
-					<div>
-						<h5>Accent</h5>@@accent@@<br />
-						<label>
-							<input type="checkbox" class="filled-in" id="use-color_3" value="1" checked disabled />
-							<span>@@use@@</span>
-						</label><br />
-						<input type="color"  id="color-picker3_value">
-					</div>
-
-					<div class="advanced hide">
-						<h5>Modal</h5>@@modal@@<br />
-						<label>
-							<input type="checkbox" class="filled-in" id="use-color_4" value="1" />
-							<span>@@use@@</span>
-						</label><br />
-						@@copyFrom@@:
-							<a class="pointer" onclick="copyColor('background','modal')">Background</a>
-						<br />
-						<input type="color"  id="color-picker4_value">
+						<h5>Texts</h5>@@text@@
+						<div id="color-picker2-wrap">
+							<div class="color-picker" id="color-picker2"></div>
+						</div>
+						<input type="hidden" id="color-picker2_value">
 					</div>
 					<div class="advanced hide">
-						<h5>Modal Footer</h5>@@modalFooter@@<br />
-						<label>
-							<input type="checkbox" class="filled-in" id="use-color_5" value="1" />
-							<span>@@use@@</span>
-						</label><br />
-						@@copyFrom@@:
-							<a class="pointer" onclick="copyColor('background','modalFooter')">Background</a>/
-							<a class="pointer" onclick="copyColor('modal','modalFooter')">Modal</a>
-						<br />
-						<input type="color"  id="color-picker5_value">
+						<h5>Accent</h5>@@accent@@
+						<div id="color-picker3-wrap">
+							<div class="color-picker" id="color-picker3"></div>
+						</div>
+						<input type="hidden" id="color-picker3_value">
 					</div>
 					<div class="advanced hide">
-						<h5>3rd Color</h5>@@thirdColor@@<br />
-						<label>
-							<input type="checkbox" class="filled-in" id="use-color_6" value="1" />
-							<span>@@use@@</span>
-						</label><br />
-						@@copyFrom@@:
-							<a class="pointer" onclick="copyColor('subcolor','third')">Subcolor</a>
-						<br />
-						<input type="color"  id="color-picker6_value">
+						<h5>Active</h5>@@active@@
+						<div id="color-picker4-wrap">
+							<div class="color-picker" id="color-picker4"></div>
+						</div>
+						<input type="hidden" id="color-picker4_value">
 					</div>
 					<div class="advanced hide">
-						<h5>4th Color</h5>@@forthColor@@<br />
-						<label>
-							<input type="checkbox" class="filled-in" id="use-color_7" value="1" />
-							<span>@@use@@</span>
-						</label><br />
-						@@copyFrom@@:
-							<a class="pointer" onclick="copyColor('subcolor','forth')">Subcolor</a>/
-							<a class="pointer" onclick="copyColor('third','forth')">3rd Color</a>
-						<br />
-						<input type="color"  id="color-picker7_value">
+						<h5>Modal</h5>@@modal@@
+						<div id="color-picker5-wrap">
+							<div class="color-picker" id="color-picker5"></div>
+						</div>
+						<input type="hidden" id="color-picker5_value">
 					</div>
 					<div class="advanced hide">
-						<h5>Bottom</h5>@@bottom@@<br />
-						<label>
-							<input type="checkbox" class="filled-in" id="use-color_8" value="1" />
-							<span>@@use@@</span>
-						</label><br />
-						@@copyFrom@@:
-							<a class="pointer" onclick="copyColor('subcolor','bottom')">Subcolor</a>
-						<br />
-						<input type="color"  id="color-picker8_value">
+						<h5>Bottom</h5>@@bottom@@
+						<div id="color-picker6-wrap">
+							<div class="color-picker" id="color-picker6"></div>
+						</div>
+						<input type="hidden" id="color-picker6_value">
 					</div>
 					<div class="advanced hide">
-						<h5>2nd Accent</h5>@@emphasized@@<br />
-						<label>
-							<input type="checkbox" class="filled-in" id="use-color_9" value="1" />
-							<span>@@use@@</span>
-						</label><br />
-						@@copyFrom@@:
-							<a class="pointer" onclick="copyColor('accent','emphasized')">Accent</a>
-						<br />
-						<input type="color"  id="color-picker9_value">
+						<h5>Postbox</h5>@@postbox@@
+						<div id="color-picker7-wrap">
+							<div class="color-picker" id="color-picker7"></div>
+						</div>
+						<input type="hidden" id="color-picker7_value">
 					</div>
 					<div class="advanced hide">
-						<h5>Postbox</h5>@@postbox@@<br />
-						<label>
-							<input type="checkbox" class="filled-in" id="use-color_10" value="1" />
-							<span>@@use@@</span>
-						</label><br />
-						@@copyFrom@@:
-							<a class="pointer" onclick="copyColor('subcolor','postbox')">Subcolor</a>
-						<br />
-						<input type="color"  id="color-picker10_value">
+						<h5>Subcolor</h5>@@subcolor@@
+						<div id="color-picker8-wrap">
+							<div class="color-picker" id="color-picker8"></div>
+						</div>
+						<input type="hidden" id="color-picker8_value">
 					</div>
-					<div class="advanced hide">
-						<h5>Active</h5>@@active@@<br />
-						<label>
-							<input type="checkbox" class="filled-in" id="use-color_11" value="1" />
-							<span>@@use@@</span>
-						</label><br />
-						@@copyFrom@@:
-							<a class="pointer" onclick="copyColor('accent','active')">Accent</a>
-						<br />
-						<input type="color"  id="color-picker11_value">
-					</div>
-					<div class="advanced hide">
-						<h5>Selected</h5>@@selected@@<br />
-						<label>
-							<input type="checkbox" class="filled-in" id="use-color_12" value="1" />
-							<span>@@use@@</span>
-						</label><br />
-						<input type="color"  id="color-picker12_value">
-					</div>
-					<div class="advanced hide">
-						<h5>Selected with shared</h5>@@selectedWithShare@@<br />
-						<label>
-							<input type="checkbox" class="filled-in" id="use-color_13" value="1" />
-							<span>@@use@@</span>
-						</label><br />
-						<input type="color"  id="color-picker13_value">
-					</div>
-				</div><br /><br />
+				</div>
 				<button class="btn-large waves-effect" onclick="customComp()">@@change@@</button>&nbsp;<button
 					class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">@@delete@@</button><br><br>
 				<input type="text" style="width:22rem;height:40px;" id="custom_json" class="materialize-textarea"
@@ -483,15 +443,15 @@
 			</div>
 			<div class="collapsible-body">
 				<h5>@@bouyomi@@</h5>
-				@@bouyomiWarn@@<a href="https://github.com/xztaityozx/BouyomiChan-WebSocket-Plugin"
-					target="_blank">GitHub</a><br>
+				@@bouyomiWarn@@<a href="https://github.com/xztaityozx/BouyomiChan-WebSocket-Plugin" target="_blank">GitHub</a><br>
 				<label>
 					<input class="with-gap" onchange="voiceSettings()" name="bym" type="radio" id="bym_yes"
 						value="yes" />
 					<span>@@yes@@</span>
 				</label>
 				<label>
-					<input class="with-gap" onchange="voiceSettings()" name="bym" type="radio" id="bym_no" value="no" />
+					<input class="with-gap" onchange="voiceSettings()" name="bym" type="radio" id="bym_no"
+						value="no" />
 					<span>@@no@@</span>
 				</label>
 				<h5>@@speed@@</h5>
@@ -574,19 +534,16 @@
 		style="width:100%; max-width:40rem;"><img src="../../img/desk_full.svg" class="left" width="25"
 			style="padding-top:5px;">Main author: Cutls@cutls.com</a>
 	<br>
-	TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/@@gitHash@@">@@gitHash@@</a> - <a
-		onclick="checkupd(); return localStorage.removeItem('new-ver-skip'); location.href='index.html';"
-		class="pointer pwa">@@checkup@@</a><br>
+	TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/@@gitHash@@">@@gitHash@@</a> - <a onclick="checkupd(); return localStorage.removeItem('new-ver-skip'); location.href='index.html';"
+	class="pointer pwa">@@checkup@@</a><br>
 	<br>
 	Kyash<br>
 	<img src="../../img/kyash.png" width="100"><br>
-	<a href="https://status.cutls.com/">
-		<img src="https://status.cutls.com/badge-service?site=thedesk.top">
-	</a><br>
-	<h5>OSS License@@ossJP@@</h5>
-	<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fcutls%2FTheDesk/refs/branch/master/@@gitHash@@"
-		alt="FOSSA Status"><img
-			src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fcutls%2FTheDesk.svg?type=small" /></a>
+		<a href="https://status.cutls.com/">
+			<img src="https://status.cutls.com/badge-service?site=thedesk.top">
+		</a><br>
+		<h5>OSS License@@ossJP@@</h5>
+		<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fcutls%2FTheDesk/refs/branch/master/@@gitHash@@" alt="FOSSA Status"><img src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fcutls%2FTheDesk.svg?type=small"/></a>
 	<br>
 	<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018
 		Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a
--- a/app/view/make/setting.sample.js
+++ b/app/view/make/setting.sample.js
@@ -60,40 +60,16 @@ var envConstruction = [
 		}
 	},
 	{
-		checkbox: false,
-		doubleText: true,
-		data: [
-			{
-				id: 'width',
-				storage: 'width',
-				width: 50,
-				setValue: 300,
-				text: { after: 'px ~ ' }
-			},
-			{
-				id: 'maxWidth',
-				storage: 'max-width',
-				width: 50,
-				setValue: 600,
-				text: { after: 'px' }
-			}
-		],
-		text: {
-			head: '@@width@@',
-			desc: '@@widthwarn@@'
-		}
-	},
-	{
-		id: 'margin',
-		storage: 'margin',
+		id: 'width',
+		storage: 'width',
 		checkbox: false,
 		doubleText: false,
-		setValue: 0,
 		width: 50,
+		setValue: 300,
 		text: {
-			head: '@@margin@@',
-			desc: '',
-			after: 'px'
+			head: '@@minwidth@@',
+			desc: '@@minwidthwarn@@',
+			after: 'px @@above@@'
 		}
 	},
 	{
--- a/app/view/make/update.sample.html
+++ b/app/view/make/update.sample.html
@@ -86,7 +86,7 @@
 		<i class="material-icons pointer waves-effect" onclick="about();">info</i>
 		<i class="material-icons pointer waves-effect" onclick="skipper();">clear</i>
 		<!--a href="update.html">Reload</a-->
-		<div id="start" style="filter: brightness(100%)">
+		<div id="start">
 			<div id="box" class="show">
 				<h2>TheDesk</h2>
 				<p>@@updatehere@@</p>
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -7,27 +7,6 @@
  resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f"
  integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA==

-"@babel/code-frame@^7.0.0":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
-  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
-"@babel/helper-validator-identifier@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
-  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
-
-"@babel/highlight@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
-  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
 "@babel/runtime@^7.7.2":
  version "7.8.4"
  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308"
@@ -58,10 +37,10 @@
    global-agent "^2.0.2"
    global-tunnel-ng "^2.7.1"

-"@fortawesome/fontawesome-free@^5.14.0":
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.14.0.tgz#a371e91029ebf265015e64f81bfbf7d228c9681f"
-  integrity sha512-OfdMsF+ZQgdKHP9jUbmDcRrP0eX90XXrsXIdyjLbkmSBzmMXPABB8eobUJtivaupucYaByz6WNe1PI1JuYm3qA==
+"@fortawesome/fontawesome-free@^5.13.1":
+  version "5.13.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.13.1.tgz#c53b4066edae16cd1fd669f687baf031b45fb9d6"
+  integrity sha512-D819f34FLHeBN/4xvw0HR0u7U2G7RqjPSggXqf7LktsxWQ48VAfGwvMrhcVuaZV2fF069c/619RdgCCms0DHhw==

 "@jimp/bmp@^0.14.0":
  version "0.14.0"
@@ -409,31 +388,11 @@ abbrev@1:
  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==

-acorn-jsx@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
-  integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
-
-acorn@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"
-  integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==
-
 ajv-keywords@^3.4.1:
  version "3.4.1"
  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
  integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==

-ajv@^6.10.0, ajv@^6.10.2:
-  version "6.12.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
-  integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 ajv@^6.12.0:
  version "6.12.0"
  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
@@ -461,11 +420,6 @@ ansi-align@^3.0.0:
  dependencies:
    string-width "^3.0.0"

-ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
 ansi-regex@^2.0.0:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -579,11 +533,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=

-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-
 async-exit-hook@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"
@@ -763,11 +712,6 @@ cacheable-request@^6.0.0:
    normalize-url "^4.1.0"
    responselike "^1.0.2"

-callsites@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
-  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-
 camelcase@^5.0.0, camelcase@^5.3.1:
  version "5.3.1"
  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
@@ -778,7 +722,7 @@ caseless@~0.12.0:
  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=

-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.2:
+chalk@^2.0.1, chalk@^2.4.2:
  version "2.4.2"
  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -803,10 +747,10 @@ chalk@^4.0.0:
    ansi-styles "^4.1.0"
    supports-color "^7.1.0"

-chokidar@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.1.tgz#e905bdecf10eaa0a0b1db0c664481cc4cbc22ba1"
-  integrity sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==
+chokidar@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
+  integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==
  dependencies:
    anymatch "~3.1.1"
    braces "~3.0.2"
@@ -976,24 +920,15 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=

-cross-spawn@^7.0.2:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
 crypto-random-string@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==

-custom-electron-titlebar@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/custom-electron-titlebar/-/custom-electron-titlebar-3.2.3.tgz#41da10b97958639e96a04275051bb5f78a666fc3"
-  integrity sha512-7DIZELlDoiAKT+i73XF9EG778M3/SYMmGa867cn3d0mLEEXDtEJq9sqM/u57vrtjolXKJ5ZJQ9hCCL2uxx9nxQ==
+custom-electron-titlebar@^3.2.2-hotfix62:
+  version "3.2.2-hotfix62"
+  resolved "https://registry.yarnpkg.com/custom-electron-titlebar/-/custom-electron-titlebar-3.2.2-hotfix62.tgz#94b908f0f2bf812e4f65447a26b93b88f7a76088"
+  integrity sha512-Kh86xAolkCpqj4AD/H4HcR2pEtxUyIHzMzqwkxqZkSqE7R9tRfN8G3fVpiiNIAJlX8rbN3VwxaoHi1B1sSMn/Q==

 dashdash@^1.12.0:
  version "1.14.1"
@@ -1009,7 +944,7 @@ debug@2.6.9, debug@^2.5.1:
  dependencies:
    ms "2.0.0"

-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+debug@^4.1.0, debug@^4.1.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -1040,11 +975,6 @@ deep-extend@^0.6.0:
  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==

-deep-is@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
-
 defaults@^1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
@@ -1096,13 +1026,6 @@ dmg-builder@22.7.0:
    js-yaml "^3.14.0"
    sanitize-filename "^1.6.3"

-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
 dom-walk@^0.1.0:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
@@ -1203,10 +1126,10 @@ electron-rebuild@^1.11.0:
    spawn-rx "^3.0.0"
    yargs "^14.2.0"

-electron@^9.1.1:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-9.1.1.tgz#d52c9873be4113287c3eb2b02f85bad6644b100e"
-  integrity sha512-BYvroBLV9x7G4iN33P/IxeZqwjl62/9VuBAF1CoM0m6OeheaiLog1ZMKLlCqVXycJvvrAvLHc454DDEmwnqqhA==
+electron@^9.0.5:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-9.0.5.tgz#189ee117cc2a2777cccf40fae0766acec5faae57"
+  integrity sha512-bnL9H48LuQ250DML8xUscsKiuSu+xv5umXbpBXYJ0BfvYVmFfNbG3jCfhrsH7aP6UcQKVxOG1R/oQExd0EFneQ==
  dependencies:
    "@electron/get" "^1.0.1"
    "@types/node" "^12.0.12"
@@ -1234,13 +1157,6 @@ end-of-stream@^1.1.0:
  dependencies:
    once "^1.4.0"

-enquirer@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
-  dependencies:
-    ansi-colors "^4.1.1"
-
 env-paths@^2.2.0:
  version "2.2.0"
  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
@@ -1291,111 +1207,11 @@ escape-string-regexp@^2.0.0:
  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==

-eslint-scope@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5"
-  integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
-eslint-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
-eslint@^7.6.0:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.6.0.tgz#522d67cfaea09724d96949c70e7a0550614d64d6"
-  integrity sha512-QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    ajv "^6.10.0"
-    chalk "^4.0.0"
-    cross-spawn "^7.0.2"
-    debug "^4.0.1"
-    doctrine "^3.0.0"
-    enquirer "^2.3.5"
-    eslint-scope "^5.1.0"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^1.3.0"
-    espree "^7.2.0"
-    esquery "^1.2.0"
-    esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.0.0"
-    globals "^12.1.0"
-    ignore "^4.0.6"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    is-glob "^4.0.0"
-    js-yaml "^3.13.1"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
-    lodash "^4.17.19"
-    minimatch "^3.0.4"
-    natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    progress "^2.0.0"
-    regexpp "^3.1.0"
-    semver "^7.2.1"
-    strip-ansi "^6.0.0"
-    strip-json-comments "^3.1.0"
-    table "^5.2.3"
-    text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
-
-espree@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.2.0.tgz#1c263d5b513dbad0ac30c4991b93ac354e948d69"
-  integrity sha512-H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g==
-  dependencies:
-    acorn "^7.3.1"
-    acorn-jsx "^5.2.0"
-    eslint-visitor-keys "^1.3.0"
-
 esprima@^4.0.0:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==

-esquery@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
-  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
-  dependencies:
-    estraverse "^5.1.0"
-
-esrecurse@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
-  dependencies:
-    estraverse "^4.1.0"
-
-estraverse@^4.1.0, estraverse@^4.1.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
-estraverse@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
-  integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
-
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
-  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-
 exif-parser@^0.1.12:
  version "0.1.12"
  resolved "https://registry.yarnpkg.com/exif-parser/-/exif-parser-0.1.12.tgz#58a9d2d72c02c1f6f02a0ef4a9166272b7760922"
@@ -1456,11 +1272,6 @@ fast-json-stable-stringify@^2.0.0:
  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=

-fast-levenshtein@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
-
 fd-slicer@~1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
@@ -1468,13 +1279,6 @@ fd-slicer@~1.0.1:
  dependencies:
    pend "~1.2.0"

-file-entry-cache@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
-  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
-  dependencies:
-    flat-cache "^2.0.1"
-
 file-type@^9.0.0:
  version "9.0.0"
  resolved "https://registry.yarnpkg.com/file-type/-/file-type-9.0.0.tgz#a68d5ad07f486414dfb2c8866f73161946714a18"
@@ -1509,20 +1313,6 @@ find-up@^4.1.0:
    locate-path "^5.0.0"
    path-exists "^4.0.0"

-flat-cache@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
-  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
-  dependencies:
-    flatted "^2.0.0"
-    rimraf "2.6.3"
-    write "1.0.3"
-
-flatted@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
-  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
-
 for-each@^0.3.3:
  version "0.3.3"
  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
@@ -1585,11 +1375,6 @@ function-bind@^1.1.1:
  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==

-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-
 gauge@~2.7.3:
  version "2.7.4"
  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -1638,13 +1423,6 @@ gifwrap@^0.9.2:
    image-q "^1.1.1"
    omggif "^1.0.10"

-glob-parent@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
-  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
-  dependencies:
-    is-glob "^4.0.1"
-
 glob-parent@~5.1.0:
  version "5.1.0"
  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
@@ -1702,13 +1480,6 @@ global@~4.3.0:
    min-document "^2.19.0"
    process "~0.5.1"

-globals@^12.1.0:
-  version "12.4.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
-  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
-  dependencies:
-    type-fest "^0.8.1"
-
 globalthis@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.0.tgz#c5fb98213a9b4595f59cf3e7074f141b4169daae"
@@ -1828,24 +1599,11 @@ ieee754@^1.1.4:
  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==

-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
 image-q@^1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/image-q/-/image-q-1.1.1.tgz#fc84099664460b90ca862d9300b6bfbbbfbf8056"
  integrity sha1-/IQJlmRGC5DKhi2TALa/u7+/gFY=

-import-fresh@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
-  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
 import-lazy@^2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
@@ -1925,7 +1683,7 @@ is-function@^1.0.1:
  resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"
  integrity sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=

-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
+is-glob@^4.0.1, is-glob@~4.0.1:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
@@ -2050,11 +1808,6 @@ jquery@^3.5.1:
  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
  integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==

-js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
 js-yaml@^3.13.1:
  version "3.13.1"
  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
@@ -2091,11 +1844,6 @@ json-schema@0.2.3:
  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=

-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
-
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
  version "5.0.1"
  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -2153,14 +1901,6 @@ lazy-val@^1.0.4:
  resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65"
  integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==

-levn@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
-  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
-  dependencies:
-    prelude-ls "^1.2.1"
-    type-check "~0.4.0"
-
 load-bmfont@^1.3.1, load-bmfont@^1.4.0:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/load-bmfont/-/load-bmfont-1.4.0.tgz#75f17070b14a8c785fe7f5bee2e6fd4f98093b6b"
@@ -2195,10 +1935,10 @@ lodash.assign@^4.2.0:
  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=

-lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.19:
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
-  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
+lodash@^4.17.10, lodash@^4.17.15:
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==

 log-symbols@^2.2.0:
  version "2.2.0"
@@ -2240,7 +1980,7 @@ matcher@^2.0.0:

 "materialize-css@git://github.com/cutls/materialize#v1-dev":
  version "1.0.0"
-  resolved "git://github.com/cutls/materialize#e92efb770c6f17197b12b9af14b388f1454b5b4d"
+  resolved "git://github.com/cutls/materialize#e7fedb112cc28af96cc0119bccf3f8c13c4a98a6"
  dependencies:
    grapheme-splitter "^1.0.4"

@@ -2337,11 +2077,6 @@ ms@2.1.2, ms@^2.1.1:
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==

-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
-
 node-abi@^2.11.0:
  version "2.12.0"
  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.12.0.tgz#40e9cfabdda1837863fa825e7dfa0b15686adf6f"
@@ -2464,18 +2199,6 @@ onetime@^2.0.0:
  dependencies:
    mimic-fn "^1.0.0"

-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
-  dependencies:
-    deep-is "^0.1.3"
-    fast-levenshtein "^2.0.6"
-    levn "^0.4.1"
-    prelude-ls "^1.2.1"
-    type-check "^0.4.0"
-    word-wrap "^1.2.3"
-
 ora@^3.4.0:
  version "3.4.0"
  resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318"
@@ -2559,13 +2282,6 @@ pako@^1.0.5:
  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==

-parent-module@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
-  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
-  dependencies:
-    callsites "^3.0.0"
-
 parse-bmfont-ascii@^1.0.3:
  version "1.0.6"
  resolved "https://registry.yarnpkg.com/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz#11ac3c3ff58f7c2020ab22769079108d4dfa0285"
@@ -2607,11 +2323,6 @@ path-is-absolute@^1.0.0:
  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=

-path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
 path-parse@^1.0.6:
  version "1.0.6"
  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
@@ -2659,11 +2370,6 @@ pngjs@^3.0.0, pngjs@^3.3.3:
  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
  integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==

-prelude-ls@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
-  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
-
 prepend-http@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
@@ -2679,11 +2385,6 @@ process@~0.5.1:
  resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
  integrity sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=

-progress@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-
 proto-list@~1.2.1:
  version "1.2.4"
  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
@@ -2785,11 +2486,6 @@ regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.3:
  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
  integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==

-regexpp@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
-  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
-
 registry-auth-token@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.0.0.tgz#30e55961eec77379da551ea5c4cf43cbf03522be"
@@ -2841,11 +2537,6 @@ require-main-filename@^2.0.0:
  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==

-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
 resolve@^1.10.0:
  version "1.12.0"
  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
@@ -2868,13 +2559,6 @@ restore-cursor@^2.0.0:
    onetime "^2.0.0"
    signal-exit "^3.0.2"

-rimraf@2.6.3:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^2.6.3:
  version "2.7.1"
  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -2950,7 +2634,7 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==

-semver@^7.2.1, semver@^7.3.2:
+semver@^7.3.2:
  version "7.3.2"
  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
@@ -2967,32 +2651,11 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=

-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
 signal-exit@^3.0.0, signal-exit@^3.0.2:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=

-slice-ansi@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
-  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
-  dependencies:
-    ansi-styles "^3.2.0"
-    astral-regex "^1.0.0"
-    is-fullwidth-code-point "^2.0.0"
-
 sort-keys-length@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188"
@@ -3180,11 +2843,6 @@ strip-ansi@^6.0.0:
  dependencies:
    ansi-regex "^5.0.0"

-strip-json-comments@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
-  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
-
 strip-json-comments@~2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -3211,10 +2869,10 @@ supports-color@^7.1.0:
  dependencies:
    has-flag "^4.0.0"

-sweetalert2@^9.17.0:
-  version "9.17.0"
-  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-9.17.0.tgz#9ea457f3c44295a3629ed5998fee6a51940c3891"
-  integrity sha512-tOby96N1FlTT8Xi7Y7QlTiswNJTySgghmRSyFwb3pO3zdrhsR2PUp4ucmye7a3CTLbLdqjHdszsGlCJ0v6pGaQ==
+sweetalert2@^9.15.2:
+  version "9.15.2"
+  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-9.15.2.tgz#d26f1e6dee91d9ff57b3b98b3d92a0d6c3fa6fc1"
+  integrity sha512-evJfoa49s5ZzSmVc62tslNkzlQoCg2GHjB3MQxawfESppvY5AlXKLGQ3nNKxHXKdodKmIHbkl39DgUhcOK7LgQ==

 system-font-families@^0.4.1:
  version "0.4.1"
@@ -3224,16 +2882,6 @@ system-font-families@^0.4.1:
    babel-polyfill "^6.23.0"
    ttfinfo "https://github.com/rBurgett/ttfinfo.git"

-table@^5.2.3:
-  version "5.4.6"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
-  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
-  dependencies:
-    ajv "^6.10.2"
-    lodash "^4.17.14"
-    slice-ansi "^2.1.0"
-    string-width "^3.0.0"
-
 tar@^4.4.12:
  version "4.4.13"
  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
@@ -3260,11 +2908,6 @@ term-size@^2.1.0:
  resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz#1f16adedfe9bdc18800e1776821734086fcc6753"
  integrity sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==

-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
-
 timm@^1.6.1:
  version "1.6.2"
  resolved "https://registry.yarnpkg.com/timm/-/timm-1.6.2.tgz#dfd8c6719f7ba1fcfc6295a32670a1c6d166c0bd"
@@ -3328,13 +2971,6 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=

-type-check@^0.4.0, type-check@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
-  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
-  dependencies:
-    prelude-ls "^1.2.1"
-
 type-fest@^0.8.0, type-fest@^0.8.1:
  version "0.8.1"
  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
@@ -3440,11 +3076,6 @@ uuid@^3.3.2:
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
  integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==

-v8-compile-cache@^2.0.3:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
-  integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
-
 validate-npm-package-license@^3.0.1:
  version "3.0.4"
  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -3486,13 +3117,6 @@ which@^1.3.1:
  dependencies:
    isexe "^2.0.0"

-which@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
 wide-align@^1.1.0:
  version "1.1.3"
  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
@@ -3507,11 +3131,6 @@ widest-line@^3.1.0:
  dependencies:
    string-width "^4.0.0"

-word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-
 wrap-ansi@^5.1.0:
  version "5.1.0"
  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
@@ -3545,13 +3164,6 @@ write-file-atomic@^3.0.0:
    signal-exit "^3.0.2"
    typedarray-to-buffer "^3.1.5"

-write@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
-  dependencies:
-    mkdirp "^0.5.1"
-
 xdg-basedir@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
Author	SHA1	Message	Date
cutls	0bf3f69a28	initial	2020-07-09 17:03:22 +09:00
cutls	414782fd71	Introduce: remove Materialize JS	2020-07-05 19:45:21 +09:00