WIP: use-strict 'login'

WIP: use-strict
Merge branch 'master' into use-strict
2019-11-25 00:03:33 +09:00 · 2019-11-24 23:53:35 +09:00 · 2019-11-24 23:35:56 +09:00 · 2019-11-24 22:26:19 +09:00
750 changed files with 19902 additions and 37300 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/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,49 +0,0 @@
-version: 2
-updates:
- package-ecosystem: npm
-  directory: "/app"
-  schedule:
-    interval: daily
-    time: "20:00"
-  open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: font-manager
-    versions:
-    - "> 0.3.0, < 0.4"
-  - dependency-name: sweetalert2
-    versions:
-    - 10.14.1
-    - 10.15.0
-    - 10.15.1
-    - 10.15.2
-    - 10.15.3
-    - 10.15.5
-    - 10.15.6
-    - 10.16.0
-    - 10.16.2
-    - 10.16.5
-  - dependency-name: electron
-    versions:
-    - 11.2.1
-    - 12.0.2
-    - 12.0.3
-    - 12.0.4
-  - dependency-name: eslint
-    versions:
-    - 7.18.0
-    - 7.19.0
-    - 7.20.0
-    - 7.21.0
-    - 7.22.0
-    - 7.24.0
-  - dependency-name: itunes-nowplaying-mac
-    versions:
-    - 0.4.0
-  - dependency-name: electron-dl
-    versions:
-    - 3.0.3
-    - 3.1.0
-    - 3.2.0
-  - dependency-name: electron-rebuild
-    versions:
-    - 2.3.4
--- a/.github/workflows/build-debug-macos.bup
+++ b/.github/workflows/build-debug-macos.bup
@ -1,37 +0,0 @@
-# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
-name: macOS debug build
-
-on: push
-
-jobs:
-  build:
-
-    runs-on: macos-latest
-    environment:
-      name: build
-    env: 
-      APPLEID: ${{ secrets.APPLEID }}
-      APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
-      CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-      CSC_LINK: ${{ secrets.CSC_LINK}}
-
-    strategy:
-      matrix:
-        node-version: [14.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: cd app && yarn
-    - run: cd app && yarn build --skipX64 --withArm64
-    - name: Deploy to S3
-      env:
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      run:
-        aws s3 sync --delete --region ap-northeast-1 ./build/ s3://cutls-s3-backup/debug
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@ -1,43 +0,0 @@
-# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
-name: Linux build
-
-on:
-  release:
-    types:
-      - created
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [14.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: cd app && yarn
-    - run: cd app && yarn build:all
-    - uses: shogo82148/actions-upload-release-asset@v1
-      with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: "build/*.zip"
-    - uses: shogo82148/actions-upload-release-asset@v1
-      with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: "build/*.snap"
-    - uses: shogo82148/actions-upload-release-asset@v1
-      with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: "build/*.deb"
-    - uses: shogo82148/actions-upload-release-asset@v1
-      with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: "build/*.AppImage"
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@ -1,42 +0,0 @@
-# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
-name: macOS build
-
-on:
-  release:
-    types:
-      - created
-
-jobs:
-  build:
-
-    runs-on: macos-latest
-    environment:
-      name: build
-    env: 
-      APPLEID: ${{ secrets.APPLEID }}
-      APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
-      CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-      CSC_LINK: ${{ secrets.CSC_LINK}}
-
-    strategy:
-      matrix:
-        node-version: [14.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: cd app && yarn
-    - run: cd app && yarn build:all
-    - uses: shogo82148/actions-upload-release-asset@v1
-      with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: "build/*.zip"
-    - uses: shogo82148/actions-upload-release-asset@v1
-      with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: "build/*.dmg"
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -1,35 +0,0 @@
-# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
-name: Windows build
-
-on:
-  release:
-    types:
-      - created
-
-jobs:
-  build:
-
-    runs-on: windows-latest
-
-    strategy:
-      matrix:
-        node-version: [14.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: cd app && yarn
-    - run: cd app && yarn build:all
-    - uses: shogo82148/actions-upload-release-asset@v1
-      with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: "build/*.exe"
-    - uses: shogo82148/actions-upload-release-asset@v1
-      with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: "build/*.appx"
--- a/.gitignore
+++ b/.gitignore
@ -20,23 +20,6 @@ app/view/bg
 app/view/cs
 app/view/ps
 app/view/es-AR
-app/view/it-IT
-app/view/pl-PL
 app/git
 *.code-workspace
 releasenote.md
-app/yarn-error.log
-app/js/platform/native.js
-app/view/es-ES
-app/view/fr-FR
-app/view/no-NO
-app/view/zh-CN
-app/view/ru-RU
-app/view/zh-TW
-app/view/pt-BR
-app/view/si-LK
-app/build.js
-app/view/make/make.js
-app/view/make/makeCli.ts
-app/.env
-app/view/make/index.generated.html
--- a/.prettierrc
+++ b/.prettierrc
@ -1,8 +0,0 @@
-{
-    "tabWidth": 4,
-    "useTabs": true,
-    "semi": false,
-    "singleQuote": true,
-    "printWidth": 200,
-    "jsxBracketSameLine": true
-}
--- a/.travis.yml
+++ b/.travis.yml
@ -1,19 +1,40 @@
-matrix:
-  include:
-  - os: osx
-    osx_image: xcode11.3
+os: 
+ - windows
+ - linux
+ - osx
 language: node_js
 env:
  - YARN_GPG=no
 node_js:
- '14.16.1'
+- '10.15.2'
 cache:
  yarn: true
 script: node -v
 before_deploy:
+  - yarn global add electron-builder
  - cd app
-  - yarn
-  - yarn build:all
+  - 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
+  - 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
+  - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../build;else :;fi
+  - 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
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then mv TheDesk-setup.exe TheDesk-setup-ia32.exe;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then mv *$VERSION.exe TheDesk-ia32.exe;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../app;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then electron-builder --win --x64 -p never;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../build;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then ls;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then mv ../build/TheDesk-setup.exe ../build/TheDesk-setup.exe;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then mv ../build/*$VERSION.exe ../build/TheDesk.exe;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../app;else :;fi
  - cd ../
  - ls build
 deploy:
--- a/46
+++ b/46
@ -1,46 +0,0 @@
-# Maintainer: Zergling_man, from fedora.email
-
-pkgname=thedesk
-_pkgname=TheDesk
-pkgver=24.2.1
-_electronversion=22
-pkgrel=2
-pkgdesc="Mastodon Client for PC, Zergling_man's pleroma-focused fork."
-arch=("x86_64")
-url="https://thedesk.top/"
-license=('GPL3')
-conflicts=("${pkgname%-bin}")
-depends=("npm")
-makedepends=("npm")
-optdeps=('hicolor-icon-theme')
-
-source=("git+http://precious.harpy.faith/Zergling_man/TheDesk.git")
-sha256sums=('SKIP')
-
-build()
-{
-	cd ${srcdir}/${_pkgname}/app
-	npm run build
-	npm run construct
-}
-
-package()
-{
-	cd ${pkgdir}
-	install -d opt/${_pkgname}/ usr/share/icons/hicolor usr/share/applications/ usr/share/licenses/thedesk/ usr/bin/
-	cd ${srcdir}/${_pkgname}
-	mv thedesk ${pkgdir}/usr/bin/
-	chmod 555 ${pkgdir}/usr/bin/thedesk
-	mv thedesk.desktop ${pkgdir}/usr/share/applications/
-	mv LICENSE ${pkgdir}/usr/share/licenses/thedesk/
-	cd app/img/icons/
-	sizes=($(ls | grep -Eo '[0-9x]+'))
-	for size in ${sizes[@]}; do
-		install -d ${pkgdir}/usr/share/icons/hicolor/$size/apps/
-		mv icon-$size.png ${pkgdir}/usr/share/icons/hicolor/$size/apps/desk.png
-	done
-	cd ..
-	rm -d icons
-	cd ${srcdir}
-	cp -r ${_pkgname} ${pkgdir}/opt/
-}
--- a/README.md
+++ b/README.md
@ -1,14 +1,9 @@
- **English** | [日本語](README_ja.md)
+<img src="https://thedesk.top/img/top.png" width="300" align="left">
+<img src="https://thedesk.top/img/desk.png" width="150" align="right">
+
+# TheDesk
 
-<div align="center">
-
-<img src="https://thedesk.top/img/desk.png" width="150" align="center">
-
-<h1 align="center">TheDesk</h1>
-
-[![Windows build](https://github.com/cutls/TheDesk/actions/workflows/build.yml/badge.svg)](https://github.com/cutls/TheDesk/actions/workflows/build.yml)
-[![Linux build](https://github.com/cutls/TheDesk/actions/workflows/build-linux.yml/badge.svg)](https://github.com/cutls/TheDesk/actions/workflows/build-linux.yml)
-[![Linux build](https://github.com/cutls/TheDesk/actions/workflows/build-macos.yml/badge.svg)](https://github.com/cutls/TheDesk/actions/workflows/build-macos.yml)  
+[![Build Status](https://travis-ci.org/cutls/TheDesk.svg?branch=master)](https://travis-ci.org/cutls/TheDesk)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/thedesk/localized.svg)](https://translate.thedesk.top/project/thedesk)
 [![FOSSA Status](https://bit.ly/2N4cLd1)](https://bit.ly/31zqMmZ)
 [![Version](https://flat.badgen.net/github/release/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
@ -16,40 +11,161 @@
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
 オープンソースSNSマストドン/MisskeyのPC向けクライアント[日本語はこちら](README_ja.md)  
  
-[![Download from TheDesk Official Website](https://thedesk.top/img/dlfrom-thedesk.svg?7)](https://thedesk.top)
-
-</div>
+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>
 ![Screenshots1](https://thedesk.top/img/scr1.png)  

-## Build and Development
+## License

-See [Wiki](https://github.com/cutls/TheDesk/wiki)
+[GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/LICENSE)  

-## Translation
+The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/)
+[Press Kit](https://d2upiril6ywqp9.cloudfront.net/press/TheDesk+PressKit.zip)  
+
+* [PNG 512x512](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.png)
+* [SVG 4095x4096](https://d2upiril6ywqp9.cloudfront.net/press/thedesk-fullcolor.svg)
+* [ico 256x256](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ico)
+* [icns old](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.icns)
+* [Illustrator .ai](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ai)
+
+The default sounds of notifications is provided [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/)
+
+## Terms of Use
+
+* [利用規約(Terms of Use(ja))](https://thedesk.top/tos.html)
+* [プライバシーポリシー(Privacy Policy(ja))](https://thedesk.top/priv.html)
+
+## Language
+
+* 日本語(Japanese)
+* English
+* de, cs, bg(from Crowdin)
+
+### Translation

 Crowdin project is available! Visit: https://translate.thedesk.top

+## Requirement and development
+
+* Electron 4.2 or above(install yourself)
+* electron-dl(in package.json)
+* Jimp(in package.json)
+* font-manager(in package.json)
+  * Python 2.x(install yourself)
+  * VisualC++(Windows)(install yourself)
+* itunes-nowplaying-mac(for macOS)(in package.json)
+* node-notifier(in package.json)
+* sumchecker(in package.json)
+* Ability to read unformated files!(install yourself)
+
+### Run on developer mode
+
+`npm run dev` on `app` folder.
+
+## Contributors
+
+Build for macOS  
+
+* [toneji](https://minohdon.jp/@toneji)
+
+Build for Linux  
+
+* [popn_ja](https://popon.pptdn.jp/@popn_ja)
+
+Fellow coder
+
+* [kPherox](https://pl.kpherox.dev/kPherox)
+
+## Build
+
+You have to use either **npm** or **yarn**. Whichever you use, it works well.
+
+### npm
+
+```sh
+git clone https://github.com/cutls/TheDesk
+cd TheDesk/app
+npm install
+npm install --only=dev
+npm run construct
+```
+
+### yarn
+
+```sh
+git clone https://github.com/cutls/TheDesk
+cd TheDesk/app
+# Linux or macOS
+yarn install --no-lockfile
+# Windows
+yarn install
+
+yarn construct
+```
+
+run `npm run dev` or `yarn dev` to launch developer version with console(click `view`)
+
+### electron-builder(Recommended)
+Use scripts(they can work well with npm, **yarn**).  
+
+#### npm
+
+```sh
+# Build for current platform
+npm run build
+
+# Select build target
+## Windows
+npm run build:win
+
+## Windows and Linux (The macOS target should run on macOS. So, this option hasn't include the build for macOS)
+npm run build:all
+```
+
+#### yarn
+
+```sh
+# Build for current platform
+yarn build
+
+# Select build target
+## Windows
+yarn build:win
+
+## Windows and Linux (The macOS target should run on macOS. So, this option hasn't include the build for macOS)
+yarn build:all
+```
+
+
+Config is all on package.json  
+
+### electron-packager
+`npm install --save-dev electron-rebuild`  
+  
+Linux/macOS  
+`./node_modules/.bin/electron-rebuild`  
+Windows  
+`.\node_modules\.bin\electron-rebuild.cmd`  
+  
+To install Python 2.x and Visual C++ for Windows, before running `npm install --save-dev electron-rebuild`  
+`npm install --global windows-build-tools`  
+
+Windows  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --win32metadata.CompanyName="TheDesk&Cutls.com" --win32metadata.FileDescription="TheDesk" --win32metadata.OriginalFilename="TheDesk" --win32metadata.InternalName="TheDesk" --win32metadata.ProductName="TheDesk" --platform=win32 --arch=all --electron-version=4.0.5 --icon=.\app\thedesk.ico --overwrite`  
+Linux  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=4.0.5 --overwrite`  
+macOS  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=4.0.5 --icon=./app/icon.icns --overwrite`  
+
 ## Pleroma support

 Did you find a bug with Pleroma accounts?  
 Pleroma **does not** follow Mastodon API rules completely although Pleroma developers say so.  
 Please write issues to improve TheDesk affinity with Pleroma.

-## License
+## Vulnerabilities when `npm i`???

-* [GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/LICENSE)
-* [License of other assets](https://github.com/cutls/TheDesk/wiki/License-of-other-assets)
-* [プライバシーポリシー(Privacy Policy(ja))](https://thedesk.top/priv.html)
+No, if your npm says materialize-css has vulnerabilities(CVE-2019-11002/3/4), look at [here](https://github.com/Dogfalo/materialize/issues/6286) under discussion.

-## Contributors
-
-[![](https://opencollective.com/TheDesk/contributors.svg?width=400&button=false)](https://github.com/cutls/TheDesk/graphs/contributors)
-
-## Support
-
-<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!" height="30"></a>
-<a href="https://liberapay.com/cutls/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="30"></a>
-<a href="https://cutls.fanbox.cc"><img alt="PixivFANBOX" src="https://thedesk.top/img/fanbox.png" height="30"></a>
-
-Or [others](https://cutls.dev) to support me.
--- a/README_ja.md
+++ b/README_ja.md
@ -1,59 +1,173 @@
-[English](README.md) | **日本語**
+<img src="https://thedesk.top/img/top.png" width="300" align="left">
+<img src="https://thedesk.top/img/desk.png" width="150" align="right">
+
+# TheDesk
 
-<div align="center">
-
-<img src="https://thedesk.top/img/desk.png" width="150" align="center">
-
-<h1 align="center">TheDesk</h1>
-
-[![Windows build](https://github.com/cutls/TheDesk/actions/workflows/build.yml/badge.svg)](https://github.com/cutls/TheDesk/actions/workflows/build.yml)
-[![Linux build](https://github.com/cutls/TheDesk/actions/workflows/build-linux.yml/badge.svg)](https://github.com/cutls/TheDesk/actions/workflows/build-linux.yml)
-[![Linux build](https://github.com/cutls/TheDesk/actions/workflows/build-macos.yml/badge.svg)](https://github.com/cutls/TheDesk/actions/workflows/build-macos.yml)  
+[![Build Status](https://travis-ci.org/cutls/TheDesk.svg?branch=master)](https://travis-ci.org/cutls/TheDesk)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/thedesk/localized.svg)](https://translate.thedesk.top/project/thedesk)
 [![FOSSA Status](https://bit.ly/2N4cLd1)](https://bit.ly/31zqMmZ)
 [![Version](https://flat.badgen.net/github/release/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
 ![Contributors](https://flat.badgen.net/github/contributors/cutls/TheDesk)  
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
 オープンソースSNSマストドン/MisskeyのPC向けクライアント  
+Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge/?site=thedesk.top)](https://status.cutls.com)    

-[![Download from TheDesk Official Website](https://thedesk.top/img/dlfrom-thedesk.svg?7)](https://thedesk.top)
-
-</div>
+[Pixiv FANBOX](https://www.pixiv.net/fanbox/creator/28105985)

 ![Screenshots1](https://thedesk.top/img/scr1.png)  

-## 翻訳
+## ライセンス
+
+[GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/LICENSE)  
+
+アイコンは[クリエイティブ・コモンズ 表示-非営利-継承](https://creativecommons.org/licenses/by-nc-sa/4.0/)で提供されています。  
+[プレスキット](https://d2upiril6ywqp9.cloudfront.net/press/TheDesk+PressKit.zip)  
+
+* [PNG 512x512](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.png)
+* [SVG 4095x4096](https://d2upiril6ywqp9.cloudfront.net/press/thedesk-fullcolor.svg)
+* [ico 256x256](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ico)
+* [icns old](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.icns)
+* [Illustrator .ai](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ai)
+
+標準の通知音は [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/) で提供されています。
+
+## 利用規約
+
+* [利用規約](https://thedesk.top/tos.html)
+* [プライバシーポリシー](https://thedesk.top/priv.html)
+
+## 言語
+
+* 日本語
+* English(英語)
+* ドイツ語, チェコ語, ブルガリア語(from Crowdin)
+
+### 翻訳
  
 Crowdinから翻訳に参加してみませんか？: https://translate.thedesk.top  

-## ビルドと開発
+## 環境

-[Wiki](https://github.com/cutls/TheDesk/wiki)を参照。
+* Electron 4.2以上(自分で入れて)
+* electron-dl(in package.json)
+* Jimp(in package.json)
+* font-manager(in package.json)
+  * Python 2.x(自分で入れて)
+  * VisualC++(Windows)(自分で入れて)
+* itunes-nowplaying-mac(macOS向け)(in package.json)
+* node-notifier(in package.json)
+* sumchecker(in package.json)
+* Ability to read unformated files!(自分で入れて)
+
+### デベロッパーモード
+
+`npm run dev`を`app`フォルダ内で実行
+
+## 主なコントリビューター
+
+macOSビルダー  
+
+* [とねぢ](https://minohdon.jp/@toneji)
+
+Linuxビルダー  
+
+* [ぽぷんじゃ](https://popon.pptdn.jp/@popn_ja)
+
+コーダー
+
+* [kPherox](https://pl.kpherox.dev/kPherox)
+
+## ビルド
+
+npmでもyarnでも好きな方を選んでください。
+
+### npm
+
+```sh
+git clone https://github.com/cutls/TheDesk
+cd TheDesk/app
+npm install
+npm install --only=dev
+npm run construct
+```
+
+### yarn
+
+```sh
+git clone https://github.com/cutls/TheDesk
+cd TheDesk/app
+# Linux or macOS
+yarn install --no-lockfile
+# Windows
+yarn install
+
+yarn construct
+```
+
+### electron-builder(推奨)
+
+scriptsを利用します
+
+#### npm
+
+```sh
+# 実行している環境向けにビルド
+npm run build
+
+# ターゲットを指定してビルド
+## Windows
+npm run build:win
+
+## macOS向けのビルドにはmacOSで実行する必要があるためこのコマンドではビルドされません
+npm run build:all
+```
+
+#### yarn
+
+```sh
+# 実行している環境向けにビルド
+yarn build
+
+# ターゲットを指定してビルド
+## Windows
+yarn build:win
+
+## macOS向けのビルドにはmacOSで実行する必要があるためこのコマンドではビルドされません
+yarn build:all
+```
+
+ビルド設定はすべてpackage.jsonに記載しています。  
+
+### electron-packager(非推奨)
+`npm install --save-dev electron-rebuild`  
+  
+Linux/macOS  
+`./node_modules/.bin/electron-rebuild`  
+Windows  
+`.\node_modules\.bin\electron-rebuild.cmd`  
+  
+WindowsでPython 2.xやVisualC++を一発でインストールできるツールもあります(`npm install --save-dev electron-rebuild`の前に)  
+`npm install --global windows-build-tools`  
+  
+日本語話者向けですが、macOSビルドにはXCodeが要るとの情報があります。([とねぢ](https://minohdon.jp/@toneji)氏談)  
+
+Windows  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --win32metadata.CompanyName="TheDesk&Cutls.com" --win32metadata.FileDescription="TheDesk" --win32metadata.OriginalFilename="TheDesk" --win32metadata.InternalName="TheDesk" --win32metadata.ProductName="TheDesk" --platform=win32 --arch=all --electron-version=4.0.5 --icon=.\app\thedesk.ico --overwrite`  
+Linux  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=4.0.5 --overwrite`  
+macOS  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=4.0.5 --icon=./app/icon.icns --overwrite`  

 ## Pleromaのサポート

 Pleromaは、Mastodon APIとの互換性を謳っていますが、実際には様々な差異があり、TheDeskで不具合が発生することがあります。  
 Issuesに書いてある問題についてはなるべく対処しますので、ぜひお知らせください。

-## よみもの
+## 詳しく

-* [TheDesk - マストドン日本語ウィキ](https://ja.mstdn.wiki/TheDesk)
-* [TheDeskを作って思う今クライアントを作る意味 | Cutls Code Archives ](https://code.cutls.com/thedesk-log/)
+[TheDesk - マストドン日本語ウィキ](https://ja.mstdn.wiki/TheDesk)

-## ライセンス
+## `npm i`したら脆弱性あるって言われた

-* [GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/LICENSE)
-* [License of other assets](https://github.com/cutls/TheDesk/wiki/License-of-other-assets)
-* [プライバシーポリシー](https://thedesk.top/priv.html)
-
-## 主なコントリビューター
-
-[![](https://opencollective.com/TheDesk/contributors.svg?width=400&button=false)](https://github.com/cutls/TheDesk/graphs/contributors)
-
-## 支援
-
-<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!" height="30"></a>
-<a href="https://liberapay.com/cutls/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="30"></a>
-<a href="https://cutls.fanbox.cc"><img alt="PixivFANBOX" src="https://thedesk.top/img/fanbox.png" height="30"></a>
-
-[その他の支援法](https://cutls.dev)
+materialize-cssの脆弱性(CVE-2019-11002/3/4)については[こちら](https://github.com/Dogfalo/materialize/issues/6286)で本当に脆弱性かどうか議論しています。  
+実際には害が無いものと思われます。
--- 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/about.html
+++ b/app/about.html
@ -1,15 +1,15 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="ja">

 <head>
    <title>TheDesk</title>
-    <meta content="width=device-width,initial-scale=1.0" name="viewport" />
-    <link href="./node_modules/@cutls/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet" />
-    <link href="./css/font-awesome.css" rel="stylesheet" type="text/css" />
-    <link href="./css/themes.css" type="text/css" rel="stylesheet" />
-    <link href="./css/master.css" type="text/css" rel="stylesheet" />
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet" />
-    <meta charset="utf-8" />
+    <meta content="width=device-width,initial-scale=1.0" name="viewport">
+    <link href="./node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
+    <link href='./css/font-awesome.css' rel='stylesheet' type='text/css'>
+    <link href="./css/themes.css" type="text/css" rel="stylesheet">
+    <link href="./css/master.css" type="text/css" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
+    <meta charset="utf-8">
    <style>
        body {
            font-family: 'Open Sans';
@ -18,77 +18,77 @@
            padding: 5px;
            padding-top: 15px;
        }
-        
+
        a,
        button {
            -webkit-app-region: no-drag;
        }
-        
+
        .container {
            width: 100%;
            display: grid;
            grid-template-columns: 1fr 1fr;
            grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
-            grid-template-areas: 'name1 data1' 'name2 data2' 'name3 data3' 'name4 data4' 'name5 data5' 'name6 data6';
+            grid-template-areas: 'name1 data1''name2 data2''name3 data3''name4 data4''name5 data5''name6 data6';
            text-align: left;
            margin: 5px;
        }
-        
+
        .area-name1 {
            grid-area: name1;
        }
-        
+
        .area-data1 {
            grid-area: data1;
        }
-        
+
        .area-name2 {
            grid-area: name2;
        }
-        
+
        .area-data2 {
            grid-area: data2;
        }
-        
+
        .area-name3 {
            grid-area: name3;
        }
-        
+
        .area-data3 {
            grid-area: data3;
        }
-        
+
        .area-name4 {
            grid-area: name4;
        }
-        
+
        .area-data4 {
            grid-area: data4;
        }
-        
+
        .area-name5 {
            grid-area: name5;
        }
-        
+
        .area-data5 {
            grid-area: data5;
        }
-        
+
        .area-name6 {
            grid-area: name6;
        }
-        
+
        .area-data6 {
            grid-area: data6;
        }
    </style>
 </head>

-<body class="center" style="overflow: hidden;">
+<body class="center " style="overflow:hidden">
    <script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
    <script type="text/javascript" src="./js/platform/first-not-view.js"></script>
-    <script type="text/javascript" src="./node_modules/@cutls/materialize-css/dist/js/materialize.js"></script>
-    <img src="./img/desk.svg" style="max-width: 58%;" />
+    <script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
+    <img src="./img/desk.svg" style="max-width:62%;">
    <h5>TheDesk</h5>
    <div class="container">
        <div class="area-name1">Display version</div>
@ -104,32 +104,32 @@
        <div class="area-name6">Node.js</div>
        <div class="area-data6" id="node"></div>
    </div>
-    <div class="cp">
-        Copyright &copy; TheDesk 2018<br /> Main developer(author): <a href="https://2m.cutls.com/@Cutls" target="_blank">Cutls P</a><br />
-        <a href="https://github.com/cutls/TheDesk/graphs/contributors" style="text-align: center; user-select: none;"><img src="https://opencollective.com/TheDesk/contributors.svg?width=700&button=false" style="width: 100%"></a>
-        <br /><a href="https://thedesk.top" target="_blank">Web site</a>
-    </div>
-    <button onclick="window.close()" class="btn waves-effect indigo" style="width: calc(100% - 10px);"><i class="material-icons left">close</i>Close</button>
+    <div class="cp">Copyright &copy; TheDesk 2018<br>
+        Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br>
+        Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a
+            href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a href="https://pl.kpherox.dev/kPherox"
+            target="_blank">kPherox</a> and all users
+        <img draggable="false" style="width:0.8rem;top: 1px;margin-left: 1px;position: relative;" alt="❤️"
+            title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png">
+        <br><a href="https://thedesk.top" target="_blank">Web site</a></div>
+    <button onclick="window.close()" class="btn waves-effect indigo" style="width:calc(100% - 10px);"><i
+            class="material-icons left">close</i>Close</button>
    <script type="text/javascript" src="./js/ui/theme.js"></script>
    <script>
-        var about = JSON.parse(localStorage.getItem('about'))
-        $('#now').text(localStorage.getItem('ver'))
-        $('#node').text(about[0])
-        $('#chrome').text(about[1])
-        $('#electron').text(about[2])
+        var about = JSON.parse(localStorage.getItem("about"));
+        $("#now").text(localStorage.getItem("ver"));
+        $("#node").text(about[0]);
+        $("#chrome").text(about[1]);
+        $("#electron").text(about[2]);
        if (location.search) {
-            var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/)
-            var ver = m[1]
-            $('#ver').text(ver)
+            var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/);
+            var ver = m[1];
+            $("#ver").text(ver);
        }
-        $('#hash').html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>')
-        $(document).on('click', 'a', (e) => {
-            e.preventDefault()
-            var url = $(e.target).attr('href')
-            postMessage(['openUrlMainProcess', url], '*')
-            return false
-        })
-    </script>
-</body>
-
-</html>
+        $("#hash").html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>');
+        $(document).on('click', 'a', e => {
+            var url = $(e.target).attr('href');
+            postMessage(["openUrl", url], "*")
+            return false;
+        });
+    </script>
--- a/app/build.d.ts
+++ b/app/build.d.ts
@ -1,15 +0,0 @@
-declare function _exports(options?: {
-    onlyStore?: boolean;
-    withStore?: boolean;
-    withIa32?: boolean;
-    withArm64?: boolean;
-    windows?: boolean;
-    linux?: boolean;
-    macOS?: boolean;
-    skipWindows?: boolean;
-    skipLinux?: boolean;
-    skipMacOS?: boolean;
-    unnotarize?: boolean;
-    skipUniversal?: boolean;
-}): void;
-export = _exports;
--- a/app/build.js
+++ b/app/build.js
@ -1,252 +1,112 @@
-const builder = require('electron-builder')
-const path = require('path')
-const fs = require('fs')
-const basefile = __dirname + '/'
-const package = fs.readFileSync(basefile + 'package.json')
-const data = JSON.parse(package)
-const version = data.version
-const codename = data.codename
-const ver = `${version} (${codename})`
-const construct = require('./view/make/make.js')
-const { platform, arch } = process
+const builder = require("electron-builder");
+const fs = require('fs');
+const os = process.platform;
 const Platform = builder.Platform
 const Arch = builder.Arch
-require('dotenv').config()
-const artifactName = 'TheDesk-setup-${arch}.${ext}'
-const config = {
-    productName: 'TheDesk',
-    appId: 'top.thedesk',
-    asarUnpack: ['node_modules/itunes-nowplaying-mac', 'main/script'],
-    afterSign: 'build/notarize.js',
+const targets = new Map();
+const archToType = new Map();
+const pref = {
+    productName: "TheDesk",
+    appId: "top.thedesk",
+    asarUnpack: [
+        "node_modules/itunes-nowplaying-mac"
+    ],
    directories: {
-        output: '../build',
+        output: "../build/"
    },
    win: {
-        icon: 'build/thedesk.ico',
-        target: ['nsis', 'appx', 'portable'],
-        publish: []
+        icon: "build/thedesk.ico",
+        target: [
+            "nsis",
+            "portable",
+            "appx"
+        ]
    },
    appx: {
-        identityName: '53491Cutls.TheDesk',
-        applicationId: 'Cutls.TheDesk',
-        publisherDisplayName: 'Cutls',
-        publisher: 'CN=629757F5-A5EE-474F-9562-B304A89A9FD1',
-        languages: ['JA-JP', 'EN-US'],
+        identityName: "53491Cutls.TheDesk",
+        applicationId: "Cutls.TheDesk",
+        publisherDisplayName: "Cutls",
+        publisher: "CN=629757F5-A5EE-474F-9562-B304A89A9FD1",
+        languages: [
+            "JA-JP",
+            "EN-US"
+        ]
    },
    nsis: {
        oneClick: false,
-        allowToChangeInstallationDirectory: true,
-        artifactName: 'TheDesk-setup-${arch}.${ext}',
+        allowToChangeInstallationDirectory: true
    },
    linux: {
-        target: ['zip', 'appImage', 'snap', 'deb'],
-        category: 'Network',
-    },
-    deb: {
-        depends: ['gconf2', 'gconf-service', 'libnotify4', 'libappindicator1', 'libxtst6', 'libnss3']
+        icon: "build/icons",
+        target: [
+            "zip",
+            "snap"
+        ],
+        category: "Network"
    },
    mac: {
-        hardenedRuntime: true,
-        gatekeeperAssess: false,
-        entitlements: 'build/entitlements.mac.plist',
-        entitlementsInherit: 'build/entitlements.mac.plist',
+        target: [
+            "dmg",
+            "zip"
+        ]
    },
-    dmg: {
-        sign: false,
+    electronDownload: {
+        version: "5.0.1"
    },
+    electronVersion: "5.0.1"
 }
+const json = JSON.parse(fs.readFileSync("package.json", 'utf8'));
+const version = json.version;

-async function build(os, arch, config) {
-    let targets = new Map()
-    let archToType = new Map()
-    archToType.set(arch, [])
-    targets.set(os, archToType)
-    await builder.build({
-        targets: targets,
-        config: config,
-        publish: 'never'
-    })
-}
-async function cmd(options) {
-    if (isTrue(options, 'help', 'h')) {
-        return console.log(help())
-    }
-    if (isTrue(options, 'onlyStore') || isTrue(options, 'withStore')) {
-        console.log('start building for application stores')
-        construct(ver, basefile, false, true)
-        if ((platform === 'win32' && !isTrue(options, 'skiWindows')) || isTrue(options, 'windows', 'w')) {
-            if ((isTrue(options, 'withIa32') && arch === 'x64') || arch === 'ia32') {
-                config.nsis.artifactName = artifactName.replace('${arch}', 'ia32')
-                await build(Platform.WINDOWS, Arch.ia32, config)
-                fs.renameSync(
-                    `../build/TheDesk ${version}.exe`,
-                    '../build/TheDesk-ia32-store.exe'
-                )
-                fs.renameSync(
-                    `../build/TheDesk-setup-ia32.exe`,
-                    '../build/TheDesk-setup-ia32-store.exe'
-                )
-            }
-            if (arch === 'x64') {
-                config.nsis.artifactName = artifactName.replace('${arch}', 'x64')
-                await build(Platform.WINDOWS, Arch.x64, config)
-                fs.renameSync(
-                    `../build/TheDesk ${version}.exe`,
-                    '../build/TheDesk-store.exe'
-                )
-                fs.renameSync(
-                    `../build/TheDesk-setup-x64.exe`,
-                    '../build/TheDesk-setup-store.exe'
-                )
-            }
-        }
-        if ((platform === 'linux' && !isTrue(options, 'skipLinux')) || isTrue(options, 'linux', 'l')) {
-            if (arch === 'ia32') {
-                await build(Platform.LINUX, Arch.ia32, config)
-            }
-            if ((isTrue(options, 'withIa32') && arch === 'x64')) {
-                console.log('snapcraft does not curretly support builing i386 on amd64')
-            }
-            if (arch === 'x64') {
-                await build(Platform.LINUX, Arch.x64, config)
-                if (!isTrue(options, 'onlyStore')) {
-                    fs.renameSync(
-                        `../build/thedesk_${version}_amd64.snap`,
-                        `../build/thedesk_${version}_amd64-store.snap`
-                    )
-                }
-            }
-        }
-    }
-    if (!isTrue(options, 'onlyStore')) {
-        console.log('start building for normal usage')
-        construct(ver, basefile, false, false)
-        if ((platform === 'win32' && !isTrue(options, 'skiWindows')) || isTrue(options, 'windows', 'w')) {
-            if ((isTrue(options, 'withIa32') && arch === 'x64') || arch === 'ia32') {
-                config.nsis.artifactName = artifactName.replace('${arch}', 'ia32')
-                await build(Platform.WINDOWS, Arch.ia32, config)
-                fs.renameSync(
-                    `../build/TheDesk ${version}.exe`,
-                    '../build/TheDesk-ia32.exe'
-                )
-            }
-            if (arch === 'x64') {
-                config.nsis.artifactName = artifactName.replace('${arch}', 'x64')
-                await build(Platform.WINDOWS, Arch.x64, config)
-                fs.renameSync(
-                    `../build/TheDesk ${version}.exe`,
-                    '../build/TheDesk.exe'
-                )
-                fs.renameSync(
-                    `../build/TheDesk-setup-x64.exe`,
-                    '../build/TheDesk-setup.exe'
-                )
-            }
-            if ((isTrue(options, 'withArm64') && arch === 'x64') || arch === 'arm64') {
-                config.nsis.artifactName = artifactName.replace('${arch}', 'arm64')
-                await build(Platform.WINDOWS, Arch.arm64, config)
-                fs.renameSync(
-                    `../build/TheDesk ${version}.exe`,
-                    '../build/TheDesk-arm64.exe'
-                )
-            }
-        }
-        if ((platform === 'linux' && !isTrue(options, 'skipLinux')) || isTrue(options, 'linux', 'l')) {
-            if (arch === 'ia32') {
-                await build(Platform.LINUX, Arch.ia32, config)
-            }
-            if (isTrue(options, 'withIa32') && arch === 'x64') {
-                console.log('snapcraft does not curretly support builing i386 on amd64')
-            }
-            if (arch === 'x64') {
-                await build(Platform.LINUX, Arch.x64, config)
-                fs.renameSync(
-                    `../build/thedesk_${version}_amd64.snap`,
-                    `../build/thedesk_${version}_amd64-normal.snap`
-                )
-                if (isTrue(options, 'onlyStore') || isTrue(options, 'withStore')) {
-                    fs.renameSync(
-                        `../build/thedesk_${version}_amd64-store.snap`,
-                        `../build/thedesk_${version}_amd64.snap`
-                    )
-                }
-            }
-        }
-        if (platform === 'darwin' && !isTrue(options, 'skipMacOS')) {
-            if (isTrue(options, 'unnotarize')) delete config.afterSign
-            if (isTrue(options, 'unnotarize')) delete config.mac.entitlements
-            if (isTrue(options, 'unnotarize')) delete config.mac.entitlementsInherit
-            if (isTrue(options, 'unnotarize')) process.env.CSC_IDENTITY_AUTO_DISCOVERY = false
-            if (isTrue(options, 'unnotarize')) delete config.afterSign
-            if (!isTrue(options, 'skipUniversal')) await build(Platform.MAC, Arch.universal, config)
-            if (isTrue(options, 'withArm64')) {
-                await build(Platform.MAC, Arch.arm64, config)
-                fs.renameSync(
-                    `../build/TheDesk-${version}.dmg`,
-                    `../build/TheDesk-${version}-arm64.dmg`
-                )
-            }
-            if (isTrue(options, 'withX64')) {
-                await build(Platform.MAC, Arch.x64, config)
-                fs.renameSync(
-                    `../build/TheDesk-${version}.dmg`,
-                    `../build/TheDesk-${version}-x64.dmg`
-                )
-            }
-        }
-    }
-}
-function isTrue(options, long, short) {
-    const { argv } = process
-    if (options ? options[long] : 0) return true
-    if (argv.includes(`--${long}`)) return true
-    if (short && argv.includes(`-${short}`)) return true
+
+if (os == "win32") {
+    archToType.set(Arch.ia32, []);
+    targets.set(Platform.WINDOWS, archToType);
+} else if (os == "linux") {
+    archToType.set(Arch.x64, []);
+    archToType.set(Arch.ia32, []);
+    targets.set(Platform.LINUX, archToType);
+} else if (os == "darwin") {
+    archToType.set(Arch.x64, []);
+    targets.set(Platform.MAC, archToType);
+} else {
    return false
 }
-function help() {
-    return `
-TheDesk Builder command tool
-    yarn build [options] (or node build.js [options])
-    yarn build:[preset] (check package.json)
-
-    --help or -h: show help
-
-    [Build for other platforms]
-    --windows (-w)
-    --linux (-l)
-
-    --skipWindows
-    --skipLinux
-    --skipMacOS
-        To skip building for itself platform.
-
-
-    [only Windows, Linux]
-    --onlyStore: application store of platforms assets(without update check)
-    --withStore: application store assets and normal version
-
-    [only Windows]
-
-    --withIa32: ia32 build on x64 system(if your machine is ia32, it will be built if this arg is not passed)
-    --withArm64(beta) arm64 build on x64 system(if your machine is arm64, it will be built if this arg is not passed, and not build store build for arm64)
-
-    [only macOS]
-    --unnotarize: Without notarize
-    Build as a "universal" package.
-    --skipUniversal: skip build for universal enviroment
-    --withX64: build x64-only build
-    --withArm64: build arm64-only build
-    `
-}
-
-/**
- * Builder
- * @module builder
- * @param {Object} [options] - Options
- * @param {boolean} [options.onlyStore] - App Store of platforms assets(without update check)
- * @param {boolean} [options.withStore] - App Store of platforms assets(without update check) assets and normal version
- * @param {boolean} [options.withIa32] - [Windows only] ia32 build on x64 system(if your machine is ia32, it will be built if this arg is not passed)
- * @param {boolean} [options.withArm64] - [Windows only(beta)] arm64 build on x64 system(if your machine is arm64, it will be built if this arg is not passed, and not build store build for arm64)
- * @return {void}
- */
-module.exports = cmd
+builder.build({
+    targets: targets,
+    config: pref
+})
+    .then(() => {
+        console.log("Done on "+os)
+        if (os == "win32") {
+            console.log("Windows")
+            fs.renameSync('../build/TheDesk ' + version + '.exe', '../build/TheDesk-ia32.exe');
+            fs.renameSync('../build/TheDesk Setup ' + version + '.exe', '../build/TheDesk-setup-ia32.exe');
+            retry()
+        }else if (os == "linux") {
+            console.log("Linux")
+            fs.renameSync('../build/thedesk-' + version + '.zip', '../build/TheDesk.zip');
+            fs.renameSync('../build/TheDesk Setup ' + version + '.exe', '../build/TheDesk-setup-ia32.exe');
+        }
+    })
+    .catch((error) => {
+        // handle error
+    })
+function retry(){
+    console.log("Windows x64")
+    const targetsAlt = new Map();
+    const archToTypeAlt = new Map();
+    targetsAlt.set(Platform.WINDOWS, archToTypeAlt);
+    archToTypeAlt.set(Arch.x64, []);
+    builder.build({
+        targets: targetsAlt,
+        config: pref
+    })
+        .then(() => {
+            fs.renameSync('../build/TheDesk Setup ' + version + '.exe', '../build/TheDesk-setup.exe');
+            fs.renameSync('../build/TheDesk ' + version + '.exe', '../build/TheDesk.exe');
+        })
+        .catch((error) => {
+            // handle error
+        })
+}
--- a/app/build/appx/Square150x150Logo.png
+++ b/app/build/appx/Square150x150Logo.png
--- a/app/build/appx/Square44x44Logo.png
+++ b/app/build/appx/Square44x44Logo.png
--- a/app/build/appx/StoreLogo.png
+++ b/app/build/appx/StoreLogo.png
--- a/app/build/entitlements.mac.plist
+++ b/app/build/entitlements.mac.plist
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>com.apple.security.cs.allow-jit</key>
-    <true/>
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
-    <key>com.apple.security.cs.disable-library-validation</key>
-    <true/>
-    <key>com.apple.security.cs.disable-executable-page-protection</key>
-    <true/>
-  </dict>
-</plist>
--- a/app/build/notarize.js
+++ b/app/build/notarize.js
@ -1,19 +0,0 @@
-require('dotenv').config()
-const { notarize } = require('@electron/notarize')
-const useNotarize = true
-exports.default = async function notarizing(context) {
-    const { electronPlatformName, appOutDir } = context
-    if (electronPlatformName !== 'darwin' || !useNotarize) return
-    const appName = context.packager.appInfo.productFilename
-    console.log(`start notarize: ${appOutDir}/${appName}.app`)
-    try {
-        return await notarize({
-            appBundleId: 'top.thedesk',
-            appPath: `${appOutDir}/${appName}.app`,
-            appleId: process.env.APPLEID,
-            appleIdPassword: process.env.APPLEIDPASS,
-        })
-    } catch (e) {
-        throw console.log(e)
-    }
-}
--- a/app/build/notarize.old.js
+++ b/app/build/notarize.old.js
@ -1,23 +0,0 @@
-require('dotenv').config()
-const { notarize } = require('electron-notarize')
-
-// Notarizeをしない場合、下のuseNotarizeをtrueからfalseに変更してください。
-const useNotarize = true
-
-
-exports.default = async function notarizing(context) {
-    const { electronPlatformName, appOutDir } = context
-    if (electronPlatformName !== 'darwin' || !useNotarize) return
-    const appName = context.packager.appInfo.productFilename
-    console.log(`start notarize: ${appOutDir}/${appName}.app`)
-    try {
-        return await notarize({
-            appBundleId: 'top.thedesk',
-            appPath: `${appOutDir}/${appName}.app`,
-            appleId: process.env.APPLEID,
-            appleIdPassword: process.env.APPLEIDPASS,
-        })
-    } catch (e) {
-        throw console.log(e)
-    }
-}
--- a/app/build/thedesk.ico
+++ b/app/build/thedesk.ico
--- a/app/buildCli.js
+++ b/app/buildCli.js
@ -1,2 +0,0 @@
-const cmd = require('./build')
-cmd()
--- a/app/css/acct.css
+++ b/app/css/acct.css
@ -1,109 +0,0 @@
-.acct {
-	display: flex;
-	justify-content: space-around;
-}
-
-.card {
-	width: 400px;
-	background-color: #494949;
-	margin: 10px;
-}
-
-body,
-html {
-	overflow-y: scroll;
-}
-
-#acct-list {
-	display: flex;
-	flex-wrap: wrap;
-	color: white;
-	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%;
-}
-
-.colorsel {
-	display: flex;
-}
-
-.card .colorsel div:not(.exc) {
-	width: 20px;
-	height: 20px;
-}
-
-.card .colorsel div.exc {
-	width: 40px;
-	height: 20px;
-}
-
-.first {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-
-.first .hide-first {
-	display: none;
-}
-.hide-second {
-	display: none;
-}
-.first .hide-second {
-	display: inline;
-}
-
-#compt {
-	margin-top: 20px;
-	margin-bottom: 50px;
-	border: 1px solid;
-	border: 1px solid;
-	padding: 5px;
-}
-
-#compt li {
-	list-style-type: disc;
-	margin-left: 20px;
-}
-
-#domain-list {
-    width: 500px;
-    max-width: 100%;
-}
-
-i.left {
-    margin-right: 5px;
-}
-
-#domain-list .title {
-   font-size: 1.3rem;
-}
-.text-line-icon {
-	font-size: 1rem;
-}
-.loginBtnWrap {
-	padding-top: 10px !important;
-}
-#add {
-	max-width: 1000px;
-}
-.autocomplete-content {
-	min-width: 450px;
-}
-.autocomplete-content li {
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    word-break: break-word;
-    overflow: hidden;
-}
--- a/app/css/master.css
+++ b/app/css/master.css
--- a/app/css/post.css
+++ b/app/css/post.css
@ -1,163 +1,144 @@
 /*トゥートボックス向けCSS*/
 #post-box {
