Merge branch 'nightly' into release

99 files changed, 1624 insertions, 1777 deletions

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 1457084cb..82719f20d 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -995,6 +995,96 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "Suvarna221B",
+      "name": "Suvarna Sivadas",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31803071?v=4",
+      "profile": "https://github.com/Suvarna221B",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "johan-mathew",
+      "name": "Johan Mathew",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31700508?v=4",
+      "profile": "https://github.com/johan-mathew",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "AjeshKumarS",
+      "name": "Ajesh Kumar S",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31558237?v=4",
+      "profile": "https://github.com/AjeshKumarS",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sreelekhaMarasig",
+      "name": "Ajesh Kumar S",
+      "avatar_url": "https://avatars.githubusercontent.com/u/93112178?v=4",
+      "profile": "https://github.com/sreelekhaMarasig",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "MadhuriBandanadam",
+      "name": "Madhuri",
+      "avatar_url": "https://avatars.githubusercontent.com/u/63137999?v=4",
+      "profile": "https://github.com/MadhuriBandanadam",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "abinmn",
+      "name": "Abin Mn",
+      "avatar_url": "https://avatars.githubusercontent.com/u/29946484?v=4",
+      "profile": "https://github.com/abinmn",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "AnjithPaul",
+      "name": "Anjith Paul",
+      "avatar_url": "https://avatars.githubusercontent.com/u/65152866?v=4",
+      "profile": "https://github.com/AnjithPaul",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Vishnu017",
+      "name": "Vishnu017",
+      "avatar_url": "https://avatars.githubusercontent.com/u/39431453?v=4",
+      "profile": "https://github.com/Vishnu017",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rachelcynthia",
+      "name": "Rachel Cynthia V",
+      "avatar_url": "https://avatars.githubusercontent.com/u/46859572?v=4",
+      "profile": "https://github.com/rachelcynthia",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Chandrika-Priya",
+      "name": "Chandrika Priya Bogadi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/46720139?v=4",
+      "profile": "https://github.com/Chandrika-Priya",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 16,
diff --git a/.eslintrc.js b/.eslintrc.js
index dd50364d0..af9eaef9d 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -127,6 +127,9 @@ module.exports = {
     'consistent-return': 1,
     'implicit-arrow-linebreak': 0,
     indent: 0,
+    // TODO: Turn this rule on once the js to ts conversions are over
+    // This is necessary as workaround for window.ferdi vs window['ferdi']
+    'dot-notation': 0,
     'function-paren-newline': 0,
     'linebreak-style': 0,
     'max-len': 0,
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml
index 8e7b5ae8e..81a8ad556 100644
--- a/.github/workflows/dependency-updates.yml
+++ b/.github/workflows/dependency-updates.yml
@@ -55,7 +55,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v2.0.1
         with:
-          version: 6.17.1
+          version: 6.19.0
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml
index bbd001a0a..e00893c19 100644
--- a/.github/workflows/ferdi-builds.yml
+++ b/.github/workflows/ferdi-builds.yml
@@ -152,7 +152,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v2.0.1
         with:
-          version: 6.17.1
+          version: 6.19.0
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
@@ -255,7 +255,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v2.0.1
         with:
-          version: 6.17.1
+          version: 6.19.0
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
@@ -379,7 +379,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v2.0.1
         with:
-          version: 6.17.1
+          version: 6.19.0
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4459c46f7..65c9a30ca 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -64,7 +64,7 @@ v14.18.1
 npm -v
 6.14.13
 pnpm -v
-6.17.1
+6.19.0
 ```
 
 _Note:_ You can choose any package manager to manage multiple versions of `node` and `npm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [asdf](https://github.com/asdf-vm/asdf).
@@ -196,7 +196,7 @@ DEBUG=Ferdi:* npm run start
 - Optionally, you can run both commands in one terminal with [concurrently](https://www.npmjs.com/package/concurrently):
 
 ```bash
-DEBUG=Ferdi:* npm run start:all-dev
+DEBUG_COLORS=1 DEBUG=Ferdi:* npm run start:all-dev
 ```
 
 Note: please prefer [`debug()`](https://github.com/visionmedia/debug) over `console.log()`.
diff --git a/Dockerfile b/Dockerfile
index 404502283..13551dad3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update -y \
 
 WORKDIR /usr/src/ferdi
 
-RUN npm i -g pnpm@6.17.1 \
+RUN npm i -g pnpm@6.19.0 \
   && npm ls -g node-gyp@8.2.0 || npm i -g node-gyp@8.2.0
 
 COPY package*.json .
diff --git a/README.md b/README.md
index 84c2875ef..050d4166e 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
 <p align="center">
 <img alt="GitHub Releases" src="https://img.shields.io/github/downloads/getferdi/ferdi/latest/total?label=Downloads&logo=iCloud&logoColor=%23FFFFFF">
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href='#contributors-'><img src='https://img.shields.io/badge/contributors-100-default.svg?logo=github' alt='Contributors'/></a>
+<a href='#contributors-'><img src='https://img.shields.io/badge/contributors-110-default.svg?logo=github' alt='Contributors'/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 <a href="#backers-via-opencollective"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective"></a>
 <a href="#sponsors-via-opencollective"><img alt="Open Collective sponsors" src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective"></a>
@@ -227,7 +227,7 @@ If you use an AUR Helper, e.g. yay, install it via `yay -S ferdi`.
 
 ### Adds internal changes
 
-- [x] Upgrades to Electron 15.2.0
+- [x] Upgrades to Electron 15.3.0
 - [x] Switches to [`electron-spellchecker`](https://github.com/electron-userland/electron-spellchecker) to improve application size
 - [x] Minifies build files to improve app size
 - [x] Adds "npm run prepare-code" command for development to lint and beautify code
@@ -390,6 +390,16 @@ Thanks goes to these awesome people:
     <td align="center"><a href='https://www.ekino.com' title='Sadetdin EYILI: code, bug, userTesting'><img src='https://avatars.githubusercontent.com/u/5607440?v=4' alt='sad270' style='border-radius:42px;width:42px;height:42px;'/></a></td>
     <td align="center"><a href='https://github.com/Tsakatac' title='Tsakatac: bug'><img src='https://avatars.githubusercontent.com/u/89021195?v=4' alt='Tsakatac' style='border-radius:42px;width:42px;height:42px;'/></a></td>
     <td align="center"><a href='http://niute.ch' title='niu tech: code'><img src='https://avatars.githubusercontent.com/u/384997?v=4' alt='niutech' style='border-radius:42px;width:42px;height:42px;'/></a></td>
+    <td align="center"><a href='https://github.com/Suvarna221B' title='Suvarna Sivadas: code'><img src='https://avatars.githubusercontent.com/u/31803071?v=4' alt='Suvarna221B' style='border-radius:42px;width:42px;height:42px;'/></a></td>
+    <td align="center"><a href='https://github.com/johan-mathew' title='Johan Mathew: code'><img src='https://avatars.githubusercontent.com/u/31700508?v=4' alt='johan-mathew' style='border-radius:42px;width:42px;height:42px;'/></a></td>
+    <td align="center"><a href='https://github.com/AjeshKumarS' title='Ajesh Kumar S: code'><img src='https://avatars.githubusercontent.com/u/31558237?v=4' alt='AjeshKumarS' style='border-radius:42px;width:42px;height:42px;'/></a></td>
+    <td align="center"><a href='https://github.com/sreelekhaMarasig' title='Ajesh Kumar S: code'><img src='https://avatars.githubusercontent.com/u/93112178?v=4' alt='sreelekhaMarasig' style='border-radius:42px;width:42px;height:42px;'/></a></td>
+    <td align="center"><a href='https://github.com/MadhuriBandanadam' title='Madhuri: code'><img src='https://avatars.githubusercontent.com/u/63137999?v=4' alt='MadhuriBandanadam' style='border-radius:42px;width:42px;height:42px;'/></a></td>
+    <td align="center"><a href='https://github.com/abinmn' title='Abin Mn: code'><img src='https://avatars.githubusercontent.com/u/29946484?v=4' alt='abinmn' style='border-radius:42px;width:42px;height:42px;'/></a></td>
+    <td align="center"><a href='https://github.com/AnjithPaul' title='Anjith Paul: code'><img src='https://avatars.githubusercontent.com/u/65152866?v=4' alt='AnjithPaul' style='border-radius:42px;width:42px;height:42px;'/></a></td>
+    <td align="center"><a href='https://github.com/Vishnu017' title='Vishnu017: code'><img src='https://avatars.githubusercontent.com/u/39431453?v=4' alt='Vishnu017' style='border-radius:42px;width:42px;height:42px;'/></a></td>
+    <td align="center"><a href='https://github.com/rachelcynthia' title='Rachel Cynthia V: code'><img src='https://avatars.githubusercontent.com/u/46859572?v=4' alt='rachelcynthia' style='border-radius:42px;width:42px;height:42px;'/></a></td>
+    <td align="center"><a href='https://github.com/Chandrika-Priya' title='Chandrika Priya Bogadi: code'><img src='https://avatars.githubusercontent.com/u/46720139?v=4' alt='Chandrika-Priya' style='border-radius:42px;width:42px;height:42px;'/></a></td>
   </tr>
 </table>
 
diff --git a/package-lock.json b/package-lock.json
index 953500553..8993173a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ferdi",
-  "version": "5.6.3-beta.2",
+  "version": "5.6.3-nightly.44",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -684,9 +684,9 @@
       }
     },
     "@babel/plugin-proposal-decorators": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.15.4.tgz",
-      "integrity": "sha512-WNER+YLs7avvRukEddhu5PSfSaMMimX2xBFgLQS7Bw16yrUxJGWidO9nQp+yLy9MVybg5Ba3BlhAw+BkdhpDmg==",
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.15.8.tgz",
+      "integrity": "sha512-5n8+xGK7YDrXF+WAORg3P7LlCCdiaAyKLZi22eP2BwTy4kJ0kFUMMDCj4nQ8YrKyNZgjhU/9eRVqONnjB3us8g==",
       "dev": true,
       "requires": {
         "@babel/helper-create-class-features-plugin": "^7.15.4",
@@ -1345,9 +1345,9 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.15.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.6.tgz",
-      "integrity": "sha512-L+6jcGn7EWu7zqaO2uoTDjjMBW+88FXzV8KvrBl2z6MtRNxlsmUNRlZPaNNPUTgqhyC5DHNFk/2Jmra+ublZWw==",
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.8.tgz",
+      "integrity": "sha512-rCC0wH8husJgY4FPbHsiYyiLxSY8oMDJH7Rl6RQMknbN9oDDHhM9RDFvnGM2MgkbUJzSQB4gtuwygY5mCqGSsA==",
       "dev": true,
       "requires": {
         "@babel/compat-data": "^7.15.0",
@@ -1355,7 +1355,7 @@
         "@babel/helper-plugin-utils": "^7.14.5",
         "@babel/helper-validator-option": "^7.14.5",
         "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.15.4",
-        "@babel/plugin-proposal-async-generator-functions": "^7.15.4",
+        "@babel/plugin-proposal-async-generator-functions": "^7.15.8",
         "@babel/plugin-proposal-class-properties": "^7.14.5",
         "@babel/plugin-proposal-class-static-block": "^7.15.4",
         "@babel/plugin-proposal-dynamic-import": "^7.14.5",
@@ -1410,7 +1410,7 @@
         "@babel/plugin-transform-regenerator": "^7.14.5",
         "@babel/plugin-transform-reserved-words": "^7.14.5",
         "@babel/plugin-transform-shorthand-properties": "^7.14.5",
-        "@babel/plugin-transform-spread": "^7.14.6",
+        "@babel/plugin-transform-spread": "^7.15.8",
         "@babel/plugin-transform-sticky-regex": "^7.14.5",
         "@babel/plugin-transform-template-literals": "^7.14.5",
         "@babel/plugin-transform-typeof-symbol": "^7.14.5",
@@ -1419,7 +1419,7 @@
         "@babel/preset-modules": "^0.1.4",
         "@babel/types": "^7.15.6",
         "babel-plugin-polyfill-corejs2": "^0.2.2",
-        "babel-plugin-polyfill-corejs3": "^0.2.2",
+        "babel-plugin-polyfill-corejs3": "^0.2.5",
         "babel-plugin-polyfill-regenerator": "^0.2.2",
         "core-js-compat": "^3.16.0",
         "semver": "^6.3.0"
@@ -1434,9 +1434,9 @@
       }
     },
     "@babel/preset-modules": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
-      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -1579,16 +1579,16 @@
       "dev": true
     },
     "@commitlint/cli": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-13.1.0.tgz",
-      "integrity": "sha512-xN/uNYWtGTva5OMSd+xA6e6/c2jk8av7MUbdd6w2cw89u6z3fAWoyiH87X0ewdSMNYmW/6B3L/2dIVGHRDID5w==",
+      "version": "13.2.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-13.2.1.tgz",
+      "integrity": "sha512-JGzYk2ay5JkRS5w+FLQzr0u/Kih52ds4HPpa3vnwVOQN8Q+S1VYr8Nk/6kRm6uNYsAcC1nejtuDxRdLcLh/9TA==",
       "dev": true,
       "requires": {
-        "@commitlint/format": "^13.1.0",
-        "@commitlint/lint": "^13.1.0",
-        "@commitlint/load": "^13.1.0",
-        "@commitlint/read": "^13.1.0",
-        "@commitlint/types": "^13.1.0",
+        "@commitlint/format": "^13.2.0",
+        "@commitlint/lint": "^13.2.0",
+        "@commitlint/load": "^13.2.1",
+        "@commitlint/read": "^13.2.0",
+        "@commitlint/types": "^13.2.0",
         "lodash": "^4.17.19",
         "resolve-from": "5.0.0",
         "resolve-global": "1.0.0",
@@ -1604,9 +1604,9 @@
       }
     },
     "@commitlint/config-conventional": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-13.1.0.tgz",
-      "integrity": "sha512-zukJXqdr6jtMiVRy3tTHmwgKcUMGfqKDEskRigc5W3k2aYF4gBAtCEjMAJGZgSQE4DMcHeok0pEV2ANmTpb0cw==",
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-13.2.0.tgz",
+      "integrity": "sha512-7u7DdOiF+3qSdDlbQGfpvCH8DCQdLFvnI2+VucYmmV7E92iD6t9PBj+UjIoSQCaMAzYp27Vkall78AkcXBh6Xw==",
       "dev": true,
       "requires": {
         "conventional-changelog-conventionalcommits": "^4.3.1"
@@ -1851,78 +1851,6 @@
         "@commitlint/to-lines": "^13.2.0",
         "@commitlint/types": "^13.2.0",
         "execa": "^5.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-          "dev": true,
-          "requires": {
-            "path-key": "^3.1.0",
-            "shebang-command": "^2.0.0",
-            "which": "^2.0.1"
-          }
-        },
-        "execa": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^7.0.3",
-            "get-stream": "^6.0.0",
-            "human-signals": "^2.1.0",
-            "is-stream": "^2.0.0",
-            "merge-stream": "^2.0.0",
-            "npm-run-path": "^4.0.1",
-            "onetime": "^5.1.2",
-            "signal-exit": "^3.0.3",
-            "strip-final-newline": "^2.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-          "dev": true
-        },
-        "human-signals": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-          "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-          "dev": true
-        },
-        "path-key": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-          "dev": true
-        },
-        "shebang-command": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-          "dev": true,
-          "requires": {
-            "shebang-regex": "^3.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-          "dev": true
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
       }
     },
     "@commitlint/to-lines": {
@@ -1976,6 +1904,12 @@
           "requires": {
             "p-limit": "^3.0.2"
           }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
         }
       }
     },
@@ -2258,19 +2192,19 @@
       }
     },
     "@formatjs/cli": {
-      "version": "4.2.33",
-      "resolved": "https://registry.npmjs.org/@formatjs/cli/-/cli-4.2.33.tgz",
-      "integrity": "sha512-4Lg+KZ5QhXgF6+zjHyZlxMG8I0D3m3PZyrj3hRl97vdZ6rAWKVFWw8fkTO/iyhUCP2iC47Eh9r+ZTgGARX9Teg==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/cli/-/cli-4.4.0.tgz",
+      "integrity": "sha512-aBo+U8/EoBDWmksgPo3mhUunW55GFTqVA6hiudfHBPARfXX/b6JtXDi0fJGZpN2LbtYyvy4OrQlMP+c/7LGPQQ==",
       "dev": true,
       "requires": {
-        "@formatjs/icu-messageformat-parser": "2.0.11",
-        "@formatjs/ts-transformer": "3.4.10",
+        "@formatjs/icu-messageformat-parser": "2.0.14",
+        "@formatjs/ts-transformer": "3.6.0",
         "@types/estree": "^0.0.50",
         "@types/fs-extra": "^9.0.1",
         "@types/json-stable-stringify": "^1.0.32",
         "@types/node": "14",
-        "@vue/compiler-core": "^3.0.5",
-        "@vue/compiler-sfc": "^3.0.5",
+        "@vue/compiler-core": "^3.2.19",
+        "@vue/compiler-sfc": "^3.2.19",
         "chalk": "^4.0.0",
         "commander": "8",
         "fast-glob": "^3.2.7",
@@ -2278,7 +2212,7 @@
         "json-stable-stringify": "^1.0.1",
         "loud-rejection": "^2.2.0",
         "tslib": "^2.1.0",
-        "typescript": "4"
+        "typescript": "^4.4"
       },
       "dependencies": {
         "ansi-styles": {
@@ -2316,9 +2250,9 @@
           "dev": true
         },
         "commander": {
-          "version": "8.2.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-8.2.0.tgz",
-          "integrity": "sha512-LLKxDvHeL91/8MIyTAD5BFMNtoIwztGPMiM/7Bl8rIPmHCZXRxmSWr91h57dpOpnQ6jIUqEWdXE/uBYMfiVZDA==",
+          "version": "8.3.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+          "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
           "dev": true
         },
         "has-flag": {
@@ -2335,15 +2269,21 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "typescript": {
+          "version": "4.4.4",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
+          "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
+          "dev": true
         }
       }
     },
     "@formatjs/ecma402-abstract": {
-      "version": "1.9.8",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.9.8.tgz",
-      "integrity": "sha512-2U4n11bLmTij/k4ePCEFKJILPYwdMcJTdnKVBi+JMWBgu5O1N+XhCazlE6QXqVO1Agh2Doh0b/9Jf1mSmSVfhA==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.10.0.tgz",
+      "integrity": "sha512-WNkcUHC6xw12rWY87TUw6KXzb1LnOooYBLLqtyn1kW2j197rcwpqmUOJMBED56YcLzaJPfVw1L2ShiDhL5pVnQ==",
       "requires": {
-        "@formatjs/intl-localematcher": "0.2.20",
+        "@formatjs/intl-localematcher": "0.2.21",
         "tslib": "^2.1.0"
       }
     },
@@ -2356,75 +2296,77 @@
       }
     },
     "@formatjs/icu-messageformat-parser": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.11.tgz",
-      "integrity": "sha512-5mWb8U8aulYGwnDZWrr+vdgn5PilvtrqQYQ1pvpgzQes/osi85TwmL2GqTGLlKIvBKD2XNA61kAqXYY95w4LWg==",
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.14.tgz",
+      "integrity": "sha512-M79MdUMLnfLK8eMrznUwke6afH9G/eOQeYvMUJ7uElXIL+//PyyjOzb42hAYfDAGYsAcKA2TsUo33Yuy2lE4AQ==",
       "requires": {
-        "@formatjs/ecma402-abstract": "1.9.8",
-        "@formatjs/icu-skeleton-parser": "1.2.12",
+        "@formatjs/ecma402-abstract": "1.10.0",
+        "@formatjs/icu-skeleton-parser": "1.3.1",
         "tslib": "^2.1.0"
       }
     },
     "@formatjs/icu-skeleton-parser": {
-      "version": "1.2.12",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.2.12.tgz",
-      "integrity": "sha512-DTFxWmEA02ZNW6fsYjGYSADvtrqqjCYF7DSgCmMfaaE0gLP4pCdAgOPE+lkXXU+jP8iCw/YhMT2Seyk/C5lBWg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.1.tgz",
+      "integrity": "sha512-WdPNjhv9e7EfyrIVYk6hN6/mC9YF+PcfFViDI2kATwoi1uKHr+AkQCMoNrWyCDdUQ+Dn50mQOlrEkCBXoLrkPQ==",
       "requires": {
-        "@formatjs/ecma402-abstract": "1.9.8",
+        "@formatjs/ecma402-abstract": "1.10.0",
         "tslib": "^2.1.0"
       }
     },
     "@formatjs/intl": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-1.14.1.tgz",
-      "integrity": "sha512-mtL8oBgFwTu0GHFnxaF93fk/zNzNkPzl+27Fwg5AZ88pWHWb7037dpODzoCBnaIVk4FBO5emUn/6jI9Byj8hOw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-1.15.0.tgz",
+      "integrity": "sha512-8apTN/j7+pF02U1pUbsORgvWHjVEXH6eXj1y1iw/bbPoVWqfTsUSj/u9hL9MMoLI04RnOQiuK2nIh0cKeOnh1Q==",
       "requires": {
-        "@formatjs/ecma402-abstract": "1.9.8",
+        "@formatjs/ecma402-abstract": "1.10.0",
         "@formatjs/fast-memoize": "1.2.0",
-        "@formatjs/icu-messageformat-parser": "2.0.11",
-        "@formatjs/intl-displaynames": "5.2.3",
-        "@formatjs/intl-listformat": "6.3.3",
-        "intl-messageformat": "9.9.1",
+        "@formatjs/icu-messageformat-parser": "2.0.14",
+        "@formatjs/intl-displaynames": "5.2.5",
+        "@formatjs/intl-listformat": "6.3.5",
+        "intl-messageformat": "9.9.4",
         "tslib": "^2.1.0"
       }
     },
     "@formatjs/intl-displaynames": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-5.2.3.tgz",
-      "integrity": "sha512-5BmhSurLbfgdeo0OBcNPPkIS8ikMMYaHe2NclxEQZqcMvrnQzNMNnUE2dDF5vZx+mkvKq77aQYzpc8RfqVsRCQ==",
+      "version": "5.2.5",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-5.2.5.tgz",
+      "integrity": "sha512-iYlce/hG31ohJOwpv3yhOiEIwEBMqOt2kzA2BQTx1ra8ferBn4WlTxkouoDNiAKEBD1LFYZBIC25jsSJUJOEbg==",
       "requires": {
-        "@formatjs/ecma402-abstract": "1.9.8",
-        "@formatjs/intl-localematcher": "0.2.20",
+        "@formatjs/ecma402-abstract": "1.10.0",
+        "@formatjs/intl-localematcher": "0.2.21",
         "tslib": "^2.1.0"
       }
     },
     "@formatjs/intl-listformat": {
-      "version": "6.3.3",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-6.3.3.tgz",
-      "integrity": "sha512-3nzAKgVS5rePDa5HiH0OwZgAhqxLtzlMc9Pg4QgajRHSP1TqFiMmQnnn52wd3+xVTb7cjZVm3JBnTv51/MhTOg==",
+      "version": "6.3.5",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-6.3.5.tgz",
+      "integrity": "sha512-GtiMMx5RB/gID7ydGr+i1lRbGu728plTfT196X151cE2PYEqC05BEuHQFlE1rcUGC2+RfFqlvmipYcbOqJTQug==",
       "requires": {
-        "@formatjs/ecma402-abstract": "1.9.8",
-        "@formatjs/intl-localematcher": "0.2.20",
+        "@formatjs/ecma402-abstract": "1.10.0",
+        "@formatjs/intl-localematcher": "0.2.21",
         "tslib": "^2.1.0"
       }
     },
     "@formatjs/intl-localematcher": {
-      "version": "0.2.20",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.20.tgz",
-      "integrity": "sha512-/Ro85goRZnCojzxOegANFYL0LaDIpdPjAukR7xMTjOtRx+3yyjR0ifGTOW3/Kjhmab3t6GnyHBYWZSudxEOxPA==",
+      "version": "0.2.21",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.21.tgz",
+      "integrity": "sha512-JTJeLiNwexN4Gy0cMxoUPvJbKhXdnSuo5jPrDafEZpnDWlJ5VDYta8zUVVozO/pwzEmFVHEUpgiEDj+39L4oMg==",
       "requires": {
         "tslib": "^2.1.0"
       }
     },
     "@formatjs/ts-transformer": {
-      "version": "3.4.10",
-      "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.4.10.tgz",
-      "integrity": "sha512-5fu8x+8CtyrFe8zdwHvFsYLx9TEPjeJSODRS1ZJxkMVpTBHaNsPqsPkN1TuTk5x3+tSczxXmN1LGrAzUxNN3nQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.6.0.tgz",
+      "integrity": "sha512-r0J230J3TOLJolnAMbWsmzKu1NNitORzoPRGv0CPzjQSAmbTOtbrWNfYsyp+Ro8k5Gfkm9Qdg+BhxRXfyVTmtg==",
       "dev": true,
       "requires": {
-        "@formatjs/icu-messageformat-parser": "2.0.11",
+        "@formatjs/icu-messageformat-parser": "2.0.14",
+        "@types/node": "14 || 16",
         "chalk": "^4.0.0",
-        "tslib": "^2.1.0"
+        "tslib": "^2.1.0",
+        "typescript": "^4.4"
       },
       "dependencies": {
         "ansi-styles": {
@@ -2475,6 +2417,12 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "typescript": {
+          "version": "4.4.4",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
+          "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
+          "dev": true
         }
       }
     },
@@ -2570,6 +2518,12 @@
             "p-limit": "^2.2.0"
           }
         },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
         "resolve-from": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
@@ -2591,16 +2545,16 @@
       "dev": true
     },
     "@jest/console": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.2.5.tgz",
-      "integrity": "sha512-smtlRF9vNKorRMCUtJ+yllIoiY8oFmfFG7xlzsAE76nKEwXNhjPOJIsc7Dv+AUitVt76t+KjIpUP9m98Crn2LQ==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.3.1.tgz",
+      "integrity": "sha512-RkFNWmv0iui+qsOr/29q9dyfKTTT5DCuP31kUwg7rmOKPT/ozLeGLKJKVIiOfbiKyleUZKIrHwhmiZWVe8IMdw==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^27.2.5",
-        "jest-util": "^27.2.5",
+        "jest-message-util": "^27.3.1",
+        "jest-util": "^27.3.1",
         "slash": "^3.0.0"
       },
       "dependencies": {
@@ -2656,15 +2610,15 @@
       }
     },
     "@jest/core": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.2.5.tgz",
-      "integrity": "sha512-VR7mQ+jykHN4WO3OvusRJMk4xCa2MFLipMS+43fpcRGaYrN1KwMATfVEXif7ccgFKYGy5D1TVXTNE4mGq/KMMA==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.3.1.tgz",
+      "integrity": "sha512-DMNE90RR5QKx0EA+wqe3/TNEwiRpOkhshKNxtLxd4rt3IZpCt+RSL+FoJsGeblRZmqdK4upHA/mKKGPPRAifhg==",
       "dev": true,
       "requires": {
-        "@jest/console": "^27.2.5",
-        "@jest/reporters": "^27.2.5",
-        "@jest/test-result": "^27.2.5",
-        "@jest/transform": "^27.2.5",
+        "@jest/console": "^27.3.1",
+        "@jest/reporters": "^27.3.1",
+        "@jest/test-result": "^27.3.1",
+        "@jest/transform": "^27.3.1",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
@@ -2672,19 +2626,19 @@
         "emittery": "^0.8.1",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^27.2.5",
-        "jest-config": "^27.2.5",
-        "jest-haste-map": "^27.2.5",
-        "jest-message-util": "^27.2.5",
+        "jest-changed-files": "^27.3.0",
+        "jest-config": "^27.3.1",
+        "jest-haste-map": "^27.3.1",
+        "jest-message-util": "^27.3.1",
         "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.2.5",
-        "jest-resolve-dependencies": "^27.2.5",
-        "jest-runner": "^27.2.5",
-        "jest-runtime": "^27.2.5",
-        "jest-snapshot": "^27.2.5",
-        "jest-util": "^27.2.5",
-        "jest-validate": "^27.2.5",
-        "jest-watcher": "^27.2.5",
+        "jest-resolve": "^27.3.1",
+        "jest-resolve-dependencies": "^27.3.1",
+        "jest-runner": "^27.3.1",
+        "jest-runtime": "^27.3.1",
+        "jest-snapshot": "^27.3.1",
+        "jest-util": "^27.3.1",
+        "jest-validate": "^27.3.1",
+        "jest-watcher": "^27.3.1",
         "micromatch": "^4.0.4",
         "rimraf": "^3.0.0",
         "slash": "^3.0.0",
@@ -2801,52 +2755,52 @@
       }
     },
     "@jest/environment": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.2.5.tgz",