-	display: none;
-	position: fixed;
-	left: calc(50vw - 150px);
-	top: 50vh;
-	background-color: var(--postbox);
-	border: thin solid gray;
-	z-index: 501;
-	max-width: 100%;
-	padding: 0.4rem;
-	border-radius: 0.4rem;
-	overflow: hidden;
+  display: none;
+  position: fixed;
+  left: calc(50vw - 150px);
+  top: 50vh;
+  background-color: var(--postbox);
+  border: thin solid gray;
+  z-index: 501;
+  max-width: 100%;
+  padding: 5px;
+  border-radius: 5px;
+  overflow: hidden;
 }
 textarea {
-	min-height: 7.7rem !important;
-	font-family: inherit;
+  min-height: 100px !important;
+  font-family: inherit;
 }
-#post-box .ui-resizable-s,
-#post-box .ui-resizable-se {
-	display: none !important;
+#post-box .ui-resizable-s, #post-box .ui-resizable-se{
+  display: none !important;
 }

 .cancel {
-	font-size: 0.5rem;
-	color: gray;
-	cursor: pointer;
-	position: absolute;
-	right: 2px;
-	top: 4px;
+  font-size: 0.5rem;
+  color: gray;
+  cursor: pointer;
+  position: absolute;
+  right: 2px;
+  top: 4px;
 }
 .more-show {
-	display: none;
+  display: none;
 }
 #drag {
-	width: 100%;
-	height: 100px;
+  width: 100%;
+  height: 100px;
 }
 #post-btn {
-	display: none;
+  display: none;
 }
 #vis {
-	text-transform: capitalize;
+  text-transform: capitalize;
 }
 #cw-text {
-	display: none;
+  display: none;
 }
 #sch-box {
-	display: none;
+  display: none;
 }
 #sch-box input {
-	width: auto;
+  width: auto;
 }
 .picker__close,
 .picker__today,
 .picker__clear {
-	color: #26a69a !important;
+  color: #26a69a !important;
 }
 .cw {
-	display: none;
+  display: none;
 }
 .sensitive {
-	filter: blur(50px);
+  filter: blur(50px);
 }
 #emoji {
 }
-#suggest, #draft {
-	max-height: 23rem;
-	overflow-y: scroll;
-	overflow-x: hidden;
-}
 #suggest {
-	position: absolute;
-	top: 0;
-	left: 0;
-	background-color: var(--bg);
-	z-index: 2;
-	border-radius: 0.5rem;
-	display: none;
-	max-height: 10rem;
-}
-#suggest a {
-	margin-left: 0.5rem;
-	margin-right: 0.5rem;
+  max-height: 300px;
+  overflow-y: scroll;
 }
 #emoji-list {
-	width: 100%;
-	height: 15.4rem;
-	overflow-y: scroll;
+  width: 100%;
+  height: 200px;
+  overflow-y: scroll;
 }
 #preview-field {
-	display: none;
+  display: none;
 }
 .preview-img {
-	width: 4rem;
-	max-height: 7.6rem;
+  width: 50px;
+  max-height: 100px;
 }
 .pi-wrap {
-	display: inline-block;
-	width: 3.8rem;
-	max-height: 7.7rem;
+  display: inline-block;
+  width: 50px;
+  max-height: 100px;
 }
 #default-emoji a {
-	color: var(--text);
-	margin-right: 0.15rem;
+  color: var(--color);
+  margin-right: 2px;
 }
 .character-counter {
-	position: relative;
-	top: -1.9rem;
+  position: relative;
+  top: -25px;
 }
 .trendtag {
-	overflow-y: scroll;
-	max-height: 7.7rem;
+  overflow-y: scroll;
+  max-height: 100px;
 }
 #toot-btn-field {
-	display: flex;
+  display: flex;
 }
 #toot-post-btn {
-	width: calc(100% - 0.7rem);
-	padding: 0;
-	margin-top: 0.7rem;
-	height: 2.7rem;
+  width: calc(100% - 10px);
+  padding: 0;
+  margin-top: 10px;
 }
 #toot-sec-btn {
-	width: 2.3rem;
-	padding: 0;
-	margin-top: 0.7rem;
+  width: 30px;
+  padding: 0;
+  margin-top: 10px;
 }
 #left-side {
-	float: left;
-	overflow-x: hidden;
-	height: calc(100% - 2.5rem);
+  float: left;
+  overflow-x: hidden;
+  height: calc(100% - 32px);
 }
 #right-side {
-	display: none;
-	float: left;
-	width: 23rem;
-	padding: 0.4rem;
-	overflow-x: hidden;
-	height: calc(100% - 2.5rem);
+  display: none;
+  float: left;
+  width: 300px;
+  padding: 5px;
+  overflow-x: hidden;
+  height: calc(100% - 32px);
 }
-#posttgl,
-#toot-post-btn {
-	background-color: var(--active);
-	color: var(--text);
+#posttgl,#toot-post-btn {
+  background-color: var(--accentbtn);
 }
 /*mini*/
 .mini-post .mize {
-	display: none !important;
+  display: none !important;
 }
 .mini-post #textarea {
-	padding: 0;
+  padding: 0;
 }
 .mini-post #post-box {
-	width: 15.4rem;
-	min-width: 7.7rem;
+  width: 200px;
+  min-width: 100px;
 }
 .mini-post #toot-field {
-	padding: 0;
+  padding: 0;
 }
 .mini-post #toot-btn-field {
-	padding: 0;
+  padding: 0;
 }
--- a/app/css/sort.css
+++ b/app/css/sort.css
@ -3,29 +3,29 @@
  cursor: move;
  user-select: none;
  background-color: var(--modalfooter);
-  margin: 0.4rem;
-  border-radius: 0.4rem;
-  color: var(--text);
+  margin: 5px;
+  border-radius: 5px;
+  color: var(--color);
  padding: 3px;
  display: grid;
-  grid-template-columns: 3.3rem 1fr 4.6rem;
+  grid-template-columns: 43px 1fr 60px;
  grid-template-areas: "sorticon sorttitle sorttitle" "sorticon sortacct sortaction";
 }
 .sorticon {
  grid-area: sorticon;
 }
 .sorticon i {
-  font-size: 3.3rem;
+  font-size: 43px;
 }
 .sorttitle {
-  margin-left: 0.4rem;
+  margin-left: 5px;
  grid-area: sorttitle;
 }
 .sortacct {
-  margin-left: 0.4rem;
+  margin-left: 5px;
  grid-area: sortacct;
 }
 .sortaction {
-  margin-left: 0.4rem;
+  margin-left: 5px;
  grid-area: sortaction;
 }
--- a/app/css/sweetalert2-material.css
+++ b/app/css/sweetalert2-material.css
--- a/app/css/themes.css
+++ b/app/css/themes.css
@ -1,22 +1,144 @@
 :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");
+}
--- a/app/css/tl.css
+++ b/app/css/tl.css
@ -1,7 +1,7 @@
 /*TL CSS(ただしBBCode pulse:master.css/spin:font-awesome*/
 #main {
 	width: 100vw;
-	height: calc(100% - 3rem);
+	height: calc(100vh - 40px);
 }
 #timeline-container {
 	overflow-x: scroll;
@ -11,19 +11,18 @@
 }
 #bottom {
 	position: absolute;
-	overflow: hidden;
 	bottom: 0;
 	width: 100vw;
-	height: 3rem;
-	padding: 0.23rem;
+	height: 40px;
+	padding: 3px;
 	padding-right: 0;
-	padding-left: 3rem;
-	background-color: var(--bottom);
+	padding-left: 40px;
+	background-color: var(--sidebar);
 	display: flex;
 	justify-content: space-between;
 	flex-wrap: wrap;
 	z-index: 500;
-	box-shadow: 0.77rem 0 0.77rem, 0.77rem rgba(0, 0, 0, 0.2);
+	box-shadow: 10px 0 10px 10px rgba(0, 0, 0, 0.2);
 }
 #demobottom {
 	width: 500px;
@ -31,24 +30,24 @@
 }
 #bottom.reverse {
 	padding-left: 0;
-	padding-right: 3rem;
+	padding-right: 40px;
 }
 .reverse {
 	flex-direction: row-reverse;
 }
 #bottom #dambox {
-	width: 23rem;
-	margin-right: 0.76rem;
+	width: 300px;
+	margin-right: 10px;
 }
 #bottom.reverse #dambox {
 	margin-right: 0;
 }
 #bottom .trendtag {
-	height: 3rem;
+	height: 40px;
 }
 #bottom #group,
 #demogroup {
-	margin-right: 3rem;
+	margin-right: 40px;
 }
 #bottom .leftside {
 	display: flex;
@ -58,42 +57,34 @@
 	align-items: center;
 }
 #bottom #tips img {
-	vertical-align: -0.23rem;
+	vertical-align: -3px;
 }
 #bottom a,
 #demogroup a {
-	color: var(--text);
+	color: var(--color);
 }
 #bottom i {
-	font-size: 2.3rem;
+	font-size: 30px;
 }
 .exc-icons {
-	font-size: 1.53rem;
+	font-size: 20px;
 }
 .exc-chb {
-	padding-left: 1.84rem !important;
+	padding-left: 24px !important;
 }
 .btnsgroup {
 	border: 1px solid;
 	padding-top: 1px;
-	padding-left: 0.4rem;
-	padding-right: 0.4rem;
-	margin-right: 1.15rem;
-	border-radius: 0.4rem;
-	height: 2.7rem;
-}
-.bgReport {
-	height: 2.61rem;
-	padding-top: 0.45rem;
-	text-decoration: underline;
-	padding-left: 0.4rem;
-	padding-right: 0.4rem;
+	padding-left: 5px;
+	padding-right: 5px;
+	margin-right: 15px;
+	border-radius: 5px;
 }
 #spot-box {
 	display: grid;
-	grid-template-columns: 3rem 2.3rem 2.5fr 1fr 4.6rem;
-	grid-template-rows: 1.7rem 1.5rem;
-	grid-template-areas: 'cover name name name refresh' 'cover progress progress progress time';
+	grid-template-columns: 40px 30px 2.5fr 1fr 60px;
+	grid-template-rows: 22px 20px;
+	grid-template-areas: 'cover name name artist refresh' 'cover progress progress progress time';
 }
 #spot-refresh {
 	grid-area: refresh;
@ -106,14 +97,20 @@
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	overflow: hidden;
-	line-height: 1.92rem;
+	line-height: 25px;
+}
+#spot-artist {
+	grid-area: artist;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	line-height: 25px;
 }
 #spot-img {
 	width: 90%;
 }
 #spot-time {
 	grid-area: time;
-	line-height: 0.5rem;
 }
 .progress {
 	grid-area: progress;
@ -121,7 +118,7 @@
 }
 .btnsgroup .grouptitle {
 	font-family: Open Sans;
-	font-size: 1.1rem;
+	font-size: 15px;
 }
@media screen and (max-width: 890px) {
 	.btnsgroup .grouptitle {
@ -135,7 +132,7 @@
 iframe,
 .cvo video {
 	max-width: 100%;
-	max-height: 23rem;
+	max-height: 300px;
 }
@media screen and (max-width: 600px) {
 	.mobile #timeline-container {
@ -152,12 +149,11 @@ iframe,
 .box {
 	overflow: hidden;
 	min-width: 300px;
-	max-width: 600px;
 	flex: 1;
 	border-top: none;
 	display: flex;
 	flex-direction: column;
-	margin-bottom: -0.75rem;
+	margin-bottom: -10px;
 }
 .img_FTL {
 	display: none;
@ -211,23 +207,16 @@ iframe,
 }
 .emoji,
 .emoji-img {
-	width: 1.153rem;
-	height: 1.153rem;
-	object-fit: cover;
+	width: 15px;
 }
 .area-toot .emoji,
 .area-toot .emoji-img {
-	width: 1.538rem;
-	height: 1.538rem;
-	object-fit: cover;
+	width: 20px;
 	vertical-align: middle;
 	margin: -1px 0;
 }
 .bigemoji {
-	width: 7.7rem !important;
-	height: auto !important;
-	position: relative;
-	z-index: 9999;
+	width: 60px !important;
 }
 .faicon_FTL {
 	display: none;
@ -253,14 +242,14 @@ iframe,
 }
 .cvo {
 	user-select: text;
-	padding-left: 0.4rem;
+	padding-left: 5px;
 	border-bottom: 0.5px solid;
-	padding-right: 0.15rem;
+	padding-right: 2px;
 	word-break: break-word;
 	width: 100%;
 	display: grid;
-	grid-template-columns: 3.3rem 2fr 1fr;
-	grid-template-rows: auto 1.6rem 1fr auto 1.9rem;
+	grid-template-columns: 43px 2fr 1fr;
+	grid-template-rows: auto 1.6rem 1fr auto 2.5rem;
 	grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'space toot toot' 'space additional additional' 'vis actions side';
 }
 .hide-actions {
@ -285,21 +274,21 @@ iframe,
 }

 .area-notice {
-	margin: 0.15rem;
+	margin: 2px;
 	grid-area: notice;
 }

 .area-icon {
-	width: 3rem;
-	margin: 0.15rem;
+	width: 40px;
+	margin: 2px;
 	grid-area: icon;
 }

 .area-display_name {
 	user-select: text;
-	height: 1.5rem;
-	margin: 0.15rem;
-	margin-left: 0.4rem;
+	height: 1.5em;
+	margin: 2px;
+	margin-left: 5px;
 	overflow: hidden;
 	grid-area: display_name;
 	white-space: nowrap;
@ -310,7 +299,7 @@ iframe,
 	flex-wrap: nowrap;
 }
 .flex-name {
-	max-width: calc(100% - 4.6rem);
+	max-width: calc(100% - 60px);
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
@ -318,9 +307,9 @@ iframe,
 .area-toot {
 	cursor: text;
 	user-select: auto;
-	margin-top: 0.4rem;
-	margin-bottom: 0.4rem;
-	margin-left: 0.4rem;
+	margin-top: 5px;
+	margin-bottom: 5px;
+	margin-left: 5px;
 	grid-area: toot;
 }

@ -353,93 +342,42 @@ iframe,
 .area-actions {
 	padding: 0;
 	margin: 0;
+	top: -5px;
+	position: relative;
 	display: flex;
 	justify-content: space-around;
 	max-width: 100%;
 	grid-area: actions;
 }
-.area-actions .btn-flat {
-	height: 1.3rem;
-	line-height: 1.3rem;
-}
-.area-actions .btn-flat,
-.area-vis i,
-.area-side .btn-flat {
-	margin: 0;
-}
-.area-side i {
-	line-height: initial;
-}
-
 .area-vis {
-	margin: 0.2rem;
+	margin: 2px;
 	grid-area: vis;
 	text-align: center;
 }
 .area-side {
 	display: flex;
-	top: -0.4rem;
+	top: -5px;
 	position: relative;
 	justify-content: flex-end;
-	margin: 0.15rem;
+	margin: 2px;
 	grid-area: side;
 }
-.notf-udg-text {
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	word-break: break-word;
-	overflow: hidden;
-	max-width: calc(100% - 150px);
-	display: inline-block;
-	position: relative;
-	top: 0.2rem;
-}
-.cusr {
-	user-select: text;
-	padding-left: 0.4rem;
-	border-bottom: 0.5px solid;
-	padding-right: 0.15rem;
-	word-break: break-word;
-	width: 100%;
-	display: grid;
-	grid-template-columns: 3.3rem 2fr 1fr;
-	grid-template-rows: auto 1.6rem 2fr auto;
-	grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'space status status' 'space actions actions';
-}
-
-.area-status {
-	grid-area: status;
-	display: flex;
-	flex-wrap: wrap;
-	margin-bottom: 0.75rem;
-}
-
-.cusr .cbadge {
-	margin-top: 0.46rem;
-	margin-left: 0.46rem;
-}
-.landing {
-	text-align: center;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-}

 .quote-inline {
 	display: none;
 }
 .quote-renote {
 	display: grid;
-	grid-template-columns: 3.3rem 2fr 1.92rem;
+	grid-template-columns: 43px 2fr 25px;
 	grid-template-areas: 'ricon ruser rdet' 'ricon rtext rdet';
 	border: 1px solid;
-	margin-top: 0.23rem;
+	margin-top: 3px;
 	padding: 1px;
-	border-radius: 0.23rem;
+	border-radius: 3px;
 }
 .renote-icon {
 	grid-area: ricon;
-	padding: 0.4rem;
+	padding: 5px;
 }
 .renote-details {
 	grid-area: rdet;
@ -455,43 +393,63 @@ iframe,
 }

 .btn-flat {
-	color: var(--text);
-}
-.sublink {
-	font-size: 1.4rem !important;
-	position: relative;
-	top: 0.4rem;
-	cursor: pointer;
+	color: var(--color);
 }
 .area-side i {
-	margin-left: 0.75rem;
+	margin-left: 10px;
 }
 .viabadge {
-	margin-top: 0.75rem;
+	margin-top: 10px;
 }
 .action i {
 	font-size: 1.2rem;
-	margin-right: 0.15rem;
-}
-.action li i {
-	margin-right: 0.5rem;
+	margin-right: 2px;
 }
 .action .fa-quote-right {
-	margin-top: 0.15rem;
+	margin-top: 2px;
 }
 .actct {
 	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: 5px;
+	padding: 5px;
+}
+.contextMenu.bottom:before {
+	content: '';
+	position: absolute;
+	top: 100%;
+	right: 27px;
+	border: 15px solid transparent;
+	border-top: 15px solid var(--box);
+}
+.contextMenu.top:before {
+	content: '';
+	position: absolute;
+	top: -30px;
+	right: 27px;
+	border: 15px solid transparent;
+	border-bottom: 15px solid var(--box);
+}
+.contextMenu .btn-flat {
+	text-transform: none !important;
+	width: 100%;
+	text-align: left;
+}
+
 .gray {
 	color: var(--gray);
 }
@ -507,30 +465,30 @@ iframe,
 }
 .toot img:not(.emoji-img) {
 	max-width: 100%;
-	max-height: 23rem;
+	max-height: 300px;
 }
 .cbadge {
 	display: inline-block;
-	min-width: 0.76rem;
-	max-width: 7.7rem;
-	padding: 0.23rem 0.5rem;
+	min-width: 10px;
+	max-width: 100px;
+	padding: 3px 7px;
 	font-size: 0.8em;
-	margin-right: 0.4rem;
+	margin-right: 5px;
 	line-height: 1;
 	color: #fff;
 	text-align: center;
 	white-space: nowrap;
 	vertical-align: middle;
 	background-color: #777;
-	border-radius: 0.75rem;
+	border-radius: 10px;
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
-	height: calc(0.8em + 0.6rem);
+	height: calc(0.8em + 8px);
 	user-select: none;
 }
 .cbadge-hover {
-	color: var(--text);
+	color: var(--color);
 	background-color: transparent;
 }
 .cbadge-hover:hover {
@ -540,13 +498,13 @@ iframe,
 p {
 	margin: 0;
 	margin-bottom: 0px;
-	line-height: 1.53rem;
+	line-height: 20px;
 }
 p:not(:last-child) {
-	margin-bottom: 0.76rem;
+	margin-bottom: 10px;
 }
 .shared {
-	background-color: var(--accent);
+	background-color: var(--shared);
 }
 .emphasized {
 	background-color: var(--emphasized);
@ -556,80 +514,28 @@ 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;
+	margin-right: 10px;
 	width: 100%;
-	min-height: 4.6rem;
+	min-height: 60px;
 	z-index: 500;
-	padding: 0.4rem;
+	padding: 5px;
 	display: grid;
-	grid-template-columns: 3rem 5rem 1fr 1.8rem;
-	grid-template-rows: 2.3rem 2.3rem;
+	grid-template-columns: 40px 1fr 1fr 24px;
+	grid-template-rows: 30px 30px;
 	grid-template-areas: 'notice notice_name notice_name a2' 'notice a1 sta a3' 'notf-box notf-box notf-box notf-box';
 }
-.small-header.notice-box {
-	min-height: 2rem;
-	grid-template-columns: 2.3rem 1fr 5rem 2rem 2rem;
-	grid-template-rows: 1.8rem;
-	grid-template-areas: 'notice notice_name a1 a3 a2';
-}
-.small-header.has-notf.notice-box {
-	min-height: 2rem;
-	grid-template-columns: 2.3rem 1fr 8rem 5rem 2rem 2rem;
-	grid-template-rows: 1.8rem;
-	grid-template-areas: 'notice notice_name sta a1 a3 a2';
-}
 .emp {
 	font-weight: bold;
 	text-decoration: underline;
 }
-.rotate-90 {
-	transform: rotate(90deg);
-}
+
 .area-notice {
 	grid-area: notice;
 }
-.small-header .area-notice {
-	margin: 0;
-}
-.small-header .area-sta {
-	display: none;
-}
-.small-header.has-notf .area-sta {
-	overflow-x: scroll;
-	overflow-y: hidden;
-	height: 2rem;
-	width: 8rem;
-	display: flex;
-}
-.small-header .area-sta::-webkit-scrollbar {
-	height: 5px;
-}
-#tagContextMenu {
-	position: absolute;
-	top: 0;
-	left: 0;
-	background-color: var(--subcolor);
-	z-index: 2;
-	border-radius: 0.4rem;
-}
-#tagContextMenu a {
-	display: block;
-	color: var(--text);
-	padding-left: 0.5rem;
-	padding-right: 0.5rem;
-}
-#tagContextMenu a:hover {
-	background-color: var(--selected);
-}
-.firstTCM {
-	margin-top: 0.4rem;
-}
-.lastTCM {
-	margin-bottom: 0.4rem;
-}
+
 .area-notice_name {
 	grid-area: notice_name;
 	overflow: hidden;
@ -645,10 +551,6 @@ p:not(:last-child) {
 	grid-area: a1;
 }
 .area-sta {
-	display: none;
-}
-.has-notf .area-sta {
-	display: block;
 	text-align: center;
 	grid-area: sta;
 }
@ -666,8 +568,8 @@ p:not(:last-child) {
 }
 #tools {
 	position: fixed;
-	top: 0.76rem;
-	right: 0.76rem;
+	top: 10px;
+	right: 10px;
 	float: right;
 }
 .setting {
@ -680,14 +582,14 @@ p:not(:last-child) {
 }
 .notf-box {
 	position: fixed;
-	right: 5.4rem;
-	background-color: var(--subcolor);
+	right: 70px;
+	background-color: var(--box);
 	border: thin solid gray;
 	z-index: 501;
-	width: 30rem;
-	padding: 0.4rem;
-	min-height: 7.7rem;
-	max-height: 38.4rem;
+	width: 400px;
+	padding: 5px;
+	min-height: 100px;
+	max-height: 500px;
 }
 .column-hide {
 	display: none;
@ -695,66 +597,33 @@ p:not(:last-child) {
 	height: 0;
 }
 .prof-img {
-	border-radius: 0.23rem;
-	width: 3rem;
-}
-.prof-img-sml {
-	width: 1.5rem;
+	border-radius: 3px;
 }
 .notf-icon {
 	position: relative;
-	top: -1.53rem;
-	width: 1.5rem;
-	left: 1.5rem;
+	top: -20px;
+	width: 20px;
+	left: 20px;
 }
 .notf-indv-box {
 	width: 100%;
-	max-height: 30.7rem;
+	max-height: 400px;
 	overflow-y: scroll;
 	overflow-x: hidden;
 	border: thin solid gray;
 	border-bottom: 2px solid white;
 	grid-area: notf-box;
-	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;
-}
-.columnSettings {
-	display: flex;
-	flex-wrap: wrap;
-}
-.notf-indv-box .setting {
-	font-size: 1rem;
-	width: calc(25% - 6px);
-	margin: 3px;
-	height: 100px;
-	text-align: center;
-	display: flex;
-	flex-direction: column;
-	padding-top: 17px;
-	border: 1px solid;
-	border-radius: 5px;
-}
-.notf-indv-box .setting:hover {
-	color: var(--text);
-}
-.notf-exclude-btn {
-	border: 1px solid;
-}
-.notf-exclude-btn:hover {
-	background-color: inherit !important;
-	filter: brightness(70%);
+	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;
 }
 .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;
@ -771,79 +640,46 @@ p:not(:last-child) {
 .vote {
 	width: 100%;
 	border: 1px solid;
-	margin-top: 0.23rem;
+	margin-top: 3px;
 	padding: 1px;
-	border-radius: 0.23rem;
-	overflow: hidden;
-	position: relative;
-}
-.dropdown-content li {
-	padding-top: 0.4rem;
-}
-.dropdown-content li > a, .dropdown-content li > span {
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
+	border-radius: 3px;
 }
 .fa-2x > .emoji-img {
-	width: 2.3rem !important;
-	height: 2.3rem !important;
+	width: 36px !important;
+	height: 36px !important;
 }
 .fa-3x > .emoji-img {
-	width: 4.15rem !important;
-	height: 4.15rem !important;
+	width: 54px !important;
+	height: 54px !important;
 }
 .fa-4x > .emoji-img {
-	width: 4.6rem !important;
-	height: 4.6rem !important;
+	width: 72px !important;
+	height: 72px !important;
 }
 .fa-5x > .emoji-img {
-	width: 6.9rem !important;
-	height: 6.9rem !important;
+	width: 90px !important;
+	height: 90px !important;
 }
 #lists-user {
 	overflow-y: scroll;
 	overflow-x: hidden;
-	max-height: 15.4rem;
+	max-height: 200px;
 }
 .votebtn {
 	border: 1px solid;
 	color: var(--bg);
 	background-color: var(--beforehover);
 	cursor: pointer;
-	width: 3.8rem;
-	height: 1.7rem;
+	width: 50px;
+	padding: 2px;
 	display: inline-block;
 	text-align: center;
-	margin-top: 0.38rem;
-	border-radius: 0.75rem;
+	margin-top: 5px;
+	border-radius: 10px;
 	transition-duration: 0.5s;
 }
 .votebtn:hover {
-	background-color: var(--text);
-}
-.leadPoll {
-	position: absolute;
-	background-color: var(--subcolor);
-	height: 1.5rem;
-	border-radius: 0.23rem;
-}
-.lpAnime {
-	animation-duration: 1s;
-	animation-name: fadeInLeft;
-}
-.onPoll {
-	position: relative;
-}
-.maxVoter {
-	background-color: var(--emphasized);
-	filter: brightness(120%);
-}
-.ownMark img {
-	width: 1.2rem !important;
-	position: relative;
-	top: -1px;
-	margin-left: 0.38rem !important;
+	background-color: var(--color);
 }
 .jump {
 	display: inline-block;
@ -868,11 +704,6 @@ p:not(:last-child) {
 	width: 100%;
 	height: 100%;
 }
-.fav_ct,
-.rt_ct,
-.rep_ct {
-	font-size: 1.1rem;
-}
 .shared.selectedToot {
 	background-color: var(--selectedWithShare);
 }
@ -886,18 +717,17 @@ audio {
 	white-space: normal;
 }
 .cw_btn {
-	margin: 0.23rem;
+	margin: 3px;
 	background-color: var(--emphasized);
-	color: var(--text);
-	padding-left: 0.23rem;
-	padding-right: 0.23rem;
-	border-radius: 0.23rem;
-	border: 1px solid var(--text);
-	user-select: none;
+	color: var(--color);
+	padding-left: 3px;
+	padding-right: 3px;
+	border-radius: 3px;
+	border: 1px solid var(--color);
 }
 .vis-data {
 	font-size: 1rem !important;
-	margin: 0.4rem;
+	margin: 5px;
 	user-select: none;
 }
@keyframes jump {
@ -970,39 +800,3 @@ audio {
 .box .ui-resizable-se {
 	display: none !important;
 }
-.small-header .top-icon {
-	font-size: 2rem !important;
-	padding-top: 0%;
-}
-.top-icon {
-	font-size: 40px !important;
-	padding-top: 25%;
-}
-.announcement {
-	padding: 0.38rem;
-	border-bottom: 1px solid;
-}
-.announReaction {
-	width: 2.7rem;
-	height: 1.7rem;
-	font-size: 1.1rem;
-	margin: 0.23rem;
-	cursor: pointer;
-	border: solid 1px;
-	padding-left: 0.15rem;
-	background-color: var(--subcolor);
-	border-radius: 0.15rem;
-}
-.announReaction img {
-	position: relative;
-	top: 0.23rem;
-}
-.announReaction.reactioned {
-	background-color: var(--emphasized);
-}
-.announReaction.add {
-	width: 1.46rem;
-}
-.reactionsPack {
-	display: flex;
-}
--- a/app/css/twemoji-awesome.css
+++ b/app/css/twemoji-awesome.css
--- a/app/css/userdata.css
+++ b/app/css/userdata.css
@ -1,219 +1,151 @@
 /*アイコンをクリックした時とかにでてくるユーザーデータ*/
-
 #his-data {
-    background-repeat: no-repeat;
-    background-image: url('../img/loading.svg');
-    overflow-y: hidden;
+  background-repeat: no-repeat;
+  background-image: url("../../loading.svg");
+  overflow-y: hidden;
 }
-
-#his-data .btn .material-icons {
-    float: left;
+#his-data .btn .material-icons{
+  float:left;
 }
-
 #his-data-content {
-    display: flex;
-    justify-content: center;
+  display: flex;
+  justify-content: center;
 }
-
 #his-name {
-    font-size: 1.5rem;
+  font-size: 1.5rem;
 }
-
 #his-prof {
-    width: 7.7rem;
-    margin-right: 0.4rem;
+  float: left;
+  width: 100px;
+  margin-right: 5px;
 }
-
 .his-float {
-    overflow-y: scroll;
-    padding: 0.4rem;
+  overflow-y: scroll;
+  padding: 5px;
 }
-
 #his-float-data {
-    height: 100%;
-    overflow-y: hidden;
+  height: 100%;
+  overflow-y: hidden;
 }