-      "integrity": "sha512-XvUW3q6OUF+54SYFCgbbfCd/BKTwm5b2MGLoc2jINXQLKQDTCS2P2IrpPOtQ08WWZDGzbhAzVhOYta3J2arubg==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.3.1.tgz",
+      "integrity": "sha512-BCKCj4mOVLme6Tanoyc9k0ultp3pnmuyHw73UHRPeeZxirsU/7E3HC4le/VDb/SMzE1JcPnto+XBKFOcoiJzVw==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^27.2.5",
+        "@jest/fake-timers": "^27.3.1",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
-        "jest-mock": "^27.2.5"
+        "jest-mock": "^27.3.0"
       }
     },
     "@jest/fake-timers": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.2.5.tgz",
-      "integrity": "sha512-ZGUb6jg7BgwY+nmO0TW10bc7z7Hl2G/UTAvmxEyZ/GgNFoa31tY9/cgXmqcxnnZ7o5Xs7RAOz3G1SKIj8IVDlg==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.3.1.tgz",
+      "integrity": "sha512-M3ZFgwwlqJtWZ+QkBG5NmC23A9w+A6ZxNsO5nJxJsKYt4yguBd3i8TpjQz5NfCX91nEve1KqD9RA2Q+Q1uWqoA==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
         "@sinonjs/fake-timers": "^8.0.1",
         "@types/node": "*",
-        "jest-message-util": "^27.2.5",
-        "jest-mock": "^27.2.5",
-        "jest-util": "^27.2.5"
+        "jest-message-util": "^27.3.1",
+        "jest-mock": "^27.3.0",
+        "jest-util": "^27.3.1"
       }
     },
     "@jest/globals": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.2.5.tgz",
-      "integrity": "sha512-naRI537GM+enFVJQs6DcwGYPn/0vgJNb06zGVbzXfDfe/epDPV73hP1vqO37PqSKDeOXM2KInr6ymYbL1HTP7g==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.3.1.tgz",
+      "integrity": "sha512-Q651FWiWQAIFiN+zS51xqhdZ8g9b88nGCobC87argAxA7nMfNQq0Q0i9zTfQYgLa6qFXk2cGANEqfK051CZ8Pg==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.2.5",
+        "@jest/environment": "^27.3.1",
         "@jest/types": "^27.2.5",
-        "expect": "^27.2.5"
+        "expect": "^27.3.1"
       }
     },
     "@jest/reporters": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.2.5.tgz",
-      "integrity": "sha512-zYuR9fap3Q3mxQ454VWF8I6jYHErh368NwcKHWO2uy2fwByqBzRHkf9j2ekMDM7PaSTWcLBSZyd7NNxR1iHxzQ==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.3.1.tgz",
+      "integrity": "sha512-m2YxPmL9Qn1emFVgZGEiMwDntDxRRQ2D58tiDQlwYTg5GvbFOKseYCcHtn0WsI8CG4vzPglo3nqbOiT8ySBT/w==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^27.2.5",
-        "@jest/test-result": "^27.2.5",
-        "@jest/transform": "^27.2.5",
+        "@jest/console": "^27.3.1",
+        "@jest/test-result": "^27.3.1",
+        "@jest/transform": "^27.3.1",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -2859,10 +2813,10 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^27.2.5",
-        "jest-resolve": "^27.2.5",
-        "jest-util": "^27.2.5",
-        "jest-worker": "^27.2.5",
+        "jest-haste-map": "^27.3.1",
+        "jest-resolve": "^27.3.1",
+        "jest-util": "^27.3.1",
+        "jest-worker": "^27.3.1",
         "slash": "^3.0.0",
         "source-map": "^0.6.0",
         "string-length": "^4.0.1",
@@ -2967,33 +2921,33 @@
       }
     },
     "@jest/test-result": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.2.5.tgz",
-      "integrity": "sha512-ub7j3BrddxZ0BdSnM5JCF6cRZJ/7j3wgdX0+Dtwhw2Po+HKsELCiXUTvh+mgS4/89mpnU1CPhZxe2mTvuLPJJg==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.3.1.tgz",
+      "integrity": "sha512-mLn6Thm+w2yl0opM8J/QnPTqrfS4FoXsXF2WIWJb2O/GBSyResL71BRuMYbYRsGt7ELwS5JGcEcGb52BNrumgg==",
       "dev": true,
       "requires": {
-        "@jest/console": "^27.2.5",
+        "@jest/console": "^27.3.1",
         "@jest/types": "^27.2.5",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       }
     },
     "@jest/test-sequencer": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.2.5.tgz",
-      "integrity": "sha512-8j8fHZRfnjbbdMitMAGFKaBZ6YqvFRFJlMJzcy3v75edTOqc7RY65S9JpMY6wT260zAcL2sTQRga/P4PglCu3Q==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.3.1.tgz",
+      "integrity": "sha512-siySLo07IMEdSjA4fqEnxfIX8lB/lWYsBPwNFtkOvsFQvmBrL3yj3k3uFNZv/JDyApTakRpxbKLJ3CT8UGVCrA==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^27.2.5",
+        "@jest/test-result": "^27.3.1",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.2.5",
-        "jest-runtime": "^27.2.5"
+        "jest-haste-map": "^27.3.1",
+        "jest-runtime": "^27.3.1"
       }
     },
     "@jest/transform": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.2.5.tgz",
-      "integrity": "sha512-29lRtAHHYGALbZOx343v0zKmdOg4Sb0rsA1uSv0818bvwRhs3TyElOmTVXlrw0v1ZTqXJCAH/cmoDXimBhQOJQ==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.3.1.tgz",
+      "integrity": "sha512-3fSvQ02kuvjOI1C1ssqMVBKJpZf6nwoCiSu00zAKh5nrp3SptNtZy/8s5deayHnqxhjD9CWDJ+yqQwuQ0ZafXQ==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.1.0",
@@ -3003,9 +2957,9 @@
         "convert-source-map": "^1.4.0",
         "fast-json-stable-stringify": "^2.0.0",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.2.5",
+        "jest-haste-map": "^27.3.1",
         "jest-regex-util": "^27.0.6",
-        "jest-util": "^27.2.5",
+        "jest-util": "^27.3.1",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.1",
         "slash": "^3.0.0",
@@ -3296,14 +3250,14 @@
       }
     },
     "@mdi/font": {
-      "version": "6.2.95",
-      "resolved": "https://registry.npmjs.org/@mdi/font/-/font-6.2.95.tgz",
-      "integrity": "sha512-0RKkhabkFZP3ALwKqrjhdKdhydQpoydIjX6cvjIwLyjADCsE0pG68YkGY+S3qnfdErmhS4m8adwvgrAFXp2AYQ=="
+      "version": "6.3.95",
+      "resolved": "https://registry.npmjs.org/@mdi/font/-/font-6.3.95.tgz",
+      "integrity": "sha512-bbvnF7rNX9aMn7PeqDCa8ZQTPxEqerZeXo/lQQxE84Ka/7UrFcqvOO3XXVLtrCCtyA6uIqiG4oYFRPVJqv247Q=="
     },
     "@mdi/js": {
-      "version": "6.2.95",
-      "resolved": "https://registry.npmjs.org/@mdi/js/-/js-6.2.95.tgz",
-      "integrity": "sha512-fbD22sEBathqVSQWcxshEtzhhRNFmMnV64z6T7DClRbQ9N5axorykt3Suv2zPzLDyiqH7UhNRu0VPvPCPDNpnQ=="
+      "version": "6.3.95",
+      "resolved": "https://registry.npmjs.org/@mdi/js/-/js-6.3.95.tgz",
+      "integrity": "sha512-/EI+ao3caXcYTWGYwwOylZKmO0ilywwE8CsEZl5L82Rgsv1eLUlCmLIrViE5A9pISsaTZELkzgbP1lQSGwRY8A=="
     },
     "@mdi/react": {
       "version": "1.5.0",
@@ -3379,9 +3333,9 @@
       }
     },
     "@sentry/electron": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/@sentry/electron/-/electron-2.5.3.tgz",
-      "integrity": "sha512-WxfLd8Q9ddk38TUTscahh594MugHNBsN5/82gBhIdPwjKnd4JtuD+BAeZfz0ihe7xhP07SNSkkAszmFOIGnTcg==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@sentry/electron/-/electron-2.5.4.tgz",
+      "integrity": "sha512-tCCK+P581TmdjsDpHBQz7qYcldzGdUk1Fd6FPxPy1JKGzeY4uf/uSLKzR80Lzs5kTpEZFOwiMHSA8yjwFp5qoA==",
       "requires": {
         "@sentry/browser": "6.7.1",
         "@sentry/core": "6.7.1",
@@ -3692,18 +3646,18 @@
       "dev": true
     },
     "@types/fs-extra": {
-      "version": "9.0.12",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.12.tgz",
-      "integrity": "sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==",
+      "version": "9.0.13",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
+      "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==",
       "dev": true,
       "requires": {
         "@types/node": "*"
       }
     },
     "@types/glob": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
-      "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
       "dev": true,
       "requires": {
         "@types/minimatch": "*",
@@ -3726,18 +3680,6 @@
       "requires": {
         "@types/react": "*",
         "hoist-non-react-statics": "^3.3.0"
-      },
-      "dependencies": {
-        "@types/react": {
-          "version": "17.0.30",
-          "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.30.tgz",
-          "integrity": "sha512-3Dt/A8gd3TCXi2aRe84y7cK1K8G+N9CZRDG8kDGguOKa0kf/ZkSwTmVIDPsm/KbQOVMaDJXwhBtuOXxqwdpWVg==",
-          "requires": {
-            "@types/prop-types": "*",
-            "@types/scheduler": "*",
-            "csstype": "^3.0.2"
-          }
-        }
       }
     },
     "@types/html-minifier-terser": {
@@ -3789,9 +3731,9 @@
       "dev": true
     },
     "@types/lodash": {
-      "version": "4.14.172",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.172.tgz",
-      "integrity": "sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw==",
+      "version": "4.14.176",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.176.tgz",
+      "integrity": "sha512-xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ==",
       "dev": true
     },
     "@types/mime-types": {
@@ -3874,10 +3816,9 @@
       "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
     },
     "@types/react": {
-      "version": "17.0.27",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.27.tgz",
-      "integrity": "sha512-zgiJwtsggVGtr53MndV7jfiUESTqrbxOcBvwfe6KS/9bzaVPCTDieTWnFNecVNx6EAaapg5xsLLWFfHHR437AA==",
-      "dev": true,
+      "version": "17.0.31",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.31.tgz",
+      "integrity": "sha512-MQSR5EL4JZtdWRvqDgz9kXhSDDoy2zMTYyg7UhP+FZ5ttUOocWyxiqFJiI57sUG0BtaEX7WDXYQlkCYkb3X9vQ==",
       "requires": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -3885,9 +3826,9 @@
       }
     },
     "@types/react-dom": {
-      "version": "17.0.9",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.9.tgz",
-      "integrity": "sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg==",
+      "version": "17.0.10",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.10.tgz",
+      "integrity": "sha512-8oz3NAUId2z/zQdFI09IMhQPNgIbiP8Lslhv39DIDamr846/0spjZK0vnrMak0iB8EKb9QFTTIdg2Wj2zH5a3g==",
       "dev": true,
       "requires": {
         "@types/react": "*"
@@ -3905,9 +3846,9 @@
       "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
     },
     "@types/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now=="
+      "version": "7.3.9",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.9.tgz",
+      "integrity": "sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ=="
     },
     "@types/source-list-map": {
       "version": "0.1.2",
@@ -3966,9 +3907,9 @@
       "dev": true
     },
     "@types/validator": {
-      "version": "13.6.3",
-      "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.6.3.tgz",
-      "integrity": "sha512-fWG42pMJOL4jKsDDZZREnXLjc3UE0R8LOJfARWYg6U966rxDT7TYejYzLnUF5cvSObGg34nd0+H2wHHU5Omdfw==",
+      "version": "13.6.4",
+      "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.6.4.tgz",
+      "integrity": "sha512-M9Lk74A8hjJIxnSW1+TcPo7Iv4arXBUvd91HuucGPjXVKRAhFHWP5HFpWjxhNWrm7HYoJwuyWpB+BKLgFYHq4w==",
       "dev": true
     },
     "@types/verror": {
@@ -4045,74 +3986,74 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.0.0.tgz",
-      "integrity": "sha512-T6V6fCD2U0YesOedvydTnrNtsC8E+c2QzpawIpDdlaObX0OX5dLo7tLU5c64FhTZvA1Xrdim+cXDI7NPsVx8Cg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.1.0.tgz",
+      "integrity": "sha512-bekODL3Tqf36Yz8u+ilha4zGxL9mdB6LIsIoMAvvC5FAuWo4NpZYXtCbv7B2CeR1LhI/lLtLk+q4tbtxuoVuCg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "5.0.0",
-        "@typescript-eslint/scope-manager": "5.0.0",
-        "debug": "^4.3.1",
+        "@typescript-eslint/experimental-utils": "5.1.0",
+        "@typescript-eslint/scope-manager": "5.1.0",
+        "debug": "^4.3.2",
         "functional-red-black-tree": "^1.0.1",
         "ignore": "^5.1.8",
-        "regexpp": "^3.1.0",
+        "regexpp": "^3.2.0",
         "semver": "^7.3.5",
         "tsutils": "^3.21.0"
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.0.0.tgz",
-      "integrity": "sha512-Dnp4dFIsZcPawD6CT1p5NibNUQyGSEz80sULJZkyhyna8AEqArmfwMwJPbmKzWVo4PabqNVzHYlzmcdLQWk+pg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.1.0.tgz",
+      "integrity": "sha512-ovE9qUiZMOMgxQAESZsdBT+EXIfx/YUYAbwGUI6V03amFdOOxI9c6kitkgRvLkJaLusgMZ2xBhss+tQ0Y1HWxA==",
       "dev": true,
       "requires": {
-        "@types/json-schema": "^7.0.7",
-        "@typescript-eslint/scope-manager": "5.0.0",
-        "@typescript-eslint/types": "5.0.0",
-        "@typescript-eslint/typescript-estree": "5.0.0",
+        "@types/json-schema": "^7.0.9",
+        "@typescript-eslint/scope-manager": "5.1.0",
+        "@typescript-eslint/types": "5.1.0",
+        "@typescript-eslint/typescript-estree": "5.1.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0"
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.0.0.tgz",
-      "integrity": "sha512-B6D5rmmQ14I1fdzs71eL3DAuvnPHTY/t7rQABrL9BLnx/H51Un8ox1xqYAchs0/V2trcoyxB1lMJLlrwrJCDgw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.1.0.tgz",
+      "integrity": "sha512-vx1P+mhCtYw3+bRHmbalq/VKP2Y3gnzNgxGxfEWc6OFpuEL7iQdAeq11Ke3Rhy8NjgB+AHsIWEwni3e+Y7djKA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.0.0",
-        "@typescript-eslint/types": "5.0.0",
-        "@typescript-eslint/typescript-estree": "5.0.0",
-        "debug": "^4.3.1"
+        "@typescript-eslint/scope-manager": "5.1.0",
+        "@typescript-eslint/types": "5.1.0",
+        "@typescript-eslint/typescript-estree": "5.1.0",
+        "debug": "^4.3.2"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.0.0.tgz",
-      "integrity": "sha512-5RFjdA/ain/MDUHYXdF173btOKncIrLuBmA9s6FJhzDrRAyVSA+70BHg0/MW6TE+UiKVyRtX91XpVS0gVNwVDQ==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.1.0.tgz",
+      "integrity": "sha512-yYlyVjvn5lvwCL37i4hPsa1s0ORsjkauhTqbb8MnpvUs7xykmcjGqwlNZ2Q5QpoqkJ1odlM2bqHqJwa28qV6Tw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.0.0",
-        "@typescript-eslint/visitor-keys": "5.0.0"
+        "@typescript-eslint/types": "5.1.0",
+        "@typescript-eslint/visitor-keys": "5.1.0"
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.0.0.tgz",
-      "integrity": "sha512-dU/pKBUpehdEqYuvkojmlv0FtHuZnLXFBn16zsDmlFF3LXkOpkAQ2vrKc3BidIIve9EMH2zfTlxqw9XM0fFN5w==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.1.0.tgz",
+      "integrity": "sha512-sEwNINVxcB4ZgC6Fe6rUyMlvsB2jvVdgxjZEjQUQVlaSPMNamDOwO6/TB98kFt4sYYfNhdhTPBEQqNQZjMMswA==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.0.0.tgz",
-      "integrity": "sha512-V/6w+PPQMhinWKSn+fCiX5jwvd1vRBm7AX7SJQXEGQtwtBvjMPjaU3YTQ1ik2UF1u96X7tsB96HMnulG3eLi9Q==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.1.0.tgz",
+      "integrity": "sha512-SSz+l9YrIIsW4s0ZqaEfnjl156XQ4VRmJsbA0ZE1XkXrD3cRpzuZSVCyqeCMR3EBjF27IisWakbBDGhGNIOvfQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.0.0",
-        "@typescript-eslint/visitor-keys": "5.0.0",
-        "debug": "^4.3.1",
-        "globby": "^11.0.3",
-        "is-glob": "^4.0.1",
+        "@typescript-eslint/types": "5.1.0",
+        "@typescript-eslint/visitor-keys": "5.1.0",
+        "debug": "^4.3.2",
+        "globby": "^11.0.4",
+        "is-glob": "^4.0.3",
         "semver": "^7.3.5",
         "tsutils": "^3.21.0"
       },
@@ -4129,12 +4070,12 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.0.0.tgz",
-      "integrity": "sha512-yRyd2++o/IrJdyHuYMxyFyBhU762MRHQ/bAGQeTnN3pGikfh+nEmM61XTqaDH1XDp53afZ+waXrk0ZvenoZ6xw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.1.0.tgz",
+      "integrity": "sha512-uqNXepKBg81JVwjuqAxYrXa1Ql/YDzM+8g/pS+TCPxba0wZttl8m5DkrasbfnmJGHs4lQ2jTbcZ5azGhI7kK+w==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.0.0",
+        "@typescript-eslint/types": "5.1.0",
         "eslint-visitor-keys": "^3.0.0"
       },
       "dependencies": {
@@ -4445,16 +4386,6 @@
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
-    "abstract-socket": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/abstract-socket/-/abstract-socket-2.1.1.tgz",
-      "integrity": "sha512-YZJizsvS1aBua5Gd01woe4zuyYBGgSMeqDOB6/ChwdTI904KP6QGtJswXl4hcqWxbz86hQBe++HWV0hF1aGUtA==",
-      "optional": true,
-      "requires": {
-        "bindings": "^1.2.1",
-        "nan": "^2.12.1"
-      }
-    },
     "accepts": {
       "version": "1.3.7",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
@@ -4640,6 +4571,12 @@
             "p-limit": "^2.2.0"
           }
         },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
         "pify": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
@@ -5112,29 +5049,6 @@
         "sanitize-filename": "^1.6.3",
         "semver": "^7.3.5",
         "temp-file": "^3.4.0"
-      },
-      "dependencies": {
-        "builder-util-runtime": {
-          "version": "8.9.1",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz",
-          "integrity": "sha512-c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg==",
-          "dev": true,
-          "requires": {
-            "debug": "^4.3.2",
-            "sax": "^1.2.4"
-          }
-        },
-        "form-data": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-          "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-          "dev": true,
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.8",
-            "mime-types": "^2.1.12"
-          }
-        }
       }
     },
     "app-root-path": {
@@ -5632,12 +5546,12 @@
       "dev": true
     },
     "babel-jest": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.2.5.tgz",
-      "integrity": "sha512-GC9pWCcitBhSuF7H3zl0mftoKizlswaF0E3qi+rPL417wKkCB0d+Sjjb0OfXvxj7gWiBf497ldgRMii68Xz+2g==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.3.1.tgz",
+      "integrity": "sha512-SjIF8hh/ir0peae2D6S6ZKRhUy7q/DnpH7k/V6fT4Bgs/LXXUztOpX4G2tCgq8mLo5HA9mN6NmlFMeYtKmIsTQ==",
       "dev": true,
       "requires": {
-        "@jest/transform": "^27.2.5",
+        "@jest/transform": "^27.3.1",
         "@jest/types": "^27.2.5",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.0.0",
@@ -5708,9 +5622,9 @@
       }
     },
     "babel-plugin-formatjs": {
-      "version": "10.3.9",
-      "resolved": "https://registry.npmjs.org/babel-plugin-formatjs/-/babel-plugin-formatjs-10.3.9.tgz",
-      "integrity": "sha512-+LO2Sap2HLoFBEOGnx1E/s34gsgCUWWvoPZ8YSg4cGfveIh94btBdCaAOUcAjUJamLXyL0g7Lsqkp7GjcNq20Q==",
+      "version": "10.3.11",
+      "resolved": "https://registry.npmjs.org/babel-plugin-formatjs/-/babel-plugin-formatjs-10.3.11.tgz",
+      "integrity": "sha512-NkV5+dajX+YvsBHEYcwlJm4Q9l7BoLBuhUMW8cCcOzx9c4ZGKcpmaRt7EObpT742iOsFE5QYUlfLwqOL0MVkTg==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.10.4",
@@ -5718,134 +5632,45 @@
         "@babel/plugin-syntax-jsx": "7",
         "@babel/traverse": "7",
         "@babel/types": "^7.12.11",
-        "@formatjs/icu-messageformat-parser": "2.0.12",
-        "@formatjs/ts-transformer": "3.5.0",
+        "@formatjs/icu-messageformat-parser": "2.0.14",
+        "@formatjs/ts-transformer": "3.6.0",
         "@types/babel__core": "^7.1.7",
         "@types/babel__helper-plugin-utils": "^7.10.0",
         "tslib": "^2.1.0"
-      },
-      "dependencies": {
-        "@formatjs/ecma402-abstract": {
-          "version": "1.9.9",
-          "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.9.9.tgz",
-          "integrity": "sha512-w2HpUW17Ev8UN8G1fSvl0skCLP+HkhGZii0ALaBXYc7rd3osD2s8EF2ihSNkeEeC6aySX1IAkRm0f4lnE8Jeaw==",
-          "dev": true,
-          "requires": {
-            "@formatjs/intl-localematcher": "0.2.21",
-            "tslib": "^2.1.0"
-          }
-        },
-        "@formatjs/icu-messageformat-parser": {
-          "version": "2.0.12",
-          "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.12.tgz",
-          "integrity": "sha512-X/tdbKLfVBc2yJRX+xC3uqYxXkp9336FhSS1Hb6kU6pSOU+EseylS3a/vjFOKjol1qQ5BSIQd8YPWtOOt3KcWA==",
-          "dev": true,
-          "requires": {
-            "@formatjs/ecma402-abstract": "1.9.9",
-            "@formatjs/icu-skeleton-parser": "1.2.13",
-            "tslib": "^2.1.0"
-          }
-        },
-        "@formatjs/icu-skeleton-parser": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.2.13.tgz",
-          "integrity": "sha512-PHK4kdIcNTI15ASyn6dCA2cxzUPHE+UK/FsBkPULNpKgPWEZIYAFO9PgG0a9SDcIIr7Ta3SPPbUZGKRXT3d+ng==",
-          "dev": true,
-          "requires": {
-            "@formatjs/ecma402-abstract": "1.9.9",
-            "tslib": "^2.1.0"
-          }
-        },
-        "@formatjs/intl-localematcher": {
-          "version": "0.2.21",
-          "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.21.tgz",
-          "integrity": "sha512-JTJeLiNwexN4Gy0cMxoUPvJbKhXdnSuo5jPrDafEZpnDWlJ5VDYta8zUVVozO/pwzEmFVHEUpgiEDj+39L4oMg==",
-          "dev": true,
-          "requires": {
-            "tslib": "^2.1.0"
-          }
-        },
-        "@formatjs/ts-transformer": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.5.0.tgz",
-          "integrity": "sha512-nmQqlSzY3ceNE9BoR0o/OsM+SFzbFwrQnopQL1K2I//K6wCwQn/fewh7MMcT6glkoMDBUx9PS7P9LeQfb+qgHQ==",
-          "dev": true,
-          "requires": {
-            "@formatjs/icu-messageformat-parser": "2.0.12",
-            "@types/node": "14 || 16",
-            "chalk": "^4.0.0",
-            "tslib": "^2.1.0",
-            "typescript": "^4.3"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "typescript": {
-          "version": "4.4.4",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
-          "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
-          "dev": true
-        }
       }
     },
     "babel-plugin-istanbul": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
-      "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
         "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^4.0.0",
+        "istanbul-lib-instrument": "^5.0.4",
         "test-exclude": "^6.0.0"
+      },
+      "dependencies": {
+        "istanbul-lib-instrument": {
+          "version": "5.0.4",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.0.4.tgz",
+          "integrity": "sha512-W6jJF9rLGEISGoCyXRqa/JCGQGmmxPO10TMu7izaUTynxvBvTjqzAIIGCK9USBmIbQAaSWD6XJPrM9Pv5INknw==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.12.3",
+            "@babel/parser": "^7.14.7",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-coverage": "^3.0.0",
+            "semver": "^6.3.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
     },
     "babel-plugin-jest-hoist": {
@@ -6479,14 +6304,14 @@
       "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
     },
     "buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
       "dev": true,
+      "optional": true,
       "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
       }
     },
     "buffer-alloc": {
@@ -6588,16 +6413,6 @@
             "color-convert": "^2.0.1"
           }
         },
-        "builder-util-runtime": {
-          "version": "8.9.1",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz",
-          "integrity": "sha512-c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg==",
-          "dev": true,
-          "requires": {
-            "debug": "^4.3.2",
-            "sax": "^1.2.4"
-          }
-        },
         "chalk": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -6682,9 +6497,10 @@
       }
     },
     "builder-util-runtime": {
-      "version": "8.7.5",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.5.tgz",
-      "integrity": "sha512-fgUFHKtMNjdvH6PDRFntdIGUPgwZ69sXsAqEulCtoiqgWes5agrMq/Ud274zjJRTbckYh2PHh8/1CpFc6dpsbQ==",
+      "version": "8.9.1",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz",
+      "integrity": "sha512-c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg==",
+      "dev": true,
       "requires": {
         "debug": "^4.3.2",
         "sax": "^1.2.4"
@@ -6707,6 +6523,75 @@
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
       "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
     },
+    "cacache": {
+      "version": "12.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+          "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "y18n": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+          "dev": true
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
+        }
+      }
+    },
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
@@ -6835,9 +6720,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001269",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001269.tgz",
-      "integrity": "sha512-UOy8okEVs48MyHYgV+RdW1Oiudl1H6KolybD6ZquD0VcrPSgj25omXO1S7rDydjpqaISCwA8Pyx+jUQKZwWO5w==",
+      "version": "1.0.30001271",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz",
+      "integrity": "sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==",
       "dev": true
     },
     "caseless": {
@@ -7116,9 +7001,9 @@
       }
     },
     "clean-css": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
-      "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
+      "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
       "dev": true,
       "requires": {
         "source-map": "~0.6.0"
@@ -7426,21 +7311,21 @@
       "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs="
     },
     "colorspace": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz",
-      "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz",
+      "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==",
       "requires": {
-        "color": "3.0.x",
+        "color": "^3.1.3",
         "text-hex": "1.0.x"
       },
       "dependencies": {
         "color": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
-          "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
+          "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
           "requires": {
-            "color-convert": "^1.9.1",
-            "color-string": "^1.5.2"
+            "color-convert": "^1.9.3",
+            "color-string": "^1.6.0"
           }
         }
       }
@@ -7621,12 +7506,6 @@
           "requires": {
             "ansi-regex": "^4.1.0"
           }
-        },
-        "strip-json-comments": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
-          "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
-          "dev": true
         }
       }
     },
@@ -7748,15 +7627,14 @@
       }
     },
     "concurrently": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.2.1.tgz",