-
 #his-leftside {
-    width: 28.4rem;
-    max-width: 30vw;
+  width: 500px;
 }
-
 #his-float-timeline {
-    max-width: 47.5rem;
-    width: calc(100% - 28.4rem);
-    height: 100%;
-    overflow-y: hidden;
+  max-width: 775px;
+  height: 100%;
+  overflow-y: hidden;
 }
-
 #his-basic-prof {
-    display: flex;
-    min-height: 10rem;
+  min-height: 130px;
+}
+#his-matching-list {
+  overflow-y: scroll;
+  overflow-x: hidden;
 }
-
 #his-field {
-    vertical-align: baseline;
-    text-align: center;
-    padding: 0;
+  vertical-align: baseline;
+  text-align: center;
+  padding: 0;
 }
-
 #his-field tr {
-    height: 1.5rem;
+  height: 1.5rem;
 }
-
 .his-field-title {
-    height: 1.5rem;
-    padding: 0;
-    background-color: #757575;
-    text-align: center;
-    padding: 0.4rem;
-    margin-bottom: 1px;
-    width: 30%;
+  height: 1.5rem;
+  padding: 0;
+  background-color: #757575;
+  text-align: center;
+  padding: 5px;
+  margin-bottom: 1px;
+  width: 30%;
 }
-
 .his-field-content {
-    height: 1.5rem;
-    padding: 0;
-    padding-left: 0.4rem;
+  height: 1.5rem;
+  padding: 0;
+  padding-left: 5px;
 }
-
 .his-var-content a span.ellipsis:after {
-    content: '...';
+  content: "...";
 }
-
 .his-var-content a:not(.mention) span:last-of-type {
-    display: none;
+  display: none;
 }
-
 #his-data a .rep_ct,
 #his-data a .rt_ct,
 #his-data a .fav_ct {
-    display: inline !important;
+  display: inline !important;
 }
-
 #his-data-show {
-    margin: 1.5rem;
-    margin-left: 3.8rem;
-    margin-right: 3.8rem;
-    background-color: var(--his-data);
-    height: calc(100% - 1.5rem);
-    margin-bottom: 0;
-    padding: 0.4rem;
+  margin: 20px;
+  margin-left: 50px;
+  margin-right: 50px;
+  background-color: var(--his-data);
+  height: calc(100% - 20px);
+  margin-bottom: 0;
+  padding: 5px;
 }
-
 #his-data-wrap {
-    display: flex;
+  display: flex;
 }
-
 .his-var-content {
-    overflow-y: scroll;
-    overflow-x: hidden;
-    height: calc(100% - 3.4rem);
-    padding-bottom: 60px;
+  overflow-y: scroll;
+  overflow-x: hidden;
+  height: calc(100% - 45px);
 }
-
 #my-data-nav .btn {
-    width: 10.6rem;
+  width: 140px;
 }
-
-#my-data-nav .active-back {
-    display: none;
+.active-back {
+  background-color: var(--active);
 }
-
 #his-name .emojione,
 #his-name .emoji-img {
-    width: 1.538rem;
+  width: 20px;
 }
-
 #his-plus-action .btn {
-    padding-right: 0.4rem;
-    padding-left: 0.4rem;
+  padding-right: 5px;
+  padding-left: 5px;
 }
-
 .tabs {
-    display: flex;
+  display: flex;
 }
-
 .tabs .tab a {
-    padding: 0.6rem 0.9rem;
+  padding: 8px 12px;
 }
-
 #his-des {
-    max-height: 17.7rem;
-    overflow-y: scroll;
-    user-select: text;
-    cursor: text;
+  max-height: 250px;
+  overflow-y: scroll;
 }
-
 #his-sign-action {
-    border: 1px solid;
-    border-radius: 0.4rem;
-    display: flex;
-    align-items: center;
-    padding-left: 0.75rem;
-    padding-right: 0.75rem;
-    flex-wrap: wrap;
+  border: 1px solid;
+  border-radius: 5px;
+  display: flex;
+  align-items: center;
+  padding-left: 10px;
+  padding-right: 10px;
+  flex-wrap: wrap;
 }
-
-#his-sign-action .shrinker {
-    margin-right: 0.5rem;
-    flex-basis: calc(50% - 1rem);
+#his-sign-action .btn {
+  flex-basis: 31.2%;
 }
-
-#his-sign-action .shrinker.btn {
-    width: 100%;
-}
-
-#his-sign-action .dropdown-trigger {
-    flex-basis: 100%;
-}
-
 #his-des .mention {
-    color: #039be5;
-    cursor: pointer;
+  color: #039be5;
+  cursor: pointer;
 }
-
-#his-table {
-    max-height: 9.2rem;
-    overflow-y: scroll;
-    user-select: text;
+#his-table{
+  max-height: 150px;
+  overflow-y: scroll;
 }
-
 #his-float-blocked {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    font-size: 2rem;
-    height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 2rem;
+  height: 100%;
 }
-
-#hisdropdown {
-    background-color: var(--bg);
+#hisdropdown{
+  background-color: var(--bg);
 }
-
-#hisdropdown li a {
-    color: var(--text);
-}
-
-#hisdropdown li:hover {
-    background-color: var(--active);
-}
-
-#his-data-title-wrap {
-    width: 100%;
-    text-align: center;
-    font-size: 1.5rem;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-#his-data-title .material-icons {
-    position: relative;
-    top: 5px;
-    margin-right: 3px;
-}
-
-#his-data-title a {
-    color: white;
+#hisdropdown li:hover{
+  background-color: var(--active);
 }