-      "integrity": "sha512-emgwhH+ezkuYKSHZQ+AkgEpoUZZlbpPVYCVv7YZx0r+T7fny1H03r2nYRebpi2DudHR4n1Rgbo2YTxKOxVJ4+g==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.3.0.tgz",
+      "integrity": "sha512-k4k1jQGHHKsfbqzkUszVf29qECBrkvBKkcPJEUDTyVR7tZd1G/JOfnst4g1sYbFvJ4UjHZisj1aWQR8yLKpGPw==",
       "dev": true,
       "requires": {
         "chalk": "^4.1.0",
         "date-fns": "^2.16.1",
         "lodash": "^4.17.21",
-        "read-pkg": "^5.2.0",
         "rxjs": "^6.6.3",
         "spawn-command": "^0.0.2-1",
         "supports-color": "^8.1.0",
@@ -8176,19 +8054,6 @@
       "optional": true,
       "requires": {
         "buffer": "^5.1.0"
-      },
-      "dependencies": {
-        "buffer": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-          "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "base64-js": "^1.3.1",
-            "ieee754": "^1.1.13"
-          }
-        }
       }
     },
     "create-ecdh": {
@@ -8443,9 +8308,9 @@
       }
     },
     "csstype": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
-      "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw=="
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz",
+      "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw=="
     },
     "currently-unhandled": {
       "version": "0.4.1",
@@ -8513,9 +8378,9 @@
       "dev": true
     },
     "darkreader": {
-      "version": "4.9.34",
-      "resolved": "https://registry.npmjs.org/darkreader/-/darkreader-4.9.34.tgz",
-      "integrity": "sha512-Nq8rxXLUD/0TZ9qzvAkZDAbxRVrbPdwKPTqnx7sEk1RLTK6IyQNu2d1GdffPVEhXgK1SvSeETWDwo443tSf0fg=="
+      "version": "4.9.39",
+      "resolved": "https://registry.npmjs.org/darkreader/-/darkreader-4.9.39.tgz",
+      "integrity": "sha512-OikzTzTDasjq+e+PXRWZRxMA+PZddz9cDLiZGVUI48w1FbBDfXwwQyyWiO7eavdAQ1cV9dYA21g6KtdK/0OefA=="
     },
     "dashdash": {
       "version": "1.14.1",
@@ -8544,17 +8409,17 @@
       "dev": true
     },
     "dbus-next": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/dbus-next/-/dbus-next-0.9.2.tgz",
-      "integrity": "sha512-tzQq/+wrTZ2yU+U5PoeXc97KABhX2v55C/T0finH3tSKYuI8H/SqppIFymBBrUHcK13LvEGY3vdj3ikPPenL5g==",
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/dbus-next/-/dbus-next-0.10.2.tgz",
+      "integrity": "sha512-kLNQoadPstLgKKGIXKrnRsMgtAK/o+ix3ZmcfTfvBHzghiO9yHXpoKImGnB50EXwnfSFaSAullW/7UrSkAISSQ==",
       "requires": {
         "@nornagon/put": "0.0.8",
-        "abstract-socket": "^2.0.0",
         "event-stream": "3.3.4",
         "hexy": "^0.2.10",
         "jsbi": "^2.0.5",
         "long": "^4.0.0",
         "safe-buffer": "^5.1.1",
+        "usocket": "^0.3.0",
         "xml2js": "^0.4.17"
       }
     },
@@ -8801,12 +8666,6 @@
             }
           }
         },
-        "p-map": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-          "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-          "dev": true
-        },
         "rimraf": {
           "version": "2.7.1",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -8960,16 +8819,6 @@
         "js-yaml": "^4.1.0"
       },
       "dependencies": {
-        "builder-util-runtime": {
-          "version": "8.9.1",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz",
-          "integrity": "sha512-c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg==",
-          "dev": true,
-          "requires": {
-            "debug": "^4.3.2",
-            "sax": "^1.2.4"
-          }
-        },
         "iconv-lite": {
           "version": "0.6.3",
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
@@ -9313,9 +9162,9 @@
       }
     },
     "electron": {
-      "version": "15.2.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-15.2.0.tgz",
-      "integrity": "sha512-kg0JdlsVbJgD/hO/A7o9VH8U44pQWkIsyt/sALxH6g8CiHQxMujLn2JfB2gyUfHXPT7m8vD4Z+CurS2KodEsWw==",
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-15.3.0.tgz",
+      "integrity": "sha512-YLzaKCFmSniNlz9+NUTNs7ssPyDc+bYOCYZ0b/D6DjVkOeIFz4SR8EYKqlOc8TcqlDNu18BbWqz6zbJPyAAURg==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.13.0",
@@ -9352,16 +9201,6 @@
             "color-convert": "^2.0.1"
           }
         },
-        "builder-util-runtime": {
-          "version": "8.9.1",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz",
-          "integrity": "sha512-c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg==",
-          "dev": true,
-          "requires": {
-            "debug": "^4.3.2",
-            "sax": "^1.2.4"
-          }
-        },
         "chalk": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -9428,9 +9267,9 @@
       "integrity": "sha512-C2FQJuk8567P2a2loBNwl5c8kwOTQVMB0capgHtPI7zKwZG16X0UxG+sNYZExQfnJ0PA+ecECA/4LcXxQa2TCA=="
     },
     "electron-notarize": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.1.0.tgz",
-      "integrity": "sha512-Dmp/jm2y3PTcjmjVe+jCT0sjsbBfbNuk7GOPtduZce2iae1hgAPnlNErk6x70TalsGIL5Ip3liSryqde/6eB5w==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.1.1.tgz",
+      "integrity": "sha512-kufsnqh86CTX89AYNG3NCPoboqnku/+32RxeJ2+7A4Rbm4bbOx0Nc7XTy3/gAlBfpj9xPAxHfhZLOHgfi6cJVw==",
       "dev": true,
       "requires": {
         "debug": "^4.1.1",
@@ -9531,16 +9370,6 @@
             "color-convert": "^2.0.1"
           }
         },
-        "builder-util-runtime": {
-          "version": "8.9.1",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz",
-          "integrity": "sha512-c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg==",
-          "dev": true,
-          "requires": {
-            "debug": "^4.3.2",
-            "sax": "^1.2.4"
-          }
-        },
         "chalk": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -9590,9 +9419,9 @@
       }
     },
     "electron-react-titlebar": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/electron-react-titlebar/-/electron-react-titlebar-1.0.0.tgz",
-      "integrity": "sha512-/Ilv4kYPyJ1czijKtkQ1pXgvI/UeWaHjlNRnvuimWbrDzJJhsEtRHMdbnR1MaZEqRlT5pPlCIy3VflTP6ow3rg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/electron-react-titlebar/-/electron-react-titlebar-1.1.0.tgz",
+      "integrity": "sha512-MS7RXQqXO1H7rKUPjCkd18LJmRt2Ime1WK/gnqMUNxUFrFbh8WA5Cim8/HRAW3EgwDRPrnNHSxxLjXzykKiT3Q==",
       "requires": {
         "classnames": "^2.3.1",
         "lodash": "^4.17.21",
@@ -9600,9 +9429,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.870",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.870.tgz",
-      "integrity": "sha512-PiJMshfq6PL+i1V+nKLwhHbCKeD8eAz8rvO9Cwk/7cChOHJBtufmjajLyYLsSRHguRFiOCVx3XzJLeZsIAYfSA==",
+      "version": "1.3.877",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.877.tgz",
+      "integrity": "sha512-fT5mW5Giw5iyVukeHb2XvB4joBKvzHtl8Vs3QzE7APATpFMt/T7RWyUcIKSZzYkKQgpMbu+vDBTCHfQZvh8klA==",
       "dev": true
     },
     "electron-updater": {
@@ -9618,6 +9447,17 @@
         "lodash.escaperegexp": "^4.1.2",
         "lodash.isequal": "^4.5.0",
         "semver": "^7.3.5"
+      },
+      "dependencies": {
+        "builder-util-runtime": {
+          "version": "8.7.5",
+          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.5.tgz",
+          "integrity": "sha512-fgUFHKtMNjdvH6PDRFntdIGUPgwZ69sXsAqEulCtoiqgWes5agrMq/Ud274zjJRTbckYh2PHh8/1CpFc6dpsbQ==",
+          "requires": {
+            "debug": "^4.3.2",
+            "sax": "^1.2.4"
+          }
+        }
       }
     },
     "electron-window-state": {
@@ -9760,8 +9600,7 @@
     "env-paths": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "dev": true
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="
     },
     "errno": {
       "version": "0.1.8",
@@ -9982,9 +9821,9 @@
       }
     },
     "eslint": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.0.1.tgz",
-      "integrity": "sha512-LsgcwZgQ72vZ+SMp4K6pAnk2yFDWL7Ti4pJaRvsZ0Hsw2h8ZjUIW38a9AFn2cZXdBMlScMFYYgsSp4ttFI/0bA==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.1.0.tgz",
+      "integrity": "sha512-JZvNneArGSUsluHWJ8g8MMs3CfIEzwaLx9KyH4tZ2i+R2/rPWzL8c0zg3rHdwYVpN/1sB9gqnjHwz9HoeJpGHw==",
       "dev": true,
       "requires": {
         "@eslint/eslintrc": "^1.0.3",
@@ -10343,12 +10182,6 @@
           "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
           "dev": true
         },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        },
         "pkg-dir": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
@@ -10417,9 +10250,9 @@
       }
     },
     "eslint-plugin-jest": {
-      "version": "25.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.2.1.tgz",
-      "integrity": "sha512-fC6T95lqgWHsdVFd+f0kTHH32NxbIzIm1fJ/3kGaCFcQP1fJc5khV7DzUHjNQSTOHd5Toa7ccEBptab4uFqbNQ==",
+      "version": "25.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.2.2.tgz",
+      "integrity": "sha512-frn5yhOF60U4kcqozO3zKTNZQUk+mfx037XOy2iiYL8FhorEkuCuL3/flzKcY1ECDP2WYT9ydmvlO3fRW9o4mg==",
       "dev": true,
       "requires": {
         "@typescript-eslint/experimental-utils": "^5.0.0"
@@ -10744,18 +10577,19 @@
       }
     },
     "execa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
       "requires": {
-        "cross-spawn": "^7.0.0",
-        "get-stream": "^5.0.0",
-        "human-signals": "^1.1.1",
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
         "is-stream": "^2.0.0",
         "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.0",
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
         "strip-final-newline": "^2.0.0"
       },
       "dependencies": {
@@ -10763,6 +10597,7 @@
           "version": "7.0.3",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
           "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
           "requires": {
             "path-key": "^3.1.0",
             "shebang-command": "^2.0.0",
@@ -10770,22 +10605,22 @@
           }
         },
         "get-stream": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+          "dev": true
         },
         "path-key": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
         },
         "shebang-command": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
           "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
           "requires": {
             "shebang-regex": "^3.0.0"
           }
@@ -10793,12 +10628,14 @@
         "shebang-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
         },
         "which": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
           "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
           "requires": {
             "isexe": "^2.0.0"
           }
@@ -10913,16 +10750,16 @@
       }
     },
     "expect": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.2.5.tgz",
-      "integrity": "sha512-ZrO0w7bo8BgGoP/bLz+HDCI+0Hfei9jUSZs5yI/Wyn9VkG9w8oJ7rHRgYj+MA7yqqFa0IwHA3flJzZtYugShJA==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-27.3.1.tgz",
+      "integrity": "sha512-MrNXV2sL9iDRebWPGOGFdPQRl2eDQNu/uhxIMShjjx74T6kC6jFIkmQ6OqXDtevjGUkyB2IT56RzDBqXf/QPCg==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
         "ansi-styles": "^5.0.0",
-        "jest-get-type": "^27.0.6",
-        "jest-matcher-utils": "^27.2.5",
-        "jest-message-util": "^27.2.5",
+        "jest-get-type": "^27.3.1",
+        "jest-matcher-utils": "^27.3.1",
+        "jest-message-util": "^27.3.1",
         "jest-regex-util": "^27.0.6"
       },
       "dependencies": {
@@ -11163,9 +11000,9 @@
       }
     },
     "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz",
+      "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=",
       "optional": true
     },
     "fancy-log": {
@@ -11632,13 +11469,13 @@
       "dev": true
     },
     "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "optional": true,
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
+        "combined-stream": "^1.0.8",
         "mime-types": "^2.1.12"
       }
     },
@@ -13465,14 +13302,15 @@
       }
     },
     "human-signals": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true
     },
     "husky": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.2.tgz",
-      "integrity": "sha512-8yKEWNX4z2YsofXAMT7KvA1g8p+GxtB1ffV8XtpAEGuXNAbCV5wdNKH+qTpw8SM9fh4aMPDR+yQuKfgnreyZlg==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz",
+      "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==",
       "dev": true
     },
     "hyphenate-style-name": {
@@ -13596,6 +13434,12 @@
             "p-limit": "^2.2.0"
           }
         },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
         "pkg-dir": {
           "version": "4.2.0",
           "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
@@ -13795,12 +13639,12 @@
       "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="
     },
     "intl-messageformat": {
-      "version": "9.9.1",
-      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.9.1.tgz",
-      "integrity": "sha512-cuzS/XKHn//hvKka77JKU2dseiVY2dofQjIOZv6ZFxFt4Z9sPXnZ7KQ9Ak2r+4XBCjI04MqJ1PhKs/3X22AkfA==",
+      "version": "9.9.4",
+      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.9.4.tgz",
+      "integrity": "sha512-+Mz5LMTV+JCybFBym69z+XnE47wnIjHC31Jz7We6SE0yKyjf/neaWAFz8teuT6OUw/AW3Orr5LO4SHVNXl5keg==",
       "requires": {
         "@formatjs/fast-memoize": "1.2.0",
-        "@formatjs/icu-messageformat-parser": "2.0.11",
+        "@formatjs/icu-messageformat-parser": "2.0.14",
         "tslib": "^2.1.0"
       }
     },
@@ -14289,9 +14133,9 @@
       "optional": true
     },
     "istanbul-lib-coverage": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.2.tgz",
-      "integrity": "sha512-o5+eTUYzCJ11/+JhW5/FUCdfsdoYVdQ/8I/OveE2XsjehYn5DdeSnNQAbjYaO8gQ6hvGTN6GM6ddQqpTVG5j8g==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
       "dev": true
     },
     "istanbul-lib-instrument": {
@@ -14418,14 +14262,14 @@
       }
     },
     "jest": {
-      "version": "27.1.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-27.1.0.tgz",
-      "integrity": "sha512-pSQDVwRSwb109Ss13lcMtdfS9r8/w2Zz8+mTUA9VORD66GflCdl8nUFCqM96geOD2EBwWCNURrNAfQsLIDNBdg==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-27.3.1.tgz",
+      "integrity": "sha512-U2AX0AgQGd5EzMsiZpYt8HyZ+nSVIh5ujQ9CPp9EQZJMjXIiSZpJNweZl0swatKRoqHWgGKM3zaSwm4Zaz87ng==",
       "dev": true,
       "requires": {
-        "@jest/core": "^27.1.0",
+        "@jest/core": "^27.3.1",
         "import-local": "^3.0.2",
-        "jest-cli": "^27.1.0"
+        "jest-cli": "^27.3.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -14481,21 +14325,21 @@
           "dev": true
         },
         "jest-cli": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.2.5.tgz",
-          "integrity": "sha512-XzfcOXi5WQrXqFYsDxq5RDOKY4FNIgBgvgf3ZBz4e/j5/aWep5KnsAYH5OFPMdX/TP/LFsYQMRH7kzJUMh6JKg==",
+          "version": "27.3.1",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.3.1.tgz",
+          "integrity": "sha512-WHnCqpfK+6EvT62me6WVs8NhtbjAS4/6vZJnk7/2+oOr50cwAzG4Wxt6RXX0hu6m1169ZGMlhYYUNeKBXCph/Q==",
           "dev": true,
           "requires": {
-            "@jest/core": "^27.2.5",
-            "@jest/test-result": "^27.2.5",
+            "@jest/core": "^27.3.1",
+            "@jest/test-result": "^27.3.1",
             "@jest/types": "^27.2.5",
             "chalk": "^4.0.0",
             "exit": "^0.1.2",
             "graceful-fs": "^4.2.4",
             "import-local": "^3.0.2",
-            "jest-config": "^27.2.5",
-            "jest-util": "^27.2.5",
-            "jest-validate": "^27.2.5",
+            "jest-config": "^27.3.1",
+            "jest-util": "^27.3.1",
+            "jest-validate": "^27.3.1",
             "prompts": "^2.0.1",
             "yargs": "^16.2.0"
           }
@@ -14547,110 +14391,38 @@
       }
     },
     "jest-changed-files": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.2.5.tgz",
-      "integrity": "sha512-jfnNJzF89csUKRPKJ4MwZ1SH27wTmX2xiAIHUHrsb/OYd9Jbo4/SXxJ17/nnx6RIifpthk3Y+LEeOk+/dDeGdw==",
+      "version": "27.3.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.3.0.tgz",
+      "integrity": "sha512-9DJs9garMHv4RhylUMZgbdCJ3+jHSkpL9aaVKp13xtXAD80qLTLrqcDZL1PHA9dYA0bCI86Nv2BhkLpLhrBcPg==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
         "execa": "^5.0.0",
         "throat": "^6.0.1"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-          "dev": true,
-          "requires": {
-            "path-key": "^3.1.0",
-            "shebang-command": "^2.0.0",
-            "which": "^2.0.1"
-          }
-        },
-        "execa": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^7.0.3",
-            "get-stream": "^6.0.0",
-            "human-signals": "^2.1.0",
-            "is-stream": "^2.0.0",
-            "merge-stream": "^2.0.0",
-            "npm-run-path": "^4.0.1",
-            "onetime": "^5.1.2",
-            "signal-exit": "^3.0.3",
-            "strip-final-newline": "^2.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-          "dev": true
-        },
-        "human-signals": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-          "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-          "dev": true
-        },
-        "path-key": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-          "dev": true
-        },
-        "shebang-command": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-          "dev": true,
-          "requires": {
-            "shebang-regex": "^3.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-          "dev": true
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
       }
     },
     "jest-circus": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.2.5.tgz",
-      "integrity": "sha512-eyL9IcrAxm3Saq3rmajFCwpaxaRMGJ1KJs+7hlTDinXpJmeR3P02bheM3CYohE7UfwOBmrFMJHjgo/WPcLTM+Q==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.3.1.tgz",
+      "integrity": "sha512-v1dsM9II6gvXokgqq6Yh2jHCpfg7ZqV4jWY66u7npz24JnhP3NHxI0sKT7+ZMQ7IrOWHYAaeEllOySbDbWsiXw==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.2.5",
-        "@jest/test-result": "^27.2.5",
+        "@jest/environment": "^27.3.1",
+        "@jest/test-result": "^27.3.1",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
         "dedent": "^0.7.0",
-        "expect": "^27.2.5",
+        "expect": "^27.3.1",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.2.5",
-        "jest-matcher-utils": "^27.2.5",
-        "jest-message-util": "^27.2.5",
-        "jest-runtime": "^27.2.5",
-        "jest-snapshot": "^27.2.5",
-        "jest-util": "^27.2.5",
-        "pretty-format": "^27.2.5",
+        "jest-each": "^27.3.1",
+        "jest-matcher-utils": "^27.3.1",
+        "jest-message-util": "^27.3.1",
+        "jest-runtime": "^27.3.1",
+        "jest-snapshot": "^27.3.1",
+        "jest-util": "^27.3.1",
+        "pretty-format": "^27.3.1",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3",
         "throat": "^6.0.1"
@@ -14708,32 +14480,32 @@
       }
     },
     "jest-config": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.2.5.tgz",
-      "integrity": "sha512-QdENtn9b5rIIYGlbDNEcgY9LDL5kcokJnXrp7x8AGjHob/XFqw1Z6p+gjfna2sUulQsQ3ce2Fvntnv+7fKYDhQ==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.3.1.tgz",
+      "integrity": "sha512-KY8xOIbIACZ/vdYCKSopL44I0xboxC751IX+DXL2+Wx6DKNycyEfV3rryC3BPm5Uq/BBqDoMrKuqLEUNJmMKKg==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^27.2.5",
+        "@jest/test-sequencer": "^27.3.1",
         "@jest/types": "^27.2.5",
-        "babel-jest": "^27.2.5",
+        "babel-jest": "^27.3.1",
         "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.1",
         "graceful-fs": "^4.2.4",
-        "is-ci": "^3.0.0",
-        "jest-circus": "^27.2.5",
-        "jest-environment-jsdom": "^27.2.5",
-        "jest-environment-node": "^27.2.5",
-        "jest-get-type": "^27.0.6",
-        "jest-jasmine2": "^27.2.5",
+        "jest-circus": "^27.3.1",
+        "jest-environment-jsdom": "^27.3.1",
+        "jest-environment-node": "^27.3.1",
+        "jest-get-type": "^27.3.1",
+        "jest-jasmine2": "^27.3.1",
         "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.2.5",
-        "jest-runner": "^27.2.5",
-        "jest-util": "^27.2.5",
-        "jest-validate": "^27.2.5",
+        "jest-resolve": "^27.3.1",
+        "jest-runner": "^27.3.1",
+        "jest-util": "^27.3.1",
+        "jest-validate": "^27.3.1",
         "micromatch": "^4.0.4",
-        "pretty-format": "^27.2.5"
+        "pretty-format": "^27.3.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -14845,15 +14617,15 @@
       }
     },
     "jest-diff": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.2.5.tgz",
-      "integrity": "sha512-7gfwwyYkeslOOVQY4tVq5TaQa92mWfC9COsVYMNVYyJTOYAqbIkoD3twi5A+h+tAPtAelRxkqY6/xu+jwTr0dA==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.3.1.tgz",
+      "integrity": "sha512-PCeuAH4AWUo2O5+ksW4pL9v5xJAcIKPUPfIhZBcG1RKv/0+dvaWTQK1Nrau8d67dp65fOqbeMdoil+6PedyEPQ==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "diff-sequences": "^27.0.6",
-        "jest-get-type": "^27.0.6",
-        "pretty-format": "^27.2.5"
+        "jest-get-type": "^27.3.1",
+        "pretty-format": "^27.3.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -14917,16 +14689,16 @@
       }
     },
     "jest-each": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.2.5.tgz",
-      "integrity": "sha512-HUPWIbJT0bXarRwKu/m7lYzqxR4GM5EhKOsu0z3t0SKtbFN6skQhpAUADM4qFShBXb9zoOuag5lcrR1x/WM+Ag==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.3.1.tgz",
+      "integrity": "sha512-E4SwfzKJWYcvOYCjOxhZcxwL+AY0uFMvdCOwvzgutJiaiodFjkxQQDxHm8FQBeTqDnSmKsQWn7ldMRzTn2zJaQ==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.0.6",
-        "jest-util": "^27.2.5",
-        "pretty-format": "^27.2.5"
+        "jest-get-type": "^27.3.1",
+        "jest-util": "^27.3.1",
+        "pretty-format": "^27.3.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -14981,44 +14753,44 @@
       }
     },
     "jest-environment-jsdom": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.2.5.tgz",
-      "integrity": "sha512-QtRpOh/RQKuXniaWcoFE2ElwP6tQcyxHu0hlk32880g0KczdonCs5P1sk5+weu/OVzh5V4Bt1rXuQthI01mBLg==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.3.1.tgz",
+      "integrity": "sha512-3MOy8qMzIkQlfb3W1TfrD7uZHj+xx8Olix5vMENkj5djPmRqndMaXtpnaZkxmxM+Qc3lo+yVzJjzuXbCcZjAlg==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.2.5",
-        "@jest/fake-timers": "^27.2.5",
+        "@jest/environment": "^27.3.1",
+        "@jest/fake-timers": "^27.3.1",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
-        "jest-mock": "^27.2.5",
-        "jest-util": "^27.2.5",
+        "jest-mock": "^27.3.0",
+        "jest-util": "^27.3.1",
         "jsdom": "^16.6.0"
       }
     },
     "jest-environment-node": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.2.5.tgz",
-      "integrity": "sha512-0o1LT4grm7iwrS8fIoLtwJxb/hoa3GsH7pP10P02Jpj7Mi4BXy65u46m89vEM2WfD1uFJQ2+dfDiWZNA2e6bJg==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.3.1.tgz",
+      "integrity": "sha512-T89F/FgkE8waqrTSA7/ydMkcc52uYPgZZ6q8OaZgyiZkJb5QNNCF6oPZjH9IfPFfcc9uBWh1574N0kY0pSvTXw==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.2.5",
-        "@jest/fake-timers": "^27.2.5",
+        "@jest/environment": "^27.3.1",
+        "@jest/fake-timers": "^27.3.1",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
-        "jest-mock": "^27.2.5",
-        "jest-util": "^27.2.5"
+        "jest-mock": "^27.3.0",
+        "jest-util": "^27.3.1"
       }
     },
     "jest-get-type": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.0.6.tgz",
-      "integrity": "sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.3.1.tgz",
+      "integrity": "sha512-+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg==",
       "dev": true
     },
     "jest-haste-map": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.2.5.tgz",
-      "integrity": "sha512-pzO+Gw2WLponaSi0ilpzYBE0kuVJstoXBX8YWyUebR8VaXuX4tzzn0Zp23c/WaETo7XYTGv2e8KdnpiskAFMhQ==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.3.1.tgz",
+      "integrity": "sha512-lYfNZIzwPccDJZIyk9Iz5iQMM/MH56NIIcGj7AFU1YyA4ewWFBl8z+YPJuSCRML/ee2cCt2y3W4K3VXPT6Nhzg==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
@@ -15030,8 +14802,8 @@
         "graceful-fs": "^4.2.4",
         "jest-regex-util": "^27.0.6",
         "jest-serializer": "^27.0.6",
-        "jest-util": "^27.2.5",
-        "jest-worker": "^27.2.5",
+        "jest-util": "^27.3.1",
+        "jest-worker": "^27.3.1",
         "micromatch": "^4.0.4",
         "walker": "^1.0.7"
       },
@@ -15099,28 +14871,28 @@
       }
     },
     "jest-jasmine2": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.2.5.tgz",
-      "integrity": "sha512-hdxY9Cm/CjLqu2tXeAoQHPgA4vcqlweVXYOg1+S9FeFdznB9Rti+eEBKDDkmOy9iqr4Xfbq95OkC4NFbXXPCAQ==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.3.1.tgz",
+      "integrity": "sha512-WK11ZUetDQaC09w4/j7o4FZDUIp+4iYWH/Lik34Pv7ukL+DuXFGdnmmi7dT58J2ZYKFB5r13GyE0z3NPeyJmsg==",
       "dev": true,
       "requires": {
         "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^27.2.5",
+        "@jest/environment": "^27.3.1",
         "@jest/source-map": "^27.0.6",
-        "@jest/test-result": "^27.2.5",
+        "@jest/test-result": "^27.3.1",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "expect": "^27.2.5",
+        "expect": "^27.3.1",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.2.5",
-        "jest-matcher-utils": "^27.2.5",
-        "jest-message-util": "^27.2.5",
-        "jest-runtime": "^27.2.5",
-        "jest-snapshot": "^27.2.5",
-        "jest-util": "^27.2.5",
-        "pretty-format": "^27.2.5",
+        "jest-each": "^27.3.1",
+        "jest-matcher-utils": "^27.3.1",
+        "jest-message-util": "^27.3.1",
+        "jest-runtime": "^27.3.1",
+        "jest-snapshot": "^27.3.1",
+        "jest-util": "^27.3.1",
+        "pretty-format": "^27.3.1",
         "throat": "^6.0.1"
       },
       "dependencies": {
@@ -15176,25 +14948,25 @@
       }
     },
     "jest-leak-detector": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.2.5.tgz",
-      "integrity": "sha512-HYsi3GUR72bYhOGB5C5saF9sPdxGzSjX7soSQS+BqDRysc7sPeBwPbhbuT8DnOpijnKjgwWQ8JqvbmReYnt3aQ==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.3.1.tgz",
+      "integrity": "sha512-78QstU9tXbaHzwlRlKmTpjP9k4Pvre5l0r8Spo4SbFFVy/4Abg9I6ZjHwjg2QyKEAMg020XcjP+UgLZIY50yEg==",
       "dev": true,
       "requires": {
-        "jest-get-type": "^27.0.6",
-        "pretty-format": "^27.2.5"
+        "jest-get-type": "^27.3.1",
+        "pretty-format": "^27.3.1"
       }
     },
     "jest-matcher-utils": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.2.5.tgz",
-      "integrity": "sha512-qNR/kh6bz0Dyv3m68Ck2g1fLW5KlSOUNcFQh87VXHZwWc/gY6XwnKofx76Qytz3x5LDWT09/2+yXndTkaG4aWg==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.3.1.tgz",
+      "integrity": "sha512-hX8N7zXS4k+8bC1Aj0OWpGb7D3gIXxYvPNK1inP5xvE4ztbz3rc4AkI6jGVaerepBnfWB17FL5lWFJT3s7qo8w==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^27.2.5",
-        "jest-get-type": "^27.0.6",
-        "pretty-format": "^27.2.5"
+        "jest-diff": "^27.3.1",
+        "jest-get-type": "^27.3.1",
+        "pretty-format": "^27.3.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -15249,9 +15021,9 @@
       }
     },
     "jest-message-util": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.2.5.tgz",
-      "integrity": "sha512-ggXSLoPfIYcbmZ8glgEJZ8b+e0Msw/iddRmgkoO7lDAr9SmI65IIfv7VnvTnV4FGnIIUIjzM+fHRHO5RBvyAbQ==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.3.1.tgz",
+      "integrity": "sha512-bh3JEmxsTZ/9rTm0jQrPElbY2+y48Rw2t47uMfByNyUVR+OfPh4anuyKsGqsNkXk/TI4JbLRZx+7p7Hdt6q1yg==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.12.13",
@@ -15260,7 +15032,7 @@
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "micromatch": "^4.0.4",
-        "pretty-format": "^27.2.5",
+        "pretty-format": "^27.3.1",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -15360,9 +15132,9 @@
       }
     },
     "jest-mock": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.2.5.tgz",
-      "integrity": "sha512-HiMB3LqE9RzmeMzZARi2Bz3NoymxyP0gCid4y42ca1djffNtYFKgI220aC1VP1mUZ8rbpqZbHZOJ15093bZV/Q==",
+      "version": "27.3.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.3.0.tgz",
+      "integrity": "sha512-ziZiLk0elZOQjD08bLkegBzv5hCABu/c8Ytx45nJKkysQwGaonvmTxwjLqEA4qGdasq9o2I8/HtdGMNnVsMTGw==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
@@ -15382,20 +15154,20 @@
       "dev": true
     },
     "jest-resolve": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.2.5.tgz",
-      "integrity": "sha512-q5irwS3oS73SKy3+FM/HL2T7WJftrk9BRzrXF92f7net5HMlS7lJMg/ZwxLB4YohKqjSsdksEw7n/jvMxV7EKg==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.3.1.tgz",
+      "integrity": "sha512-Dfzt25CFSPo3Y3GCbxynRBZzxq9AdyNN+x/v2IqYx6KVT5Z6me2Z/PsSGFSv3cOSUZqJ9pHxilao/I/m9FouLw==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
         "chalk": "^4.0.0",
-        "escalade": "^3.1.1",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.2.5",
+        "jest-haste-map": "^27.3.1",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^27.2.5",
-        "jest-validate": "^27.2.5",
+        "jest-util": "^27.3.1",
+        "jest-validate": "^27.3.1",
         "resolve": "^1.20.0",
+        "resolve.exports": "^1.1.0",
         "slash": "^3.0.0"
       },
       "dependencies": {
@@ -15451,26 +15223,26 @@
       }
     },
     "jest-resolve-dependencies": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.2.5.tgz",
-      "integrity": "sha512-BSjefped31bcvvCh++/pN9ueqqN1n0+p8/58yScuWfklLm2tbPbS9d251vJhAy0ZI2pL/0IaGhOTJrs9Y4FJlg==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.3.1.tgz",
+      "integrity": "sha512-X7iLzY8pCiYOnvYo2YrK3P9oSE8/3N2f4pUZMJ8IUcZnT81vlSonya1KTO9ZfKGuC+svE6FHK/XOb8SsoRUV1A==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
         "jest-regex-util": "^27.0.6",
-        "jest-snapshot": "^27.2.5"
+        "jest-snapshot": "^27.3.1"
       }
     },
     "jest-runner": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.2.5.tgz",
-      "integrity": "sha512-n41vw9RLg5TKAnEeJK9d6pGOsBOpwE89XBniK+AD1k26oIIy3V7ogM1scbDjSheji8MUPC9pNgCrZ/FHLVDNgg==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.3.1.tgz",
+      "integrity": "sha512-r4W6kBn6sPr3TBwQNmqE94mPlYVn7fLBseeJfo4E2uCTmAyDFm2O5DYAQAFP7Q3YfiA/bMwg8TVsciP7k0xOww==",
       "dev": true,
       "requires": {
-        "@jest/console": "^27.2.5",
-        "@jest/environment": "^27.2.5",
-        "@jest/test-result": "^27.2.5",
-        "@jest/transform": "^27.2.5",
+        "@jest/console": "^27.3.1",
+        "@jest/environment": "^27.3.1",
+        "@jest/test-result": "^27.3.1",
+        "@jest/transform": "^27.3.1",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -15478,15 +15250,15 @@
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
         "jest-docblock": "^27.0.6",
-        "jest-environment-jsdom": "^27.2.5",
-        "jest-environment-node": "^27.2.5",
-        "jest-haste-map": "^27.2.5",
-        "jest-leak-detector": "^27.2.5",
-        "jest-message-util": "^27.2.5",
-        "jest-resolve": "^27.2.5",
-        "jest-runtime": "^27.2.5",
-        "jest-util": "^27.2.5",
-        "jest-worker": "^27.2.5",
+        "jest-environment-jsdom": "^27.3.1",
+        "jest-environment-node": "^27.3.1",
+        "jest-haste-map": "^27.3.1",
+        "jest-leak-detector": "^27.3.1",
+        "jest-message-util": "^27.3.1",
+        "jest-resolve": "^27.3.1",
+        "jest-runtime": "^27.3.1",
+        "jest-util": "^27.3.1",
+        "jest-worker": "^27.3.1",
         "source-map-support": "^0.5.6",
         "throat": "^6.0.1"
       },
@@ -15543,18 +15315,17 @@
       }
     },
     "jest-runtime": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.2.5.tgz",
-      "integrity": "sha512-N0WRZ3QszKyZ3Dm27HTBbBuestsSd3Ud5ooVho47XZJ8aSKO/X1Ag8M1dNx9XzfGVRNdB/xCA3lz8MJwIzPLLA==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.3.1.tgz",
+      "integrity": "sha512-qtO6VxPbS8umqhEDpjA4pqTkKQ1Hy4ZSi9mDVeE9Za7LKBo2LdW2jmT+Iod3XFaJqINikZQsn2wEi0j9wPRbLg==",
       "dev": true,
       "requires": {
-        "@jest/console": "^27.2.5",
-        "@jest/environment": "^27.2.5",
-        "@jest/fake-timers": "^27.2.5",
-        "@jest/globals": "^27.2.5",
+        "@jest/console": "^27.3.1",
+        "@jest/environment": "^27.3.1",
+        "@jest/globals": "^27.3.1",
         "@jest/source-map": "^27.0.6",
-        "@jest/test-result": "^27.2.5",
-        "@jest/transform": "^27.2.5",
+        "@jest/test-result": "^27.3.1",
+        "@jest/transform": "^27.3.1",
         "@jest/types": "^27.2.5",
         "@types/yargs": "^16.0.0",
         "chalk": "^4.0.0",
@@ -15564,14 +15335,14 @@
         "exit": "^0.1.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.2.5",
-        "jest-message-util": "^27.2.5",
-        "jest-mock": "^27.2.5",
+        "jest-haste-map": "^27.3.1",
+        "jest-message-util": "^27.3.1",
+        "jest-mock": "^27.3.0",
         "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.2.5",
-        "jest-snapshot": "^27.2.5",
-        "jest-util": "^27.2.5",
-        "jest-validate": "^27.2.5",
+        "jest-resolve": "^27.3.1",
+        "jest-snapshot": "^27.3.1",
+        "jest-util": "^27.3.1",
+        "jest-validate": "^27.3.1",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0",
         "yargs": "^16.2.0"
@@ -15626,40 +15397,6 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "cross-spawn": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-          "dev": true,
-          "requires": {
-            "path-key": "^3.1.0",
-            "shebang-command": "^2.0.0",
-            "which": "^2.0.1"
-          }
-        },
-        "execa": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^7.0.3",
-            "get-stream": "^6.0.0",
-            "human-signals": "^2.1.0",
-            "is-stream": "^2.0.0",
-            "merge-stream": "^2.0.0",
-            "npm-run-path": "^4.0.1",
-            "onetime": "^5.1.2",
-            "signal-exit": "^3.0.3",
-            "strip-final-newline": "^2.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-          "dev": true
-        },
         "glob": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
@@ -15680,39 +15417,12 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "human-signals": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-          "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-          "dev": true
-        },
         "is-fullwidth-code-point": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
           "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
           "dev": true
         },
-        "path-key": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-          "dev": true
-        },
-        "shebang-command": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-          "dev": true,
-          "requires": {
-            "shebang-regex": "^3.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-          "dev": true
-        },
         "string-width": {
           "version": "4.2.3",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -15742,15 +15452,6 @@
             "has-flag": "^4.0.0"
           }
         },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        },
         "yargs": {
           "version": "16.2.0",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -15779,9 +15480,9 @@
       }
     },
     "jest-snapshot": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.2.5.tgz",
-      "integrity": "sha512-2/Jkn+VN6Abwz0llBltZaiJMnL8b1j5Bp/gRIxe9YR3FCEh9qp0TXVV0dcpTGZ8AcJV1SZGQkczewkI9LP5yGw==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.3.1.tgz",
+      "integrity": "sha512-APZyBvSgQgOT0XumwfFu7X3G5elj6TGhCBLbBdn3R1IzYustPGPE38F51dBWMQ8hRXa9je0vAdeVDtqHLvB6lg==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.7.2",
@@ -15790,23 +15491,23 @@
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/traverse": "^7.7.2",
         "@babel/types": "^7.0.0",
-        "@jest/transform": "^27.2.5",
+        "@jest/transform": "^27.3.1",
         "@jest/types": "^27.2.5",
         "@types/babel__traverse": "^7.0.4",
         "@types/prettier": "^2.1.5",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^27.2.5",
+        "expect": "^27.3.1",
         "graceful-fs": "^4.2.4",
-        "jest-diff": "^27.2.5",
-        "jest-get-type": "^27.0.6",
-        "jest-haste-map": "^27.2.5",
-        "jest-matcher-utils": "^27.2.5",
-        "jest-message-util": "^27.2.5",
-        "jest-resolve": "^27.2.5",
-        "jest-util": "^27.2.5",
+        "jest-diff": "^27.3.1",
+        "jest-get-type": "^27.3.1",
+        "jest-haste-map": "^27.3.1",
+        "jest-matcher-utils": "^27.3.1",
+        "jest-message-util": "^27.3.1",
+        "jest-resolve": "^27.3.1",
+        "jest-util": "^27.3.1",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^27.2.5",
+        "pretty-format": "^27.3.1",
         "semver": "^7.3.2"
       },
       "dependencies": {
@@ -15862,16 +15563,16 @@
       }
     },
     "jest-util": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
-      "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
+      "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
         "@types/node": "*",
         "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
         "graceful-fs": "^4.2.4",
-        "is-ci": "^3.0.0",
         "picomatch": "^2.2.3"
       },
       "dependencies": {
@@ -15927,17 +15628,17 @@
       }
     },
     "jest-validate": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.2.5.tgz",
-      "integrity": "sha512-XgYtjS89nhVe+UfkbLgcm+GgXKWgL80t9nTcNeejyO3t0Sj/yHE8BtIJqjZu9NXQksYbGImoQRXmQ1gP+Guffw==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.3.1.tgz",
+      "integrity": "sha512-3H0XCHDFLA9uDII67Bwi1Vy7AqwA5HqEEjyy934lgVhtJ3eisw6ShOF1MDmRPspyikef5MyExvIm0/TuLzZ86Q==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.0.6",
+        "jest-get-type": "^27.3.1",
         "leven": "^3.1.0",
-        "pretty-format": "^27.2.5"
+        "pretty-format": "^27.3.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -15998,17 +15699,17 @@
       }
     },
     "jest-watcher": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.2.5.tgz",
-      "integrity": "sha512-umV4qGozg2Dn6DTTtqAh9puPw+DGLK9AQas7+mWjiK8t0fWMpxKg8ZXReZw7L4C88DqorsGUiDgwHNZ+jkVrkQ==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.3.1.tgz",
+      "integrity": "sha512-9/xbV6chABsGHWh9yPaAGYVVKurWoP3ZMCv6h+O1v9/+pkOroigs6WzZ0e9gLP/njokUwM7yQhr01LKJVMkaZA==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^27.2.5",
+        "@jest/test-result": "^27.3.1",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "jest-util": "^27.2.5",
+        "jest-util": "^27.3.1",
         "string-length": "^4.0.1"
       },
       "dependencies": {
@@ -16064,9 +15765,9 @@
       }
     },
     "jest-worker": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.5.tgz",
-      "integrity": "sha512-HTjEPZtcNKZ4LnhSp02NEH4vE+5OpJ0EsOWYvGQpHgUMLngydESAAMH5Wd/asPf29+XUDQZszxpLg1BkIIA2aw==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.3.1.tgz",
+      "integrity": "sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==",
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -16180,17 +15881,6 @@
             "mime-types": "^2.1.12"
           }
         },
-        "tough-cookie": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-          "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
-          "dev": true,
-          "requires": {
-            "psl": "^1.1.33",
-            "punycode": "^2.1.1",
-            "universalify": "^0.1.2"
-          }
-        },
         "ws": {
           "version": "7.5.5",
           "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
@@ -16386,12 +16076,20 @@
         "extsprintf": "1.3.0",
         "json-schema": "0.2.3",
         "verror": "1.10.0"
+      },
+      "dependencies": {
+        "extsprintf": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+          "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+          "optional": true
+        }
       }
     },
     "jss": {
-      "version": "10.7.1",
-      "resolved": "https://registry.npmjs.org/jss/-/jss-10.7.1.tgz",
-      "integrity": "sha512-5QN8JSVZR6cxpZNeGfzIjqPEP+ZJwJJfZbXmeABNdxiExyO+eJJDy6WDtqTf8SDKnbL5kZllEpAP71E/Lt7PXg==",
+      "version": "10.8.1",
+      "resolved": "https://registry.npmjs.org/jss/-/jss-10.8.1.tgz",
+      "integrity": "sha512-P4wKxU+2m5ReGl0Mmbf9XYgVjFIVZJOZ9ylXBxdpanX+HHgj5XVaAIgYzYpKbBLPCdkAUsI/Iq1fhQPsMNu0YA==",
       "requires": {
         "@babel/runtime": "^7.3.1",
         "csstype": "^3.0.2",
@@ -16834,14 +16532,6 @@
       "requires": {
         "p-locate": "^3.0.0",
         "path-exists": "^3.0.0"
-      },
-      "dependencies": {
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        }
       }
     },
     "lodash": {
@@ -17439,11 +17129,18 @@
       "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="
     },
     "mime-types": {
-      "version": "2.1.32",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz",
-      "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==",
+      "version": "2.1.33",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz",
+      "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==",
       "requires": {
-        "mime-db": "1.49.0"
+        "mime-db": "1.50.0"
+      },
+      "dependencies": {
+        "mime-db": {
+          "version": "1.50.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz",
+          "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A=="
+        }
       }
     },
     "mimic-fn": {
@@ -17869,6 +17566,12 @@
             "p-limit": "^3.0.2"
           }
         },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
         "readdirp": {
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -18353,6 +18056,17 @@
         "vm-browserify": "^1.0.1"
       },
       "dependencies": {
+        "buffer": {
+          "version": "4.9.2",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+          "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+          "dev": true,
+          "requires": {
+            "base64-js": "^1.0.2",
+            "ieee754": "^1.1.4",
+            "isarray": "^1.0.0"
+          }
+        },
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
@@ -18488,9 +18202,9 @@
       }
     },
     "node-releases": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.0.tgz",
-      "integrity": "sha512-aA87l0flFYMzCHpTM3DERFSYxc6lv/BltdbRTOMZuxZ0cwZCD3mejE5n9vLhSJCN++/eOqr77G1IO5uXxlQYWA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
+      "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
       "dev": true
     },
     "node-req": {
@@ -19034,6 +18748,12 @@
         "p-limit": "^2.0.0"
       }
     },
+    "p-map": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+      "dev": true
+    },
     "p-retry": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
@@ -19244,9 +18964,10 @@
       "dev": true
     },
     "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true
     },
     "path-is-absolute": {
       "version": "1.0.1",
@@ -19499,22 +19220,14 @@
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
     },
     "postcss": {
-      "version": "8.3.9",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.9.tgz",
-      "integrity": "sha512-f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw==",
+      "version": "8.3.11",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz",
+      "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==",
       "dev": true,
       "requires": {
-        "nanoid": "^3.1.28",
-        "picocolors": "^0.2.1",
+        "nanoid": "^3.1.30",
+        "picocolors": "^1.0.0",
         "source-map-js": "^0.6.2"
-      },
-      "dependencies": {
-        "picocolors": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-          "dev": true
-        }
       }
     },
     "prelude-ls": {
@@ -19530,9 +19243,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz",
-      "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz",
+      "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==",
       "dev": true
     },
     "prettier-linter-helpers": {
@@ -19560,9 +19273,9 @@
       }
     },
     "pretty-format": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.5.tgz",
-      "integrity": "sha512-+nYn2z9GgicO9JiqmY25Xtq8SYfZ/5VCpEU3pppHHNAhd1y+ZXxmNPd1evmNcAd6Hz4iBV2kf0UpGth5A/VJ7g==",
+      "version": "27.3.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz",
+      "integrity": "sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
@@ -20321,6 +20034,13 @@
         "ini": "~1.3.0",
         "minimist": "^1.2.0",
         "strip-json-comments": "~2.0.1"
+      },
+      "dependencies": {
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+        }
       }
     },
     "react": {
@@ -20359,9 +20079,9 @@
       }
     },
     "react-dropzone": {
-      "version": "11.3.4",
-      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-11.3.4.tgz",
-      "integrity": "sha512-B1nzNRZ4F1cnrfEC0T6KXeBN1mCPinu4JCoTrp7NjB+442KSPxqfDrw41QIA2kAwlYs1+wj/0BTedeM5hc2+xw==",
+      "version": "11.4.2",
+      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-11.4.2.tgz",
+      "integrity": "sha512-ocYzYn7Qgp0tFc1gQtUTOaHHSzVTwhWHxxY+r7cj2jJTPfMTZB5GWSJHdIVoxsl+EQENpjJ/6Zvcw0BqKZQ+Eg==",
       "requires": {
         "attr-accept": "^2.2.1",
         "file-selector": "^0.2.2",
@@ -20377,32 +20097,20 @@
       }
     },
     "react-intl": {
-      "version": "5.20.10",
-      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-5.20.10.tgz",
-      "integrity": "sha512-zy0ZQhpjkGsKcK1BFo2HbGM/q8GBVovzoXZGQ76DowR0yr6UzQuPLkrlIrObL2zxIYiDaxaz+hUJaoa2a1xqOQ==",
-      "requires": {
-        "@formatjs/ecma402-abstract": "1.9.8",
-        "@formatjs/icu-messageformat-parser": "2.0.11",
-        "@formatjs/intl": "1.14.1",
-        "@formatjs/intl-displaynames": "5.2.3",
-        "@formatjs/intl-listformat": "6.3.3",
+      "version": "5.21.0",
+      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-5.21.0.tgz",
+      "integrity": "sha512-tRXg0JrMFpHgOokj+gFXvEbm4ZEePnidfVWFh3fbYc2FlJGnwxLjsvzCvRVv2qyNMHCy8xX6frRGe52WDOiYOg==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.10.0",
+        "@formatjs/icu-messageformat-parser": "2.0.14",
+        "@formatjs/intl": "1.15.0",
+        "@formatjs/intl-displaynames": "5.2.5",
+        "@formatjs/intl-listformat": "6.3.5",
         "@types/hoist-non-react-statics": "^3.3.1",
-        "@types/react": "17",
+        "@types/react": "16 || 17",
         "hoist-non-react-statics": "^3.3.2",
-        "intl-messageformat": "9.9.1",
+        "intl-messageformat": "9.9.4",
         "tslib": "^2.1.0"
-      },
-      "dependencies": {
-        "@types/react": {
-          "version": "17.0.30",
-          "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.30.tgz",
-          "integrity": "sha512-3Dt/A8gd3TCXi2aRe84y7cK1K8G+N9CZRDG8kDGguOKa0kf/ZkSwTmVIDPsm/KbQOVMaDJXwhBtuOXxqwdpWVg==",
-          "requires": {
-            "@types/prop-types": "*",
-            "@types/scheduler": "*",
-            "csstype": "^3.0.2"
-          }
-        }
       }
     },
     "react-is": {
@@ -20660,6 +20368,12 @@
             "p-limit": "^2.2.0"
           }
         },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
         "type-fest": {
           "version": "0.8.1",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
@@ -21081,12 +20795,33 @@
         "uuid": "^3.3.2"
       },
       "dependencies": {
+        "form-data": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+          "optional": true,
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
         "qs": {
           "version": "6.5.2",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
           "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
           "optional": true
         },
+        "tough-cookie": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+          "optional": true,
+          "requires": {
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
+        },
         "uuid": {
           "version": "3.4.0",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
@@ -21206,6 +20941,12 @@
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
     },
+    "resolve.exports": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
+      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
+      "dev": true
+    },
     "responselike": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
@@ -21246,7 +20987,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
       "requires": {
         "glob": "^7.1.3"
       },
@@ -21255,7 +20995,6 @@
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
           "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-          "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
             "inflight": "^1.0.4",
@@ -21382,9 +21121,9 @@
       }
     },
     "sass": {
-      "version": "1.37.5",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.37.5.tgz",
-      "integrity": "sha512-Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA==",
+      "version": "1.43.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.43.3.tgz",
+      "integrity": "sha512-BJnLngqWpMeS65UvlYYEuCb3/fLxDxhHtOB/gWPxs6NKrslTxGt3ZxwIvOe/0Jm4tWwM/+tIpE3wj4dLEhPDeQ==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0"
@@ -21917,14 +21656,14 @@
       }
     },
     "simple-git": {
-      "version": "2.45.0",
-      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.45.0.tgz",
-      "integrity": "sha512-wu/Ujs9IXn0HuyYm4HyRvne+EKsjJSWKEMkB3wQa3gNHSMHt7y3oeNX9zRQ3UBPk7bRRMLLHAdIZCZfHT9ehPg==",
+      "version": "2.47.0",
+      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.47.0.tgz",
+      "integrity": "sha512-+HfCpqPBEZTPWiW9fPdbiPJDslM22MLqrktfzNKyI2pWaJa6DhfNVx4Mds04KZzVv5vjC9/ksw3y5gVf8ECWDg==",
       "dev": true,
       "requires": {
         "@kwsites/file-exists": "^1.1.1",
         "@kwsites/promise-deferred": "^1.1.1",
-        "debug": "^4.3.1"
+        "debug": "^4.3.2"
       }
     },
     "simple-swizzle": {
@@ -22368,6 +22107,15 @@
         "tweetnacl": "~0.14.0"
       }
     },
+    "ssri": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
+      "dev": true,
+      "requires": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
     "stack-trace": {
       "version": "0.0.10",
       "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
@@ -22714,9 +22462,10 @@
       }
     },
     "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
+      "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
+      "dev": true
     },
     "success-symbol": {
       "version": "0.1.0",
@@ -22979,61 +22728,6 @@
         "worker-farm": "^1.7.0"
       },
       "dependencies": {
-        "cacache": {
-          "version": "12.0.4",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-          "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.5",
-            "chownr": "^1.1.1",
-            "figgy-pudding": "^3.5.1",
-            "glob": "^7.1.4",
-            "graceful-fs": "^4.1.15",
-            "infer-owner": "^1.0.3",
-            "lru-cache": "^5.1.1",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.3",
-            "ssri": "^6.0.1",
-            "unique-filename": "^1.1.1",
-            "y18n": "^4.0.0"
-          }
-        },
-        "glob": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-          "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "lru-cache": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
         "serialize-javascript": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
@@ -23048,27 +22742,6 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "ssri": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
-          "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
-          "dev": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1"
-          }
-        },
-        "y18n": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-          "dev": true
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-          "dev": true
         }
       }
     },
@@ -23438,13 +23111,14 @@
       "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
     },
     "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "optional": true,
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+      "dev": true,
       "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.1.2"
       }
     },
     "tr46": {
@@ -23972,6 +23646,13 @@
       "requires": {
         "modify-filename": "^1.1.0",
         "path-exists": "^4.0.0"
+      },
+      "dependencies": {
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+        }
       }
     },
     "unzipper": {
@@ -24219,6 +23900,69 @@
         }
       }
     },
+    "usocket": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/usocket/-/usocket-0.3.0.tgz",
+      "integrity": "sha512-V/H02RNiaOCJZuPoKont/y12VJaImC6C5xW7OzPFjYu9qnig0yv9hyp9E7Wqjm6d8yZuZouH3NAfDATVMgh2SQ==",
+      "optional": true,
+      "requires": {
+        "bindings": "^1.5.0",
+        "nan": "^2.14.2",
+        "node-gyp": "^7.1.2"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+          "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+          "optional": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "node-gyp": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz",
+          "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
+          "optional": true,
+          "requires": {
+            "env-paths": "^2.2.0",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.2.3",
+            "nopt": "^5.0.0",
+            "npmlog": "^4.1.2",
+            "request": "^2.88.2",
+            "rimraf": "^3.0.2",
+            "semver": "^7.3.2",
+            "tar": "^6.0.2",
+            "which": "^2.0.2"
+          }
+        },
+        "nopt": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+          "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+          "optional": true,
+          "requires": {
+            "abbrev": "1"
+          }
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "optional": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
     "utf8-byte-length": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
@@ -25380,11 +25124,11 @@
       "dev": true
     },
     "wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
       "requires": {
-        "string-width": "^1.0.2 || 2"
+        "string-width": "^1.0.2 || 2 || 3 || 4"
       }
     },
     "widest-line": {
@@ -25455,6 +25199,73 @@
       "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
       "requires": {
         "execa": "^4.0.2"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "execa": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+          "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+          "requires": {
+            "cross-spawn": "^7.0.0",
+            "get-stream": "^5.0.0",
+            "human-signals": "^1.1.1",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.0",
+            "onetime": "^5.1.0",
+            "signal-exit": "^3.0.2",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "human-signals": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+          "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
       }
     },
     "winreg": {
@@ -25619,9 +25430,9 @@
       }
     },
     "ws": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.2.tgz",