--- a/app/fonts/OpenSans-Light.ttf
+++ b/app/fonts/OpenSans-Light.ttf
--- a/app/gitHash.js
+++ b/app/gitHash.js
@ -1,6 +0,0 @@
-const fs = require('fs')
-const execSync = require('child_process').execSync
-const gitHash = execSync('git rev-parse HEAD')
-    .toString()
-    .trim()
-fs.writeFileSync('git', gitHash)
--- 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/img/aiscript.svg
+++ b/app/img/aiscript.svg
@ -1,50 +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 687 72" 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="アートボード1" transform="matrix(1,0,0,1,-168.896,-476)">
-        <rect x="168.896" y="476" width="686.208" height="72" style="fill:none;"/>
-        <clipPath id="_clip1">
-            <rect x="168.896" y="476" width="686.208" height="72"/>
-        </clipPath>
-        <g clip-path="url(#_clip1)">
-            <g transform="matrix(1,0,0,1,77.6363,162.413)">
-                <g transform="matrix(96,0,0,96,88.3157,385.587)">
-                    <path d="M0.463,-0.571C0.452,-0.59 0.436,-0.602 0.415,-0.608C0.394,-0.613 0.374,-0.611 0.356,-0.6L0.08,-0.443C0.053,-0.428 0.04,-0.405 0.04,-0.374C0.04,-0.344 0.053,-0.321 0.08,-0.306L0.356,-0.148C0.368,-0.141 0.381,-0.138 0.395,-0.138C0.425,-0.138 0.448,-0.151 0.463,-0.178C0.474,-0.197 0.476,-0.217 0.47,-0.237C0.465,-0.259 0.453,-0.274 0.434,-0.285L0.278,-0.374L0.434,-0.464C0.453,-0.474 0.465,-0.49 0.47,-0.511C0.476,-0.532 0.474,-0.552 0.463,-0.571Z" style="fill:rgb(129,201,196);fill-rule:nonzero;"/>
-                </g>
-                <g transform="matrix(96,0,0,96,137.468,385.587)">
-                    <path d="M0.197,-0.67C0.197,-0.691 0.189,-0.71 0.174,-0.725C0.159,-0.74 0.14,-0.748 0.118,-0.748C0.096,-0.748 0.078,-0.74 0.063,-0.725C0.047,-0.71 0.04,-0.691 0.04,-0.67C0.04,-0.648 0.047,-0.629 0.063,-0.614C0.078,-0.599 0.096,-0.591 0.118,-0.591C0.14,-0.591 0.159,-0.599 0.174,-0.614C0.189,-0.629 0.197,-0.648 0.197,-0.67ZM0.197,-0.079C0.197,-0.101 0.189,-0.119 0.174,-0.135C0.159,-0.15 0.14,-0.158 0.118,-0.158C0.096,-0.158 0.078,-0.15 0.063,-0.135C0.047,-0.119 0.04,-0.101 0.04,-0.079C0.04,-0.057 0.047,-0.038 0.063,-0.023C0.078,-0.008 0.096,0 0.118,0C0.14,0 0.159,-0.008 0.174,-0.023C0.189,-0.038 0.197,-0.057 0.197,-0.079Z" style="fill:rgb(129,201,196);fill-rule:nonzero;"/>
-                </g>
-                <g transform="matrix(96,0,0,96,201.74,385.587)">
-                    <path d="M0.118,-0.75C0.097,-0.75 0.078,-0.742 0.063,-0.727C0.047,-0.712 0.04,-0.693 0.04,-0.671L0.04,-0.573C0.04,-0.551 0.047,-0.532 0.063,-0.517C0.078,-0.502 0.097,-0.494 0.118,-0.494C0.14,-0.494 0.159,-0.502 0.174,-0.517C0.189,-0.532 0.197,-0.551 0.197,-0.573L0.197,-0.671C0.197,-0.693 0.189,-0.712 0.174,-0.727C0.159,-0.742 0.14,-0.75 0.118,-0.75ZM0.355,-0.75C0.333,-0.75 0.314,-0.742 0.299,-0.727C0.284,-0.712 0.276,-0.693 0.276,-0.671L0.276,-0.573C0.276,-0.551 0.284,-0.532 0.299,-0.517C0.314,-0.502 0.333,-0.494 0.355,-0.494C0.377,-0.494 0.395,-0.502 0.41,-0.517C0.426,-0.532 0.434,-0.551 0.434,-0.573L0.434,-0.671C0.434,-0.693 0.426,-0.712 0.41,-0.727C0.395,-0.742 0.377,-0.75 0.355,-0.75Z" style="fill:rgb(129,201,196);fill-rule:nonzero;"/>
-                </g>
-                <g transform="matrix(96,0,0,96,247.1,385.587)">
-                    <path d="M0.394,-0.494L0.488,-0.306L0.3,-0.306L0.394,-0.494ZM0.063,-0.009C0.082,0.001 0.102,0.002 0.123,-0.005C0.144,-0.011 0.159,-0.024 0.169,-0.044L0.221,-0.148L0.566,-0.148L0.619,-0.044C0.625,-0.03 0.635,-0.02 0.648,-0.012C0.661,-0.004 0.674,0 0.689,0C0.701,0 0.713,-0.003 0.724,-0.009C0.743,-0.018 0.756,-0.033 0.763,-0.054C0.771,-0.075 0.769,-0.095 0.759,-0.114L0.464,-0.705C0.457,-0.718 0.448,-0.729 0.435,-0.737C0.422,-0.745 0.408,-0.749 0.394,-0.749C0.379,-0.749 0.365,-0.745 0.352,-0.737C0.339,-0.729 0.33,-0.718 0.323,-0.705L0.028,-0.114C0.018,-0.095 0.017,-0.075 0.024,-0.054C0.03,-0.033 0.043,-0.018 0.063,-0.009Z" style="fill:rgb(129,201,196);fill-rule:nonzero;"/>
-                </g>
-                <g transform="matrix(96,0,0,96,322.7,385.587)">
-                    <path d="M0.158,0C0.18,0 0.198,-0.008 0.214,-0.023C0.229,-0.038 0.236,-0.057 0.236,-0.079L0.236,-0.67C0.236,-0.691 0.229,-0.71 0.214,-0.725C0.198,-0.741 0.18,-0.749 0.158,-0.749C0.136,-0.749 0.117,-0.741 0.102,-0.725C0.087,-0.71 0.079,-0.691 0.079,-0.67L0.079,-0.079C0.079,-0.057 0.087,-0.038 0.102,-0.023C0.117,-0.008 0.136,0 0.158,0Z" style="fill:rgb(129,201,196);fill-rule:nonzero;"/>
-                </g>
-                <g transform="matrix(96,0,0,96,352.988,385.587)">
-                    <path d="M0.118,-0.158C0.097,-0.158 0.078,-0.15 0.063,-0.135C0.047,-0.119 0.04,-0.101 0.04,-0.079C0.04,-0.057 0.047,-0.038 0.063,-0.023C0.078,-0.008 0.097,0 0.118,0L0.463,0C0.525,0 0.579,-0.022 0.623,-0.067C0.667,-0.111 0.69,-0.164 0.69,-0.227C0.69,-0.289 0.667,-0.342 0.623,-0.387C0.579,-0.431 0.525,-0.453 0.463,-0.453L0.266,-0.453C0.247,-0.453 0.231,-0.46 0.218,-0.473C0.204,-0.487 0.197,-0.503 0.197,-0.522C0.197,-0.541 0.204,-0.557 0.218,-0.571C0.231,-0.584 0.247,-0.591 0.266,-0.591L0.611,-0.591C0.632,-0.591 0.651,-0.599 0.667,-0.614C0.682,-0.629 0.69,-0.648 0.69,-0.67C0.69,-0.691 0.682,-0.71 0.667,-0.725C0.651,-0.741 0.632,-0.749 0.611,-0.749L0.266,-0.749C0.204,-0.749 0.15,-0.726 0.106,-0.682C0.062,-0.638 0.04,-0.584 0.04,-0.522C0.04,-0.459 0.062,-0.406 0.106,-0.362C0.15,-0.318 0.204,-0.296 0.266,-0.296L0.463,-0.296C0.482,-0.296 0.498,-0.289 0.511,-0.275C0.525,-0.262 0.532,-0.246 0.532,-0.227C0.532,-0.207 0.525,-0.191 0.511,-0.178C0.498,-0.164 0.482,-0.158 0.463,-0.158L0.118,-0.158Z" style="fill:rgb(129,201,196);fill-rule:nonzero;"/>
-                </g>
-                <g transform="matrix(96,0,0,96,422.924,385.587)">
-                    <path d="M0.413,0C0.517,0 0.605,-0.037 0.678,-0.11C0.693,-0.125 0.701,-0.143 0.701,-0.166C0.701,-0.187 0.693,-0.206 0.678,-0.221C0.663,-0.236 0.644,-0.244 0.623,-0.244C0.601,-0.244 0.582,-0.236 0.567,-0.221C0.524,-0.179 0.473,-0.158 0.413,-0.158C0.354,-0.158 0.303,-0.179 0.261,-0.221C0.218,-0.263 0.197,-0.314 0.197,-0.374C0.197,-0.434 0.218,-0.485 0.261,-0.528C0.303,-0.57 0.354,-0.591 0.413,-0.591C0.473,-0.591 0.524,-0.57 0.567,-0.528C0.582,-0.512 0.601,-0.504 0.623,-0.504C0.644,-0.504 0.663,-0.512 0.678,-0.528C0.693,-0.543 0.701,-0.561 0.701,-0.583C0.701,-0.605 0.693,-0.623 0.678,-0.639C0.605,-0.712 0.517,-0.749 0.413,-0.749C0.31,-0.749 0.222,-0.712 0.149,-0.639C0.076,-0.566 0.04,-0.478 0.04,-0.374C0.04,-0.271 0.076,-0.183 0.149,-0.11C0.222,-0.037 0.31,0 0.413,0Z" style="fill:rgb(129,201,196);fill-rule:nonzero;"/>
-                </g>
-                <g transform="matrix(96,0,0,96,492.86,385.587)">
-                    <path d="M0.572,-0.472C0.572,-0.44 0.56,-0.412 0.537,-0.389C0.514,-0.366 0.486,-0.355 0.453,-0.355L0.236,-0.355L0.236,-0.591L0.453,-0.591C0.486,-0.591 0.514,-0.579 0.537,-0.556C0.56,-0.533 0.572,-0.505 0.572,-0.472ZM0.421,-0.197L0.595,-0.023C0.61,-0.008 0.628,0 0.65,0C0.672,0 0.69,-0.008 0.706,-0.023C0.721,-0.038 0.729,-0.057 0.729,-0.079C0.729,-0.101 0.721,-0.119 0.706,-0.135L0.601,-0.24C0.64,-0.265 0.671,-0.298 0.694,-0.338C0.717,-0.38 0.729,-0.425 0.729,-0.472C0.729,-0.549 0.702,-0.614 0.648,-0.668C0.594,-0.722 0.529,-0.749 0.453,-0.749L0.158,-0.749C0.136,-0.749 0.117,-0.741 0.102,-0.725C0.087,-0.71 0.079,-0.691 0.079,-0.67L0.079,-0.079C0.079,-0.057 0.087,-0.038 0.102,-0.023C0.117,-0.008 0.136,0 0.158,0C0.18,0 0.198,-0.008 0.214,-0.023C0.229,-0.038 0.236,-0.057 0.236,-0.079L0.236,-0.197L0.421,-0.197Z" style="fill:rgb(129,201,196);fill-rule:nonzero;"/>
-                </g>
-                <g transform="matrix(96,0,0,96,566.588,385.587)">
-                    <path d="M0.158,0C0.18,0 0.198,-0.008 0.214,-0.023C0.229,-0.038 0.236,-0.057 0.236,-0.079L0.236,-0.67C0.236,-0.691 0.229,-0.71 0.214,-0.725C0.198,-0.741 0.18,-0.749 0.158,-0.749C0.136,-0.749 0.117,-0.741 0.102,-0.725C0.087,-0.71 0.079,-0.691 0.079,-0.67L0.079,-0.079C0.079,-0.057 0.087,-0.038 0.102,-0.023C0.117,-0.008 0.136,0 0.158,0Z" style="fill:rgb(129,201,196);fill-rule:nonzero;"/>
-                </g>
-                <g transform="matrix(96,0,0,96,596.876,385.587)">
-                    <path d="M0.572,-0.472C0.572,-0.44 0.56,-0.412 0.537,-0.389C0.514,-0.366 0.486,-0.355 0.453,-0.355L0.236,-0.355L0.236,-0.591L0.453,-0.591C0.486,-0.591 0.514,-0.579 0.537,-0.556C0.56,-0.533 0.572,-0.505 0.572,-0.472ZM0.158,0C0.18,0 0.198,-0.008 0.214,-0.023C0.229,-0.038 0.236,-0.057 0.236,-0.079L0.236,-0.197L0.453,-0.197C0.529,-0.197 0.594,-0.224 0.648,-0.278C0.702,-0.332 0.729,-0.397 0.729,-0.472C0.729,-0.549 0.702,-0.614 0.648,-0.668C0.594,-0.722 0.529,-0.749 0.453,-0.749L0.158,-0.749C0.136,-0.749 0.117,-0.741 0.102,-0.725C0.087,-0.71 0.079,-0.691 0.079,-0.67L0.079,-0.079C0.079,-0.057 0.087,-0.038 0.102,-0.023C0.117,-0.008 0.136,0 0.158,0Z" style="fill:rgb(129,201,196);fill-rule:nonzero;"/>
-                </g>
-                <g transform="matrix(96,0,0,96,670.604,385.587)">
-                    <path d="M0.266,-0.591L0.266,-0.079C0.266,-0.057 0.273,-0.038 0.289,-0.023C0.304,-0.008 0.323,0 0.344,0C0.366,0 0.385,-0.008 0.4,-0.023C0.415,-0.038 0.423,-0.057 0.423,-0.079L0.423,-0.591L0.591,-0.591C0.612,-0.591 0.631,-0.599 0.647,-0.614C0.662,-0.629 0.67,-0.648 0.67,-0.67C0.67,-0.691 0.662,-0.71 0.647,-0.725C0.631,-0.741 0.612,-0.749 0.591,-0.749L0.099,-0.749C0.077,-0.749 0.058,-0.741 0.043,-0.725C0.027,-0.71 0.02,-0.691 0.02,-0.67C0.02,-0.648 0.027,-0.629 0.043,-0.614C0.058,-0.599 0.077,-0.591 0.099,-0.591L0.266,-0.591Z" style="fill:rgb(129,201,196);fill-rule:nonzero;"/>
-                </g>
-                <g transform="matrix(96,0,0,96,736.748,385.587)">
-                    <path d="M0.118,-0.75C0.097,-0.75 0.078,-0.742 0.063,-0.727C0.047,-0.712 0.04,-0.693 0.04,-0.671L0.04,-0.573C0.04,-0.551 0.047,-0.532 0.063,-0.517C0.078,-0.502 0.097,-0.494 0.118,-0.494C0.14,-0.494 0.159,-0.502 0.174,-0.517C0.189,-0.532 0.197,-0.551 0.197,-0.573L0.197,-0.671C0.197,-0.693 0.189,-0.712 0.174,-0.727C0.159,-0.742 0.14,-0.75 0.118,-0.75ZM0.355,-0.75C0.333,-0.75 0.314,-0.742 0.299,-0.727C0.284,-0.712 0.276,-0.693 0.276,-0.671L0.276,-0.573C0.276,-0.551 0.284,-0.532 0.299,-0.517C0.314,-0.502 0.333,-0.494 0.355,-0.494C0.377,-0.494 0.395,-0.502 0.41,-0.517C0.426,-0.532 0.434,-0.551 0.434,-0.573L0.434,-0.671C0.434,-0.693 0.426,-0.712 0.41,-0.727C0.395,-0.742 0.377,-0.75 0.355,-0.75Z" style="fill:rgb(129,201,196);fill-rule:nonzero;"/>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/app/img/desk-animation.svg
+++ b/app/img/desk-animation.svg
@ -1,37 +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 4096 4096" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g id="TheDesk">
-        <g id="back">
-            <g transform="matrix(1,0,0,1.53232,-11.8871,-1144.65)">
-                <rect x="1044.02" y="1686.36" width="2335.77" height="782.558" style="fill:rgba(255,255,255,0);">
-                    <animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
-                </rect>
-            </g>
-            <rect x="1058.89" y="609.971" width="711.146" height="2885.69" style="fill:rgba(255,255,255,0);">
-                <animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
-            </rect>
-            <g transform="matrix(1.08582,0,0,1,-142.973,0)">
-                <rect x="1665.9" y="1021.89" width="776.607" height="2050.26" style="fill:rgba(255,255,255,0);">
-                    <animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
-                </rect>
-            </g>
-        </g>
-        <g transform="matrix(1,0,0,0.998821,0,4.65666)" id="gray">
-            <rect x="678.5" y="128.48" width="450" height="3821.5" style="fill:rgb(84,82,81);"/>
-        </g>
-        <g transform="matrix(0.999978,-5.55112e-17,-2.20005e-08,0.996112,-1237.17,972.039)" id="orange">
-            <rect x="1915.71" y="-583.55" width="450" height="3117.62" style="fill:rgb(240,132,46);" r="3117.62">
-                <animateTransform attributeName="transform" attributeType="XML" type="rotate" from="0,1915.71,-583.55" to="-60,1915.71,-583.55" dur="0.5s" repeatCount="1" fill="freeze" />
-            </rect>
-        </g>
-        <g transform="matrix(0.999978,5.55112e-17,-5.55112e-17,0.999978,-1236.96,-1164.58)" id="blue">
-            <rect x="1915.5" y="1775.41" width="450" height="3105.58" style="fill:rgb(54,76,159);" r="3117.62">
-                <animateTransform attributeName="transform" attributeType="XML" type="rotate" from="0,1915.71,4881" to="60,1915.71,4881" dur="0.5s" repeatCount="1" fill="freeze" />
-            </rect>
-        </g>
-        <path id="cat" d="M1592.47,2584L2048.94,2584C2048.94,2519.11 2044.31,2506.24 1936.84,2506.24C1954.01,2454.74 2023.79,2330.13 2062.57,2330.13C2096.88,2330.13 2137.81,2332.02 2137.81,2410.3C2137.81,2499.17 2287.37,2642.46 2323.63,2584C2377.67,2496.88 2230.72,2523.45 2230.72,2313.35C2230.72,2025.92 2398.46,2066.84 2398.46,1905.36C2398.46,1824.57 2376.14,1813.66 2376.14,1755.9C2376.14,1679.56 2443.39,1683.99 2430.31,1620.7C2421.27,1576.98 2414.2,1541.92 2408.93,1489.05C2405.19,1451.54 2404,1411.55 2365.03,1413.16C2319.25,1415.05 2301.88,1495.63 2230.72,1501.41C2159.7,1507.18 2099.15,1440.95 2071.66,1450.41C2044.41,1459.79 2052.98,1533.73 2069.14,1586.24C2094.54,1668.78 2149.93,1776.1 2048.94,1792.26C1947.95,1808.42 1774.25,1824.58 1649.02,1990.2C1523.79,2155.82 1528.42,2350.19 1479.36,2410.31C1314.72,2612.08 1146,2529.23 1146,2697.11C1146,2772.27 1273.35,2826.38 1293.55,2802.14C1313.75,2777.9 1121.93,2705.68 1336.56,2620.36C1519.91,2547.46 1536.28,2532.58 1592.47,2584Z" style="fill:rgba(0,0,0,0);">
-            <animate attributeName="fill" begin="0.6s" dur="0.5s" fill="freeze" values="rgba(0,0,0,0);rgba(0,0,0,1)" repeatCount="1" />
-        </path>
-    </g>
-</svg>
--- a/app/img/desk.png
+++ b/app/img/desk.png
--- a/app/img/desk.svg
+++ b/app/img/desk.svg
@ -1,26 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 4096 4096" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g id="TheDesk">
-        <g>
-            <g transform="matrix(1,0,0,1.53232,-11.8871,-1144.65)">
-                <rect x="1044.02" y="1686.36" width="2335.77" height="782.558" style="fill:white;"/>
-            </g>
-            <rect x="1058.89" y="609.971" width="711.146" height="2885.69" style="fill:white;"/>
-            <g transform="matrix(1.08582,0,0,1,-142.973,0)">
-                <rect x="1665.9" y="1021.89" width="776.607" height="2050.26" style="fill:white;"/>
-            </g>
-        </g>
-        <g transform="matrix(1,0,0,0.998821,0,4.65666)">
-            <rect x="678.5" y="128.48" width="450" height="3821.5" style="fill:rgb(84,82,81);"/>
-        </g>
-        <g transform="matrix(0.5,-0.866,0.862652,0.498067,224.046,2340.41)">
-            <rect x="1915.71" y="-583.55" width="450" height="3117.62" style="fill:rgb(240,132,46);"/>
-        </g>
-        <g transform="matrix(0.5,0.866,-0.866,0.5,3757.17,-299.625)">
-            <rect x="1915.5" y="1555.41" width="450" height="3105.58" style="fill:rgb(54,76,159);"/>
-        </g>
-        <path id="cat" d="M1592.47,2584L2048.94,2584C2048.94,2519.11 2044.31,2506.24 1936.84,2506.24C1954.01,2454.74 2023.79,2330.13 2062.57,2330.13C2096.88,2330.13 2137.81,2332.02 2137.81,2410.3C2137.81,2499.17 2287.37,2642.46 2323.63,2584C2377.67,2496.88 2230.72,2523.45 2230.72,2313.35C2230.72,2025.92 2398.46,2066.84 2398.46,1905.36C2398.46,1824.57 2376.14,1813.66 2376.14,1755.9C2376.14,1679.56 2443.39,1683.99 2430.31,1620.7C2421.27,1576.98 2414.2,1541.92 2408.93,1489.05C2405.19,1451.54 2404,1411.55 2365.03,1413.16C2319.25,1415.05 2301.88,1495.63 2230.72,1501.41C2159.7,1507.18 2099.15,1440.95 2071.66,1450.41C2044.41,1459.79 2052.98,1533.73 2069.14,1586.24C2094.54,1668.78 2149.93,1776.1 2048.94,1792.26C1947.95,1808.42 1774.25,1824.58 1649.02,1990.2C1523.79,2155.82 1528.42,2350.19 1479.36,2410.31C1314.72,2612.08 1146,2529.23 1146,2697.11C1146,2772.27 1273.35,2826.38 1293.55,2802.14C1313.75,2777.9 1121.93,2705.68 1336.56,2620.36C1519.91,2547.46 1536.28,2532.58 1592.47,2584Z" style="fill:rgb(4,0,0);"/>
-        <rect x="0" y="0" width="4096" height="4096" style="fill:none;"/>
-    </g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:#545251;stroke:#040000;stroke-miterlimit:10;}
+	.st3{fill:#F0842E;}
+	.st4{fill:#364C9F;}
+	.st5{fill:#FFFFFF;stroke:#040000;stroke-miterlimit:10;}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#040000;}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:none;}
+</style>
+<g id="レイヤー_1" class="st0">
+</g>
+<g id="レイヤー_2">
+	<polyline class="st1" points="1128.5,650.67 3378,1950 3378,2137 1128.5,3432.67 	"/>
+	<rect x="678.5" y="128.48" class="st2" width="450" height="3821.5"/>
+	
+		<rect x="1915.71" y="-583.55" transform="matrix(0.5 -0.866 0.866 0.5 225.753 2341.5386)" class="st3" width="450" height="3117.62"/>
+	
+		<rect x="1915.5" y="1555.41" transform="matrix(0.5 0.866 -0.866 0.5 3762.031 -299.6245)" class="st4" width="450" height="3105.58"/>
+	<path class="st5" d="M714.5,2953.5"/>
+	<path id="path1891" class="st6" d="M1592.47,2584h456.47c0-64.89-4.63-77.76-112.1-77.76c17.17-51.5,86.95-176.11,125.73-176.11
+		c34.31,0,75.24,1.89,75.24,80.17c0,88.87,149.56,232.16,185.82,173.7c54.04-87.12-92.91-60.55-92.91-270.65
+		c0-287.43,167.74-246.51,167.74-407.99c0-80.79-22.32-91.7-22.32-149.46c0-76.34,67.25-71.91,54.17-135.2
+		c-9.04-43.72-16.11-78.78-21.38-131.65c-3.74-37.51-4.93-77.5-43.9-75.89c-45.78,1.89-63.15,82.47-134.31,88.25
+		c-71.02,5.77-131.57-60.46-159.06-51c-27.25,9.38-18.68,83.32-2.52,135.83c25.4,82.54,80.79,189.86-20.2,206.02
+		c-100.99,16.16-274.69,32.32-399.92,197.94s-120.6,359.99-169.66,420.11C1314.72,2612.08,1146,2529.23,1146,2697.11
+		c0,75.16,127.35,129.27,147.55,105.03c20.2-24.24-171.62-96.46,43.01-181.78C1519.91,2547.46,1536.28,2532.58,1592.47,2584z"/>
+	<rect class="st7" width="4096" height="4096"/>
+	<path class="st1" d="M-58,1122"/>
+</g>
 </svg>
--- a/app/img/desk_full.svg
+++ b/app/img/desk_full.svg
@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!--
-	TheDesk icon, Cutls P.
-	This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
-->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
 <style type="text/css">
--- a/app/img/icons/icon-128x128.png
+++ b/app/img/icons/icon-128x128.png
--- a/app/img/icons/icon-144x144.png
+++ b/app/img/icons/icon-144x144.png
--- a/app/img/icons/icon-152x152.png
+++ b/app/img/icons/icon-152x152.png
--- a/app/img/icons/icon-192x192.png
+++ b/app/img/icons/icon-192x192.png
--- a/app/img/icons/icon-384x384.png
+++ b/app/img/icons/icon-384x384.png
--- a/app/img/icons/icon-512x512.png
+++ b/app/img/icons/icon-512x512.png
--- a/app/img/icons/icon-72x72.png
+++ b/app/img/icons/icon-72x72.png
--- a/app/img/icons/icon-96x96.png
+++ b/app/img/icons/icon-96x96.png
--- a/app/img/picture.svg
+++ b/app/img/picture.svg
@ -1,2 +0,0 @@
-
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M21 19V5c0-1.1-.9-2-2-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5-4.5z"/><path d="M0 0h24v24H0z" fill="none"/></svg>
--- a/app/img/thinking.svg
+++ b/app/img/thinking.svg
@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-	ThinkingDesk: Cutls P's icon, Cutls P.
-	This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
-->
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
--- a/app/index.html
+++ b/app/index.html
@ -1,12 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <script>
-            if (/^ja\b/.test(navigator.language)) {
-                location.href = './view/ja'
-            } else {
-                location.href = './view/en'
-           }
-        </script>
-    </head>
-</html>
--- a/app/js/ace/ace.js
+++ b/app/js/ace/ace.js
--- a/app/js/ace/ext-beautify.js
+++ b/app/js/ace/ext-beautify.js
@ -1,9 +0,0 @@
-define("ace/ext/beautify",["require","exports","module","ace/token_iterator"],function(e,t,n){"use strict";function i(e,t){return e.type.lastIndexOf(t+".xml")>-1}var r=e("../token_iterator").TokenIterator;t.singletonTags=["area","base","br","col","command","embed","hr","html","img","input","keygen","link","meta","param","source","track","wbr"],t.blockTags=["article","aside","blockquote","body","div","dl","fieldset","footer","form","head","header","html","nav","ol","p","script","section","style","table","tbody","tfoot","thead","ul"],t.beautify=function(e){var n=new r(e,0,0),s=n.getCurrentToken(),o=e.getTabString(),u=t.singletonTags,a=t.blockTags,f,l=!1,c=!1,h=!1,p="",d="",v="",m=0,g=0,y=0,b=0,w=0,E=0,S=0,x,T=0,N=0,C=[],k=!1,L,A=!1,O=!1,M=!1,_=!1,D={0:0},P=[],H=!1,B=function(){f&&f.value&&f.type!=="string.regexp"&&(f.value=f.value.replace(/^\s*/,""))},j=function(){p=p.replace(/ +$/,"")},F=function(){p=p.trimRight(),l=!1};while(s!==null){T=n.getCurrentTokenRow(),C=n.$rowTokens,f=n.stepForward();if(typeof s!="undefined"){d=s.value,w=0,M=v==="style"||e.$modeId==="ace/mode/css",i(s,"tag-open")?(O=!0,f&&(_=a.indexOf(f.value)!==-1),d==="</"&&(_&&!l&&N<1&&N++,M&&(N=1),w=1,_=!1)):i(s,"tag-close")?O=!1:i(s,"comment.start")?_=!0:i(s,"comment.end")&&(_=!1),!O&&!N&&s.type==="paren.rparen"&&s.value.substr(0,1)==="}"&&N++,T!==x&&(N=T,x&&(N-=x));if(N){F();for(;N>0;N--)p+="\n";l=!0,!i(s,"comment")&&!s.type.match(/^(comment|string)$/)&&(d=d.trimLeft())}if(d){s.type==="keyword"&&d.match(/^(if|else|elseif|for|foreach|while|switch)$/)?(P[m]=d,B(),h=!0,d.match(/^(else|elseif)$/)&&p.match(/\}[\s]*$/)&&(F(),c=!0)):s.type==="paren.lparen"?(B(),d.substr(-1)==="{"&&(h=!0,A=!1,O||(N=1)),d.substr(0,1)==="{"&&(c=!0,p.substr(-1)!=="["&&p.trimRight().substr(-1)==="["?(F(),c=!1):p.trimRight().substr(-1)===")"?F():j())):s.type==="paren.rparen"?(w=1,d.substr(0,1)==="}"&&(P[m-1]==="case"&&w++,p.trimRight().substr(-1)==="{"?F():(c=!0,M&&(N+=2))),d.substr(0,1)==="]"&&p.substr(-1)!=="}"&&p.trimRight().substr(-1)==="}"&&(c=!1,b++,F()),d.substr(0,1)===")"&&p.substr(-1)!=="("&&p.trimRight().substr(-1)==="("&&(c=!1,b++,F()),j()):s.type!=="keyword.operator"&&s.type!=="keyword"||!d.match(/^(=|==|===|!=|!==|&&|\|\||and|or|xor|\+=|.=|>|>=|<|<=|=>)$/)?s.type==="punctuation.operator"&&d===";"?(F(),B(),h=!0,M&&N++):s.type==="punctuation.operator"&&d.match(/^(:|,)$/)?(F(),B(),d.match(/^(,)$/)&&S>0&&E===0?N++:(h=!0,l=!1)):s.type==="support.php_tag"&&d==="?>"&&!l?(F(),c=!0):i(s,"attribute-name")&&p.substr(-1).match(/^\s$/)?c=!0:i(s,"attribute-equals")?(j(),B()):i(s,"tag-close")?(j(),d==="/>"&&(c=!0)):s.type==="keyword"&&d.match(/^(case|default)$/)&&H&&(w=1):(F(),B(),c=!0,h=!0);if(l&&(!s.type.match(/^(comment)$/)||!!d.substr(0,1).match(/^[/#]$/))&&(!s.type.match(/^(string)$/)||!!d.substr(0,1).match(/^['"]$/))){b=y;if(m>g){b++;for(L=m;L>g;L--)D[L]=b}else m<g&&(b=D[m]);g=m,y=b,w&&(b-=w),A&&!E&&(b++,A=!1);for(L=0;L<b;L++)p+=o}s.type==="keyword"&&d.match(/^(case|default)$/)?H===!1&&(P[m]=d,m++,H=!0):s.type==="keyword"&&d.match(/^(break)$/)&&P[m-1]&&P[m-1].match(/^(case|default)$/)&&(m--,H=!1),s.type==="paren.lparen"&&(E+=(d.match(/\(/g)||[]).length,S+=(d.match(/\{/g)||[]).length,m+=d.length),s.type==="keyword"&&d.match(/^(if|else|elseif|for|while)$/)?(A=!0,E=0):!E&&d.trim()&&s.type!=="comment"&&(A=!1);if(s.type==="paren.rparen"){E-=(d.match(/\)/g)||[]).length,S-=(d.match(/\}/g)||[]).length;for(L=0;L<d.length;L++)m--,d.substr(L,1)==="}"&&P[m]==="case"&&m--}s.type=="text"&&(d=d.replace(/\s+$/," ")),c&&!l&&(j(),p.substr(-1)!=="\n"&&(p+=" ")),p+=d,h&&(p+=" "),l=!1,c=!1,h=!1;if(i(s,"tag-close")&&(_||a.indexOf(v)!==-1)||i(s,"doctype")&&d===">")_&&f&&f.value==="</"?N=-1:N=1;i(s,"tag-open")&&d==="</"?m--:i(s,"tag-open")&&d==="<"&&u.indexOf(f.value)===-1?m++:i(s,"tag-name")?v=d:i(s,"tag-close")&&d==="/>"&&u.indexOf(v)===-1&&m--,x=T}}s=f}p=p.trim(),e.doc.setValue(p)},t.commands=[{name:"beautify",description:"Format selection (Beautify)",exec:function(e){t.beautify(e.session)},bindKey:"Ctrl-Shift-B"}]});
-                (function() {
-                    window.require(["ace/ext/beautify"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/ext-code_lens.js
+++ b/app/js/ace/ext-code_lens.js
@ -1,9 +0,0 @@
-define("ace/ext/code_lens",["require","exports","module","ace/line_widgets","ace/lib/event","ace/lib/lang","ace/lib/dom","ace/editor","ace/config"],function(e,t,n){"use strict";function u(e){var t=e.$textLayer,n=t.$lenses;n&&n.forEach(function(e){e.remove()}),t.$lenses=null}function a(e,t){var n=e&t.CHANGE_LINES||e&t.CHANGE_FULL||e&t.CHANGE_SCROLL||e&t.CHANGE_TEXT;if(!n)return;var r=t.session,i=t.session.lineWidgets,s=t.$textLayer,a=s.$lenses;if(!i){a&&u(t);return}var f=t.$textLayer.$lines.cells,l=t.layerConfig,c=t.$padding;a||(a=s.$lenses=[]);var h=0;for(var p=0;p<f.length;p++){var d=f[p].row,v=i[d],m=v&&v.lenses;if(!m||!m.length)continue;var g=a[h];g||(g=a[h]=o.buildDom(["div",{"class":"ace_codeLens"}],t.container)),g.style.height=l.lineHeight+"px",h++;for(var y=0;y<m.length;y++){var b=g.childNodes[2*y];b||(y!=0&&g.appendChild(o.createTextNode("\u00a0|\u00a0")),b=o.buildDom(["a"],g)),b.textContent=m[y].title,b.lensCommand=m[y]}while(g.childNodes.length>2*y-1)g.lastChild.remove();var w=t.$cursorLayer.getPixelPosition({row:d,column:0},!0).top-l.lineHeight*v.rowsAbove-l.offset;g.style.top=w+"px";var E=t.gutterWidth,S=r.getLine(d).search(/\S|$/);S==-1&&(S=0),E+=S*l.characterWidth,E-=t.scrollLeft,g.style.paddingLeft=c+E+"px"}while(h<a.length)a.pop().remove()}function f(e){if(!e.lineWidgets)return;var t=e.widgetManager;e.lineWidgets.forEach(function(e){e&&e.lenses&&t.removeLineWidget(e)})}function l(e){e.codeLensProviders=[],e.renderer.on("afterRender",a),e.$codeLensClickHandler||(e.$codeLensClickHandler=function(t){var n=t.target.lensCommand;n&&e.execCommand(n.id,n.arguments)},i.addListener(e.container,"click",e.$codeLensClickHandler,e)),e.$updateLenses=function(){function o(){var r=n.selection.cursor,i=n.documentToScreenRow(r);t.setLenses(n,s);var o=n.$undoManager&&n.$undoManager.$lastDelta;if(o&&o.action=="remove"&&o.lines.length>1)return;var u=n.documentToScreenRow(r),a=e.renderer.layerConfig.lineHeight,f=n.getScrollTop()+(u-i)*a;n.setScrollTop(f)}var n=e.session;if(!n)return;n.widgetManager||(n.widgetManager=new r(n),n.widgetManager.attach(e));var i=e.codeLensProviders.length,s=[];e.codeLensProviders.forEach(function(e){e.provideCodeLenses(n,function(e,t){if(e)return;t.forEach(function(e){s.push(e)}),i--,i==0&&o()})})};var n=s.delayedCall(e.$updateLenses);e.$updateLensesOnInput=function(){n.delay(250)},e.on("input",e.$updateLensesOnInput)}function c(e){e.off("input",e.$updateLensesOnInput),e.renderer.off("afterRender",a),e.$codeLensClickHandler&&e.container.removeEventListener("click",e.$codeLensClickHandler)}var r=e("../line_widgets").LineWidgets,i=e("../lib/event"),s=e("../lib/lang"),o=e("../lib/dom");t.setLenses=function(e,t){var n=Number.MAX_VALUE;f(e),t&&t.forEach(function(t){var r=t.start.row,i=t.start.column,s=e.lineWidgets&&e.lineWidgets[r];if(!s||!s.lenses)s=e.widgetManager.$registerLineWidget({rowCount:1,rowsAbove:1,row:r,column:i,lenses:[]});s.lenses.push(t.command),r<n&&(n=r)}),e._emit("changeFold",{data:{start:{row:n}}})},t.registerCodeLensProvider=function(e,t){e.setOption("enableCodeLens",!0),e.codeLensProviders.push(t),e.$updateLensesOnInput()},t.clear=function(e){t.setLenses(e,null)};var h=e("../editor").Editor;e("../config").defineOptions(h.prototype,"editor",{enableCodeLens:{set:function(e){e?l(this):c(this)}}}),o.importCssString(".ace_codeLens {    position: absolute;    color: #aaa;    font-size: 88%;    background: inherit;    width: 100%;    display: flex;    align-items: flex-end;    pointer-events: none;}.ace_codeLens > a {    cursor: pointer;    pointer-events: auto;}.ace_codeLens > a:hover {    color: #0000ff;    text-decoration: underline;}.ace_dark > .ace_codeLens > a:hover {    color: #4e94ce;}","")});
-                (function() {
-                    window.require(["ace/ext/code_lens"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/ext-elastic_tabstops_lite.js
+++ b/app/js/ace/ext-elastic_tabstops_lite.js
@ -1,9 +0,0 @@
-define("ace/ext/elastic_tabstops_lite",["require","exports","module","ace/editor","ace/config"],function(e,t,n){"use strict";var r=function(e){this.$editor=e;var t=this,n=[],r=!1;this.onAfterExec=function(){r=!1,t.processRows(n),n=[]},this.onExec=function(){r=!0},this.onChange=function(e){r&&(n.indexOf(e.start.row)==-1&&n.push(e.start.row),e.end.row!=e.start.row&&n.push(e.end.row))}};(function(){this.processRows=function(e){this.$inChange=!0;var t=[];for(var n=0,r=e.length;n<r;n++){var i=e[n];if(t.indexOf(i)>-1)continue;var s=this.$findCellWidthsForBlock(i),o=this.$setBlockCellWidthsToMax(s.cellWidths),u=s.firstRow;for(var a=0,f=o.length;a<f;a++){var l=o[a];t.push(u),this.$adjustRow(u,l),u++}}this.$inChange=!1},this.$findCellWidthsForBlock=function(e){var t=[],n,r=e;while(r>=0){n=this.$cellWidthsForRow(r);if(n.length==0)break;t.unshift(n),r--}var i=r+1;r=e;var s=this.$editor.session.getLength();while(r<s-1){r++,n=this.$cellWidthsForRow(r);if(n.length==0)break;t.push(n)}return{cellWidths:t,firstRow:i}},this.$cellWidthsForRow=function(e){var t=this.$selectionColumnsForRow(e),n=[-1].concat(this.$tabsForRow(e)),r=n.map(function(e){return 0}).slice(1),i=this.$editor.session.getLine(e);for(var s=0,o=n.length-1;s<o;s++){var u=n[s]+1,a=n[s+1],f=this.$rightmostSelectionInCell(t,a),l=i.substring(u,a);r[s]=Math.max(l.replace(/\s+$/g,"").length,f-u)}return r},this.$selectionColumnsForRow=function(e){var t=[],n=this.$editor.getCursorPosition();return this.$editor.session.getSelection().isEmpty()&&e==n.row&&t.push(n.column),t},this.$setBlockCellWidthsToMax=function(e){var t=!0,n,r,i,s=this.$izip_longest(e);for(var o=0,u=s.length;o<u;o++){var a=s[o];if(!a.push){console.error(a);continue}a.push(NaN);for(var f=0,l=a.length;f<l;f++){var c=a[f];t&&(n=f,i=0,t=!1);if(isNaN(c)){r=f;for(var h=n;h<r;h++)e[h][o]=i;t=!0}i=Math.max(i,c)}}return e},this.$rightmostSelectionInCell=function(e,t){var n=0;if(e.length){var r=[];for(var i=0,s=e.length;i<s;i++)e[i]<=t?r.push(i):r.push(0);n=Math.max.apply(Math,r)}return n},this.$tabsForRow=function(e){var t=[],n=this.$editor.session.getLine(e),r=/\t/g,i;while((i=r.exec(n))!=null)t.push(i.index);return t},this.$adjustRow=function(e,t){var n=this.$tabsForRow(e);if(n.length==0)return;var r=0,i=-1,s=this.$izip(t,n);for(var o=0,u=s.length;o<u;o++){var a=s[o][0],f=s[o][1];i+=1+a,f+=r;var l=i-f;if(l==0)continue;var c=this.$editor.session.getLine(e).substr(0,f),h=c.replace(/\s*$/g,""),p=c.length-h.length;l>0&&(this.$editor.session.getDocument().insertInLine({row:e,column:f+1},Array(l+1).join(" ")+"	"),this.$editor.session.getDocument().removeInLine(e,f,f+1),r+=l),l<0&&p>=-l&&(this.$editor.session.getDocument().removeInLine(e,f+l,f),r+=l)}},this.$izip_longest=function(e){if(!e[0])return[];var t=e[0].length,n=e.length;for(var r=1;r<n;r++){var i=e[r].length;i>t&&(t=i)}var s=[];for(var o=0;o<t;o++){var u=[];for(var r=0;r<n;r++)e[r][o]===""?u.push(NaN):u.push(e[r][o]);s.push(u)}return s},this.$izip=function(e,t){var n=e.length>=t.length?t.length:e.length,r=[];for(var i=0;i<n;i++){var s=[e[i],t[i]];r.push(s)}return r}}).call(r.prototype),t.ElasticTabstopsLite=r;var i=e("../editor").Editor;e("../config").defineOptions(i.prototype,"editor",{useElasticTabstops:{set:function(e){e?(this.elasticTabstops||(this.elasticTabstops=new r(this)),this.commands.on("afterExec",this.elasticTabstops.onAfterExec),this.commands.on("exec",this.elasticTabstops.onExec),this.on("change",this.elasticTabstops.onChange)):this.elasticTabstops&&(this.commands.removeListener("afterExec",this.elasticTabstops.onAfterExec),this.commands.removeListener("exec",this.elasticTabstops.onExec),this.removeListener("change",this.elasticTabstops.onChange))}}})});
-                (function() {
-                    window.require(["ace/ext/elastic_tabstops_lite"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/ext-emmet.js
+++ b/app/js/ace/ext-emmet.js
--- a/app/js/ace/ext-error_marker.js
+++ b/app/js/ace/ext-error_marker.js
@ -1,9 +0,0 @@
-;
-                (function() {
-                    window.require(["ace/ext/error_marker"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/ext-keybinding_menu.js
+++ b/app/js/ace/ext-keybinding_menu.js
@ -1,9 +0,0 @@
-define("ace/ext/menu_tools/overlay_page",["require","exports","module","ace/lib/dom"],function(e,t,n){"use strict";var r=e("../../lib/dom"),i="#ace_settingsmenu, #kbshortcutmenu {background-color: #F7F7F7;color: black;box-shadow: -5px 4px 5px rgba(126, 126, 126, 0.55);padding: 1em 0.5em 2em 1em;overflow: auto;position: absolute;margin: 0;bottom: 0;right: 0;top: 0;z-index: 9991;cursor: default;}.ace_dark #ace_settingsmenu, .ace_dark #kbshortcutmenu {box-shadow: -20px 10px 25px rgba(126, 126, 126, 0.25);background-color: rgba(255, 255, 255, 0.6);color: black;}.ace_optionsMenuEntry:hover {background-color: rgba(100, 100, 100, 0.1);transition: all 0.3s}.ace_closeButton {background: rgba(245, 146, 146, 0.5);border: 1px solid #F48A8A;border-radius: 50%;padding: 7px;position: absolute;right: -8px;top: -8px;z-index: 100000;}.ace_closeButton{background: rgba(245, 146, 146, 0.9);}.ace_optionsMenuKey {color: darkslateblue;font-weight: bold;}.ace_optionsMenuCommand {color: darkcyan;font-weight: normal;}.ace_optionsMenuEntry input, .ace_optionsMenuEntry button {vertical-align: middle;}.ace_optionsMenuEntry button[ace_selected_button=true] {background: #e7e7e7;box-shadow: 1px 0px 2px 0px #adadad inset;border-color: #adadad;}.ace_optionsMenuEntry button {background: white;border: 1px solid lightgray;margin: 0px;}.ace_optionsMenuEntry button:hover{background: #f0f0f0;}";r.importCssString(i),n.exports.overlayPage=function(t,n,r){function o(e){e.keyCode===27&&u()}function u(){if(!i)return;document.removeEventListener("keydown",o),i.parentNode.removeChild(i),t&&t.focus(),i=null,r&&r()}function a(e){s=e,e&&(i.style.pointerEvents="none",n.style.pointerEvents="auto")}var i=document.createElement("div"),s=!1;return i.style.cssText="margin: 0; padding: 0; position: fixed; top:0; bottom:0; left:0; right:0;z-index: 9990; "+(t?"background-color: rgba(0, 0, 0, 0.3);":""),i.addEventListener("click",function(e){s||u()}),document.addEventListener("keydown",o),n.addEventListener("click",function(e){e.stopPropagation()}),i.appendChild(n),document.body.appendChild(i),t&&t.blur(),{close:u,setIgnoreFocusOut:a}}}),define("ace/ext/menu_tools/get_editor_keyboard_shortcuts",["require","exports","module","ace/lib/keys"],function(e,t,n){"use strict";var r=e("../../lib/keys");n.exports.getEditorKeybordShortcuts=function(e){var t=r.KEY_MODS,n=[],i={};return e.keyBinding.$handlers.forEach(function(e){var t=e.commandKeyBinding;for(var r in t){var s=r.replace(/(^|-)\w/g,function(e){return e.toUpperCase()}),o=t[r];Array.isArray(o)||(o=[o]),o.forEach(function(e){typeof e!="string"&&(e=e.name),i[e]?i[e].key+="|"+s:(i[e]={key:s,command:e},n.push(i[e]))})}}),n}}),define("ace/ext/keybinding_menu",["require","exports","module","ace/editor","ace/ext/menu_tools/overlay_page","ace/ext/menu_tools/get_editor_keyboard_shortcuts"],function(e,t,n){"use strict";function i(t){if(!document.getElementById("kbshortcutmenu")){var n=e("./menu_tools/overlay_page").overlayPage,r=e("./menu_tools/get_editor_keyboard_shortcuts").getEditorKeybordShortcuts,i=r(t),s=document.createElement("div"),o=i.reduce(function(e,t){return e+'<div class="ace_optionsMenuEntry"><span class="ace_optionsMenuCommand">'+t.command+"</span> : "+'<span class="ace_optionsMenuKey">'+t.key+"</span></div>"},"");s.id="kbshortcutmenu",s.innerHTML="<h1>Keyboard Shortcuts</h1>"+o+"</div>",n(t,s)}}var r=e("../editor").Editor;n.exports.init=function(e){r.prototype.showKeyboardShortcuts=function(){i(this)},e.commands.addCommands([{name:"showKeyboardShortcuts",bindKey:{win:"Ctrl-Alt-h",mac:"Command-Alt-h"},exec:function(e,t){e.showKeyboardShortcuts()}}])}});
-                (function() {
-                    window.require(["ace/ext/keybinding_menu"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/ext-language_tools.js
+++ b/app/js/ace/ext-language_tools.js
--- a/app/js/ace/ext-linking.js
+++ b/app/js/ace/ext-linking.js
@ -1,9 +0,0 @@
-define("ace/ext/linking",["require","exports","module","ace/editor","ace/config"],function(e,t,n){function i(e){var n=e.editor,r=e.getAccelKey();if(r){var n=e.editor,i=e.getDocumentPosition(),s=n.session,o=s.getTokenAt(i.row,i.column);t.previousLinkingHover&&t.previousLinkingHover!=o&&n._emit("linkHoverOut"),n._emit("linkHover",{position:i,token:o}),t.previousLinkingHover=o}else t.previousLinkingHover&&(n._emit("linkHoverOut"),t.previousLinkingHover=!1)}function s(e){var t=e.getAccelKey(),n=e.getButton();if(n==0&&t){var r=e.editor,i=e.getDocumentPosition(),s=r.session,o=s.getTokenAt(i.row,i.column);r._emit("linkClick",{position:i,token:o})}}var r=e("../editor").Editor;e("../config").defineOptions(r.prototype,"editor",{enableLinking:{set:function(e){e?(this.on("click",s),this.on("mousemove",i)):(this.off("click",s),this.off("mousemove",i))},value:!1}}),t.previousLinkingHover=!1});
-                (function() {
-                    window.require(["ace/ext/linking"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/ext-modelist.js
+++ b/app/js/ace/ext-modelist.js
@ -1,9 +0,0 @@
-define("ace/ext/modelist",["require","exports","module"],function(e,t,n){"use strict";function i(e){var t=a.text,n=e.split(/[\/\\]/).pop();for(var i=0;i<r.length;i++)if(r[i].supportsFile(n)){t=r[i];break}return t}var r=[],s=function(e,t,n){this.name=e,this.caption=t,this.mode="ace/mode/"+e,this.extensions=n;var r;/\^/.test(n)?r=n.replace(/\|(\^)?/g,function(e,t){return"$|"+(t?"^":"^.*\\.")})+"$":r="^.*\\.("+n+")$",this.extRe=new RegExp(r,"gi")};s.prototype.supportsFile=function(e){return e.match(this.extRe)};var o={ABAP:["abap"],ABC:["abc"],ActionScript:["as"],ADA:["ada|adb"],aiscript:[""],Alda:["alda"],Apache_Conf:["^htaccess|^htgroups|^htpasswd|^conf|htaccess|htgroups|htpasswd"],Apex:["apex|cls|trigger|tgr"],AQL:["aql"],AsciiDoc:["asciidoc|adoc"],ASL:["dsl|asl"],Assembly_x86:["asm|a"],AutoHotKey:["ahk"],BatchFile:["bat|cmd"],C_Cpp:["cpp|c|cc|cxx|h|hh|hpp|ino"],C9Search:["c9search_results"],Cirru:["cirru|cr"],Clojure:["clj|cljs"],Cobol:["CBL|COB"],coffee:["coffee|cf|cson|^Cakefile"],ColdFusion:["cfm"],Crystal:["cr"],CSharp:["cs"],Csound_Document:["csd"],Csound_Orchestra:["orc"],Csound_Score:["sco"],CSS:["css"],Curly:["curly"],D:["d|di"],Dart:["dart"],Diff:["diff|patch"],Dockerfile:["^Dockerfile"],Dot:["dot"],Drools:["drl"],Edifact:["edi"],Eiffel:["e|ge"],EJS:["ejs"],Elixir:["ex|exs"],Elm:["elm"],Erlang:["erl|hrl"],Forth:["frt|fs|ldr|fth|4th"],Fortran:["f|f90"],FSharp:["fsi|fs|ml|mli|fsx|fsscript"],FSL:["fsl"],FTL:["ftl"],Gcode:["gcode"],Gherkin:["feature"],Gitignore:["^.gitignore"],Glsl:["glsl|frag|vert"],Gobstones:["gbs"],golang:["go"],GraphQLSchema:["gql"],Groovy:["groovy"],HAML:["haml"],Handlebars:["hbs|handlebars|tpl|mustache"],Haskell:["hs"],Haskell_Cabal:["cabal"],haXe:["hx"],Hjson:["hjson"],HTML:["html|htm|xhtml|vue|we|wpy"],HTML_Elixir:["eex|html.eex"],HTML_Ruby:["erb|rhtml|html.erb"],INI:["ini|conf|cfg|prefs"],Io:["io"],Jack:["jack"],Jade:["jade|pug"],Java:["java"],JavaScript:["js|jsm|jsx"],JSON:["json"],JSON5:["json5"],JSONiq:["jq"],JSP:["jsp"],JSSM:["jssm|jssm_state"],JSX:["jsx"],Julia:["jl"],Kotlin:["kt|kts"],LaTeX:["tex|latex|ltx|bib"],Latte:["latte"],LESS:["less"],Liquid:["liquid"],Lisp:["lisp"],LiveScript:["ls"],LogiQL:["logic|lql"],LSL:["lsl"],Lua:["lua"],LuaPage:["lp"],Lucene:["lucene"],Makefile:["^Makefile|^GNUmakefile|^makefile|^OCamlMakefile|make"],Markdown:["md|markdown"],Mask:["mask"],MATLAB:["matlab"],Maze:["mz"],MediaWiki:["wiki|mediawiki"],MEL:["mel"],MIPS:["s|asm"],MIXAL:["mixal"],MUSHCode:["mc|mush"],MySQL:["mysql"],Nginx:["nginx|conf"],Nim:["nim"],Nix:["nix"],NSIS:["nsi|nsh"],Nunjucks:["nunjucks|nunjs|nj|njk"],ObjectiveC:["m|mm"],OCaml:["ml|mli"],Pascal:["pas|p"],Perl:["pl|pm"],pgSQL:["pgsql"],PHP:["php|inc|phtml|shtml|php3|php4|php5|phps|phpt|aw|ctp|module"],PHP_Laravel_blade:["blade.php"],Pig:["pig"],Powershell:["ps1"],Praat:["praat|praatscript|psc|proc"],Prisma:["prisma"],Prolog:["plg|prolog"],Properties:["properties"],Protobuf:["proto"],Puppet:["epp|pp"],Python:["py"],QML:["qml"],R:["r"],Raku:["raku|rakumod|rakutest|p6|pl6|pm6"],Razor:["cshtml|asp"],RDoc:["Rd"],Red:["red|reds"],RHTML:["Rhtml"],RST:["rst"],Ruby:["rb|ru|gemspec|rake|^Guardfile|^Rakefile|^Gemfile"],Rust:["rs"],SASS:["sass"],SCAD:["scad"],Scala:["scala|sbt"],Scheme:["scm|sm|rkt|oak|scheme"],SCSS:["scss"],SH:["sh|bash|^.bashrc"],SJS:["sjs"],Slim:["slim|skim"],Smarty:["smarty|tpl"],Smithy:["smithy"],snippets:["snippets"],Soy_Template:["soy"],Space:["space"],SQL:["sql"],SQLServer:["sqlserver"],Stylus:["styl|stylus"],SVG:["svg"],Swift:["swift"],Tcl:["tcl"],Terraform:["tf","tfvars","terragrunt"],Tex:["tex"],Text:["txt"],Textile:["textile"],Toml:["toml"],TSX:["tsx"],Twig:["twig|swig"],Typescript:["ts|typescript|str"],Vala:["vala"],VBScript:["vbs|vb"],Velocity:["vm"],Verilog:["v|vh|sv|svh"],VHDL:["vhd|vhdl"],Visualforce:["vfp|component|page"],Wollok:["wlk|wpgm|wtest"],XML:["xml|rdf|rss|wsdl|xslt|atom|mathml|mml|xul|xbl|xaml"],XQuery:["xq"],YAML:["yaml|yml"],Zeek:["zeek|bro"],Django:["html"]},u={ObjectiveC:"Objective-C",CSharp:"C#",golang:"Go",C_Cpp:"C and C++",Csound_Document:"Csound Document",Csound_Orchestra:"Csound",Csound_Score:"Csound Score",coffee:"CoffeeScript",HTML_Ruby:"HTML (Ruby)",HTML_Elixir:"HTML (Elixir)",FTL:"FreeMarker",PHP_Laravel_blade:"PHP (Blade Template)",Perl6:"Perl 6",AutoHotKey:"AutoHotkey / AutoIt"},a={};for(var f in o){var l=o[f],c=(u[f]||f).replace(/_/g," "),h=f.toLowerCase(),p=new s(h,c,l[0]);a[h]=p,r.push(p)}n.exports={getModeForPath:i,modes:r,modesByName:a}});
-                (function() {
-                    window.require(["ace/ext/modelist"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/ext-options.js
+++ b/app/js/ace/ext-options.js
--- a/app/js/ace/ext-prompt.js
+++ b/app/js/ace/ext-prompt.js
--- a/app/js/ace/ext-rtl.js
+++ b/app/js/ace/ext-rtl.js
@ -1,9 +0,0 @@
-define("ace/ext/rtl",["require","exports","module","ace/editor","ace/config"],function(e,t,n){"use strict";function s(e,t){var n=t.getSelection().lead;t.session.$bidiHandler.isRtlLine(n.row)&&n.column===0&&(t.session.$bidiHandler.isMoveLeftOperation&&n.row>0?t.getSelection().moveCursorTo(n.row-1,t.session.getLine(n.row-1).length):t.getSelection().isEmpty()?n.column+=1:n.setPosition(n.row,n.column+1))}function o(e){e.editor.session.$bidiHandler.isMoveLeftOperation=/gotoleft|selectleft|backspace|removewordleft/.test(e.command.name)}function u(e,t){var n=t.session;n.$bidiHandler.currentRow=null;if(n.$bidiHandler.isRtlLine(e.start.row)&&e.action==="insert"&&e.lines.length>1)for(var r=e.start.row;r<e.end.row;r++)n.getLine(r+1).charAt(0)!==n.$bidiHandler.RLE&&(n.doc.$lines[r+1]=n.$bidiHandler.RLE+n.getLine(r+1))}function a(e,t){var n=t.session,r=n.$bidiHandler,i=t.$textLayer.$lines.cells,s=t.layerConfig.width-t.layerConfig.padding+"px";i.forEach(function(e){var t=e.element.style;r&&r.isRtlLine(e.row)?(t.direction="rtl",t.textAlign="right",t.width=s):(t.direction="",t.textAlign="",t.width="")})}function f(e){function n(e){var t=e.element.style;t.direction=t.textAlign=t.width=""}var t=e.$textLayer.$lines;t.cells.forEach(n),t.cellCache.forEach(n)}var r=[{name:"leftToRight",bindKey:{win:"Ctrl-Alt-Shift-L",mac:"Command-Alt-Shift-L"},exec:function(e){e.session.$bidiHandler.setRtlDirection(e,!1)},readOnly:!0},{name:"rightToLeft",bindKey:{win:"Ctrl-Alt-Shift-R",mac:"Command-Alt-Shift-R"},exec:function(e){e.session.$bidiHandler.setRtlDirection(e,!0)},readOnly:!0}],i=e("../editor").Editor;e("../config").defineOptions(i.prototype,"editor",{rtlText:{set:function(e){e?(this.on("change",u),this.on("changeSelection",s),this.renderer.on("afterRender",a),this.commands.on("exec",o),this.commands.addCommands(r)):(this.off("change",u),this.off("changeSelection",s),this.renderer.off("afterRender",a),this.commands.off("exec",o),this.commands.removeCommands(r),f(this.renderer)),this.renderer.updateFull()}},rtl:{set:function(e){this.session.$bidiHandler.$isRtl=e,e?(this.setOption("rtlText",!1),this.renderer.on("afterRender",a),this.session.$bidiHandler.seenBidi=!0):(this.renderer.off("afterRender",a),f(this.renderer)),this.renderer.updateFull()}}})});
-                (function() {
-                    window.require(["ace/ext/rtl"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/ext-searchbox.js
+++ b/app/js/ace/ext-searchbox.js
--- a/app/js/ace/ext-settings_menu.js
+++ b/app/js/ace/ext-settings_menu.js
--- a/app/js/ace/ext-spellcheck.js
+++ b/app/js/ace/ext-spellcheck.js
@ -1,9 +0,0 @@
-define("ace/ext/spellcheck",["require","exports","module","ace/lib/event","ace/editor","ace/config"],function(e,t,n){"use strict";var r=e("../lib/event");t.contextMenuHandler=function(e){var t=e.target,n=t.textInput.getElement();if(!t.selection.isEmpty())return;var i=t.getCursorPosition(),s=t.session.getWordRange(i.row,i.column),o=t.session.getTextRange(s);t.session.tokenRe.lastIndex=0;if(!t.session.tokenRe.test(o))return;var u="\x01\x01",a=o+" "+u;n.value=a,n.setSelectionRange(o.length,o.length+1),n.setSelectionRange(0,0),n.setSelectionRange(0,o.length);var f=!1;r.addListener(n,"keydown",function l(){r.removeListener(n,"keydown",l),f=!0}),t.textInput.setInputHandler(function(e){if(e==a)return"";if(e.lastIndexOf(a,0)===0)return e.slice(a.length);if(e.substr(n.selectionEnd)==a)return e.slice(0,-a.length);if(e.slice(-2)==u){var r=e.slice(0,-2);if(r.slice(-1)==" ")return f?r.substring(0,n.selectionEnd):(r=r.slice(0,-1),t.session.replace(s,r),"")}return e})};var i=e("../editor").Editor;e("../config").defineOptions(i.prototype,"editor",{spellcheck:{set:function(e){var n=this.textInput.getElement();n.spellcheck=!!e,e?this.on("nativecontextmenu",t.contextMenuHandler):this.removeListener("nativecontextmenu",t.contextMenuHandler)},value:!0}})});
-                (function() {
-                    window.require(["ace/ext/spellcheck"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/ext-split.js
+++ b/app/js/ace/ext-split.js
@ -1,9 +0,0 @@
-define("ace/split",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/lib/event_emitter","ace/editor","ace/virtual_renderer","ace/edit_session"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/lang"),s=e("./lib/event_emitter").EventEmitter,o=e("./editor").Editor,u=e("./virtual_renderer").VirtualRenderer,a=e("./edit_session").EditSession,f=function(e,t,n){this.BELOW=1,this.BESIDE=0,this.$container=e,this.$theme=t,this.$splits=0,this.$editorCSS="",this.$editors=[],this.$orientation=this.BESIDE,this.setSplits(n||1),this.$cEditor=this.$editors[0],this.on("focus",function(e){this.$cEditor=e}.bind(this))};(function(){r.implement(this,s),this.$createEditor=function(){var e=document.createElement("div");e.className=this.$editorCSS,e.style.cssText="position: absolute; top:0px; bottom:0px",this.$container.appendChild(e);var t=new o(new u(e,this.$theme));return t.on("focus",function(){this._emit("focus",t)}.bind(this)),this.$editors.push(t),t.setFontSize(this.$fontSize),t},this.setSplits=function(e){var t;if(e<1)throw"The number of splits have to be > 0!";if(e==this.$splits)return;if(e>this.$splits){while(this.$splits<this.$editors.length&&this.$splits<e)t=this.$editors[this.$splits],this.$container.appendChild(t.container),t.setFontSize(this.$fontSize),this.$splits++;while(this.$splits<e)this.$createEditor(),this.$splits++}else while(this.$splits>e)t=this.$editors[this.$splits-1],this.$container.removeChild(t.container),this.$splits--;this.resize()},this.getSplits=function(){return this.$splits},this.getEditor=function(e){return this.$editors[e]},this.getCurrentEditor=function(){return this.$cEditor},this.focus=function(){this.$cEditor.focus()},this.blur=function(){this.$cEditor.blur()},this.setTheme=function(e){this.$editors.forEach(function(t){t.setTheme(e)})},this.setKeyboardHandler=function(e){this.$editors.forEach(function(t){t.setKeyboardHandler(e)})},this.forEach=function(e,t){this.$editors.forEach(e,t)},this.$fontSize="",this.setFontSize=function(e){this.$fontSize=e,this.forEach(function(t){t.setFontSize(e)})},this.$cloneSession=function(e){var t=new a(e.getDocument(),e.getMode()),n=e.getUndoManager();return t.setUndoManager(n),t.setTabSize(e.getTabSize()),t.setUseSoftTabs(e.getUseSoftTabs()),t.setOverwrite(e.getOverwrite()),t.setBreakpoints(e.getBreakpoints()),t.setUseWrapMode(e.getUseWrapMode()),t.setUseWorker(e.getUseWorker()),t.setWrapLimitRange(e.$wrapLimitRange.min,e.$wrapLimitRange.max),t.$foldData=e.$cloneFoldData(),t},this.setSession=function(e,t){var n;t==null?n=this.$cEditor:n=this.$editors[t];var r=this.$editors.some(function(t){return t.session===e});return r&&(e=this.$cloneSession(e)),n.setSession(e),e},this.getOrientation=function(){return this.$orientation},this.setOrientation=function(e){if(this.$orientation==e)return;this.$orientation=e,this.resize()},this.resize=function(){var e=this.$container.clientWidth,t=this.$container.clientHeight,n;if(this.$orientation==this.BESIDE){var r=e/this.$splits;for(var i=0;i<this.$splits;i++)n=this.$editors[i],n.container.style.width=r+"px",n.container.style.top="0px",n.container.style.left=i*r+"px",n.container.style.height=t+"px",n.resize()}else{var s=t/this.$splits;for(var i=0;i<this.$splits;i++)n=this.$editors[i],n.container.style.width=e+"px",n.container.style.top=i*s+"px",n.container.style.left="0px",n.container.style.height=s+"px",n.resize()}}}).call(f.prototype),t.Split=f}),define("ace/ext/split",["require","exports","module","ace/split"],function(e,t,n){"use strict";n.exports=e("../split")});
-                (function() {
-                    window.require(["ace/ext/split"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/ext-static_highlight.js
+++ b/app/js/ace/ext-static_highlight.js
@ -1,9 +0,0 @@
-define("ace/ext/static_highlight",["require","exports","module","ace/edit_session","ace/layer/text","ace/config","ace/lib/dom","ace/lib/lang"],function(e,t,n){"use strict";function f(e){this.type=e,this.style={},this.textContent=""}var r=e("../edit_session").EditSession,i=e("../layer/text").Text,s=".ace_static_highlight {font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', 'Droid Sans Mono', monospace;font-size: 12px;white-space: pre-wrap}.ace_static_highlight .ace_gutter {width: 2em;text-align: right;padding: 0 3px 0 0;margin-right: 3px;contain: none;}.ace_static_highlight.ace_show_gutter .ace_line {padding-left: 2.6em;}.ace_static_highlight .ace_line { position: relative; }.ace_static_highlight .ace_gutter-cell {-moz-user-select: -moz-none;-khtml-user-select: none;-webkit-user-select: none;user-select: none;top: 0;bottom: 0;left: 0;position: absolute;}.ace_static_highlight .ace_gutter-cell:before {content: counter(ace_line, decimal);counter-increment: ace_line;}.ace_static_highlight {counter-reset: ace_line;}",o=e("../config"),u=e("../lib/dom"),a=e("../lib/lang").escapeHTML;f.prototype.cloneNode=function(){return this},f.prototype.appendChild=function(e){this.textContent+=e.toString()},f.prototype.toString=function(){var e=[];if(this.type!="fragment"){e.push("<",this.type),this.className&&e.push(" class='",this.className,"'");var t=[];for(var n in this.style)t.push(n,":",this.style[n]);t.length&&e.push(" style='",t.join(""),"'"),e.push(">")}return this.textContent&&e.push(this.textContent),this.type!="fragment"&&e.push("</",this.type,">"),e.join("")};var l={createTextNode:function(e,t){return a(e)},createElement:function(e){return new f(e)},createFragment:function(){return new f("fragment")}},c=function(){this.config={},this.dom=l};c.prototype=i.prototype;var h=function(e,t,n){var r=e.className.match(/lang-(\w+)/),i=t.mode||r&&"ace/mode/"+r[1];if(!i)return!1;var s=t.theme||"ace/theme/textmate",o="",a=[];if(e.firstElementChild){var f=0;for(var l=0;l<e.childNodes.length;l++){var c=e.childNodes[l];c.nodeType==3?(f+=c.data.length,o+=c.data):a.push(f,c)}}else o=e.textContent,t.trim&&(o=o.trim());h.render(o,i,s,t.firstLineNumber,!t.showGutter,function(t){u.importCssString(t.css,"ace_highlight"),e.innerHTML=t.html;var r=e.firstChild.firstChild;for(var i=0;i<a.length;i+=2){var s=t.session.doc.indexToPosition(a[i]),o=a[i+1],f=r.children[s.row];f&&f.appendChild(o)}n&&n()})};h.render=function(e,t,n,i,s,u){function c(){var r=h.renderSync(e,t,n,i,s);return u?u(r):r}var a=1,f=r.prototype.$modes;typeof n=="string"&&(a++,o.loadModule(["theme",n],function(e){n=e,--a||c()}));var l;return t&&typeof t=="object"&&!t.getTokenizer&&(l=t,t=l.path),typeof t=="string"&&(a++,o.loadModule(["mode",t],function(e){if(!f[t]||l)f[t]=new e.Mode(l);t=f[t],--a||c()})),--a||c()},h.renderSync=function(e,t,n,i,o){i=parseInt(i||1,10);var u=new r("");u.setUseWorker(!1),u.setMode(t);var a=new c;a.setSession(u),Object.keys(a.$tabStrings).forEach(function(e){if(typeof a.$tabStrings[e]=="string"){var t=l.createFragment();t.textContent=a.$tabStrings[e],a.$tabStrings[e]=t}}),u.setValue(e);var f=u.getLength(),h=l.createElement("div");h.className=n.cssClass;var p=l.createElement("div");p.className="ace_static_highlight"+(o?"":" ace_show_gutter"),p.style["counter-reset"]="ace_line "+(i-1);for(var d=0;d<f;d++){var v=l.createElement("div");v.className="ace_line";if(!o){var m=l.createElement("span");m.className="ace_gutter ace_gutter-cell",m.textContent="",v.appendChild(m)}a.$renderLine(v,d,!1),v.textContent+="\n",p.appendChild(v)}return h.appendChild(p),{css:s+n.cssText,html:h.toString(),session:u}},n.exports=h,n.exports.highlight=h});
-                (function() {
-                    window.require(["ace/ext/static_highlight"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/ext-statusbar.js
+++ b/app/js/ace/ext-statusbar.js
@ -1,9 +0,0 @@
-define("ace/ext/statusbar",["require","exports","module","ace/lib/dom","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../lib/dom"),i=e("../lib/lang"),s=function(e,t){this.element=r.createElement("div"),this.element.className="ace_status-indicator",this.element.style.cssText="display: inline-block;",t.appendChild(this.element);var n=i.delayedCall(function(){this.updateStatus(e)}.bind(this)).schedule.bind(null,100);e.on("changeStatus",n),e.on("changeSelection",n),e.on("keyboardActivity",n)};(function(){this.updateStatus=function(e){function n(e,n){e&&t.push(e,n||"|")}var t=[];n(e.keyBinding.getStatusText(e)),e.commands.recording&&n("REC");var r=e.selection,i=r.lead;if(!r.isEmpty()){var s=e.getSelectionRange();n("("+(s.end.row-s.start.row)+":"+(s.end.column-s.start.column)+")"," ")}n(i.row+":"+i.column," "),r.rangeCount&&n("["+r.rangeCount+"]"," "),t.pop(),this.element.textContent=t.join("")}}).call(s.prototype),t.StatusBar=s});
-                (function() {
-                    window.require(["ace/ext/statusbar"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/ext-textarea.js
+++ b/app/js/ace/ext-textarea.js
--- a/app/js/ace/ext-themelist.js
+++ b/app/js/ace/ext-themelist.js
@ -1,9 +0,0 @@
-define("ace/ext/themelist",["require","exports","module"],function(e,t,n){"use strict";var r=[["Chrome"],["Clouds"],["Crimson Editor"],["Dawn"],["Dreamweaver"],["Eclipse"],["GitHub"],["IPlastic"],["Solarized Light"],["TextMate"],["Tomorrow"],["Xcode"],["Kuroir"],["KatzenMilch"],["SQL Server","sqlserver","light"],["Ambiance","ambiance","dark"],["Chaos","chaos","dark"],["Clouds Midnight","clouds_midnight","dark"],["Dracula","","dark"],["Cobalt","cobalt","dark"],["Gruvbox","gruvbox","dark"],["Green on Black","gob","dark"],["idle Fingers","idle_fingers","dark"],["krTheme","kr_theme","dark"],["Merbivore","merbivore","dark"],["Merbivore Soft","merbivore_soft","dark"],["Mono Industrial","mono_industrial","dark"],["Monokai","monokai","dark"],["Nord Dark","nord_dark","dark"],["One Dark","one_dark","dark"],["Pastel on dark","pastel_on_dark","dark"],["Solarized Dark","solarized_dark","dark"],["Terminal","terminal","dark"],["Tomorrow Night","tomorrow_night","dark"],["Tomorrow Night Blue","tomorrow_night_blue","dark"],["Tomorrow Night Bright","tomorrow_night_bright","dark"],["Tomorrow Night 80s","tomorrow_night_eighties","dark"],["Twilight","twilight","dark"],["Vibrant Ink","vibrant_ink","dark"]];t.themesByName={},t.themes=r.map(function(e){var n=e[1]||e[0].replace(/ /g,"_").toLowerCase(),r={caption:e[0],theme:"ace/theme/"+n,isDark:e[2]=="dark",name:n};return t.themesByName[n]=r,r})});
-                (function() {
-                    window.require(["ace/ext/themelist"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/ext-whitespace.js
+++ b/app/js/ace/ext-whitespace.js
@ -1,9 +0,0 @@
-define("ace/ext/whitespace",["require","exports","module","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../lib/lang");t.$detectIndentation=function(e,t){function c(e){var t=0;for(var r=e;r<n.length;r+=e)t+=n[r]||0;return t}var n=[],r=[],i=0,s=0,o=Math.min(e.length,1e3);for(var u=0;u<o;u++){var a=e[u];if(!/^\s*[^*+\-\s]/.test(a))continue;if(a[0]=="	")i++,s=-Number.MAX_VALUE;else{var f=a.match(/^ */)[0].length;if(f&&a[f]!="	"){var l=f-s;l>0&&!(s%l)&&!(f%l)&&(r[l]=(r[l]||0)+1),n[f]=(n[f]||0)+1}s=f}while(u<o&&a[a.length-1]=="\\")a=e[u++]}var h=r.reduce(function(e,t){return e+t},0),p={score:0,length:0},d=0;for(var u=1;u<12;u++){var v=c(u);u==1?(d=v,v=n[1]?.9:.8,n.length||(v=0)):v/=d,r[u]&&(v+=r[u]/h),v>p.score&&(p={score:v,length:u})}if(p.score&&p.score>1.4)var m=p.length;if(i>d+1){if(m==1||d<i/4||p.score<1.8)m=undefined;return{ch:"	",length:m}}if(d>i+1)return{ch:" ",length:m}},t.detectIndentation=function(e){var n=e.getLines(0,1e3),r=t.$detectIndentation(n)||{};return r.ch&&e.setUseSoftTabs(r.ch==" "),r.length&&e.setTabSize(r.length),r},t.trimTrailingSpace=function(e,t){var n=e.getDocument(),r=n.getAllLines(),i=t&&t.trimEmpty?-1:0,s=[],o=-1;t&&t.keepCursorPosition&&(e.selection.rangeCount?e.selection.rangeList.ranges.forEach(function(e,t,n){var r=n[t+1];if(r&&r.cursor.row==e.cursor.row)return;s.push(e.cursor)}):s.push(e.selection.getCursor()),o=0);var u=s[o]&&s[o].row;for(var a=0,f=r.length;a<f;a++){var l=r[a],c=l.search(/\s+$/);a==u&&(c<s[o].column&&c>i&&(c=s[o].column),o++,u=s[o]?s[o].row:-1),c>i&&n.removeInLine(a,c,l.length)}},t.convertIndentation=function(e,t,n){var i=e.getTabString()[0],s=e.getTabSize();n||(n=s),t||(t=i);var o=t=="	"?t:r.stringRepeat(t,n),u=e.doc,a=u.getAllLines(),f={},l={};for(var c=0,h=a.length;c<h;c++){var p=a[c],d=p.match(/^\s*/)[0];if(d){var v=e.$getStringScreenWidth(d)[0],m=Math.floor(v/s),g=v%s,y=f[m]||(f[m]=r.stringRepeat(o,m));y+=l[g]||(l[g]=r.stringRepeat(" ",g)),y!=d&&(u.removeInLine(c,0,d.length),u.insertInLine({row:c,column:0},y))}}e.setTabSize(n),e.setUseSoftTabs(t==" ")},t.$parseStringArg=function(e){var t={};/t/.test(e)?t.ch="	":/s/.test(e)&&(t.ch=" ");var n=e.match(/\d+/);return n&&(t.length=parseInt(n[0],10)),t},t.$parseArg=function(e){return e?typeof e=="string"?t.$parseStringArg(e):typeof e.text=="string"?t.$parseStringArg(e.text):e:{}},t.commands=[{name:"detectIndentation",description:"Detect indentation from content",exec:function(e){t.detectIndentation(e.session)}},{name:"trimTrailingSpace",description:"Trim trailing whitespace",exec:function(e,n){t.trimTrailingSpace(e.session,n)}},{name:"convertIndentation",description:"Convert indentation to ...",exec:function(e,n){var r=t.$parseArg(n);t.convertIndentation(e.session,r.ch,r.length)}},{name:"setIndentation",description:"Set indentation",exec:function(e,n){var r=t.$parseArg(n);r.length&&e.session.setTabSize(r.length),r.ch&&e.session.setUseSoftTabs(r.ch==" ")}}]});
-                (function() {
-                    window.require(["ace/ext/whitespace"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/keybinding-emacs.js
+++ b/app/js/ace/keybinding-emacs.js
--- a/app/js/ace/keybinding-sublime.js
+++ b/app/js/ace/keybinding-sublime.js
--- a/app/js/ace/keybinding-vim.js
+++ b/app/js/ace/keybinding-vim.js
--- a/app/js/ace/keybinding-vscode.js
+++ b/app/js/ace/keybinding-vscode.js
--- a/app/js/ace/mode-abap.js
+++ b/app/js/ace/mode-abap.js
--- a/app/js/ace/mode-abc.js
+++ b/app/js/ace/mode-abc.js
@ -1,9 +0,0 @@
-define("ace/mode/abc_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){this.$rules={start:[{token:["zupfnoter.information.comment.line.percentage","information.keyword","in formation.keyword.embedded"],regex:"(%%%%)(hn\\.[a-z]*)(.*)",comment:"Instruction Comment"},{token:["information.comment.line.percentage","information.keyword.embedded"],regex:"(%%)(.*)",comment:"Instruction Comment"},{token:"comment.line.percentage",regex:"%.*",comment:"Comments"},{token:"barline.keyword.operator",regex:"[\\[:]*[|:][|\\]:]*(?:\\[?[0-9]+)?|\\[[0-9]+",comment:"Bar lines"},{token:["information.keyword.embedded","information.argument.string.unquoted"],regex:"(\\[[A-Za-z]:)([^\\]]*\\])",comment:"embedded Header lines"},{token:["information.keyword","information.argument.string.unquoted"],regex:"^([A-Za-z]:)([^%\\\\]*)",comment:"Header lines"},{token:["text","entity.name.function","string.unquoted","text"],regex:"(\\[)([A-Z]:)(.*?)(\\])",comment:"Inline fields"},{token:["accent.constant.language","pitch.constant.numeric","duration.constant.numeric"],regex:"([\\^=_]*)([A-Ga-gz][,']*)([0-9]*/*[><0-9]*)",comment:"Notes"},{token:"zupfnoter.jumptarget.string.quoted",regex:'[\\"!]\\^\\:.*?[\\"!]',comment:"Zupfnoter jumptarget"},{token:"zupfnoter.goto.string.quoted",regex:'[\\"!]\\^\\@.*?[\\"!]',comment:"Zupfnoter goto"},{token:"zupfnoter.annotation.string.quoted",regex:'[\\"!]\\^\\!.*?[\\"!]',comment:"Zupfnoter annoation"},{token:"zupfnoter.annotationref.string.quoted",regex:'[\\"!]\\^\\#.*?[\\"!]',comment:"Zupfnoter annotation reference"},{token:"chordname.string.quoted",regex:'[\\"!]\\^.*?[\\"!]',comment:"abc chord"},{token:"string.quoted",regex:'[\\"!].*?[\\"!]',comment:"abc annotation"}]},this.normalizeRules()};s.metaData={fileTypes:["abc"],name:"ABC",scopeName:"text.abcnotation"},r.inherits(s,i),t.ABCHighlightRules=s}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../../range").Range,s=e("./fold_mode").FoldMode,o=t.FoldMode=function(e){e&&(this.foldingStartMarker=new RegExp(this.foldingStartMarker.source.replace(/\|[^|]*?$/,"|"+e.start)),this.foldingStopMarker=new RegExp(this.foldingStopMarker.source.replace(/\|[^|]*?$/,"|"+e.end)))};r.inherits(o,s),function(){this.foldingStartMarker=/([\{\[\(])[^\}\]\)]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{\(]*([\}\]\)])|^[\s\*]*(\*\/)/,this.singleLineBlockCommentRe=/^\s*(\/\*).*\*\/\s*$/,this.tripleStarBlockCommentRe=/^\s*(\/\*\*\*).*\*\/\s*$/,this.startRegionRe=/^\s*(\/\*|\/\/)#?region\b/,this._getFoldWidgetBase=this.getFoldWidget,this.getFoldWidget=function(e,t,n){var r=e.getLine(n);if(this.singleLineBlockCommentRe.test(r)&&!this.startRegionRe.test(r)&&!this.tripleStarBlockCommentRe.test(r))return"";var i=this._getFoldWidgetBase(e,t,n);return!i&&this.startRegionRe.test(r)?"start":i},this.getFoldWidgetRange=function(e,t,n,r){var i=e.getLine(n);if(this.startRegionRe.test(i))return this.getCommentRegionBlock(e,i,n);var s=i.match(this.foldingStartMarker);if(s){var o=s.index;if(s[1])return this.openingBracketBlock(e,s[1],n,o);var u=e.getCommentFoldRange(n,o+s[0].length,1);return u&&!u.isMultiLine()&&(r?u=this.getSectionRange(e,n):t!="all"&&(u=null)),u}if(t==="markbegin")return;var s=i.match(this.foldingStopMarker);if(s){var o=s.index+s[0].length;return s[1]?this.closingBracketBlock(e,s[1],n,o):e.getCommentFoldRange(n,o,-1)}},this.getSectionRange=function(e,t){var n=e.getLine(t),r=n.search(/\S/),s=t,o=n.length;t+=1;var u=t,a=e.getLength();while(++t<a){n=e.getLine(t);var f=n.search(/\S/);if(f===-1)continue;if(r>f)break;var l=this.getFoldWidgetRange(e,"all",t);if(l){if(l.start.row<=s)break;if(l.isMultiLine())t=l.end.row;else if(r==f)break}u=t}return new i(s,o,u,e.getLine(u).length)},this.getCommentRegionBlock=function(e,t,n){var r=t.search(/\s*$/),s=e.getLength(),o=n,u=/^\s*(?:\/\*|\/\/|--)#?(end)?region\b/,a=1;while(++n<s){t=e.getLine(n);var f=u.exec(t);if(!f)continue;f[1]?a--:a++;if(!a)break}var l=n;if(l>o)return new i(o,r,l,t.length)}}.call(o.prototype)}),define("ace/mode/abc",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/abc_highlight_rules","ace/mode/folding/cstyle"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./abc_highlight_rules").ABCHighlightRules,o=e("./folding/cstyle").FoldMode,u=function(){this.HighlightRules=s,this.foldingRules=new o,this.$behaviour=this.$defaultBehaviour};r.inherits(u,i),function(){this.lineCommentStart="%",this.$id="ace/mode/abc",this.snippetFileId="ace/snippets/abc"}.call(u.prototype),t.Mode=u});
-                (function() {
-                    window.require(["ace/mode/abc"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/mode-actionscript.js
+++ b/app/js/ace/mode-actionscript.js
--- a/app/js/ace/mode-ada.js
+++ b/app/js/ace/mode-ada.js
@ -1,9 +0,0 @@
-define("ace/mode/ada_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){var e="abort|else|new|return|abs|elsif|not|reverse|abstract|end|null|accept|entry|select|access|exception|of|separate|aliased|exit|or|some|all|others|subtype|and|for|out|synchronized|array|function|overriding|at|tagged|generic|package|task|begin|goto|pragma|terminate|body|private|then|if|procedure|type|case|in|protected|constant|interface|until||is|raise|use|declare|range|delay|limited|record|when|delta|loop|rem|while|digits|renames|with|do|mod|requeue|xor",t="true|false|null",n="count|min|max|avg|sum|rank|now|coalesce|main",r=this.createKeywordMapper({"support.function":n,keyword:e,"constant.language":t},"identifier",!0);this.$rules={start:[{token:"comment",regex:"--.*$"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.'"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:r,regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\/|\\/\\/|%|<@>|@>|<@|&|\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"paren.lparen",regex:"[\\(]"},{token:"paren.rparen",regex:"[\\)]"},{token:"text",regex:"\\s+"}]}};r.inherits(s,i),t.AdaHighlightRules=s}),define("ace/mode/ada",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/ada_highlight_rules","ace/range"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./ada_highlight_rules").AdaHighlightRules,o=e("../range").Range,u=function(){this.HighlightRules=s,this.$behaviour=this.$defaultBehaviour};r.inherits(u,i),function(){this.lineCommentStart="--",this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t),i=this.getTokenizer().getLineTokens(t,e),s=i.tokens;if(s.length&&s[s.length-1].type=="comment")return r;if(e=="start"){var o=t.match(/^.*(begin|loop|then|is|do)\s*$/);o&&(r+=n)}return r},this.checkOutdent=function(e,t,n){var r=t+n;return r.match(/^\s*(begin|end)$/)?!0:!1},this.autoOutdent=function(e,t,n){var r=t.getLine(n),i=t.getLine(n-1),s=this.$getIndent(i).length,u=this.$getIndent(r).length;if(u<=s)return;t.outdentRows(new o(n,0,n+2,0))},this.$id="ace/mode/ada"}.call(u.prototype),t.Mode=u});
-                (function() {
-                    window.require(["ace/mode/ada"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/mode-aiscript.js
+++ b/app/js/ace/mode-aiscript.js
--- a/app/js/ace/mode-alda.js
+++ b/app/js/ace/mode-alda.js
--- a/app/js/ace/mode-apache_conf.js
+++ b/app/js/ace/mode-apache_conf.js
--- a/app/js/ace/mode-apex.js
+++ b/app/js/ace/mode-apex.js
--- a/app/js/ace/mode-applescript.js
+++ b/app/js/ace/mode-applescript.js
--- a/app/js/ace/mode-aql.js
+++ b/app/js/ace/mode-aql.js
@ -1,9 +0,0 @@
-define("ace/mode/aql_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){var e="for|search|outbound|inbound|any|graph|prune|options|shortest_path|to|in|return|filter|sort|limit|let|collect|remove|update|replace|insers|upsert|with",t="true|false",n="append|contains_array|count|count_distinct|count_unique|first|flatten|intersection|last|length|minus|nth|outersection|pop|position|push|remove_nth|remove_value|remove_values|reverse|shift|slice|sorted|sorted_unique|union|union_distinct|unique|unshift|date_now|date_iso8601|date_timestamp|is_datestring|date_dayofweek|date_year|date_month|date_day|date_hour|date_minute|date_second|date_millisecond|date_dayofyear|date_isoweek|date_leapyear|date_quarter|date_days_in_month|date_trunc|date_format|date_add|date_subtract|date_diff|date_compare|attributes|count|has|is_same_collection|keep|length|matches|merge|merge_recursive|parse_identifier|translate|unset|unset_recursive|values|zip|fulltext|distance|geo_contains|geo_distance|geo_equals|geo_intersects|is_in_polygon|not_null|first_list|first_document|check_document|collection_count|collections|count|current_user|document|length|hash|apply|assert|/ warn|call|fail|noopt|passthru|sleep|v8|version|abs|acos|asin|atan|atan2|average|avg|ceil|cos|degrees|exp|exp2|floor|log|log2|log10|max|median|min|percentile|pi|pow|radians|rand|range|round|sin|sqrt|stddev_population|stddev_sample|stddev|sum|tan|variance_population|variance_sample|variance|char_length|concat|concat_separator|contains|count|encode_uri_component|find_first|find_last|json_parse|json_stringify|left|length|levenshtein_distance|like|lower|ltrim|md5|random_token|regex_matches|regex_split|regex_test|regex_replace|reverse|right|rtrim|sha1|sha512|split|soundex|substitute|substring|tokens|to_base64|to_hex|trim|upper|uuid|to_bool|to_number|to_string|to_array|to_list|is_null|is_bool|is_number|is_string|is_array|is_list|is_object|is_document|is_datestring|is_key|typename|",r=this.createKeywordMapper({"support.function":n,keyword:e,"constant.language":t},"identifier",!0);this.$rules={start:[{token:"comment",regex:"//.*$"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:r,regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\/|\\/\\/|%|<@>|@>|<@|&|\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"paren.lparen",regex:"[\\(]"},{token:"paren.rparen",regex:"[\\)]"},{token:"text",regex:"\\s+"}]},this.normalizeRules()};r.inherits(s,i),t.AqlHighlightRules=s}),define("ace/mode/aql",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/aql_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./aql_highlight_rules").AqlHighlightRules,o=function(){this.HighlightRules=s,this.$behaviour=this.$defaultBehaviour};r.inherits(o,i),function(){this.lineCommentStart="//",this.$id="ace/mode/aql"}.call(o.prototype),t.Mode=o});
-                (function() {
-                    window.require(["ace/mode/aql"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/mode-asciidoc.js
+++ b/app/js/ace/mode-asciidoc.js
--- a/app/js/ace/mode-asl.js
+++ b/app/js/ace/mode-asl.js
--- a/app/js/ace/mode-assembly_x86.js
+++ b/app/js/ace/mode-assembly_x86.js
--- a/app/js/ace/mode-autohotkey.js
+++ b/app/js/ace/mode-autohotkey.js
--- a/app/js/ace/mode-batchfile.js
+++ b/app/js/ace/mode-batchfile.js
@ -1,9 +0,0 @@
-define("ace/mode/batchfile_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){this.$rules={start:[{token:"keyword.command.dosbatch",regex:"\\b(?:append|assoc|at|attrib|break|cacls|cd|chcp|chdir|chkdsk|chkntfs|cls|cmd|color|comp|compact|convert|copy|date|del|dir|diskcomp|diskcopy|doskey|echo|endlocal|erase|fc|find|findstr|format|ftype|graftabl|help|keyb|label|md|mkdir|mode|more|move|path|pause|popd|print|prompt|pushd|rd|recover|ren|rename|replace|restore|rmdir|set|setlocal|shift|sort|start|subst|time|title|tree|type|ver|verify|vol|xcopy)\\b",caseInsensitive:!0},{token:"keyword.control.statement.dosbatch",regex:"\\b(?:goto|call|exit)\\b",caseInsensitive:!0},{token:"keyword.control.conditional.if.dosbatch",regex:"\\bif\\s+not\\s+(?:exist|defined|errorlevel|cmdextversion)\\b",caseInsensitive:!0},{token:"keyword.control.conditional.dosbatch",regex:"\\b(?:if|else)\\b",caseInsensitive:!0},{token:"keyword.control.repeat.dosbatch",regex:"\\bfor\\b",caseInsensitive:!0},{token:"keyword.operator.dosbatch",regex:"\\b(?:EQU|NEQ|LSS|LEQ|GTR|GEQ)\\b"},{token:["doc.comment","comment"],regex:"(?:^|\\b)(rem)($|\\s.*$)",caseInsensitive:!0},{token:"comment.line.colons.dosbatch",regex:"::.*$"},{include:"variable"},{token:"punctuation.definition.string.begin.shell",regex:'"',push:[{token:"punctuation.definition.string.end.shell",regex:'"',next:"pop"},{include:"variable"},{defaultToken:"string.quoted.double.dosbatch"}]},{token:"keyword.operator.pipe.dosbatch",regex:"[|]"},{token:"keyword.operator.redirect.shell",regex:"&>|\\d*>&\\d*|\\d*(?:>>|>|<)|\\d*<&|\\d*<>"}],variable:[{token:"constant.numeric",regex:"%%\\w+|%[*\\d]|%\\w+%"},{token:"constant.numeric",regex:"%~\\d+"},{token:["markup.list","constant.other","markup.list"],regex:"(%)(\\w+)(%?)"}]},this.normalizeRules()};s.metaData={name:"Batch File",scopeName:"source.dosbatch",fileTypes:["bat"]},r.inherits(s,i),t.BatchFileHighlightRules=s}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../../range").Range,s=e("./fold_mode").FoldMode,o=t.FoldMode=function(e){e&&(this.foldingStartMarker=new RegExp(this.foldingStartMarker.source.replace(/\|[^|]*?$/,"|"+e.start)),this.foldingStopMarker=new RegExp(this.foldingStopMarker.source.replace(/\|[^|]*?$/,"|"+e.end)))};r.inherits(o,s),function(){this.foldingStartMarker=/([\{\[\(])[^\}\]\)]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{\(]*([\}\]\)])|^[\s\*]*(\*\/)/,this.singleLineBlockCommentRe=/^\s*(\/\*).*\*\/\s*$/,this.tripleStarBlockCommentRe=/^\s*(\/\*\*\*).*\*\/\s*$/,this.startRegionRe=/^\s*(\/\*|\/\/)#?region\b/,this._getFoldWidgetBase=this.getFoldWidget,this.getFoldWidget=function(e,t,n){var r=e.getLine(n);if(this.singleLineBlockCommentRe.test(r)&&!this.startRegionRe.test(r)&&!this.tripleStarBlockCommentRe.test(r))return"";var i=this._getFoldWidgetBase(e,t,n);return!i&&this.startRegionRe.test(r)?"start":i},this.getFoldWidgetRange=function(e,t,n,r){var i=e.getLine(n);if(this.startRegionRe.test(i))return this.getCommentRegionBlock(e,i,n);var s=i.match(this.foldingStartMarker);if(s){var o=s.index;if(s[1])return this.openingBracketBlock(e,s[1],n,o);var u=e.getCommentFoldRange(n,o+s[0].length,1);return u&&!u.isMultiLine()&&(r?u=this.getSectionRange(e,n):t!="all"&&(u=null)),u}if(t==="markbegin")return;var s=i.match(this.foldingStopMarker);if(s){var o=s.index+s[0].length;return s[1]?this.closingBracketBlock(e,s[1],n,o):e.getCommentFoldRange(n,o,-1)}},this.getSectionRange=function(e,t){var n=e.getLine(t),r=n.search(/\S/),s=t,o=n.length;t+=1;var u=t,a=e.getLength();while(++t<a){n=e.getLine(t);var f=n.search(/\S/);if(f===-1)continue;if(r>f)break;var l=this.getFoldWidgetRange(e,"all",t);if(l){if(l.start.row<=s)break;if(l.isMultiLine())t=l.end.row;else if(r==f)break}u=t}return new i(s,o,u,e.getLine(u).length)},this.getCommentRegionBlock=function(e,t,n){var r=t.search(/\s*$/),s=e.getLength(),o=n,u=/^\s*(?:\/\*|\/\/|--)#?(end)?region\b/,a=1;while(++n<s){t=e.getLine(n);var f=u.exec(t);if(!f)continue;f[1]?a--:a++;if(!a)break}var l=n;if(l>o)return new i(o,r,l,t.length)}}.call(o.prototype)}),define("ace/mode/batchfile",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/batchfile_highlight_rules","ace/mode/folding/cstyle"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./batchfile_highlight_rules").BatchFileHighlightRules,o=e("./folding/cstyle").FoldMode,u=function(){this.HighlightRules=s,this.foldingRules=new o,this.$behaviour=this.$defaultBehaviour};r.inherits(u,i),function(){this.lineCommentStart="::",this.blockComment="",this.$id="ace/mode/batchfile"}.call(u.prototype),t.Mode=u});
-                (function() {
-                    window.require(["ace/mode/batchfile"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/mode-c9search.js
+++ b/app/js/ace/mode-c9search.js
@ -1,9 +0,0 @@
-define("ace/mode/c9search_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";function o(e,t){try{return new RegExp(e,t)}catch(n){}}var r=e("../lib/oop"),i=e("../lib/lang"),s=e("./text_highlight_rules").TextHighlightRules,u=function(){this.$rules={start:[{tokenNames:["c9searchresults.constant.numeric","c9searchresults.text","c9searchresults.text","c9searchresults.keyword"],regex:/(^\s+[0-9]+)(:)(\d*\s?)([^\r\n]+)/,onMatch:function(e,t,n){var r=this.splitRegex.exec(e),i=this.tokenNames,s=[{type:i[0],value:r[1]},{type:i[1],value:r[2]}];r[3]&&(r[3]==" "?s[1]={type:i[1],value:r[2]+" "}:s.push({type:i[1],value:r[3]}));var o=n[1],u=r[4],a,f=0;if(o&&o.exec){o.lastIndex=0;while(a=o.exec(u)){var l=u.substring(f,a.index);f=o.lastIndex,l&&s.push({type:i[2],value:l});if(a[0])s.push({type:i[3],value:a[0]});else if(!l)break}}return f<u.length&&s.push({type:i[2],value:u.substr(f)}),s}},{regex:"^Searching for [^\\r\\n]*$",onMatch:function(e,t,n){var r=e.split("\x01");if(r.length<3)return"text";var s,u,a=0,f=[{value:r[a++]+"'",type:"text"},{value:u=r[a++],type:"text"},{value:"'"+r[a++],type:"text"}];r[2]!==" in"&&f.push({value:"'"+r[a++]+"'",type:"text"},{value:r[a++],type:"text"}),f.push({value:" "+r[a++]+" ",type:"text"}),r[a+1]?(s=r[a+1],f.push({value:"("+r[a+1]+")",type:"text"}),a+=1):a-=1;while(a++<r.length)r[a]&&f.push({value:r[a],type:"text"});u&&(/regex/.test(s)||(u=i.escapeRegExp(u)),/whole/.test(s)&&(u="\\b"+u+"\\b"));var l=u&&o("("+u+")",/ sensitive/.test(s)?"g":"ig");return l&&(n[0]=t,n[1]=l),f}},{regex:"^(?=Found \\d+ matches)",token:"text",next:"numbers"},{token:"string",regex:"^\\S:?[^:]+",next:"numbers"}],numbers:[{regex:"\\d+",token:"constant.numeric"},{regex:"$",token:"text",next:"start"}]},this.normalizeRules()};r.inherits(u,s),t.C9SearchHighlightRules=u}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("../range").Range,i=function(){};(function(){this.checkOutdent=function(e,t){return/^\s+$/.test(e)?/^\s*\}/.test(t):!1},this.autoOutdent=function(e,t){var n=e.getLine(t),i=n.match(/^(\s*\})/);if(!i)return 0;var s=i[1].length,o=e.findMatchingBracket({row:t,column:s});if(!o||o.row==t)return 0;var u=this.$getIndent(e.getLine(o.row));e.replace(new r(t,0,t,s-1),u)},this.$getIndent=function(e){return e.match(/^\s*/)[0]}}).call(i.prototype),t.MatchingBraceOutdent=i}),define("ace/mode/folding/c9search",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../../range").Range,s=e("./fold_mode").FoldMode,o=t.FoldMode=function(){};r.inherits(o,s),function(){this.foldingStartMarker=/^(\S.*:|Searching for.*)$/,this.foldingStopMarker=/^(\s+|Found.*)$/,this.getFoldWidgetRange=function(e,t,n){var r=e.doc.getAllLines(n),s=r[n],o=/^(Found.*|Searching for.*)$/,u=/^(\S.*:|\s*)$/,a=o.test(s)?o:u,f=n,l=n;if(this.foldingStartMarker.test(s)){for(var c=n+1,h=e.getLength();c<h;c++)if(a.test(r[c]))break;l=c}else if(this.foldingStopMarker.test(s)){for(var c=n-1;c>=0;c--){s=r[c];if(a.test(s))break}f=c}if(f!=l){var p=s.length;return a===o&&(p=s.search(/\(Found[^)]+\)$|$/)),new i(f,p,l,0)}}}.call(o.prototype)}),define("ace/mode/c9search",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/c9search_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/folding/c9search"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./c9search_highlight_rules").C9SearchHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("./folding/c9search").FoldMode,a=function(){this.HighlightRules=s,this.$outdent=new o,this.foldingRules=new u};r.inherits(a,i),function(){this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t);return r},this.checkOutdent=function(e,t,n){return this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){this.$outdent.autoOutdent(t,n)},this.$id="ace/mode/c9search"}.call(a.prototype),t.Mode=a});
-                (function() {
-                    window.require(["ace/mode/c9search"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/mode-c_cpp.js
+++ b/app/js/ace/mode-c_cpp.js
--- a/app/js/ace/mode-cirru.js
+++ b/app/js/ace/mode-cirru.js
@ -1,9 +0,0 @@
-define("ace/mode/cirru_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){this.$rules={start:[{token:"constant.numeric",regex:/[\d\.]+/},{token:"comment.line.double-dash",regex:/--/,next:"comment"},{token:"storage.modifier",regex:/\(/},{token:"storage.modifier",regex:/,/,next:"line"},{token:"support.function",regex:/[^\(\)"\s{}\[\]]+/,next:"line"},{token:"string.quoted.double",regex:/"/,next:"string"},{token:"storage.modifier",regex:/\)/}],comment:[{token:"comment.line.double-dash",regex:/ +[^\n]+/,next:"start"}],string:[{token:"string.quoted.double",regex:/"/,next:"line"},{token:"constant.character.escape",regex:/\\/,next:"escape"},{token:"string.quoted.double",regex:/[^\\"]+/}],escape:[{token:"constant.character.escape",regex:/./,next:"string"}],line:[{token:"constant.numeric",regex:/[\d\.]+/},{token:"markup.raw",regex:/^\s*/,next:"start"},{token:"storage.modifier",regex:/\$/,next:"start"},{token:"variable.parameter",regex:/[^\(\)"\s{}\[\]]+/},{token:"storage.modifier",regex:/\(/,next:"start"},{token:"storage.modifier",regex:/\)/},{token:"markup.raw",regex:/^ */,next:"start"},{token:"string.quoted.double",regex:/"/,next:"string"}]}};r.inherits(s,i),t.CirruHighlightRules=s}),define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=e("../../range").Range,o=t.FoldMode=function(){};r.inherits(o,i),function(){this.getFoldWidgetRange=function(e,t,n){var r=this.indentationBlock(e,n);if(r)return r;var i=/\S/,o=e.getLine(n),u=o.search(i);if(u==-1||o[u]!="#")return;var a=o.length,f=e.getLength(),l=n,c=n;while(++n<f){o=e.getLine(n);var h=o.search(i);if(h==-1)continue;if(o[h]!="#")break;c=n}if(c>l){var p=e.getLine(c).length;return new s(l,a,c,p)}},this.getFoldWidget=function(e,t,n){var r=e.getLine(n),i=r.search(/\S/),s=e.getLine(n+1),o=e.getLine(n-1),u=o.search(/\S/),a=s.search(/\S/);if(i==-1)return e.foldWidgets[n-1]=u!=-1&&u<a?"start":"","";if(u==-1){if(i==a&&r[i]=="#"&&s[i]=="#")return e.foldWidgets[n-1]="",e.foldWidgets[n+1]="","start"}else if(u==i&&r[i]=="#"&&o[i]=="#"&&e.getLine(n-2).search(/\S/)==-1)return e.foldWidgets[n-1]="start",e.foldWidgets[n+1]="","";return u!=-1&&u<i?e.foldWidgets[n-1]="start":e.foldWidgets[n-1]="",i<a?"start":""}}.call(o.prototype)}),define("ace/mode/cirru",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/cirru_highlight_rules","ace/mode/folding/coffee"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./cirru_highlight_rules").CirruHighlightRules,o=e("./folding/coffee").FoldMode,u=function(){this.HighlightRules=s,this.foldingRules=new o,this.$behaviour=this.$defaultBehaviour};r.inherits(u,i),function(){this.lineCommentStart="--",this.$id="ace/mode/cirru"}.call(u.prototype),t.Mode=u});
-                (function() {
-                    window.require(["ace/mode/cirru"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/mode-clojure.js
+++ b/app/js/ace/mode-clojure.js
--- a/app/js/ace/mode-cobol.js
+++ b/app/js/ace/mode-cobol.js
@ -1,9 +0,0 @@
-define("ace/mode/cobol_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){var e="ACCEPT|MERGE|SUM|ADD||MESSAGE|TABLE|ADVANCING|MODE|TAPE|AFTER|MULTIPLY|TEST|ALL|NEGATIVE|TEXT|ALPHABET|NEXT|THAN|ALSO|NO|THEN|ALTERNATE|NOT|THROUGH|AND|NUMBER|THRU|ANY|OCCURS|TIME|ARE|OF|TO|AREA|OFF|TOP||ASCENDING|OMITTED|TRUE|ASSIGN|ON|TYPE|AT|OPEN|UNIT|AUTHOR|OR|UNTIL|BEFORE|OTHER|UP|BLANK|OUTPUT|USE|BLOCK|PAGE|USING|BOTTOM|PERFORM|VALUE|BY|PIC|VALUES|CALL|PICTURE|WHEN|CANCEL|PLUS|WITH|CD|POINTER|WRITE|CHARACTER|POSITION||ZERO|CLOSE|POSITIVE|ZEROS|COLUMN|PROCEDURE|ZEROES|COMMA|PROGRAM|COMMON|PROGRAM-ID|COMMUNICATION|QUOTE|COMP|RANDOM|COMPUTE|READ|CONTAINS|RECEIVE|CONFIGURATION|RECORD|CONTINUE|REDEFINES|CONTROL|REFERENCE|COPY|REMAINDER|COUNT|REPLACE|DATA|REPORT|DATE|RESERVE|DAY|RESET|DELETE|RETURN|DESTINATION|REWIND|DISABLE|REWRITE|DISPLAY|RIGHT|DIVIDE|RUN|DOWN|SAME|ELSE|SEARCH|ENABLE|SECTION|END|SELECT|ENVIRONMENT|SENTENCE|EQUAL|SET|ERROR|SIGN|EXIT|SEQUENTIAL|EXTERNAL|SIZE|FLASE|SORT|FILE|SOURCE|LENGTH|SPACE|LESS|STANDARD|LIMIT|START|LINE|STOP|LOCK|STRING|LOW-VALUE|SUBTRACT",t="true|false|null",n="count|min|max|avg|sum|rank|now|coalesce|main",r=this.createKeywordMapper({"support.function":n,keyword:e,"constant.language":t},"identifier",!0);this.$rules={start:[{token:"comment",regex:"\\*.*$"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:r,regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\/|\\/\\/|%|<@>|@>|<@|&|\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"paren.lparen",regex:"[\\(]"},{token:"paren.rparen",regex:"[\\)]"},{token:"text",regex:"\\s+"}]}};r.inherits(s,i),t.CobolHighlightRules=s}),define("ace/mode/cobol",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/cobol_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./cobol_highlight_rules").CobolHighlightRules,o=function(){this.HighlightRules=s,this.$behaviour=this.$defaultBehaviour};r.inherits(o,i),function(){this.lineCommentStart="*",this.$id="ace/mode/cobol"}.call(o.prototype),t.Mode=o});
-                (function() {
-                    window.require(["ace/mode/cobol"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
--- a/app/js/ace/mode-coffee.js
+++ b/app/js/ace/mode-coffee.js
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
cutls	957ef30fc0	WIP: use-strict 'login'	2019-11-25 00:03:33 +09:00
cutls	bae73521e9	WIP: use-strict	2019-11-24 23:53:35 +09:00
cutls	2583c3b80a	Merge branch 'master' into use-strict	2019-11-24 23:35:56 +09:00
cutls	2b6cf60868	WIP: use strict	2019-11-24 22:26:19 +09:00
				`@ -1,2 +0,0 @@`

				`<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M21 19V5c0-1.1-.9-2-2-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5-4.5z"/><path d="M0 0h24v24H0z" fill="none"/></svg>`