-      "integrity": "sha512-Q6B6H2oc8QY3llc3cB8kVmQ6pnJWVQbP7Q5algTcIxx7YEpc0oU4NBVHlztA7Ekzfhw2r0rPducMUiCGWKQRzw=="
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
+      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA=="
     },
     "xdg-basedir": {
       "version": "4.0.0",
diff --git a/package.json b/package.json
index fdf0b269d..c9840c4ec 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Ferdi",
   "desktopName": "ferdi.desktop",
   "appId": "com.kytwb.ferdi",
-  "version": "5.6.3-beta.2",
+  "version": "5.6.3-nightly.44",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "kytwb",
   "main": "index.js",
@@ -60,33 +60,33 @@
     "@adonisjs/shield": "1.0.8",
     "@adonisjs/validator": "5.0.6",
     "@electron/remote": "1.2.1",
-    "@mdi/font": "6.2.95",
-    "@mdi/js": "6.2.95",
+    "@mdi/font": "6.3.95",
+    "@mdi/js": "6.3.95",
     "@mdi/react": "1.5.0",
-    "@sentry/electron": "2.5.3",
+    "@sentry/electron": "2.5.4",
     "auto-launch": "5.0.5",
     "btoa": "1.2.1",
     "classnames": "2.3.1",
     "cld": "2.7.0",
     "color": "4.0.1",
-    "csstype": "3.0.8",
-    "darkreader": "4.9.34",
-    "dbus-next": "0.9.2",
+    "csstype": "3.0.9",
+    "darkreader": "4.9.39",
+    "dbus-next": "0.10.2",
     "debug": "4.3.2",
     "electron-dl": "3.2.1",
     "electron-fetch": "1.7.4",
     "electron-find": "1.0.7",
-    "electron-react-titlebar": "1.0.0",
+    "electron-react-titlebar": "1.1.0",
     "electron-updater": "4.3.9",
     "electron-window-state": "5.0.3",
     "fast-folder-size": "1.5.0",
     "fs-extra": "10.0.0",
     "jsonwebtoken": "8.5.1",
-    "jss": "10.7.1",
+    "jss": "10.8.1",
     "lodash": "4.17.21",
     "macos-notification-state": "1.3.6",
     "macos-version": "5.2.1",
-    "mime-types": "2.1.32",
+    "mime-types": "2.1.33",
     "minimist": "1.2.5",
     "mobx": "5.15.0",
     "mobx-localstorage": "1.2.0",
@@ -105,9 +105,9 @@
     "react-addons-css-transition-group": "15.6.2",
     "react-confetti": "6.0.1",
     "react-dom": "17.0.2",
-    "react-dropzone": "11.3.4",
+    "react-dropzone": "11.4.2",
     "react-electron-web-view": "2.0.1",
-    "react-intl": "5.20.10",
+    "react-intl": "5.21.0",
     "react-jss": "8.6.1",
     "react-loader": "2.4.7",
     "react-modal": "3.14.3",
@@ -122,50 +122,50 @@
     "useragent-generator": "1.1.1-amkt-22079-finish.0",
     "uuid": "8.3.2",
     "validator": "13.6.0",
-    "ws": "8.2.2"
+    "ws": "8.2.3"
   },
   "devDependencies": {
     "@babel/eslint-parser": "7.15.8",
     "@babel/plugin-proposal-class-properties": "7.14.5",
-    "@babel/plugin-proposal-decorators": "7.15.4",
-    "@babel/preset-env": "7.15.6",
+    "@babel/plugin-proposal-decorators": "7.15.8",
+    "@babel/preset-env": "7.15.8",
     "@babel/preset-react": "7.14.5",
     "@babel/register": "7.15.3",
-    "@commitlint/cli": "13.1.0",
-    "@commitlint/config-conventional": "13.1.0",
-    "@formatjs/cli": "4.2.33",
+    "@formatjs/cli": "4.4.0",
+    "@commitlint/cli": "13.2.1",
+    "@commitlint/config-conventional": "13.2.0",
     "@types/color": "3.0.2",
     "@types/expect.js": "0.3.29",
-    "@types/fs-extra": "9.0.12",
-    "@types/lodash": "4.14.172",
+    "@types/fs-extra": "9.0.13",
+    "@types/lodash": "4.14.176",
     "@types/mime-types": "2.1.1",
     "@types/mocha": "9.0.0",
     "@types/ms": "0.7.31",
     "@types/node": "14.17.27",
-    "@types/react": "17.0.27",
-    "@types/react-dom": "17.0.9",
+    "@types/react": "17.0.31",
+    "@types/react-dom": "17.0.10",
     "@types/route-parser": "0.1.3",
     "@types/tar": "4.0.5",
     "@types/uuid": "8.3.1",
-    "@types/validator": "13.6.3",
-    "@typescript-eslint/eslint-plugin": "5.0.0",
-    "@typescript-eslint/parser": "5.0.0",
+    "@types/validator": "13.6.4",
+    "@typescript-eslint/eslint-plugin": "5.1.0",
+    "@typescript-eslint/parser": "5.1.0",
     "all-contributors-cli": "6.20.0",
-    "babel-plugin-formatjs": "10.3.9",
+    "babel-plugin-formatjs": "10.3.11",
     "commitizen": "4.2.4",
-    "concurrently": "6.2.1",
+    "concurrently": "6.3.0",
     "cross-env": "7.0.3",
     "cz-conventional-changelog": "3.3.0",
     "dotenv": "10.0.0",
-    "electron": "15.2.0",
+    "electron": "15.3.0",
     "electron-builder": "22.14.5",
-    "electron-notarize": "1.1.0",
-    "eslint": "8.0.1",
+    "electron-notarize": "1.1.1",
+    "eslint": "8.1.0",
     "eslint-config-airbnb": "18.2.1",
     "eslint-config-airbnb-typescript": "14.0.1",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-import": "2.25.2",
-    "eslint-plugin-jest": "25.2.1",
+    "eslint-plugin-jest": "25.2.2",
     "eslint-plugin-jsx-a11y": "6.4.1",
     "eslint-plugin-prettier": "4.0.0",
     "eslint-plugin-react": "7.26.1",
@@ -185,15 +185,15 @@
     "gulp-uglify": "3.0.2",
     "hex-rgb": "4.3.0",
     "html-webpack-plugin": "4.5.2",
-    "husky": "7.0.2",
-    "jest": "27.1.0",
+    "husky": "7.0.4",
+    "jest": "27.3.1",
     "kebab-case": "1.0.1",
     "mocha": "9.1.3",
-    "prettier": "2.3.2",
+    "prettier": "2.4.1",
     "preval-build-info": "1.0.3",
     "rimraf": "3.0.2",
-    "sass": "1.37.5",
-    "simple-git": "2.45.0",
+    "sass": "1.43.3",
+    "simple-git": "2.47.0",
     "terser": "4.8.0",
     "ts-loader": "5.4.5",
     "ts-mocha": "8.0.0",
diff --git a/recipes b/recipes
-Subproject 2dcc204502ecbbcac39b667a37ffe36c45f33d6
+Subproject 87731bd4a54dc3c40e0188d790d0f430cacf1ef
diff --git a/src/I18n.js b/src/I18n.js
index 2a50050ee..b10c5a94b 100644
--- a/src/I18n.js
+++ b/src/I18n.js
@@ -12,7 +12,7 @@ import AppStore from './stores/AppStore';
 @observer
 class I18N extends Component {
   componentDidUpdate() {
-    window.ferdi.menu.rebuild();
+    window['ferdi'].menu.rebuild();
   }
 
   render() {
@@ -22,7 +22,7 @@ class I18N extends Component {
       <IntlProvider
         {...{ locale, key: locale, messages: translations[locale] }}
         ref={intlProvider => {
-          window.ferdi.intl = intlProvider ? intlProvider.state.intl : null;
+          window['ferdi'].intl = intlProvider ? intlProvider.state.intl : null;
         }}
       >
         {children}
diff --git a/src/actions/service.ts b/src/actions/service.ts
index e56513f8f..aa02c860a 100644
--- a/src/actions/service.ts
+++ b/src/actions/service.ts
@@ -39,6 +39,10 @@ export default {
     serviceId: PropTypes.string.isRequired,
     count: PropTypes.object.isRequired,
   },
+  setDialogTitle: {
+    serviceId: PropTypes.string.isRequired,
+    dialogTitle: PropTypes.string.isRequired,
+  },
   setWebviewReference: {
     serviceId: PropTypes.string.isRequired,
     webview: PropTypes.object.isRequired,
diff --git a/src/app.js b/src/app.js
index aea57a673..f52ecdfdc 100644
--- a/src/app.js
+++ b/src/app.js
@@ -28,7 +28,7 @@ window.addEventListener('load', () => {
   const menu = new MenuFactory(stores, actions);
   const touchBar = new TouchBarFactory(stores, actions);
 
-  window.ferdi = {
+  window['ferdi'] = {
     stores,
     actions,
     api,
@@ -46,7 +46,7 @@ window.addEventListener('load', () => {
       render(preparedApp, document.querySelector('#root'));
     },
   };
-  window.ferdi.render();
+  window['ferdi'].render();
 });
 
 // Prevent drag and drop into window from redirecting
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js
index 00eded728..047b10775 100644
--- a/src/components/auth/AuthLayout.js
+++ b/src/components/auth/AuthLayout.js
@@ -54,7 +54,7 @@ class AuthLayout extends Component {
       <>
         {isWindows && !isFullScreen && (
           <TitleBar
-            menu={window.ferdi.menu.template}
+            menu={window['ferdi'].menu.template}
             icon="assets/images/logo.svg"
           />
         )}
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index 9f3f636e3..6ed89afb6 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -168,12 +168,12 @@ class Login extends Component {
               <p className="error-message center">
                 {intl.formatMessage(messages.invalidCredentials)}
               </p>
-              {window.ferdi.stores.settings.all.app.server !==
+              {window['ferdi'].stores.settings.all.app.server !==
                 LIVE_FRANZ_API && (
                 <p className="error-message center">
                   {intl.formatMessage(messages.customServerQuestion)}{' '}
                   <Link
-                    to={`${window.ferdi.stores.settings.all.app.server.replace(
+                    to={`${window['ferdi'].stores.settings.all.app.server.replace(
                       API_VERSION,
                       '',
                     )}/import`}
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 4bacc547b..af27e8854 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -4,6 +4,7 @@ import { observer } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import { TitleBar } from 'electron-react-titlebar/renderer';
 import injectSheet from 'react-jss';
+import { ipcRenderer } from 'electron';
 
 import InfoBar from '../ui/InfoBar';
 import { Component as BasicAuth } from '../../features/basicAuth';
@@ -14,7 +15,7 @@ import ErrorBoundary from '../util/ErrorBoundary';
 
 // import globalMessages from '../../i18n/globalMessages';
 
-import { isWindows } from '../../environment';
+import { isWindows, isMac } from '../../environment';
 import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator';
 import { workspaceStore } from '../../features/workspaces';
 import AppUpdateInfoBar from '../AppUpdateInfoBar';
@@ -57,8 +58,20 @@ const styles = theme => ({
         : `translateX(-${theme.workspaces.drawer.width}px)`;
     },
   },
+  titleBar: {
+    display: 'block',
+    zIndex: 1,
+    width: '100%',
+    height: '23px',
+    position: 'absolute',
+    top: 0,
+  },
 });
 
+const toggleFullScreen = () => {
+  ipcRenderer.send('window.toolbar-double-clicked');
+};
+
 @injectSheet(styles)
 @observer
 class AppLayout extends Component {
@@ -115,10 +128,16 @@ class AppLayout extends Component {
         <div className="app">
           {isWindows && !isFullScreen && (
             <TitleBar
-              menu={window.ferdi.menu.template}
+              menu={window['ferdi'].menu.template}
               icon="assets/images/logo.svg"
             />
           )}
+          {isMac && !isFullScreen && (
+            <span
+              onDoubleClick={toggleFullScreen}
+              className={classes.titleBar}
+            />
+          )}
           <div className={`app__content ${classes.appContent}`}>
             {workspacesDrawer}
             {sidebar}
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index fc33a3c58..18492be80 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -14,7 +14,6 @@ import {
   addNewServiceShortcutKey,
   muteFerdiShortcutKey,
 } from '../../environment';
-import { workspaceStore } from '../../features/workspaces';
 import { todosStore } from '../../features/todos';
 import { todoActions } from '../../features/todos/actions';
 import AppStore from '../../stores/AppStore';
@@ -69,6 +68,7 @@ class Sidebar extends Component {
     toggleAudio: PropTypes.func.isRequired,
     toggleDarkMode: PropTypes.func.isRequired,
     showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
+    showServiceNameSetting: PropTypes.bool.isRequired,
     showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
     deleteService: PropTypes.func.isRequired,
     updateService: PropTypes.func.isRequired,
@@ -159,8 +159,7 @@ class Sidebar extends Component {
                 <i className="mdi mdi-lock" />
               </button>
             ) : null}
-            {todosStore.isFeatureEnabled &&
-            todosStore.isFeatureEnabledByUser ? (
+            {todosStore.isFeatureEnabledByUser ? (
               <button
                 type="button"
                 onClick={() => {
@@ -178,23 +177,21 @@ class Sidebar extends Component {
                 <i className="mdi mdi-check-all" />
               </button>
             ) : null}
-            {workspaceStore.isFeatureEnabled ? (
-              <button
-                type="button"
-                onClick={() => {
-                  toggleWorkspaceDrawer();
-                  this.updateToolTip();
-                }}
-                className={`sidebar__button sidebar__button--workspaces ${
-                  isWorkspaceDrawerOpen ? 'is-active' : ''
-                }`}
-                data-tip={`${intl.formatMessage(
-                  workspaceToggleMessage,
-                )} (${workspaceToggleShortcutKey(false)})`}
-              >
-                <i className="mdi mdi-view-grid" />
-              </button>
-            ) : null}
+            <button
+              type="button"
+              onClick={() => {
+                toggleWorkspaceDrawer();
+                this.updateToolTip();
+              }}
+              className={`sidebar__button sidebar__button--workspaces ${
+                isWorkspaceDrawerOpen ? 'is-active' : ''
+              }`}
+              data-tip={`${intl.formatMessage(
+                workspaceToggleMessage,
+              )} (${workspaceToggleShortcutKey(false)})`}
+            >
+              <i className="mdi mdi-view-grid" />
+            </button>
             <button
               type="button"
               onClick={() => {
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 185d41175..2562c09ce 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -30,9 +30,14 @@ class ServiceWebview extends Component {
           this.webview.view.addEventListener('console-message', e => {
             debug('Service logged a message:', e.message);
           });
+          this.webview.view.addEventListener('did-navigate', () => {
+            document.title = `Ferdi - ${this.props.service.name} ${this.props.service.dialogTitle
+              ? ` - ${this.props.service.dialogTitle}`
+              : ''
+              } ${`- ${this.props.service._webview.getTitle()}`}`;
+          })
         }
-      },
-    );
+      })
   }
 
   componentWillUnmount() {
@@ -47,6 +52,12 @@ class ServiceWebview extends Component {
     if (this.props.service.isActive) {
       webview.view.blur();
       webview.view.focus();
+      window.setTimeout(() => {
+        document.title = `Ferdi - ${this.props.service.name} ${this.props.service.dialogTitle
+          ? ` - ${this.props.service.dialogTitle}`
+          : ''
+          } ${`- ${this.props.service._webview.getTitle()}`}`;
+      }, 100);
     } else {
       debug('Refocus not required - Not active service');
     }
@@ -92,9 +103,8 @@ class ServiceWebview extends Component {
         }
         allowpopups
         nodeintegration
-        webpreferences={`spellcheck=${
-          isSpellcheckerEnabled ? 1 : 0
-        }, contextIsolation=1, enableRemoteModule=1`}
+        webpreferences={`spellcheck=${isSpellcheckerEnabled ? 1 : 0
+          }, contextIsolation=1, enableRemoteModule=1`}
       />
     );
   }
diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js
index 69a12e982..3049b6efa 100644
--- a/src/components/services/tabs/TabBarSortableList.js
+++ b/src/components/services/tabs/TabBarSortableList.js
@@ -21,6 +21,7 @@ class TabBarSortableList extends Component {
     hibernateService: PropTypes.func.isRequired,
     wakeUpService: PropTypes.func.isRequired,
     showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
+    showServiceNameSetting: PropTypes.bool.isRequired,
     showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
   };
 
@@ -39,6 +40,7 @@ class TabBarSortableList extends Component {
       wakeUpService,
       openSettings,
       showMessageBadgeWhenMutedSetting,
+      showServiceNameSetting,
       showMessageBadgesEvenWhenMuted,
     } = this.props;
 
@@ -65,6 +67,7 @@ class TabBarSortableList extends Component {
             openSettings={openSettings}
             showMessageBadgeWhenMutedSetting={showMessageBadgeWhenMutedSetting}
             showMessageBadgesEvenWhenMuted={showMessageBadgesEvenWhenMuted}
+            showServiceNameSetting={showServiceNameSetting}
           />
         ))}
       </ul>
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index ed8430b89..3ea6c5da2 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -132,6 +132,7 @@ class TabItem extends Component {
     hibernateService: PropTypes.func.isRequired,
     wakeUpService: PropTypes.func.isRequired,
     showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
+    showServiceNameSetting: PropTypes.bool.isRequired,
     showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
     stores: PropTypes.shape({
       settings: PropTypes.instanceOf(SettingsStore).isRequired,
@@ -219,6 +220,7 @@ class TabItem extends Component {
       wakeUpService,
       openSettings,
       showMessageBadgeWhenMutedSetting,
+      showServiceNameSetting,
       showMessageBadgesEvenWhenMuted,
     } = this.props;
     const { intl } = this.props;
@@ -331,6 +333,13 @@ class TabItem extends Component {
       );
     }
 
+    let errorBadge = null;
+    if ( service.isError ) {
+      errorBadge=(
+        <i className = " mdi mdi-exclamation tab-item__error-icon"/>
+      )
+    }
+
     return (
       <li
         className={classnames({
@@ -340,6 +349,7 @@ class TabItem extends Component {
           'is-active': service.isActive,
           'has-custom-icon': service.hasCustomIcon,
           'is-disabled': !service.isEnabled,
+          'is-label-enabled': showServiceNameSetting,
         })}
         onClick={clickHandler}
         onContextMenu={() => menu.popup()}
@@ -349,8 +359,14 @@ class TabItem extends Component {
             : ''
         }`}
       >
-        <img src={service.icon} className="tab-item__icon" alt="" />
+
+        {showServiceNameSetting? <div>
+          <img src={service.icon} className="tab-item__icon" alt="" />
+          <span className="tab-item__label">{service.name}</span>
+        </div> : <img src={service.icon} className="tab-item__icon" alt="" />}
+
         {notificationBadge}
+        {errorBadge}
         {IS_SERVICE_DEBUGGING_ENABLED && (
           <>
             <div
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js
index 4ab0e8611..94d6f33c1 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -23,6 +23,7 @@ class TabBar extends Component {
     wakeUpService: PropTypes.func.isRequired,
     useVerticalStyle: PropTypes.bool.isRequired,
     showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
+    showServiceNameSetting: PropTypes.bool.isRequired,
     showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
   };
 
@@ -82,6 +83,7 @@ class TabBar extends Component {
       deleteService,
       useVerticalStyle,
       showMessageBadgeWhenMutedSetting,
+      showServiceNameSetting,
       showMessageBadgesEvenWhenMuted,
     } = this.props;
 
@@ -110,6 +112,7 @@ class TabBar extends Component {
           lockAxis={axis}
           helperClass="is-reordering"
           showMessageBadgeWhenMutedSetting={showMessageBadgeWhenMutedSetting}
+          showServiceNameSetting={showServiceNameSetting}
           showMessageBadgesEvenWhenMuted={showMessageBadgesEvenWhenMuted}
         />
       </div>
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 18a71fdeb..dbb1365b0 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -6,7 +6,6 @@ import { RouterStore } from 'mobx-react-router';
 
 import { LOCAL_SERVER, LIVE_FERDI_API, LIVE_FRANZ_API } from '../../../config';
 import Link from '../../ui/Link';
-import { workspaceStore } from '../../../features/workspaces';
 import UIStore from '../../../stores/UIStore';
 import SettingsStore from '../../../stores/SettingsStore';
 import UserStore from '../../../stores/UserStore';
@@ -117,17 +116,15 @@ class SettingsNavigation extends Component {
           {intl.formatMessage(messages.yourServices)}{' '}
           <span className="badge">{serviceCount}</span>
         </Link>
-        {workspaceStore.isFeatureEnabled ? (
-          <Link
-            to="/settings/workspaces"
-            className="settings-navigation__link"
-            activeClassName="is-active"
-            disabled={!isLoggedIn}
-          >
-            {intl.formatMessage(messages.yourWorkspaces)}{' '}
-            <span className="badge">{workspaceCount}</span>
-          </Link>
-        ) : null}
+        <Link
+          to="/settings/workspaces"
+          className="settings-navigation__link"
+          activeClassName="is-active"
+          disabled={!isLoggedIn}
+        >
+          {intl.formatMessage(messages.yourWorkspaces)}{' '}
+          <span className="badge">{workspaceCount}</span>
+        </Link>
         {!isUsingWithoutAccount && (
           <Link
             to="/settings/user"
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 948e9ccd5..54f2025e5 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -194,9 +194,7 @@ class EditSettingsForm extends Component {
     isClearingAllCache: PropTypes.bool.isRequired,
     onClearAllCache: PropTypes.func.isRequired,
     getCacheSize: PropTypes.func.isRequired,
-    isTodosEnabled: PropTypes.bool.isRequired,
     isTodosActivated: PropTypes.bool.isRequired,
-    isWorkspaceEnabled: PropTypes.bool.isRequired,
     automaticUpdates: PropTypes.bool.isRequired,
     isDarkmodeEnabled: PropTypes.bool.isRequired,
     isAdaptableDarkModeEnabled: PropTypes.bool.isRequired,
@@ -244,8 +242,6 @@ class EditSettingsForm extends Component {
       isClearingAllCache,
       onClearAllCache,
       getCacheSize,
-      isTodosEnabled,
-      isWorkspaceEnabled,
       automaticUpdates,
       isDarkmodeEnabled,
       isTodosActivated,
@@ -265,7 +261,7 @@ class EditSettingsForm extends Component {
     }
 
     const { lockingFeatureEnabled, scheduledDNDEnabled } =
-      window.ferdi.stores.settings.all.app;
+      window['ferdi'].stores.settings.all.app;
 
     let cacheSize;
     let notCleared;
@@ -414,14 +410,12 @@ class EditSettingsForm extends Component {
 
                 <Hr />
 
-                {isWorkspaceEnabled && (
-                  <>
-                    <Toggle field={form.$('keepAllWorkspacesLoaded')} />
-                    <Hr />
-                  </>
-                )}
+                <>
+                  <Toggle field={form.$('keepAllWorkspacesLoaded')} />
+                  <Hr />
+                </>
 
-                {isTodosEnabled && !hasAddedTodosAsService && (
+                {!hasAddedTodosAsService && (
                   <>
                     <Toggle field={form.$('enableTodos')} />
                     {isTodosActivated && (
@@ -511,6 +505,7 @@ class EditSettingsForm extends Component {
             {this.state.activeSetttingsTab === 'appearance' && (
               <div>
                 <Toggle field={form.$('showDisabledServices')} />
+                <Toggle field={form.$('showServiceName')} />
                 <Toggle field={form.$('showMessageBadgeWhenMuted')} />
 
                 {isMac && <Toggle field={form.$('showDragArea')} />}
@@ -768,7 +763,7 @@ class EditSettingsForm extends Component {
                         name: 'Nightly builds',
                       }}
                       onChange={
-                        window.ferdi.features.nightlyBuilds.toggleFeature
+                        window['ferdi'].features.nightlyBuilds.toggleFeature
                       }
                     />
                     {updateIsReadyToInstall ? (
diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js
new file mode 100644
index 000000000..67c801d98
--- /dev/null
+++ b/src/components/ui/Button.js
@@ -0,0 +1,95 @@
+import { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer, inject } from 'mobx-react';
+import Loader from 'react-loader';
+import classnames from 'classnames';
+
+@inject('stores')
+@observer
+class Button extends Component {
+  static propTypes = {
+    className: PropTypes.string,
+    label: PropTypes.string.isRequired,
+    disabled: PropTypes.bool,
+    onClick: PropTypes.func,
+    type: PropTypes.string,
+    buttonType: PropTypes.string,
+    loaded: PropTypes.bool,
+    htmlForm: PropTypes.string,
+    stores: PropTypes.shape({
+      settings: PropTypes.shape({
+        app: PropTypes.shape({
+          accentColor: PropTypes.string.isRequired,
+        }).isRequired,
+      }).isRequired,
+    }).isRequired,
+  };
+
+  static defaultProps = {
+    className: null,
+    disabled: false,
+    onClick: () => {},
+    type: 'button',
+    buttonType: '',
+    loaded: true,
+    htmlForm: '',
+  };
+
+  element = null;
+
+  render() {
+    const {
+      label,
+      className,
+      disabled,
+      onClick,
+      type,
+      buttonType,
+      loaded,
+      htmlForm,
+    } = this.props;
+
+    const buttonProps = {
+      className: classnames({
+        'franz-form__button': true,
+        [`franz-form__button--${buttonType}`]: buttonType,
+        [`${className}`]: className,
+      }),
+      type,
+    };
+
+    if (disabled) {
+      buttonProps.disabled = true;
+    }
+
+    if (onClick) {
+      buttonProps.onClick = onClick;
+    }
+
+    if (htmlForm) {
+      buttonProps.form = htmlForm;
+    }
+
+    return (
+      // disabling rule as button has type defined in `buttonProps`
+      /* eslint-disable react/button-has-type */
+      <button {...buttonProps}>
+        <Loader
+          loaded={loaded}
+          lines={10}
+          scale={0.4}
+          color={
+            buttonType !== 'secondary'
+              ? '#FFF'
+              : this.props.stores.settings.app.accentColor
+          }
+          component="span"
+        />
+        {label}
+      </button>
+      /* eslint-enable react/button-has-type */
+    );
+  }
+}
+
+export default Button;
diff --git a/src/components/ui/Button.tsx b/src/components/ui/Button.tsx
deleted file mode 100644
index aac080fda..000000000
--- a/src/components/ui/Button.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import { Component } from 'react';
-import { observer, inject } from 'mobx-react';
-import Loader from 'react-loader';
-import classnames from 'classnames';
-import { FerdiStores } from '../../stores.types';
-
-type Props = {
-  className: string;
-  label: string;
-  disabled: boolean;
-  onClick: () => void;
-  type: 'button' | 'submit' | 'reset';
-  buttonType: string;
-  loaded: boolean;
-  htmlForm: string;
-  stores: FerdiStores;
-};
-
-@inject('stores')
-@observer
-class Button extends Component<Props> {
-  static defaultProps = {
-    className: null,
-    disabled: false,
-    onClick: () => {},
-    type: 'button',
-    buttonType: '',
-    loaded: true,
-    htmlForm: '',
-  };
-
-  render() {
-    const {
-      label,
-      className,
-      disabled,
-      onClick,
-      type,
-      buttonType,
-      loaded,
-      htmlForm,
-    } = this.props;
-
-    return (
-      <button
-        className={classnames({
-          'franz-form__button': true,
-          [`franz-form__button--${buttonType}`]: buttonType,
-          [`${className}`]: className,
-        })}
-        disabled={disabled}
-        type={type}
-        onClick={onClick}
-        form={htmlForm}
-      >
-        <Loader
-          loaded={loaded}
-          lines={10}
-          scale={0.4}
-          color={
-            buttonType !== 'secondary'
-              ? '#FFF'
-              : this.props.stores.settings.app.accentColor
-          }
-          component="span"
-        />
-        {label}
-      </button>
-    );
-  }
-}
-
-export default Button;
diff --git a/src/config.ts b/src/config.ts
index dfedbe6f5..fb073c062 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -140,13 +140,6 @@ export const ICON_SIZES = {
 // The bias should always be the "Normal icons" value
 export const iconSizeBias = 20;
 
-export const DEFAULT_FEATURES_CONFIG = {
-  isServiceProxyEnabled: true,
-  isWorkspaceEnabled: true,
-  isTodosEnabled: true,
-  isSettingsWSEnabled: false,
-};
-
 export const DEFAULT_WINDOW_OPTIONS = {
   width: 800,
   height: 600,
@@ -193,6 +186,7 @@ export const DEFAULT_APP_SETTINGS = {
   clipboardNotifications: true,
   notifyTaskBarOnMessage: false,
   showDisabledServices: true,
+  showServiceName: false,
   showMessageBadgeWhenMuted: true,
   showDragArea: false,
   enableSpellchecking: true,
@@ -236,7 +230,7 @@ export const DEFAULT_APP_SETTINGS = {
   liftSingleInstanceLock: false,
   enableLongPressServiceHint: false,
   proxyFeatureEnabled: false,
-  onlyShowFavoritesInUnreadCount: false
+  onlyShowFavoritesInUnreadCount: false,
 };
 
 export const DEFAULT_SERVICE_SETTINGS = {
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 0d566525d..6b6f97e46 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -122,6 +122,9 @@ class AppLayoutContainer extends Component {
         showMessageBadgeWhenMutedSetting={
           settings.all.app.showMessageBadgeWhenMuted
         }
+        showServiceNameSetting={
+          settings.all.app.showServiceName
+        }
         showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted}
         isTodosServiceActive={services.isTodosServiceActive || false}
       />
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index b84c0d5bb..ddf7fab36 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -8,7 +8,6 @@ import UserStore from '../../stores/UserStore';
 import RecipesStore from '../../stores/RecipesStore';
 import ServicesStore from '../../stores/ServicesStore';
 import SettingsStore from '../../stores/SettingsStore';
-import FeaturesStore from '../../stores/FeaturesStore';
 import Form from '../../lib/Form';
 
 import ServiceError from '../../components/settings/services/ServiceError';
@@ -267,7 +266,7 @@ class EditServiceScreen extends Component {
       Object.assign(config.fields, {
         customUrl: {
           label: intl.formatMessage(messages.customUrl),
-          placeholder: 'https://',
+          placeholder: "'http://' or 'https://' or 'file:///'",
           value: service.customUrl || recipe.serviceURL,
           validators: [required, url],
         },
@@ -445,7 +444,6 @@ EditServiceScreen.wrappedComponent.propTypes = {
     recipes: PropTypes.instanceOf(RecipesStore).isRequired,
     services: PropTypes.instanceOf(ServicesStore).isRequired,
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
-    features: PropTypes.instanceOf(FeaturesStore).isRequired,
   }).isRequired,
   router: PropTypes.instanceOf(RouterStore).isRequired,
   actions: PropTypes.shape({
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index de0714870..64f5b2e01 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -197,6 +197,10 @@ const messages = defineMessages({
     id: 'settings.app.form.showDisabledServices',
     defaultMessage: 'Display disabled services tabs',
   },
+  showServiceName: {
+    id: 'settings.app.form.showServiceName',
+    defaultMessage: 'Display service name under the icon',
+  },
   showMessageBadgeWhenMuted: {
     id: 'settings.app.form.showMessagesBadgesWhenMuted',
     defaultMessage: 'Show unread message badge when notifications are disabled',
@@ -301,6 +305,7 @@ class EditSettingsScreen extends Component {
           settingsData.enableGlobalHideShortcut,
         ),
         showDisabledServices: Boolean(settingsData.showDisabledServices),
+        showServiceName: Boolean(settingsData.showServiceName),
         darkMode: Boolean(settingsData.darkMode),
         adaptableDarkMode: Boolean(settingsData.adaptableDarkMode),
         universalDarkMode: Boolean(settingsData.universalDarkMode),
@@ -334,14 +339,12 @@ class EditSettingsScreen extends Component {
       },
     });
 
-    if (workspaces.isFeatureActive) {
-      const { keepAllWorkspacesLoaded } = workspaces.settings;
-      if (
-        Boolean(keepAllWorkspacesLoaded) !==
-        Boolean(settingsData.keepAllWorkspacesLoaded)
-      ) {
-        workspaceActions.toggleKeepAllWorkspacesLoadedSetting();
-      }
+    const { keepAllWorkspacesLoaded } = workspaces.settings;
+    if (
+      Boolean(keepAllWorkspacesLoaded) !==
+      Boolean(settingsData.keepAllWorkspacesLoaded)
+    ) {
+      workspaceActions.toggleKeepAllWorkspacesLoadedSetting();
     }
 
     if (todos.isFeatureActive) {
@@ -558,6 +561,11 @@ class EditSettingsScreen extends Component {
           value: settings.all.app.showDisabledServices,
           default: DEFAULT_APP_SETTINGS.showDisabledServices,
         },
+        showServiceName: {
+          label: intl.formatMessage(messages.showServiceName),
+          value: settings.all.app.showServiceName,
+          default: DEFAULT_APP_SETTINGS.showServiceName,
+        },
         showMessageBadgeWhenMuted: {
           label: intl.formatMessage(messages.showMessageBadgeWhenMuted),
           value: settings.all.app.showMessageBadgeWhenMuted,
@@ -686,7 +694,7 @@ class EditSettingsScreen extends Component {
   }
 
   render() {
-    const { app, todos, workspaces, services } = this.props.stores;
+    const { app, services } = this.props.stores;
     const {
       updateStatus,
       updateStatusTypes,
@@ -711,8 +719,6 @@ class EditSettingsScreen extends Component {
           getCacheSize={() => app.cacheSize}
           isClearingAllCache={isClearingAllCache}
           onClearAllCache={clearAllCache}
-          isTodosEnabled={todos.isFeatureActive}
-          isWorkspaceEnabled={workspaces.isFeatureActive}
           lockingFeatureEnabled={lockingFeatureEnabled}
           automaticUpdates={this.props.stores.settings.app.automaticUpdates}
           isDarkmodeEnabled={this.props.stores.settings.app.darkMode}
diff --git a/src/features/publishDebugInfo/index.js b/src/features/publishDebugInfo/index.js
index 51780a34e..43841b530 100644
--- a/src/features/publishDebugInfo/index.js
+++ b/src/features/publishDebugInfo/index.js
@@ -12,7 +12,7 @@ export default function initialize() {
     state.isModalVisible = true;
   }
 
-  window.ferdi.features.publishDebugInfo = {
+  window['ferdi'].features.publishDebugInfo = {
     state,
     showModal,
   };
diff --git a/src/features/settingsWS/actions.ts b/src/features/settingsWS/actions.ts
deleted file mode 100755
index 03a398eb5..000000000
--- a/src/features/settingsWS/actions.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import PropTypes from 'prop-types';
-import { createActionsFromDefinitions } from '../../actions/lib/actions';
-
-export const settingsWSActions = createActionsFromDefinitions(
-  {
-    greet: {
-      name: PropTypes.string.isRequired,
-    },
-  },
-  PropTypes.checkPropTypes,
-);
-
-export default settingsWSActions;
diff --git a/src/features/settingsWS/index.ts b/src/features/settingsWS/index.ts
deleted file mode 100755
index 9bb206d82..000000000
--- a/src/features/settingsWS/index.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { reaction } from 'mobx';
-import { SettingsWSStore } from './store';
-
-const debug = require('debug')('Ferdi:feature:settingsWS');
-
-export const settingsStore = new SettingsWSStore();
-
-export default function initSettingsWebSocket(
-  stores: { features: any },
-  actions: any,
-) {
-  const { features } = stores;
-
-  // Toggle SettingsWebSocket feature
-  reaction(
-    () => features.features.isSettingsWSEnabled,
-    isEnabled => {
-      if (isEnabled) {
-        debug('Initializing `settingsWS` feature');
-        settingsStore.start(stores, actions);
-      } else if (settingsStore) {
-        debug('Disabling `settingsWS` feature');
-        settingsStore.stop();
-      }
-    },
-    { fireImmediately: true },
-  );
-}
diff --git a/src/features/settingsWS/state.ts b/src/features/settingsWS/state.ts
deleted file mode 100755
index 7b16b2b6e..000000000
--- a/src/features/settingsWS/state.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { observable } from 'mobx';
-
-const defaultState = {
-  isFeatureActive: false,
-};
-
-export const settingsWSState = observable(defaultState);
-
-export function resetState() {
-  Object.assign(settingsWSState, defaultState);
-}
-
-export default settingsWSState;
diff --git a/src/features/settingsWS/store.js b/src/features/settingsWS/store.js
deleted file mode 100755
index 3b9e10825..000000000
--- a/src/features/settingsWS/store.js
+++ /dev/null
@@ -1,132 +0,0 @@
-import { observable } from 'mobx';
-import WebSocket from 'ws';
-import ms from 'ms';
-
-import { FeatureStore } from '../utils/FeatureStore';
-import { createReactions } from '../../stores/lib/Reaction';
-import { WS_API } from '../../environment-remote';
-
-const debug = require('debug')('Ferdi:feature:settingsWS:store');
-
-export class SettingsWSStore extends FeatureStore {
-  stores = null;
-
-  actions = null;
-
-  ws = null;
-
-  pingTimeout = null;
-
-  reconnectTimeout = null;
-
-  @observable connected = false;
-
-  start(stores, actions) {
-    this.stores = stores;
-    this.actions = actions;
-
-    this._registerReactions(
-      createReactions([
-        this._initialize.bind(this),
-        this._reconnect.bind(this),
-        this._close.bind(this),
-      ]),
-    );
-  }
-
-  connect() {
-    try {
-      const wsURL = `${WS_API}/ws/${this.stores.user.data.id}`;
-      debug('Setting up WebSocket to', wsURL);
-
-      this.ws = new WebSocket(wsURL);
-
-      this.ws.on('open', () => {
-        debug('Opened WebSocket');
-        this.send({
-          action: 'authorize',
-          token: this.stores.user.authToken,
-        });
-
-        this.connected = true;
-
-        this.heartbeat();
-      });
-
-      this.ws.on('message', data => {
-        const resp = JSON.parse(data);
-        debug('Received message', resp);
-
-        if (resp.id) {
-          this.stores.user.getUserInfoRequest.patch(result => {
-            if (!result) return;
-
-            debug('Patching user object with new values');
-            Object.assign(result, resp);
-          });
-        }
-      });
-
-      this.ws.on('ping', this.heartbeat.bind(this));
-    } catch (error) {
-      console.error(error);
-    }
-  }
-
-  heartbeat() {
-    debug('Heartbeat');
-    clearTimeout(this.pingTimeout);
-
-    this.pingTimeout = setTimeout(() => {
-      debug('Terminating connection, reconnecting in 35');
-      this.ws.terminate();
-
-      this.connected = false;
-    }, ms('35s'));
-  }
-
-  send(data) {
-    if (this.ws && this.ws.readyState === 1) {
-      this.ws.send(JSON.stringify(data));
-      debug('Sending data', data);
-    } else {
-      debug('WebSocket is not initialized');
-    }
-  }
-
-  // Reactions
-
-  _initialize() {
-    if (this.stores.user.data.id && !this.ws) {
-      this.connect();
-    }
-  }
-
-  _reconnect() {
-    if (!this.connected) {
-      debug('Trying to reconnect in 30s');
-      this.reconnectTimeout = setInterval(() => {
-        debug('Trying to reconnect');
-        this.connect();
-      }, ms('30s'));
-    } else {
-      debug('Clearing reconnect interval');
-      clearInterval(this.reconnectTimeout);
-    }
-  }
-
-  _close() {
-    if (!this.stores.user.isLoggedIn) {
-      debug('Stopping reactions');
-      this._stopReactions();
-
-      if (this.ws) {
-        debug('Terminating connection');
-        this.ws.terminate();
-        this.ws = null;
-      }
-    }
-  }
-}
-
-export default SettingsWSStore;
diff --git a/src/features/todos/index.ts b/src/features/todos/index.ts
index 3665812e6..2fa8c3130 100644
--- a/src/features/todos/index.ts
+++ b/src/features/todos/index.ts
@@ -1,29 +1,8 @@
-import { reaction } from 'mobx';
 import TodoStore from './store';
 
-const debug = require('debug')('Ferdi:feature:todos');
-
 export const todosStore = new TodoStore();
 
-export default function initTodos(
-  stores: { todos?: any; features?: any },
-  actions: any,
-) {
+export default function initTodos(stores: { todos?: any }, actions: any) {
   stores.todos = todosStore;
-  const { features } = stores;
-
-  // Toggle todos feature
-  reaction(
-    () => features.features.isTodosEnabled,
-    isEnabled => {
-      if (isEnabled) {
-        debug('Initializing `todos` feature');
-        todosStore.start(stores, actions);
-      } else if (todosStore.isFeatureActive) {
-        debug('Disabling `todos` feature');
-        todosStore.stop();
-      }
-    },
-    { fireImmediately: true },
-  );
+  todosStore.start(stores, actions);
 }
diff --git a/src/features/todos/store.js b/src/features/todos/store.js
index 010a029ff..d158ed480 100644
--- a/src/features/todos/store.js
+++ b/src/features/todos/store.js
@@ -23,8 +23,6 @@ const debug = require('debug')('Ferdi:feature:todos:store');
 export default class TodoStore extends FeatureStore {
   @observable stores = null;
 
-  @observable isFeatureEnabled = false;
-
   @observable isFeatureActive = false;
 
   @observable webview = null;
@@ -123,7 +121,6 @@ export default class TodoStore extends FeatureStore {
     // REACTIONS
 
     this._allReactions = createReactions([
-      this._setFeatureEnabledReaction,
       this._updateTodosConfig,
       this._firstLaunchReaction,
       this._routeCheckReaction,
@@ -262,12 +259,6 @@ export default class TodoStore extends FeatureStore {
 
   // Reactions
 
-  _setFeatureEnabledReaction = () => {
-    const { isTodosEnabled } = this.stores.features.features;
-
-    this.isFeatureEnabled = isTodosEnabled;
-  };
-
   _updateTodosConfig = () => {
     // Resend the config if any part changes in Franz:
     this._onTodosClientInitialized();
diff --git a/src/features/workspaces/index.ts b/src/features/workspaces/index.ts
index ecca64b41..25975936a 100644
--- a/src/features/workspaces/index.ts
+++ b/src/features/workspaces/index.ts
@@ -1,28 +1,8 @@
-import { reaction } from 'mobx';
 import WorkspacesStore from './store';
-import { resetApiRequests } from './api';
-
-const debug = require('debug')('Ferdi:feature:workspaces');
 
 export const workspaceStore = new WorkspacesStore();
 
 export default function initWorkspaces(stores, actions) {
   stores.workspaces = workspaceStore;
-  const { features } = stores;
-
-  // Toggle workspace feature
-  reaction(
-    () => features.features.isWorkspaceEnabled,
-    isEnabled => {
-      if (isEnabled && !workspaceStore.isFeatureActive) {
-        debug('Initializing `workspaces` feature');
-        workspaceStore.start(stores, actions);
-      } else if (workspaceStore.isFeatureActive) {
-        debug('Disabling `workspaces` feature');
-        workspaceStore.stop();
-        resetApiRequests();
-      }
-    },
-    { fireImmediately: true },
-  );
+  workspaceStore.start(stores, actions);
 }
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 0fa43b723..17ec17b3a 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -18,8 +18,6 @@ import { KEEP_WS_LOADED_USID } from '../../config';
 const debug = require('debug')('Ferdi:feature:workspaces:store');
 
 export default class WorkspacesStore extends FeatureStore {
-  @observable isFeatureEnabled = true;
-
   @observable isFeatureActive = false;
 
   @observable activeWorkspace = null;
@@ -97,7 +95,6 @@ export default class WorkspacesStore extends FeatureStore {
 
     this._allReactions = createReactions([
       this._openDrawerWithSettingsReaction,
-      this._setFeatureEnabledReaction,
       this._cleanupInvalidServiceReferences,
       this._setActiveServiceOnWorkspaceSwitchReaction,
       this._activateLastUsedWorkspaceReaction,
@@ -251,11 +248,6 @@ export default class WorkspacesStore extends FeatureStore {
 
   // Reactions
 
-  _setFeatureEnabledReaction = () => {
-    const { isWorkspaceEnabled } = this.stores.features.features;
-    this.isFeatureEnabled = isWorkspaceEnabled;
-  };
-
   _setWorkspaceBeingEditedReaction = () => {
     const { pathname } = this.stores.router.location;
     const match = matchRoute('/settings/workspaces/edit/:id', pathname);
diff --git a/src/helpers/url-helpers.ts b/src/helpers/url-helpers.ts
index 135f06cbf..c1ca3ab25 100644
--- a/src/helpers/url-helpers.ts
+++ b/src/helpers/url-helpers.ts
@@ -1,7 +1,7 @@
 // This is taken from: https://benjamin-altpeter.de/shell-openexternal-dangers/
 
 import { URL } from 'url';
-import { ensureDirSync } from 'fs-extra';
+import { ensureDirSync, existsSync } from 'fs-extra';
 import { shell } from 'electron';
 
 import { ALLOWED_PROTOCOLS } from '../config';
@@ -23,6 +23,10 @@ export function isValidExternalURL(url: string | URL) {
   return isAllowed;
 }
 
+export function isValidFileUrl(path: string) {
+  return path.startsWith('file') && existsSync(new URL(path));
+}
+
 export async function openPath(folderName: string) {
   ensureDirSync(folderName);
   shell.openPath(folderName);
diff --git a/src/helpers/validation-helpers.ts b/src/helpers/validation-helpers.ts
index 23c297443..dfaf199ee 100644
--- a/src/helpers/validation-helpers.ts
+++ b/src/helpers/validation-helpers.ts
@@ -1,5 +1,6 @@
 import { defineMessages } from 'react-intl';
 import isEmail from 'validator/lib/isEmail';
+import { isValidExternalURL, isValidFileUrl } from './url-helpers';
 
 const messages = defineMessages({
   required: {
@@ -47,17 +48,17 @@ export function email({ field }) {
 
 export function url({ field }) {
   const value = field.value.trim();
-  let isValid = false;
+  let isValid = true;
 
-  isValid =
-    value !== ''
-      ? Boolean(
-          // eslint-disable-next-line unicorn/better-regex
-          /(^|[\s.:;?\-\]<(])(https?:\/\/[-\w;/?:@&=+$|_.!~*|'()[\]%#,☺]+[\w/#](\(\))?)(?=$|[\s',|().:;?\-[\]>)])/i.test(
-            value,
-          ),
-        )
-      : true;
+  if (value !== '') {
+    if (value.startsWith('http')) {
+      isValid = isValidExternalURL(value);
+    } else if (value.startsWith('file')) {
+      isValid = isValidFileUrl(value);
+    } else {
+      isValid = false;
+    }
+  }
 
   return [
     isValid,
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index ff10978c4..4ec106205 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index 8183d193f..7cbb47907 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "عرض تبويبات الخدمات المعطلة",
   "settings.app.form.showDragArea": "إظهار المنطقة القابلة للسحب على النافذة",
   "settings.app.form.showMessagesBadgesWhenMuted": "إظهار شارة رسالة غير مقروءة عند تعطيل الإشعارات",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "البدء بنافذة مصغرة",
   "settings.app.form.universalDarkMode": "تمكين الوضع المظلم الكامل",
diff --git a/src/i18n/locales/be.json b/src/i18n/locales/be.json
index 5e5b594fe..a3e1e83a7 100644
--- a/src/i18n/locales/be.json
+++ b/src/i18n/locales/be.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index ff10978c4..4ec106205 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index b04591bee..734289614 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Mostra les pestanyes dels serveis desactivats",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostra la insígnia de missatges no llegits quan les notificacions estiguin desactivades",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index edb840722..8a5f7037e 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Zobrazit záložky vypnutých služeb",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Zobrazit odznak pro nepřečtené zprávy když jsou upozornění vypnutá",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index fbe907f10..ef78a2269 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Vis faneblade for deaktiverede tjenester",
   "settings.app.form.showDragArea": "Vis trækområde i vinduet",
   "settings.app.form.showMessagesBadgesWhenMuted": "Vis ulæst beskedikon når notifikationer er deaktiveret",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimeret",
   "settings.app.form.universalDarkMode": "Aktiver universel mørk tilstand",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index a5498fcc9..91c7495a9 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Deaktivierte Services-Tabs anzeigen",
   "settings.app.form.showDragArea": "Zeige ziehbare Fläche im Fenster",
   "settings.app.form.showMessagesBadgesWhenMuted": "Ungelesene Nachrichten zeigen, wenn die Benachrichtigungen deaktiviert sind",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Minimiert starten",
   "settings.app.form.universalDarkMode": "Universellen Dark Mode aktivieren",
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 22a3a0bc5..b42188fbf 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Προβολή καρτελών των απενεργοποιημένων υπηρεσιών",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Προβολή του εικονιδίου μη αναγνωσμένου μηνύματος όταν οι ειδοποιήσεις είναι απενεργοποιημένες",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index d5cf072f6..2544d2a00 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 8f3f05c2c..e85ebf772 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Mostrar pestañas de servicios desactivados",
   "settings.app.form.showDragArea": "Mostrar área arrastrable en la ventana",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Activar el modo de vista separada",
   "settings.app.form.startMinimized": "Iniciar minimizado",
   "settings.app.form.universalDarkMode": "Activar modo oscuro universal",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index dbac3aa59..0238a262e 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Näytä Estetyt palvelut -välilehdet",
   "settings.app.form.showDragArea": "Näytä ikkunassa siirrettävä alue",
   "settings.app.form.showMessagesBadgesWhenMuted": "Näytä merkki lukemattomasta viestistä kun ilmoitukset on poistettu käytöstä",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Käynnistä pienennettynä",
   "settings.app.form.universalDarkMode": "Ota käyttöön yleinen tumma tila",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 7e2c591e2..52069c127 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -129,7 +129,7 @@
   "menu.view.openQuickSwitch": "Ouvrir le changement rapide",
   "menu.view.reloadFerdi": "Recharger Ferdi",
   "menu.view.reloadService": "Redémarrer le service",
-  "menu.view.reloadTodos": "Recharger les Todos",
+  "menu.view.reloadTodos": "Recharger les tâches à accomplir",
   "menu.view.resetZoom": "Taille actuelle",
   "menu.view.toggleDarkMode": "Activer le mode sombre",
   "menu.view.toggleDevTools": "Activer les outils de développeur",
@@ -207,7 +207,7 @@
   "settings.app.form.clipboardNotifications": "Ne pas afficher les notifications pour les événements du presse-papiers",
   "settings.app.form.closeToSystemTray": "Lors de la fermeture, laisser Ferdi actif dans la barre d'état système",
   "settings.app.form.confirmOnQuit": "Confirmer lorsque vous quittez Ferdi",
-  "settings.app.form.customTodoServer": "Serveur Todo personnalisé",
+  "settings.app.form.customTodoServer": "Serveur des tâches à accomplir personnalisé",
   "settings.app.form.darkMode": "Activer le mode sombre",
   "settings.app.form.enableGPUAcceleration": "Activer l'accélération GPU",
   "settings.app.form.enableGlobalHideShortcut": "Activer le raccourci global pour masquer Ferdi",
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Afficher les onglets des services désactivés",
   "settings.app.form.showDragArea": "Afficher les zones de glisser-déposer dans la fenêtre",
   "settings.app.form.showMessagesBadgesWhenMuted": "Afficher les badges de messages non lus quand les notifications sont désactivées",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Activer le Mode Vue Divisée",
   "settings.app.form.startMinimized": "Démarrage minimisé",
   "settings.app.form.universalDarkMode": "Activer le mode sombre universel",
@@ -266,7 +267,7 @@
   "settings.app.spellCheckerLanguageInfo": "Ferdi utilise le correcteur orthographique intégré de votre Mac pour vérifier les fautes de frappe. Si vous voulez changer les langues pour lesquelles le correcteur vérifie l'orthographe, vous pouvez le faire dans les préférences système de votre Mac.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.subheadlineFerdiProfile": "Profil Ferdi",
-  "settings.app.todoServerInfo": "Ce serveur sera utilisé pour la fonctionnalité \"Ferdi Todo\".",
+  "settings.app.todoServerInfo": "Ce serveur sera utilisé pour la fonctionnalité des tâches à accomplir de Ferdi.",
   "settings.app.translationHelp": "Aidez-nous à traduire Ferdi dans votre langue.",
   "settings.app.universalDarkModeInfo": "Le mode sombre universel tente de générer dynamiquement des styles de mode sombre pour les services qui ne sont pas encore supportés.",
   "settings.app.updateStatusAvailable": "Mise à jour disponible, téléchargement en cours...",
@@ -311,7 +312,7 @@
   "settings.service.form.enableHibernation": "Activer la veille prolongée",
   "settings.service.form.enableNotification": "Activer les notifications",
   "settings.service.form.enableService": "Activer le service",
-  "settings.service.form.enableWakeUp": "Enable wake up",
+  "settings.service.form.enableWakeUp": "Activer le réveil",
   "settings.service.form.headlineBadges": "Badge des messages non lus",
   "settings.service.form.headlineDarkReaderSettings": "Paramètre de Dark Reader",
   "settings.service.form.headlineGeneral": "Général",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index ed893c943..1d9596a79 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Taispeáin tabanna do sheirbhísí dhíchumasaithe",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Taispeáin teachtaireachtaí neamhléite, nuair a dhíchumasaítear fógraí",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 1ba7c5ada..226c66943 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "התחלה במצב ממוזער",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/hi.json b/src/i18n/locales/hi.json
index d5cf072f6..2544d2a00 100644
--- a/src/i18n/locales/hi.json
+++ b/src/i18n/locales/hi.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 6f0677e16..81e76fc9f 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Prikaži ploče s onemogućenim servisima",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Pokaži nepročitane značke poruka kad se obavještenja onemoguće",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 8a9c1a441..628fa91cd 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Letiltott szolgáltatások megjelenítése",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mutassa az 'olvasatlan üzenet' jelzést, amikor az értesítések le vannak tiltva",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Indítás minimalizálva",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index a57b60247..d0a3dd482 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Tampilkan tab layanan yang dinonaktifkan",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Tampilkan lencana pesan belum dibaca saat pemberitahuan dinonaktifkan",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 09cfaaf25..340ad936d 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -241,7 +241,8 @@
   "settings.app.form.showDisabledServices": "Mostra schede servizi disattivati",
   "settings.app.form.showDragArea": "Mostra area trascinabile nella finestra",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostra l'etichetta dei messaggi non letti quando le notifiche sono disattivate",
-  "settings.app.form.splitMode": "Enable Split View Mode",
+  "settings.app.form.showServiceName": "Mostra il nome del servizio sotto all'icona",
+  "settings.app.form.splitMode": "Abilità la modalità split view",
   "settings.app.form.startMinimized": "Avvio ridotto a icona",
   "settings.app.form.universalDarkMode": "Abilita la modalità scura universale",
   "settings.app.form.useTouchIdToUnlock": "Consenti l'utilizzo di TouchID per sbloccare Ferdi",
@@ -324,7 +325,7 @@
   "settings.service.form.isHibernatedEnabledInfo": "Quando abilitato, un servizio verrà disattivato dopo un lasso di tempo per preservare le risorse del sistema.",
   "settings.service.form.isMutedInfo": "Se disattivato, tutte le notifiche sonore e le riproduzioni audio saranno mutate",
   "settings.service.form.name": "Nome",
-  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Mostra solo i favoriti nel conteggio dei non letti",
   "settings.service.form.openDarkmodeCss": "Apri 'darkmode.css'",
   "settings.service.form.openUserCss": "Apri user.css",
   "settings.service.form.openUserJs": "Apri il file 'user.js'",
@@ -359,7 +360,7 @@
   "settings.supportFerdi.openSurvey": "Apri sondaggio",
   "settings.supportFerdi.textDonation": "Se vuoi aiutare lo sviluppo di Ferdi con una donazione, puoi farlo",
   "settings.supportFerdi.textDonationAnd": "e",
-  "settings.supportFerdi.textExpenses": "Nonostante la maggior parte del lavoro sia svolto da volontari è comunque necessario pagare per la gestione di server e certificati. Essendo una comunità vogliamo essere completamente trasparenti rispetto a come raccogliamo e spendiamo fondi",
+  "settings.supportFerdi.textExpenses": "Nonostante la maggior parte del lavoro sia svolto da volontari è comunque necessario pagare per la gestione di server e certificati. Essendo una comunità vogliamo essere completamente trasparenti rispetto a come raccogliamo e spendiamo fondi. Maggiori informazioni su",
   "settings.supportFerdi.textGitHubSponsors": "Sponsor GitHub",
   "settings.supportFerdi.textListContributors": "Elenco completo dei contributori",
   "settings.supportFerdi.textListContributorsHere": "qui",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 54257c599..26e1f3606 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "無効化されたサービスのタブを表示する",
   "settings.app.form.showDragArea": "ドラッグ可能な領域をウィンドウに表示",
   "settings.app.form.showMessagesBadgesWhenMuted": "通知の無効時に未読メッセージ件数を表示する",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "分割表示モードを有効にする",
   "settings.app.form.startMinimized": "最小化して起動",
   "settings.app.form.universalDarkMode": "ユニバーサルダークモードを有効にする",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index fee1f6668..a5e9bab9c 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index c66313751..12307159a 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "사용하지 않는 서비스 출력",
   "settings.app.form.showDragArea": "드래그 가능 영역 보기",
   "settings.app.form.showMessagesBadgesWhenMuted": "알림이 비활성화잉ㄹ 때 읽지 않은 메세지 배지 표시",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "최소화 된 상태로 시작",
   "settings.app.form.universalDarkMode": "전체 다크 모드 활성화",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 1cd2cdc42..44f48ee9b 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Toon uitgeschakelde services",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 4d58e5611..69c99b37f 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -6,9 +6,9 @@
   "changeserver.label": "Server",
   "changeserver.urlError": "Vul een geldige URL in",
   "changeserver.warning": "Extra instellingen van Ferdi worden niet opgeslagen",
-  "connectionLostBanner.cta": "Een service opnieuw laden",
+  "connectionLostBanner.cta": "Service opnieuw laden",
   "connectionLostBanner.informationLink": "Wat gebeurde er?",
-  "connectionLostBanner.message": "Oh nee! Ferdi heeft de verbinding met {name} verloren.",
+  "connectionLostBanner.message": "O nee! Ferdi heeft de verbinding met {name} verloren.",
   "feature.basicAuth.signIn": "Log in",
   "feature.nightlyBuilds.activate": "Activeren",
   "feature.nightlyBuilds.info": "Nachtelijke builds zijn zeer experimentele versies van Ferdi die ongepolijste of onvoltooide functies kunnen bevatten. Deze nightly builds worden voornamelijk gebruikt door ontwikkelaars om hun nieuwe functies te testen en hoe ze zullen presteren in de finale build. Als je niet weet wat je aan het doen bent, raden we aan om nachtelijke versies niet te activeren.",
@@ -24,30 +24,30 @@
   "feature.quickSwitch.search": "Zoeken...",
   "feature.quickSwitch.title": "Quickswitch",
   "global.api.unhealthy": "Kan geen verbinding maken met de Ferdi-services",
-  "global.cancel": "Annuleer",
-  "global.edit": "Bewerk",
+  "global.cancel": "Annuleren",
+  "global.edit": "Bewerken",
   "global.no": "Nee",
-  "global.notConnectedToTheInternet": "U bent niet verbonden met het internet.",
-  "global.ok": "Oké",
+  "global.notConnectedToTheInternet": "Je bent niet verbonden met het internet.",
+  "global.ok": "OK",
   "global.quit": "Afsluiten",
   "global.quitConfirmation": "Wil je echt stoppen?",
   "global.save": "Opslaan",
   "global.settings": "Instellingen",
-  "global.spellchecker.useDefault": "Gebruik systeemstandaard ({default})",
+  "global.spellchecker.useDefault": "Systeemstandaard gebruiken ({default})",
   "global.spellchecking.autodetect": "Taal automatisch herkennen",
   "global.spellchecking.autodetect.short": "Automatisch",
   "global.spellchecking.language": "Taal voor spellingcontrole",
   "global.submit": "Verzenden",
   "global.userAgentHelp": "Gebruik 'https://whatmyuseragent.com/' om te ontdekken of 'https://developers.whatismybrowser.com/useragents/explore/' om je gewenste user-agent te kiezen en het hier te kopiëren en plakken.",
-  "global.userAgentPref": "User Agent",
+  "global.userAgentPref": "Gebruikersagent",
   "global.yes": "Ja",
   "import.headline": "Importeer uw Ferdi 4-services",
   "import.notSupportedHeadline": "Services die (nog) niet ondersteund worden in Ferdi 5",
-  "import.skip.label": "Ik wil diensten handmatig toevoegen",
-  "import.submit.label": "Importeer {count} diensten",
+  "import.skip.label": "Ik wil services handmatig toevoegen",
+  "import.submit.label": "{count} services importeren",
   "infobar.authRequestFailed": "Er zijn fouten opgetreden tijdens het uitvoeren van een geverifieerd verzoek. Probeer opnieuw in te loggen als deze fout zich blijft voordoen.",
   "infobar.buttonChangelog": "Wat is er nieuw?",
-  "infobar.buttonInstallUpdate": "Opnieuw opstarten & update installeren",
+  "infobar.buttonInstallUpdate": "Opnieuw opstarten en update installeren",
   "infobar.buttonReloadServices": "Services opnieuw laden",
   "infobar.hide": "Verbergen",
   "infobar.requiredRequestsFailed": "Kan de services en gebruikersinformatie niet laden",
@@ -55,7 +55,7 @@
   "infobar.updateAvailable": "Een nieuwe update voor Ferdi is beschikbaar.",
   "infobox.dismiss": "Negeren",
   "invite.email.label": "E-mailadres",
-  "invite.headline.friends": "Nodig 3 vrienden of collega's uit",
+  "invite.headline.friends": "Nodig drie vrienden of collega's uit",
   "invite.name.label": "Naam",
   "invite.skip.label": "Ik wil dit later doen",
   "invite.submit.label": "Uitnodigingen verzenden",
@@ -65,12 +65,12 @@
   "locked.invalidCredentials": "Verkeerd wachtwoord",
   "locked.password.label": "Wachtwoord",
   "locked.submit.label": "Ontgrendelen",
-  "locked.touchId": "Ontgrendel met Touch ID",
-  "locked.touchIdPrompt": "ontgrendel met Touch ID",
+  "locked.touchId": "Ontgrendelen met Touch ID",
+  "locked.touchIdPrompt": "ontgrendelen met Touch ID",
   "locked.unlockWithPassword": "Ontgrendelen met wachtwoord",
   "login.changeServer": "Server wijzigen",
-  "login.customServerQuestion": "Using a custom Ferdi server?",
-  "login.customServerSuggestion": "Try importing your Franz account",
+  "login.customServerQuestion": "Gebruik je een Franz-account om in te loggen?",
+  "login.customServerSuggestion": "Probeer je Franz-account te importeren in Ferdi",
   "login.email.label": "E-mailadres",
   "login.headline": "Inloggen",
   "login.invalidCredentials": "E-mailadres of wachtwoord ongeldig",
@@ -88,7 +88,7 @@
   "menu.app.hide": "Verbergen",
   "menu.app.hideOthers": "Verberg overigen",
   "menu.app.unhide": "Weergeven",
-  "menu.edit": "Bewerk",
+  "menu.edit": "Bewerken",
   "menu.edit.copy": "Kopiëren",
   "menu.edit.cut": "Knippen",
   "menu.edit.delete": "Verwijderen",
@@ -128,21 +128,21 @@
   "menu.view.lockFerdi": "Ferdi vergrendelen",
   "menu.view.openQuickSwitch": "Open Quick Switch",
   "menu.view.reloadFerdi": "Ferdi opnieuw laden",
-  "menu.view.reloadService": "Een service opnieuw laden",
+  "menu.view.reloadService": "Service opnieuw laden",
   "menu.view.reloadTodos": "ToDos opnieuw laden",
   "menu.view.resetZoom": "Werkelijke grootte",
   "menu.view.toggleDarkMode": "Donkere modus aan/uit",
   "menu.view.toggleDevTools": "Ontwikkelaarstools aan/uit",
-  "menu.view.toggleFullScreen": "Volledig scherm in-/uitschakelen",
-  "menu.view.toggleServiceDevTools": "Service ontwikkelaarstools aan/uit",
-  "menu.view.toggleTodosDevTools": "Todos Developer Tools in-/uitschakelen",
+  "menu.view.toggleFullScreen": "Volledig scherm aan/uit",
+  "menu.view.toggleServiceDevTools": "Ontwikkelaarstools voor service aan/uit",
+  "menu.view.toggleTodosDevTools": "Ontwikkelaarstools voor Todos aan/uit",
   "menu.view.zoomIn": "Inzoomen",
   "menu.view.zoomOut": "Uitzoomen",
   "menu.window": "Venster",
   "menu.window.close": "Sluiten",
   "menu.window.minimize": "Minimaliseren",
   "menu.workspaces": "Werkruimtes",
-  "menu.workspaces.addNewWorkspace": "Voeg nieuwe werkruimte toe...",
+  "menu.workspaces.addNewWorkspace": "Nieuwe werkruimte toevoegen...",
   "menu.workspaces.closeWorkspaceDrawer": "Werkruimtepagina sluiten",
   "menu.workspaces.defaultWorkspace": "Alle services",
   "menu.workspaces.openWorkspaceDrawer": "Werkruimtepagina openen",
@@ -151,37 +151,37 @@
   "password.link.login": "Log in op je account",
   "password.link.signup": "Maak een gratis account aan",
   "password.noUser": "Er is geen gebruiker met dit e-mailadres gevonden",
-  "password.successInfo": "Uw nieuwe wachtwoord is verzonden naar uw e-mailadres",
-  "service.crashHandler.action": "Laad {name} opnieuw",
+  "password.successInfo": "Je nieuwe wachtwoord is verzonden naar je e-mailadres",
+  "service.crashHandler.action": "{name} opnieuw laden",
   "service.crashHandler.autoReload": "Bezig om {name} te herstellen over {seconds} seconden",
-  "service.crashHandler.headline": "Oh nee!",
+  "service.crashHandler.headline": "O nee!",
   "service.crashHandler.text": "{name} heeft een fout veroorzaakt.",
   "service.disabledHandler.action": "Activeer {name}",
   "service.disabledHandler.headline": "{name} is uitgeschakeld",
-  "service.errorHandler.action": "Laad {name} opnieuw",
-  "service.errorHandler.editAction": "Bewerk {name}",
-  "service.errorHandler.headline": "Oh nee!",
+  "service.errorHandler.action": "{name} opnieuw laden",
+  "service.errorHandler.editAction": "{name} bewerken",
+  "service.errorHandler.headline": "O nee!",
   "service.errorHandler.message": "Fout",
   "service.errorHandler.text": "{name} kon niet geladen worden.",
   "service.webviewLoader.loading": "{service} wordt geladen",
-  "services.getStarted": "Begin",
-  "services.login": "Log alstublieft in om Ferdi te gebruiken.",
-  "services.serverInfo": "U kunt ook uw Ferdi server veranderen door op het tandwieltje in de linker onderhoek te klikken. Als u overschakelt (van een van de gehoste servers) naar Ferdi zonder account wees u ervan bewust dat u uw gegevens van de server kunt exporteren en deze vervolgens kunt importeren via het Help-menu om al uw werkruimtes en geconfigureerde diensten weer te genereren!",
-  "services.serverless": "Gebruik Ferdi zonder account",
+  "services.getStarted": "Aan de slag",
+  "services.login": "Log in om Ferdi te gebruiken.",
+  "services.serverInfo": "Je kunt je Ferdi-server ook veranderen door op het tandwieltje in de linkeronderhoek te klikken. Als je van een van de gehoste servers wisselt naar Ferdi zonder account, dien je je ervan bewust te zijn dat je je gegevens van die server kunt exporteren en deze vervolgens kunt importeren via het Help-menu om al je werkruimtes en geconfigureerde diensten weer te genereren!",
+  "services.serverless": "Ferdi zonder account gebruiken",
   "services.welcome": "Welkom bij Ferdi",
   "settings.account.account.editButton": "Account bewerken",
   "settings.account.accountUnavailable": "Account is niet beschikbaar",
   "settings.account.accountUnavailableInfo": "U gebruikt Ferdi zonder account. Als u Ferdi wilt gebruiken met een account en uw services gesynchroniseerd wilt houden tussen installaties, selecteer een server in het tabblad Instellingen en log in.",
-  "settings.account.buttonSave": "Update profiel",
-  "settings.account.deleteAccount": "Verwijder account",
+  "settings.account.buttonSave": "Profiel bijwerken",
+  "settings.account.deleteAccount": "Account verwijderen",
   "settings.account.deleteEmailSent": "Je hebt een e-mail ontvangen met een link om het verwijderen van je account te bevestigen. Je accountgegevens en -data kunnen na verwijderen niet meer worden teruggehaald!",
   "settings.account.deleteInfo": "Wanneer je je Ferdi-account niet langer wilt gebruiken, kun je je account en alle gerelateerde data verwijderen.",
   "settings.account.headline": "Account",
-  "settings.account.headlineAccount": "Account informatie",
+  "settings.account.headlineAccount": "Accountgegevens",
   "settings.account.headlineDangerZone": "Gevarenzone",
   "settings.account.headlineInvoices": "Facturen",
   "settings.account.headlinePassword": "Wachtwoord wijzigen",
-  "settings.account.headlineProfile": "Update profiel",
+  "settings.account.headlineProfile": "Profiel bijwerken",
   "settings.account.successInfo": "Je wijzigingen zijn opgeslagen",
   "settings.account.tryReloadServices": "Probeer opnieuw",
   "settings.account.tryReloadUserInfoRequest": "Probeer opnieuw",
@@ -189,7 +189,7 @@
   "settings.account.yourLicense": "Uw Ferdi licentie:",
   "settings.app.accentColorInfo": "Schrijf uw accentkleur in een CSS-compatibel formaat (standaard: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Cache legen",
-  "settings.app.buttonInstallUpdate": "Opnieuw opstarten & update installeren",
+  "settings.app.buttonInstallUpdate": "Opnieuw opstarten en update installeren",
   "settings.app.buttonOpenFerdiProfileFolder": "Profielmap openen",
   "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open de map servicerecepten",
   "settings.app.buttonSearchForUpdate": "Controleer op updates",
@@ -199,7 +199,7 @@
   "settings.app.currentVersion": "Huidige versie:",
   "settings.app.form.accentColor": "Accent kleur",
   "settings.app.form.adaptableDarkMode": "Donkere modus synchroniseren met de instelling van mijn OS",
-  "settings.app.form.alwaysShowWorkspaces": "Werkruimte lade altijd weergeven",
+  "settings.app.form.alwaysShowWorkspaces": "Werkruimtepagina altijd weergeven",
   "settings.app.form.autoLaunchInBackground": "Open op de achtergrond",
   "settings.app.form.autoLaunchOnStart": "Open Ferdi bij opstarten",
   "settings.app.form.automaticUpdates": "Updates inschakelen",
@@ -208,7 +208,7 @@
   "settings.app.form.closeToSystemTray": "Minimaliseer Ferdi naar systeemvak",
   "settings.app.form.confirmOnQuit": "Bevestigen bij het sluiten van Ferdi",
   "settings.app.form.customTodoServer": "Aangepaste Todo Server",
-  "settings.app.form.darkMode": "Dark mode aanzetten",
+  "settings.app.form.darkMode": "Donkere modus inschakelen",
   "settings.app.form.enableGPUAcceleration": "Schakel videokaart-acceleratie in ",
   "settings.app.form.enableGlobalHideShortcut": "Enable Global shortcut to hide Ferdi",
   "settings.app.form.enableLock": "Wachtwoordvergrendeling inschakelen",
@@ -217,11 +217,11 @@
   "settings.app.form.enableSpellchecking": "Zet spellingcontrole aan",
   "settings.app.form.enableSystemTray": "Laat Ferdi altijd in systeembalk zien",
   "settings.app.form.enableTodos": "Ferdi Todos inschakelen",
-  "settings.app.form.hibernateOnStartup": "Diensten in slaapstand houden bij opstarten",
+  "settings.app.form.hibernateOnStartup": "Services in slaapstand houden bij opstarten",
   "settings.app.form.hibernationStrategy": "Slaapstand strategie",
   "settings.app.form.iconSize": "Service icoongrootte",
   "settings.app.form.inactivityLock": "Vergrendel na inactiviteit",
-  "settings.app.form.keepAllWorkspacesLoaded": "Houd alle werkruimtes geladen",
+  "settings.app.form.keepAllWorkspacesLoaded": "Alle werkruimtes geladen houden",
   "settings.app.form.language": "Taal",
   "settings.app.form.lockPassword": "Wachtwoord",
   "settings.app.form.minimizeToSystemTray": "Minimaliseer Ferdi naar systeemvak",
@@ -233,19 +233,20 @@
   "settings.app.form.reloadAfterResume": "Herlaad Ferdi na systeem hervatten",
   "settings.app.form.runInBackground": "Houd Ferdi open op de achtergrond wanneer het venster gesloten wordt",
   "settings.app.form.scheduledDNDEnabled": "Activeer geplande niet-storen modus",
-  "settings.app.form.scheduledDNDEnd": "To",
+  "settings.app.form.scheduledDNDEnd": "Tot",
   "settings.app.form.scheduledDNDStart": "Van",
   "settings.app.form.searchEngine": "Zoekmachine",
-  "settings.app.form.sentry": "Verzend telemetrie gegevens",
-  "settings.app.form.serviceRibbonWidth": "Sidebar width",
+  "settings.app.form.sentry": "Telemetriegegevens verzenden",
+  "settings.app.form.serviceRibbonWidth": "Breedte van de zijbalk",
   "settings.app.form.showDisabledServices": "Toon uitgeschakelde services",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
-  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
-  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
-  "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.universalDarkMode": "Universele donkere modus inschakelen",
+  "settings.app.form.useTouchIdToUnlock": "Gebruik van Touch ID toestaan om Ferdi te ontgrendelen",
+  "settings.app.form.useVerticalStyle": "Horizontale stijl gebruiken",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Geavanceerd",
   "settings.app.headlineAppearance": "Weergave",
@@ -260,60 +261,60 @@
   "settings.app.lockedPassword": "Wachtwoord",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Deze wijziging heeft een herstart nodig",
-  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
-  "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
+  "settings.app.scheduledDNDInfo": "Geplande niet-storen modus laat je een tijdsperiode instellen waarin je geen notificaties van Ferdi wilt ontvangen.",
+  "settings.app.scheduledDNDTimeInfo": "Tijden in 24-uur-formaat. De eindtijd kan voor de starttijd zijn (bijvoorbeeld begin 17:00, eind 09:00) om de niet-storen modus 's nachts in te schakelen.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
+  "settings.app.subheadlineFerdiProfile": "Ferdi-profiel",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help ons om Ferdi uw taal te laten spreken.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update beschikbaar, downloaden...",
   "settings.app.updateStatusSearching": "Zoekt naar updates",
   "settings.app.updateStatusUpToDate": "Je gebruikt de laatste versie van Ferdi",
-  "settings.invite.headline": "Nodig vrienden uit",
+  "settings.invite.headline": "Vrienden uitnodigen",
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Beschikbare services",
   "settings.navigation.logout": "Uitloggen",
   "settings.navigation.supportFerdi": "Over Ferdi",
-  "settings.navigation.team": "Beheer Team",
+  "settings.navigation.team": "Team beheren",
   "settings.navigation.yourServices": "Jouw services",
   "settings.navigation.yourWorkspaces": "Jouw werkruimtes",
   "settings.recipes.all": "Alle services",
-  "settings.recipes.custom": "Custom Services",
+  "settings.recipes.custom": "Aangepaste services",
   "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
   "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes",
   "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
   "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
-  "settings.recipes.customService.openDevDocs": "Developer Documentation",
-  "settings.recipes.customService.openFolder": "Open folder",
+  "settings.recipes.customService.openDevDocs": "Documentatie voor ontwikkelaars",
+  "settings.recipes.customService.openFolder": "Map openen",
   "settings.recipes.headline": "Beschikbare services",
   "settings.recipes.missingService": "Mis je een service?",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service succesvol toegevoegd",
-  "settings.searchService": "Zoek service",
+  "settings.searchService": "Service zoeken",
   "settings.service.error.goBack": "Terug naar services",
   "settings.service.error.headline": "Fout",
   "settings.service.error.message": "Kon servicerecept niet laden.",
-  "settings.service.form.addServiceHeadline": "Toevoegen {name}",
+  "settings.service.form.addServiceHeadline": "{name} toevoegen",
   "settings.service.form.availableServices": "Beschikbare services",
   "settings.service.form.customUrl": "Aangepaste server",
   "settings.service.form.customUrlValidationError": "Kon aangepaste server {name} niet valideren.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Delete service",
-  "settings.service.form.editServiceHeadline": "Bewerk {name}",
+  "settings.service.form.deleteButton": "Service verwijderen",
+  "settings.service.form.editServiceHeadline": "{name} bewerken",
   "settings.service.form.enableAudio": "Audio inschakelen",
   "settings.service.form.enableBadge": "Toon badges met ongelezen berichten",
-  "settings.service.form.enableDarkMode": "Dark mode aanzetten",
+  "settings.service.form.enableDarkMode": "Donkere modus inschakelen",
   "settings.service.form.enableHibernation": "Enable hibernation",
   "settings.service.form.enableNotification": "Meldingen inschakelen",
   "settings.service.form.enableService": "Service inschakelen",
   "settings.service.form.enableWakeUp": "Enable wake up",
   "settings.service.form.headlineBadges": "Ongelezen berichten badges",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
+  "settings.service.form.headlineDarkReaderSettings": "Instellingen voor Dark Reader",
   "settings.service.form.headlineGeneral": "Algemeen",
   "settings.service.form.headlineNotifications": "Meldingen",
   "settings.service.form.icon": "Aangepast icoon",
@@ -325,18 +326,18 @@
   "settings.service.form.isMutedInfo": "Indien uitgeschakeld, worden meldingen en audio niet afgespeeld",
   "settings.service.form.name": "Naam",
   "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
-  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
-  "settings.service.form.openUserCss": "Open user.css",
-  "settings.service.form.openUserJs": "Open user.js",
-  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy instellingen",
+  "settings.service.form.openDarkmodeCss": "Darkmode.css openen",
+  "settings.service.form.openUserCss": "User.css openen",
+  "settings.service.form.openUserJs": "User.js openen",
+  "settings.service.form.proxy.headline": "HTTP/HTTPS-proxyinstellingen",
   "settings.service.form.proxy.host": "Proxy Host/IP",
   "settings.service.form.proxy.info": "Proxy instellingen worden niet gesynchroniseerd met de Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Proxy gebruiken",
   "settings.service.form.proxy.password": "Wachtwoord (optioneel)",
   "settings.service.form.proxy.port": "Poort",
-  "settings.service.form.proxy.restartInfo": "Start Ferdi opnieuw na het aanpassen van proxy instellingen.",
+  "settings.service.form.proxy.restartInfo": "Start Ferdi opnieuw na het aanpassen van de proxyinstellingen.",
   "settings.service.form.proxy.user": "Gebruiker (optioneel)",
-  "settings.service.form.recipeFileInfo": "Je gebruikersbestanden worden op de webpagina ingevoegd zodat je diensten op elke manier kunt aanpassen. Gebruikersbestanden worden alleen lokaal opgeslagen en worden niet overgebracht naar andere computers met hetzelfde account.",
+  "settings.service.form.recipeFileInfo": "Je gebruikersbestanden worden op de webpagina ingevoegd zodat je services op elke manier kunt aanpassen. Gebruikersbestanden worden alleen lokaal opgeslagen en worden niet overgebracht naar andere computers met hetzelfde account.",
   "settings.service.form.saveButton": "Service opslaan",
   "settings.service.form.tabHosted": "Gehost",
   "settings.service.form.tabOnPremise": "Zelf-gehost ⭐️",
@@ -354,20 +355,20 @@
   "settings.services.tooltip.notificationsDisabled": "Meldingen zijn uitgeschakeld",
   "settings.services.updatedInfo": "Je wijzigingen zijn opgeslagen",
   "settings.supportFerdi.aboutIntro": "<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>",
-  "settings.supportFerdi.bannerText": "Do you want to help us improve Ferdi?",
+  "settings.supportFerdi.bannerText": "Wil je ons helpen Ferdi te verbeteren?",
   "settings.supportFerdi.headline": "Over Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
+  "settings.supportFerdi.openSurvey": "Vragenlijst openen",
   "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,",
-  "settings.supportFerdi.textDonationAnd": "and",
+  "settings.supportFerdi.textDonationAnd": "en",
   "settings.supportFerdi.textExpenses": "While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our",
-  "settings.supportFerdi.textGitHubSponsors": "GitHub Sponsors",
-  "settings.supportFerdi.textListContributors": "Full list of contributors",
-  "settings.supportFerdi.textListContributorsHere": "here",
+  "settings.supportFerdi.textGitHubSponsors": "GitHub-sponsors",
+  "settings.supportFerdi.textListContributors": "Volledige lijst met bijdragers",
+  "settings.supportFerdi.textListContributorsHere": "hier",
   "settings.supportFerdi.textOpenCollective": "Open Collective",
   "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
-  "settings.supportFerdi.textSupportWelcomeHere": "here",
+  "settings.supportFerdi.textSupportWelcomeHere": "hier",
   "settings.supportFerdi.textVolunteers": "The development of Ferdi is done by volunteers. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.",
-  "settings.supportFerdi.title": "Do you like Ferdi?",
+  "settings.supportFerdi.title": "Gebruik je Ferdi graag?",
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
@@ -385,17 +386,17 @@
   "settings.user.form.lastname": "Achternaam",
   "settings.user.form.newPassword": "Nieuw wachtwoord",
   "settings.workspace.add.form.name": "Naam",
-  "settings.workspace.add.form.submitButton": "Maak werkruimte aan",
-  "settings.workspace.form.buttonDelete": "Verwijder werkruimte",
-  "settings.workspace.form.buttonSave": "Sla werkruimte op",
-  "settings.workspace.form.keepLoaded": "Keep this workspace loaded*",
+  "settings.workspace.add.form.submitButton": "Werkruimte maken",
+  "settings.workspace.form.buttonDelete": "Werkruimte verwijderen",
+  "settings.workspace.form.buttonSave": "Werkruimte opslaan",
+  "settings.workspace.form.keepLoaded": "Deze werkruimte geladen houden*",
   "settings.workspace.form.keepLoadedInfo": "*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
   "settings.workspace.form.name": "Naam",
   "settings.workspace.form.servicesInWorkspaceHeadline": "Services in deze werkruimte",
   "settings.workspace.form.yourWorkspaces": "Jouw werkruimtes",
   "settings.workspaces.deletedInfo": "Werkruimte is verwijderd",
   "settings.workspaces.headline": "Jouw werkruimtes",
-  "settings.workspaces.noWorkspacesAdded": "You haven't created any workspaces yet.",
+  "settings.workspaces.noWorkspacesAdded": "Je hebt nog geen werkruimtes gemaakt.",
   "settings.workspaces.tryReloadWorkspaces": "Probeer opnieuw",
   "settings.workspaces.updatedInfo": "Je wijzigingen zijn opgeslagen",
   "settings.workspaces.workspaceFeatureHeadline": "Less is More: Zie hier Ferdi Werkruimtes",
@@ -424,9 +425,9 @@
   "signup.password.label": "Wachtwoord",
   "signup.submit.label": "Account aanmaken",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Delete service",
+  "tabs.item.deleteService": "Service verwijderen",
   "tabs.item.disableAudio": "Audio uitschakelen",
-  "tabs.item.disableDarkMode": "Disable Dark mode",
+  "tabs.item.disableDarkMode": "Donkere modus uitschakelen",
   "tabs.item.disableNotifications": "Meldingen uitschakelen",
   "tabs.item.disableService": "Service uitschakelen",
   "tabs.item.enableAudio": "Audio inschakelen",
@@ -435,11 +436,11 @@
   "tabs.item.enableService": "Service inschakelen",
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Herladen",
-  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} should be at least {length} characters long",
+  "tabs.item.wakeUpService": "Service ontwaken",
+  "validation.email": "{field} is ongeldig",
+  "validation.minLength": "{field} moet minstens {length} tekens lang zijn",
   "validation.oneRequired": "Minstens één vereist",
-  "validation.required": "{field} is required",
+  "validation.required": "{field} is vereist",
   "validation.url": "{field} is geen geldige URL",
   "webControls.back": "Terug",
   "webControls.forward": "Doorsturen",
@@ -448,12 +449,12 @@
   "webControls.reload": "Herladen",
   "welcome.loginButton": "Log in op je account",
   "welcome.signupButton": "Maak een gratis account aan",
-  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
+  "workspaceDrawer.addNewWorkspaceLabel": "Nieuwe werkruimte toevoegen",
   "workspaceDrawer.allServices": "Alle services",
   "workspaceDrawer.headline": "Werkruimtes",
   "workspaceDrawer.item.contextMenuEdit": "bewerken",
   "workspaceDrawer.item.noServicesAddedYet": "Nog geen services toegevoegd",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
+  "workspaceDrawer.workspacesSettingsTooltip": "Werkruimte-instellingen aanpassen",
   "workspaces.switchingIndicator.switchingTo": "Overschakelen naar"
 }
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index 0d927a6cd..0e9dec5ee 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Vis deaktiverte tjenestefaner",
   "settings.app.form.showDragArea": "Vis flyttbart område i vinduet",
   "settings.app.form.showMessagesBadgesWhenMuted": "Vis uleste meldingsetiketter når varsler er deaktivert",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimert",
   "settings.app.form.universalDarkMode": "Aktiver universelt mørkt tema",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index b6c3bc98c..0accdac07 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Wyświetlaj karty wyłączonych usług",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Uruchom zminimalizowany",
   "settings.app.form.universalDarkMode": "Włącz uniwersalny tryb ciemny",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 08a631c9a..5e7287530 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Apresentar separadores de serviços desativados",
   "settings.app.form.showDragArea": "Mostrar área arrastável na janela",
   "settings.app.form.showMessagesBadgesWhenMuted": "Apresentar emblema com o número de mensagens não lidas quando as notificações estão desativadas",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Ativar modo de visualização dividida",
   "settings.app.form.startMinimized": "Iniciar minimizado",
   "settings.app.form.universalDarkMode": "Habilitar modo noturno universal",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index b0411578b..cd113996d 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Mostrar separadores de serviços desativados",
   "settings.app.form.showDragArea": "Mostrar área arrastável na janela",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar ícone de mensagem não lida quando as notificações estiverem desativadas",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Iniciar minimizado",
   "settings.app.form.universalDarkMode": "Ativar o Modo Noturno Universal",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index e6c8f6262..d858313ac 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 3d9bd13b1..48bc83ac5 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Показывать вкладки отключённых служб",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Показывать значок непрочитанного сообщения при отключённых уведомлениях",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Запускать свернутым",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 08fb905cf..80bd1c69d 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Zobraziť záložky vypnutých služieb",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Zobraziť symbol pre neprečítané správy, keď sú vypnuté upozornenia",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index ff10978c4..4ec106205 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index a058a81ed..8b26d6548 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Prikaži ploče s onemogućenim servisima",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Покажи беџ за непрочитане поруке када су обавештења онемогућена",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index c3491f720..ca21dc442 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Visa flikar för inaktiverade tjänster",
   "settings.app.form.showDragArea": "Visa dragbart område i fönstret",
   "settings.app.form.showMessagesBadgesWhenMuted": "Visa antal olästa meddelanden när aviseringar är inaktiverade",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Aktivera delat visningsläge",
   "settings.app.form.startMinimized": "Starta i minimerat läge",
   "settings.app.form.universalDarkMode": "Aktivera globalt mörkt läge",
diff --git a/src/i18n/locales/te.json b/src/i18n/locales/te.json
index d5cf072f6..2544d2a00 100644
--- a/src/i18n/locales/te.json
+++ b/src/i18n/locales/te.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 99e4d4358..eae1bccc5 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Devre dışı bırakılan servis sekmelerini göster",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Bildirimler kapalı iken okunmamış mesaj sayısını göster",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index d1cf6f9c7..39cfeb604 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Показати вкладку вимкнених сервісів",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Показувати значок непрочитаних повідомлень коли сповіщення вимкнені",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Запускати згорнутим",
   "settings.app.form.universalDarkMode": "Увімкнути універсальний темний режим",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index e658b959c..e168c3cc3 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Hiển thị các tab dịch vụ bị vô hiệu hóa",
   "settings.app.form.showDragArea": "Hiển thị khu vực có thể kéo trên cửa sổ",
   "settings.app.form.showMessagesBadgesWhenMuted": "Hiển thị huy hiệu tin nhắn chưa đọc khi tắt thông báo",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Bắt đầu thu nhỏ",
   "settings.app.form.universalDarkMode": "Bật Chế độ tối chung",
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index 30c81436d..37ac383e1 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index 836a067f5..7c26a7ff7 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -241,6 +241,7 @@
   "settings.app.form.showDisabledServices": "显示禁用的服务标签",
   "settings.app.form.showDragArea": "在窗口上显示可拖动区域",
   "settings.app.form.showMessagesBadgesWhenMuted": "禁用通知时显示未读消息徽章",
+  "settings.app.form.showServiceName": "Display service name under the icon",
   "settings.app.form.splitMode": "启用分割视图模式",
   "settings.app.form.startMinimized": "启动时最小化",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/index.ts b/src/index.ts
index b4a754289..89903a669 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -627,6 +627,10 @@ ipcMain.on('set-spellchecker-locales', (_e, { locale, serviceId }) => {
   serviceSession.setSpellCheckerLanguages(locales);
 });
 
+ipcMain.on('window.toolbar-double-clicked', () => {
+  mainWindow?.isMaximized() ? mainWindow.unmaximize() : mainWindow?.maximize();
+});
+
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
   // On OS X it is common for applications and their menu bar
diff --git a/src/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js
index dedb5a12b..c4ca5a113 100644
--- a/src/internal-server/app/Controllers/Http/ServiceController.js
+++ b/src/internal-server/app/Controllers/Http/ServiceController.js
@@ -6,7 +6,7 @@ const { v4: uuid } = require('uuid');
 const path = require('path');
 const fs = require('fs-extra');
 const { LOCAL_HOSTNAME, DEFAULT_SERVICE_ORDER } = require('../../../../config');
-const { API_VERSION } = require('../../../../environment');
+const { API_VERSION } = require('../../../../environment-remote');
 
 const hostname = LOCAL_HOSTNAME;
 const port = Env.get('PORT');
diff --git a/src/internal-server/app/Controllers/Http/StaticController.js b/src/internal-server/app/Controllers/Http/StaticController.js
deleted file mode 100644
index 33e0e52d9..000000000
--- a/src/internal-server/app/Controllers/Http/StaticController.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Controller for routes with static responses
- */
-
-import { DEFAULT_FEATURES_CONFIG } from '../../../../config';
-
-// TODO: This endpoint and associated code needs to be remoeved as cleanup
-class StaticController {
-  // Enable all features
-  features({ response }) {
-    return response.send(DEFAULT_FEATURES_CONFIG);
-  }
-
-  // Return an empty array
-  emptyArray({ response }) {
-    return response.send([]);
-  }
-}
-
-export default StaticController;
diff --git a/src/internal-server/start/routes.js b/src/internal-server/start/routes.js
index 50b9448cf..177035dac 100644
--- a/src/internal-server/start/routes.js
+++ b/src/internal-server/start/routes.js
@@ -55,17 +55,12 @@ Route.group(() => {
   Route.get('recipes', 'RecipeController.list');
   Route.get('recipes/download/:recipe', 'RecipeController.download');
   Route.get('recipes/search', 'RecipeController.search');
-  Route.get('recipes/update', 'StaticController.emptyArray');
 
   // Workspaces
   Route.put('workspace/:id', 'WorkspaceController.edit');
   Route.delete('workspace/:id', 'WorkspaceController.delete');
   Route.post('workspace', 'WorkspaceController.create');
   Route.get('workspace', 'WorkspaceController.list');
-
-  // Static responses
-  Route.get('features/:mode?', 'StaticController.features');
-  Route.get('services', 'StaticController.emptyArray');
 })
   .prefix(API_VERSION)
   .middleware(OnlyAllowFerdi);
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index b1cbaf992..7d4c228f5 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -21,7 +21,6 @@ import {
   muteFerdiShortcutKey,
 } from '../environment';
 import { aboutAppDetails, ferdiVersion } from '../environment-remote';
-import { todosStore } from '../features/todos';
 import { todoActions } from '../features/todos/actions';
 import { workspaceActions } from '../features/workspaces/actions';
 import { workspaceStore } from '../features/workspaces/index';
@@ -313,7 +312,7 @@ const menuItems = defineMessages({
 });
 
 function getActiveService() {
-  return window.ferdi.stores.services.active;
+  return window['ferdi'].stores.services.active;
 }
 
 const _titleBarTemplateFactory = (intl, locked) => [
@@ -375,7 +374,7 @@ const _titleBarTemplateFactory = (intl, locked) => [
         label: intl.formatMessage(menuItems.openQuickSwitch),
         accelerator: `${cmdOrCtrlShortcutKey()}+S`,
         click() {
-          window.ferdi.features.quickSwitch.state.isModalVisible = true;
+          window['ferdi'].features.quickSwitch.state.isModalVisible = true;
         },
       },
       {
@@ -391,7 +390,7 @@ const _titleBarTemplateFactory = (intl, locked) => [
             // Focus webview so find in page popup gets focused
             service.webview.focus();
 
-            window.ferdi.actions.service.sendIPCMessage({
+            window['ferdi'].actions.service.sendIPCMessage({
               serviceId: service.id,
               channel: 'find-in-page',
               args: {},
@@ -457,12 +456,12 @@ const _titleBarTemplateFactory = (intl, locked) => [
         label: intl.formatMessage(menuItems.toggleDarkMode),
         type: 'checkbox',
         accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+D`,
-        checked: window.ferdi.stores.settings.app.darkMode,
+        checked: window['ferdi'].stores.settings.app.darkMode,
         click: () => {
-          window.ferdi.actions.settings.update({
+          window['ferdi'].actions.settings.update({
             type: 'app',
             data: {
-              darkMode: !window.ferdi.stores.settings.app.darkMode,
+              darkMode: !window['ferdi'].stores.settings.app.darkMode,
             },
           });
         },
@@ -479,12 +478,12 @@ const _titleBarTemplateFactory = (intl, locked) => [
     label: intl.formatMessage(menuItems.workspaces),
     accelerator: `${altKey()}+W`,
     submenu: [],
-    visible: !locked && workspaceStore.isFeatureEnabled,
+    visible: !locked,
   },
   {
     label: intl.formatMessage(menuItems.todos),
     submenu: [],
-    visible: !locked && todosStore.isFeatureEnabled,
+    visible: !locked,
   },
   {
     label: intl.formatMessage(menuItems.window),
@@ -579,13 +578,13 @@ class FranzMenu {
     // need to clone object so we don't modify computed (cached) object
     const serviceTpl = Object.assign([], this.serviceTpl());
 
-    // Don't initialize when window.ferdi is undefined
-    if (window.ferdi === undefined) {
+    // Don't initialize when window['ferdi'] is undefined
+    if (window['ferdi'] === undefined) {
       console.log('skipping menu init');
       return;
     }
 
-    const { intl } = window.ferdi;
+    const { intl } = window['ferdi'];
     const tpl = _titleBarTemplateFactory(intl, this.stores.settings.app.locked);
     const { actions } = this;
 
@@ -593,13 +592,13 @@ class FranzMenu {
       tpl[1].submenu.push({
         label: intl.formatMessage(menuItems.autohideMenuBar),
         type: 'checkbox',
-        checked: window.ferdi.stores.settings.app.autohideMenuBar,
+        checked: window['ferdi'].stores.settings.app.autohideMenuBar,
         click: () => {
-          window.ferdi.actions.settings.update({
+          window['ferdi'].actions.settings.update({
             type: 'app',
             data: {
               autohideMenuBar:
-                !window.ferdi.stores.settings.app.autohideMenuBar,
+                !window['ferdi'].stores.settings.app.autohideMenuBar,
             },
           });
         },
@@ -698,13 +697,9 @@ class FranzMenu {
         tpl[2].submenu = serviceTpl;
       }
 
-      if (workspaceStore.isFeatureEnabled) {
-        tpl[3].submenu = this.workspacesMenu();
-      }
+      tpl[3].submenu = this.workspacesMenu();
 
-      if (todosStore.isFeatureEnabled) {
-        tpl[4].submenu = this.todosMenu();
-      }
+      tpl[4].submenu = this.todosMenu();
     } else {
       const touchIdEnabled = isMac
         ? this.stores.settings.app.useTouchIdToUnlock &&
@@ -872,13 +867,9 @@ class FranzMenu {
         tpl[3].submenu = serviceTpl;
       }
 
-      if (workspaceStore.isFeatureEnabled) {
-        tpl[4].submenu = this.workspacesMenu();
-      }
+      tpl[4].submenu = this.workspacesMenu();
 
-      if (todosStore.isFeatureEnabled) {
-        tpl[5].submenu = this.todosMenu();
-      }
+      tpl[5].submenu = this.todosMenu();
 
       tpl[tpl.length - 1].submenu.push(
         {
@@ -893,7 +884,7 @@ class FranzMenu {
   }
 
   serviceTpl() {
-    const { intl } = window.ferdi;
+    const { intl } = window['ferdi'];
     const { user, services, settings } = this.stores;
     if (!user.isLoggedIn) return [];
     const menu = [];
@@ -988,7 +979,7 @@ class FranzMenu {
   workspacesMenu() {
     const { workspaces, activeWorkspace, isWorkspaceDrawerOpen } =
       workspaceStore;
-    const { intl } = window.ferdi;
+    const { intl } = window['ferdi'];
     const menu = [];
 
     // Add new workspace item:
@@ -1050,7 +1041,7 @@ class FranzMenu {
 
   todosMenu() {
     const { isTodosPanelVisible, isFeatureEnabledByUser } = this.stores.todos;
-    const { intl } = window.ferdi;
+    const { intl } = window['ferdi'];
     const menu = [];
 
     const drawerLabel = isTodosPanelVisible
@@ -1084,7 +1075,7 @@ class FranzMenu {
   }
 
   debugMenu() {
-    const { intl } = window.ferdi;
+    const { intl } = window['ferdi'];
 
     return [
       {
@@ -1107,7 +1098,7 @@ class FranzMenu {
       {
         label: intl.formatMessage(menuItems.publishDebugInfo),
         click: () => {
-          window.ferdi.features.publishDebugInfo.state.isModalVisible = true;
+          window['ferdi'].features.publishDebugInfo.state.isModalVisible = true;
         },
       },
     ];
diff --git a/src/models/Service.js b/src/models/Service.js
index 12109fb0a..3cf0523c3 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -37,6 +37,8 @@ export default class Service {
 
   @observable unreadIndirectMessageCount = 0;
 
+  @observable dialogTitle = '';
+
   @observable order = DEFAULT_SERVICE_ORDER;
 
   @observable isEnabled = true;
@@ -171,7 +173,7 @@ export default class Service {
     );
 
     // Check if "Hibernate on Startup" is enabled and hibernate all services except active one
-    const { hibernateOnStartup } = window.ferdi.stores.settings.app;
+    const { hibernateOnStartup } = window['ferdi'].stores.settings.app;
     // The service store is probably not loaded yet so we need to use localStorage data to get active service
     const isActive =
       window.localStorage.service &&
diff --git a/src/models/UserAgent.js b/src/models/UserAgent.js
index 02ff97db1..f971fb08a 100644
--- a/src/models/UserAgent.js
+++ b/src/models/UserAgent.js
@@ -37,7 +37,7 @@ export default class UserAgent {
     if (typeof this.getUserAgent === 'function') {
       return this.getUserAgent();
     }
-    const globalPref = window.ferdi.stores.settings.all.app.userAgentPref;
+    const globalPref = window['ferdi'].stores.settings.all.app.userAgentPref;
     if (typeof globalPref === 'string') {
       const trimmed = globalPref.trim();
       if (trimmed !== '') {
diff --git a/src/stores.types.ts b/src/stores.types.ts
index e5978a392..c63cdd4b8 100644
--- a/src/stores.types.ts
+++ b/src/stores.types.ts
@@ -231,7 +231,6 @@ interface TodosStore {
   actions: Actions;
   api: Api;
   isFeatureActive: () => void;
-  isFeatureEnabled: () => void;
   isInitialized: true;
   stores: Stores;
   userAgentModel: () => void;
@@ -246,7 +245,6 @@ interface TodosStore {
   _reactions: any[];
   _reload: () => void;
   _routeCheckReaction: () => void;
-  _setFeatureEnabledReaction: () => void;
   _updateSettings: () => void;
   _updateTodosConfig: () => void;
   isFeatureEnabledByUser: () => void;
@@ -343,7 +341,6 @@ export interface WorkspacesStore {
   saving: boolean;
   filterServicesByActiveWorkspace: () => void;
   isFeatureActive: () => void;
-  isFeatureEnabled: () => void;
   isSettingsRouteActive: () => void;
   isSwitchingWorkspace: () => void;
   isWorkspaceDrawerOpen: () => void;
@@ -359,7 +356,6 @@ export interface WorkspacesStore {
   _openDrawerWithSettingsReaction: () => void;
   _reactions: any[];
   _setActiveServiceOnWorkspaceSwitchReaction: () => void;
-  _setFeatureEnabledReaction: () => void;
   _setWorkspaceBeingEditedReaction: () => void;
   _toggleKeepAllWorkspacesLoadedSetting: () => void;
   _updateSettings: () => void;
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 8e0134d7f..fdb502b6b 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -9,13 +9,10 @@ import workspaces from '../features/workspaces';
 import quickSwitch from '../features/quickSwitch';
 import nightlyBuilds from '../features/nightlyBuilds';
 import publishDebugInfo from '../features/publishDebugInfo';
-import settingsWS from '../features/settingsWS';
 import communityRecipes from '../features/communityRecipes';
 import todos from '../features/todos';
 import appearance from '../features/appearance';
 
-import { DEFAULT_FEATURES_CONFIG } from '../config';
-
 export default class FeaturesStore extends Store {
   @observable defaultFeaturesRequest = new CachedRequest(
     this.api.features,
@@ -27,7 +24,7 @@ export default class FeaturesStore extends Store {
     'features',
   );
 
-  @observable features = { ...DEFAULT_FEATURES_CONFIG };
+  @observable features = { };
 
   async setup() {
     this.registerReactions([
@@ -41,12 +38,12 @@ export default class FeaturesStore extends Store {
 
   @computed get anonymousFeatures() {
     return (
-      this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG
+      this.defaultFeaturesRequest.execute().result || {}
     );
   }
 
   _updateFeatures = () => {
-    const features = { ...DEFAULT_FEATURES_CONFIG };
+    const features = { };
     if (this.stores.user.isLoggedIn) {
       let requestResult = {};
       try {
@@ -77,7 +74,6 @@ export default class FeaturesStore extends Store {
     quickSwitch();
     nightlyBuilds();
     publishDebugInfo();
-    settingsWS(this.stores, this.actions);
     communityRecipes(this.stores, this.actions);
     todos(this.stores, this.actions);
     appearance(this.stores);
diff --git a/src/stores/GlobalErrorStore.js b/src/stores/GlobalErrorStore.js
index 7cbfdc608..9c851d6f2 100644
--- a/src/stores/GlobalErrorStore.js
+++ b/src/stores/GlobalErrorStore.js
@@ -64,7 +64,7 @@ export default class GlobalErrorStore extends Store {
           this.response = {};
         }
         if (this.error.status === 401) {
-          window.ferdi.stores.app.authRequestFailed = true;
+          window['ferdi'].stores.app.authRequestFailed = true;
           // this.actions.user.logout({ serverLogout: true });
         }
       }
@@ -78,10 +78,10 @@ export default class GlobalErrorStore extends Store {
         },
         error: this.error,
         response: this.response,
-        server: window.ferdi.stores.settings.app.server,
+        server: window['ferdi'].stores.settings.app.server,
       });
     } else {
-      window.ferdi.stores.app.authRequestFailed = false;
+      window['ferdi'].stores.app.authRequestFailed = false;
     }
   });
 }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 4f7ad7442..926ee36f0 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -82,6 +82,7 @@ export default class ServicesStore extends Store {
     this.actions.service.setUnreadMessageCount.listen(
       this._setUnreadMessageCount.bind(this),
     );
+    this.actions.service.setDialogTitle.listen(this._setDialogTitle.bind(this));
     this.actions.service.openWindow.listen(this._openWindow.bind(this));
     this.actions.service.filter.listen(this._filter.bind(this));
     this.actions.service.resetFilter.listen(this._resetFilter.bind(this));
@@ -646,6 +647,12 @@ export default class ServicesStore extends Store {
     service.unreadIndirectMessageCount = count.indirect;
   }
 
+  @action _setDialogTitle({ serviceId, dialogTitle }) {
+    const service = this.one(serviceId);
+
+    service.dialogTitle = dialogTitle;
+  }
+
   @action _setWebviewReference({ serviceId, webview }) {
     const service = this.one(serviceId);
 
@@ -683,6 +690,9 @@ export default class ServicesStore extends Store {
       // TODO: add checks to not focus service when router path is /settings or /auth
       const service = this.active;
       if (service) {
+        document.title = `Ferdi - ${service.name} ${
+          service.dialogTitle ? ` - ${service.dialogTitle}` : ''
+        } ${service._webview ? `- ${service._webview.getTitle()}` : ''}`;
         this._focusService({ serviceId: service.id });
         if (this.stores.settings.app.splitMode && !focusEvent) {
           setTimeout(() => {
@@ -741,6 +751,16 @@ export default class ServicesStore extends Store {
 
         break;
       }
+      case 'active-dialog-title': {
+        debug(`Received active dialog title from '${serviceId}'`, args[0]);
+
+        this.actions.service.setDialogTitle({
+          serviceId,
+          dialogTitle: args[0],
+        });
+
+        break;
+      }
       case 'notification': {
         const { options } = args[0];
 
@@ -1063,7 +1083,9 @@ export default class ServicesStore extends Store {
     const service = this.active;
     if (service) {
       this.actions.service.focusService({ serviceId: service.id });
-      document.title = `Ferdi - ${service.name}`;
+      document.title = `Ferdi - ${service.name} ${
+        service.dialogTitle ? ` - ${service.dialogTitle}` : ''
+      } ${service._webview ? `- ${service._webview.getTitle()}` : ''}`;
     } else {
       debug('No service is active');
     }
diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss
index 16318b9f6..ab7cee08d 100644
--- a/src/styles/tabs.scss
+++ b/src/styles/tabs.scss
@@ -1,6 +1,8 @@
 @import './config.scss';
 
 .theme__dark .tab-item {
+  color: $dark-theme-text-color;
+
   &.is-active {
     background: $dark-theme-gray;
 
@@ -54,6 +56,22 @@
     }
   }
 
+  &.is-label-enabled{
+    height: min-content;
+    overflow: hidden;
+    padding-top: 8px;
+    padding-bottom: 8px;
+  }
+
+  .tab-item__label {
+    display: block;
+    margin-top: 6px;
+    font-size: 11px;
+    padding-left: 4px;
+    padding-right: 4px;
+    line-height: 13px;
+  }
+
   &.is-disabled .tab-item__icon {
     filter: grayscale(100%) opacity(0.2);
   }
@@ -136,4 +154,13 @@
   &.is-reordering {
     z-index: 99999;
   }
+
+  .tab-item__error-icon{
+    font-size: 1.9em;
+    color: red;
+    position: absolute;
+    top: 6px;
+    right: 0px;
+    transform: scaleX(1.5);
+  }
 }
diff --git a/src/webview/badge.ts b/src/webview/badge.ts
index fb696723d..02bd3fb15 100644
--- a/src/webview/badge.ts
+++ b/src/webview/badge.ts
@@ -3,15 +3,6 @@ import { ipcRenderer } from 'electron';
 const debug = require('debug')('Ferdi:Plugin:BadgeHandler');
 
 export class BadgeHandler {
-  countCache: { direct: number; indirect: number };
-
-  constructor() {
-    this.countCache = {
-      direct: 0,
-      indirect: 0,
-    };
-  }
-
   // TODO: Need to extract this into a utility class and reuse outside of the recipes
   safeParseInt(text: string | number | undefined | null) {
     if (text === undefined || text === null) {
@@ -35,16 +26,7 @@ export class BadgeHandler {
       indirect: this.safeParseInt(indirect),
     };
 
-    if (
-      this.countCache.direct.toString() === count.direct.toString() &&
-      this.countCache.indirect.toString() === count.indirect.toString()
-    ) {
-      return;
-    }
-
-    debug('Sending badge count to host', count);
+    debug('Sending badge count to host: %j', count);
     ipcRenderer.sendToHost('message-counts', count);
-
-    Object.assign(this.countCache, count);
   }
 }
diff --git a/src/webview/dialogTitle.ts b/src/webview/dialogTitle.ts
new file mode 100644
index 000000000..f9a1aac6f
--- /dev/null
+++ b/src/webview/dialogTitle.ts
@@ -0,0 +1,33 @@
+import { ipcRenderer } from 'electron';
+
+const debug = require('debug')('Ferdi:Plugin:DialogTitleHandler');
+
+export class DialogTitleHandler {
+  titleCache: { title: string };
+
+  constructor() {
+    this.titleCache = {
+      title: '',
+    };
+  }
+
+  safeGetTitle(title: string | undefined | null) {
+    if (!title) {
+      return '';
+    }
+
+    return title;
+  }
+
+  setDialogTitle(title: string | undefined | null) {
+    const newTitle = this.safeGetTitle(title);
+    if (this.titleCache.title === newTitle) {
+      return;
+    }
+
+    debug('Sending active dialog title to host %s', newTitle);
+    ipcRenderer.sendToHost('active-dialog-title', newTitle);
+
+    this.titleCache.title = newTitle;
+  }
+}
diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js
index f1d493e7c..ebe88ed85 100644
--- a/src/webview/lib/RecipeWebview.js
+++ b/src/webview/lib/RecipeWebview.js
@@ -5,8 +5,14 @@ import { pathExistsSync, readFileSync, existsSync } from 'fs-extra';
 const debug = require('debug')('Ferdi:Plugin:RecipeWebview');
 
 class RecipeWebview {
-  constructor(badgeHandler, notificationsHandler, sessionHandler) {
+  constructor(
+    badgeHandler,
+    dialogTitleHandler,
+    notificationsHandler,
+    sessionHandler,
+  ) {
     this.badgeHandler = badgeHandler;
+    this.dialogTitleHandler = dialogTitleHandler;
     this.notificationsHandler = notificationsHandler;
     this.sessionHandler = sessionHandler;
 
@@ -59,6 +65,17 @@ class RecipeWebview {
   }
 
   /**
+   * Set the active dialog title to the app title
+   *
+   * @param {string | undefined | null} title                Set the active dialog title
+   *                                                         to the app title
+   *                                                         eg. WhatsApp contact name
+   */
+  setDialogTitle(title) {
+    this.dialogTitleHandler.setDialogTitle(title);
+  }
+
+  /**
    * Safely parse the given text into an integer
    *
    * @param  {string | number | undefined | null} text to be parsed
@@ -127,7 +144,10 @@ class RecipeWebview {
   }
 
   clearStorageData(serviceId, targetsToClear) {
-    ipcRenderer.send('clear-storage-data', { serviceId, targetsToClear });
+    ipcRenderer.send('clear-storage-data', {
+      serviceId,
+      targetsToClear,
+    });
   }
 
   releaseServiceWorkers() {
diff --git a/src/webview/lib/Userscript.js b/src/webview/lib/Userscript.js
index bed2b1ff8..f7bb99206 100644
--- a/src/webview/lib/Userscript.js
+++ b/src/webview/lib/Userscript.js
@@ -60,6 +60,16 @@ export default class Userscript {
   }
 
   /**
+   * Set active dialog title to the app title
+   * @param {*} title Dialog title
+   */
+  setDialogTitle(title) {
+    if (this.recipe && this.recipe.setDialogTitle) {
+      this.recipe.setDialogTitle(title);
+    }
+  }
+
+  /**
    * Inject CSS files into the current page
    *
    * @param  {...string} files
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 5cab28c09..92c1ee2f0 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -23,6 +23,7 @@ import RecipeWebview from './lib/RecipeWebview';
 import Userscript from './lib/Userscript';
 
 import { BadgeHandler } from './badge';
+import { DialogTitleHandler } from './dialogTitle';
 import { SessionHandler } from './sessionHandler';
 import contextMenu from './contextMenu';
 import {
@@ -51,6 +52,8 @@ const debug = require('debug')('Ferdi:Plugin');
 
 const badgeHandler = new BadgeHandler();
 
+const dialogTitleHandler = new DialogTitleHandler();
+
 const sessionHandler = new SessionHandler();
 
 const notificationsHandler = new NotificationsHandler();
@@ -106,6 +109,7 @@ contextBridge.exposeInMainWorld('ferdi', {
   open: window.open,
   setBadge: (direct, indirect) => badgeHandler.setBadge(direct, indirect),
   safeParseInt: text => badgeHandler.safeParseInt(text),
+  setDialogTitle: title => dialogTitleHandler.setDialogTitle(title),
   displayNotification: (title, options) =>
     notificationsHandler.displayNotification(title, options),
   getDisplayMediaSelector,
@@ -200,6 +204,7 @@ class RecipeController {
     try {
       this.recipe = new RecipeWebview(
         badgeHandler,
+        dialogTitleHandler,
         notificationsHandler,
         sessionHandler,
       );
diff --git a/tsconfig.json b/tsconfig.json
index c1c2fded2..58bd1e837 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -34,5 +34,6 @@
     "noFallthroughCasesInSwitch": true,
     "resolveJsonModule": true,
     "forceConsistentCasingInFileNames": true
-  }
+  },
+  "exclude": ["node_modules", "build"]
 }