Merge branch 'develop' into release

# Conflicts: # package-lock.json # package.json
author: kytwb <kytwb@pm.me> 2021-12-16 12:02:18 +0100
committer: kytwb <kytwb@pm.me> 2021-12-16 12:02:18 +0100
commit: 36c23f67c3783b3986b21ea85d56fc0e37941a0c (patch)
tree: 3c9138790d672ff84071bba8e441149c245a80e7
parent: Bumped up ferdi to '5.6.3' (diff)
parent: Iterate on README [skip ci] (diff)
download: ferdium-app-36c23f67c3783b3986b21ea85d56fc0e37941a0c.tar.gz
ferdium-app-36c23f67c3783b3986b21ea85d56fc0e37941a0c.tar.zst
ferdium-app-36c23f67c3783b3986b21ea85d56fc0e37941a0c.zip
223 files changed, 5002 insertions, 5416 deletions
diff --git a/.all-contributorsrc b/.all-contributorsrc
index b22a175c1..9cef56038 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -10,7 +10,7 @@
  "commit": true,
  "commitConvention": "none",
  "badgeTemplate": "<a href='#contributors-'><img src='https://img.shields.io/badge/contributors-<%= contributors.length %>-default.svg?logo=github' alt='Contributors'/></a>",
-  "contributorTemplate": "<a href='<%= contributor.profile %>' title='<%= contributor.name %>: <%= contributor.contributions.join(', ') %>'><img src='<%= contributor.avatar_url %>' alt='<%= contributor.login %>' style='border-radius:<%= options.imageSize %>px;width:<%= options.imageSize %>px;height:<%= options.imageSize %>px;'/></a>",
+  "contributorTemplate": "<a href='<%= contributor.profile %>' title='<%= contributor.name %>: <%= contributor.contributions.join(', ') %>'><img src='<%= contributor.avatar_url %>' alt='<%= contributor.login %>' style='width:<%= options.imageSize %>px;'/></a>",
  "contributors": [
    {
      "login": "vantezzen",
@@ -993,7 +993,8 @@
      "avatar_url": "https://avatars.githubusercontent.com/u/384997?v=4",
      "profile": "http://niute.ch",
      "contributions": [
-        "code"
+        "code",
+        "bug"
      ]
    },
    {
@@ -1103,6 +1104,35 @@
      "contributions": [
        "code"
      ]
+    },
+    {
+      "login": "klaegera",
+      "name": "Adrian Klaeger",
+      "avatar_url": "https://avatars.githubusercontent.com/u/34807567?v=4",
+      "profile": "https://github.com/klaegera",
+      "contributions": [
+        "code",
+        "bug"
+      ]
+    },
+    {
+      "login": "martinbernat",
+      "name": "martinbernat",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6809891?v=4",
+      "profile": "https://github.com/martinbernat",
+      "contributions": [
+        "code",
+        "bug"
+      ]
+    },
+    {
+      "login": "dedotombo",
+      "name": "dedotombo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/42537874?v=4",
+      "profile": "https://github.com/dedotombo",
+      "contributions": [
+        "code"
+      ]
    }
  ],
  "contributorsPerLine": 16,
diff --git a/.eslintrc.js b/.eslintrc.js
index af9eaef9d..f7ca7b620 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -82,6 +82,8 @@ module.exports = {
        'react/sort-comp': 0,
        'react/state-in-constructor': 0,
        'react/static-property-placement': 0,
+        'react/function-component-definition': 0,
+        'react/jsx-no-useless-fragment': 0,
        //  eslint-plugin-jsx-a11y
        'jsx-a11y/click-events-have-key-events': 1,
        'jsx-a11y/mouse-events-have-key-events': 1,
@@ -115,6 +117,8 @@ module.exports = {
          },
        ],
        'unicorn/consistent-destructuring': 0,
+        // INFO: Turned off due to src/internal-server/database/factory.js
+        'unicorn/no-empty-file': 0,
        // eslint-plugin-prettier
        'prettier/prettier': 1,
      },
@@ -165,6 +169,8 @@ module.exports = {
    'react/static-property-placement': 0,
    'react/state-in-constructor': 1,
    'react/sort-comp': 0,
+    'react/function-component-definition': 0,
+    'react/jsx-no-useless-fragment': 0,
    //  eslint-plugin-jsx-a11y
    'jsx-a11y/click-events-have-key-events': 1,
    'jsx-a11y/no-static-element-interactions': 1,
@@ -187,6 +193,8 @@ module.exports = {
      },
    ],
    'unicorn/consistent-destructuring': 0,
+    // INFO: Turned off due to src/internal-server/database/factory.js
+    'unicorn/no-empty-file': 0,
    // eslint-plugin-prettier
    'prettier/prettier': 1,
  },
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 020d6ff58..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,45 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
---
-<!--
-Please remember that if you are logging a bug for some service that has *stopped working*, please log the bug at https://github.com/getferdi/recipes/issues
-Please remember to read the self-help documentation at https://github.com/getferdi/ferdi#troubleshooting-recipes-self-help - in case it helps you unblock yourself.
-Please fill our form below, this way we can analyse and fix the problem as fast as possible.
-Please keep in mind that any text inside "<!--" and "--\>" are comments from us and won't be visible in your bug report, so please don't put any text in them.
-->
-**Bug description:**
-<!-- Add a clear and concise description of what the bug is -->
-**Steps to reproduce:**
-<!-- Explain to us how we can reproduce your bug on our computer -->
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-**Expected behavior**
-<!-- If applicable, add a description of what you expected to happen. -->
-**Screenshots**
-<!-- If applicable, add screenshots to help explain your problem. -->
-<!-- You can simply drag and drop any image file into the editor to add it to the report -->
-**Environment:**
- Operating System: <!-- e.g. macOS Catalina, Windows 10, etc. -->
- Ferdi Version: <!-- e.g. 5.4.3 -->
- Server: <!-- e.g. Ferdi, Franz, Using without an account -->
- Debug information:
-<!--
-Get your debug information via Ferdi "Help" menu ("Copy/Publish Debug Information") then
-share a debug information file or your published link with us.
-->
-<!-- Please consider supporting Ferdi!
-👉  https://github.com/sponsors/getferdi
-👉  https://opencollective.com/getferdi/donate -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..207e3463a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,121 @@
+name: Bug Report
+description: Report an Ferdi bug
+title: "[Bug]: "
+labels: ["bug :beetle:"]
+body:
+- type: markdown
+  attributes:
+    value: |
+      1. Please remember that if you are logging a bug for some service that has *stopped working*, please log the bug [here](https://github.com/getferdi/recipes/issues)
+      2. Please remember to read the [self-help documentation](https://github.com/getferdi/ferdi#troubleshooting-recipes-self-help) - in case it helps you unblock yourself for issues related to old recipes.
+      3. If you are requesting support for a new service in Ferdi, please log it [here](https://github.com/getferdi/recipes/issues)
+      4. If none of the above pertain to your problem, please fill our form below, this way we can analyse and fix the problem as fast as possible.
+      5. Please consider supporting Ferdi!
+        👉  https://github.com/sponsors/getferdi
+        👉  https://opencollective.com/getferdi/donate
+- type: checkboxes
+  attributes:
+    label: Preflight Checklist
+    description: Please ensure you've completed all of the following.
+    options:
+      - label: I have read the [Contributing Guidelines](https://github.com/getferdi/ferdi/blob/develop/CONTRIBUTING.md) for this project.
+        required: true
+      - label: I agree to follow the [Code of Conduct](https://github.com/getferdi/ferdi/blob/develop/CODE_OF_CONDUCT.md) that this project adheres to.
+        required: true
+      - label: I have searched the [issue tracker](https://github.com/getferdi/ferdi/issues) for a feature request that matches the one I want to file, without success.
+        required: true
+- type: input
+  attributes:
+    label: Ferdi Version
+    description: What version of Ferdi are you using?
+    placeholder: 5.6.3
+  validations:
+    required: true
+- type: dropdown
+  attributes:
+    label: What operating system are you using?
+    options:
+      - Windows
+      - macOS
+      - Ubuntu
+      - Other Linux
+      - Other (specify below)
+  validations:
+    required: true
+- type: dropdown
+  attributes:
+    label: Server
+    options:
+      - Ferdi
+      - Franz
+      - Using without an account
+      - Other server (please specify in the steps to reproduce)
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: Operating System Version
+    description: What operating system version are you using? On Windows, click Start button > Settings > System > About. On macOS, click the Apple Menu > About This Mac. On Linux, inside a terminal session, use lsb_release or uname -a.
+    placeholder: "e.g. Windows 10 version 1909, macOS Catalina 10.15.7, or Ubuntu 20.04"
+  validations:
+    required: true
+- type: dropdown
+  attributes:
+    label: What arch are you using?
+    options:
+      - x64
+      - ia32
+      - arm64 (including Apple Silicon)
+      - Other (specify below)
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: Last Known working version of Ferdi
+    description: What is the last version of Ferdi this worked in, if applicable?
+    placeholder: 5.6.3
+- type: input
+  attributes:
+    label: Git SHA and/or build date
+    description: In the latest versions of Ferdi, we now also expose the GIT SHA and the build date. IF you are running one such version, please include this information as well.
+    placeholder: 9b29f041 / Sun May 09 2021 12:35:48 GMT+0200
+- type: textarea
+  attributes:
+    label: Steps to reproduce
+    description: Explain to us how we can reproduce your bug on our computer
+    placeholder: |
+      1. Go to '...'
+      2. Click on '....'
+      3. Scroll down to '....'
+      4. See error
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Expected Behavior
+    description: A clear and concise description of what you expected to happen.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Actual Behavior
+    description: A clear description of what actually happens.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Screenshots
+    description: If applicable, add screenshots to help explain your problem. You can simply drag and drop any image file into the editor to add it to the report
+- type: textarea
+  attributes:
+    label: Debug information
+    description: Get your debug information via Ferdi "Help" menu ("Copy/Publish Debug Information") then share a debug information file or your published link with us.
+- type: input
+  attributes:
+    label: Testcase Gist URL
+    description: If you can reproduce the issue in a standalone test case, please use [Electron Fiddle](https://github.com/electron/fiddle) to create one and to publish it as a [GitHub gist](https://gist.github.com) and put the gist URL here. This is **the best way** to ensure this issue is triaged quickly **and** does not regress in the future.
+    placeholder: https://gist.github.com/...
+- type: textarea
+  attributes:
+    label: Additional Information
+    description: If your problem needs further explanation, or if the issue you're seeing cannot be reproduced in a gist, please add more information here.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..99cc88f24
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+# blank_issues_enabled: false
+contact_links:
+  - name: Ferdi Community Support
+    url: https://getferdi.com/faq/
+    about: Please see some basic questions here. If your question is not answered, please continue with raising an issue in github.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 61353797c..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
---
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-**Additional context**
-Add any other context or screenshots about the feature request here.
-<!-- Please consider supporting Ferdi!
-👉  https://github.com/sponsors/getferdi
-👉  https://opencollective.com/getferdi/donate -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 000000000..3e7e6d312
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,48 @@
+name: Feature Request
+description: Suggest an idea for Ferdi
+title: "[Feature Request]: "
+labels: ["enhancement :sparkles:"]
+body:
+- type: markdown
+  attributes:
+    value: |
+      1. Please remember that if you are logging a bug for some service that has *stopped working*, please log the bug [here](https://github.com/getferdi/recipes/issues)
+      2. If you are requesting support for a new service in Ferdi, please log it [here](https://github.com/getferdi/recipes/pulls)
+      3. Please remember to read the [self-help documentation](https://github.com/getferdi/ferdi#troubleshooting-recipes-self-help) - in case it helps you unblock yourself for issues related to old recipes.
+      4. Please fill our form below, this way we can analyse and fix the problem as fast as possible.
+      5. Please consider supporting Ferdi!
+        👉  https://github.com/sponsors/getferdi
+        👉  https://opencollective.com/getferdi/donate
+- type: checkboxes
+  attributes:
+    label: Preflight Checklist
+    description: Please ensure you've completed all of the following.
+    options:
+      - label: I have read the [Contributing Guidelines](https://github.com/getferdi/ferdi/blob/develop/CONTRIBUTING.md) for this project.
+        required: true
+      - label: I agree to follow the [Code of Conduct](https://github.com/getferdi/ferdi/blob/develop/CODE_OF_CONDUCT.md) that this project adheres to.
+        required: true
+      - label: I have searched the [issue tracker](https://github.com/getferdi/ferdi/issues) for a feature request that matches the one I want to file, without success.
+        required: true
+- type: textarea
+  attributes:
+    label: Problem Description
+    description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Proposed Solution
+    description: A clear and concise description of what you want to happen.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Alternatives Considered
+    description: A clear and concise description of any alternative solutions or features you've considered.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Additional Information
+    description: Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/open_issue.md b/.github/ISSUE_TEMPLATE/open_issue.md
deleted file mode 100644
index c7c279643..000000000
--- a/.github/ISSUE_TEMPLATE/open_issue.md
+++ /dev/null
@@ -1,8 +0,0 @@
---
-name: Open issue
-about: For everything that's neither a feature request, nor a bug
---
-<!-- Please consider supporting Ferdi!
-👉  https://github.com/sponsors/getferdi
-👉  https://opencollective.com/getferdi/donate -->
diff --git a/.github/ISSUE_TEMPLATE/open_issue.yml b/.github/ISSUE_TEMPLATE/open_issue.yml
new file mode 100644
index 000000000..a7771be59
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/open_issue.yml
@@ -0,0 +1,13 @@
+name: Open issue
+description: For everything that's neither a feature request, nor a bug
+body:
+- type: markdown
+  attributes:
+    value: |
+      1. Please remember that if you are logging a bug for some service that has *stopped working*, please log the bug [here](https://github.com/getferdi/recipes/issues)
+      2. If you are requesting support for a new service in Ferdi, please log it [here](https://github.com/getferdi/recipes/pulls)
+      3. Please remember to read the [self-help documentation](https://github.com/getferdi/ferdi#troubleshooting-recipes-self-help) - in case it helps you unblock yourself for issues related to old recipes.
+      4. Please fill our form below, this way we can analyse and fix the problem as fast as possible.
+      5. Please consider supporting Ferdi!
+        👉  https://github.com/sponsors/getferdi
+        👉  https://opencollective.com/getferdi/donate
diff --git a/.github/config.yml b/.github/config.yml
new file mode 100644
index 000000000..237e3f570
--- /dev/null
+++ b/.github/config.yml
@@ -0,0 +1,17 @@
+# Comment to be posted to on PRs from first time contributors in your repository
+newPRWelcomeComment: |
+  💖 Thanks for opening this pull request! 💖
+  Things that will help get your PR across the finish line:
+  - Follow the JavaScript [coding style](https://github.com/electron/electron/blob/master/docs/development/coding-style.md) as recommended by the Electron project.
+  - Run `npm run lint` locally to catch formatting errors earlier.
+  - Document any user-facing changes you've made by including screenshots and animated GIFs whenever possible.
+  We get a lot of pull requests on this repo, so please be patient and we will get back to you as soon as we can.
+# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
+# Comment to be posted to on pull requests merged by a first time user
+firstPRMergeComment: >
+  Congrats on merging your first pull request! 🎉🎉🎉
diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 000000000..6d8b15d02
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,22 @@
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+    authors:
+      - FerdiBot
+      - allcontributors
+  categories:
+    - title: Breaking Changes 🛠
+      labels:
+        - Semver-Major
+        - breaking-change
+    - title: Exciting New Features 🎉
+      labels:
+        - Semver-Minor
+        - enhancement
+    - title: Bug Fixes 🐞
+      labels:
+        - bug
+    - title: Other Changes
+      labels:
+        - "*"
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/builds.yml
index b15ba44a1..3f356e1e0 100644
--- a/.github/workflows/ferdi-builds.yml
+++ b/.github/workflows/builds.yml
@@ -10,7 +10,7 @@
 # 'WIN_CSC_LINK' (The HTTPS link or local path to certificate - for code signing of windows artifacts)
 # 'WIN_CSC_KEY_PASSWORD' (The password to decrypt the certificate given in CSC_LINK - for code signing of windows artifacts)
-name: Ferdi Builds
+name: Builds
 on:
  # Push to any tracked branches
@@ -141,7 +141,7 @@ jobs:
      - name: Install pnpm
        uses: pnpm/action-setup@v2.0.1
        with:
-          version: 6.19.0
+          version: 6.23.6
      - name: Install node dependencies
        run: npm i
      - name: Package recipes
@@ -223,7 +223,7 @@ jobs:
      - name: Install pnpm
        uses: pnpm/action-setup@v2.0.1
        with:
-          version: 6.19.0
+          version: 6.23.6
      - name: Install node dependencies
        run: npm i
      - name: Figure out used package.json version
@@ -326,7 +326,7 @@ jobs:
      - name: Install pnpm
        uses: pnpm/action-setup@v2.0.1
        with:
-          version: 6.19.0
+          version: 6.23.6
      - name: Install node dependencies
        run: npm i
        shell: bash
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml
index 4f5e68332..7958aa5f5 100644
--- a/.github/workflows/dependency-updates.yml
+++ b/.github/workflows/dependency-updates.yml
@@ -1,6 +1,6 @@
 # This workflow will do a clean install of ferdi dev-dependencies, update the dependencies, build the source code and run tests. It will only run on scheduled trigger.
-name: Ferdi Dependency updates
+name: Dependency updates
 on:
  # Manual trigger from the UI
@@ -38,21 +38,31 @@ jobs:
      - name: Install pnpm
        uses: pnpm/action-setup@v2.0.1
        with:
-          version: 6.19.0
+          version: 6.23.6
      - name: Install node dependencies
        run: npm i
      - name: Update submodules
-        run: npm run update-submodules
+        run: |
+          rm -rf ./recipes
+          npm run update-submodules
+          git add .
+          echo "GIT_DIRTY=$(git status -s | wc -l)" >> $GITHUB_ENV
      - name: Update browserslist db
-        run: npx browserslist@latest --update-db
+        run: |
+          npx browserslist@latest --update-db
+          git add .
+          echo "GIT_DIRTY=$(git status -s | wc -l)" >> $GITHUB_ENV
      - name: Run linter, reformatter, rebrander and tests
+        if: ${{ env.GIT_DIRTY != '0' }}
        run: |
          npm run prepare-code
          npm run test
      - name: Commit submodules, dependency-updates and linter changes
+        if: ${{ env.GIT_DIRTY != '0' }}
        run: |
          git config user.name github-actions
          git config user.email github-actions@github.com
          git commit -am "Update submodules, browserslist data updates and linter fixes [skip ci]" --no-verify || true
      - name: Push all changes
+        if: ${{ env.GIT_DIRTY != '0' }}
        run: git push origin ${{ env.GIT_BRANCH_NAME }} --no-verify
diff --git a/.github/workflows/twitter-together.yml b/.github/workflows/twitter-together.yml
new file mode 100644
index 000000000..5d552928a
--- /dev/null
+++ b/.github/workflows/twitter-together.yml
@@ -0,0 +1,26 @@
+on: [push, pull_request]
+name: Twitter, together!
+jobs:
+  preview:
+    name: Preview
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    steps:
+      - uses: gr2m/twitter-together@v1.x
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+  tweet:
+    name: Tweet
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
+    steps:
+      - name: checkout develop
+        uses: actions/checkout@v2
+      - name: Tweet
+        uses: gr2m/twitter-together@v1.x
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
+          TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
+          TWITTER_API_KEY: ${{ secrets.TWITTER_API_KEY }}
+          TWITTER_API_SECRET_KEY: ${{ secrets.TWITTER_API_SECRET_KEY }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 794d3cb79..55c5303d7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,6 +31,7 @@
      - [Javascript Coding style-checker](#javascript-coding-style-checker)
  - [Packaging](#packaging)
  - [Release](#release)
+    - [Nightly releases](#nightly-releases)
    - [Updating the code after a hiatus](#updating-the-code-after-a-hiatus)
 <!-- /TOC -->
@@ -63,7 +64,7 @@ v16.13.0
 npm -v
 8.1.1
 pnpm -v
-6.19.0
+6.23.6
 ```
 _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).
@@ -99,7 +100,7 @@ npm i -g windows-build-tools --vs2015
 ```bash
 git clone https://github.com/getferdi/ferdi.git
 cd ferdi
-git submodule update --init --recursive
+git submodule update --init --recursive --remote --rebase --force
 ```
 It is important you execute the last command to get the required submodules (recipes).
@@ -229,6 +230,10 @@ git push
 This will automatically trigger the build, as part of which, a new, draft release will be created [here](https://github.com/getferdi/ferdi/releases/). Once all the assets are uploaded (19 assets in total), publish the release (you will need elevated permissions in GitHub for doing this). The last commit of the `release` branch will be tagged.
+### Nightly releases
+Nightly releases are automatically triggered every day ([details](https://github.com/getferdi/ferdi/pull/990)) and available in [getferdi/ferdi](https://github.com/getferdi/ferdi/releases). Maintainers still need to verify and manually publish the draft releases as pre-releases for now.
 ### Updating the code after a hiatus
 Since we are making a lot of changes that involve restructuring the code as well as taking a hard look at the dependencies (including node versions), please remember to update them by running the appropriate command of your chosen package manager.
diff --git a/Dockerfile b/Dockerfile
index 1b8a70da2..3e02fe64c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update -y \
 WORKDIR /usr/src/ferdi
-RUN npm i -g pnpm@6.19.0
+RUN npm i -g pnpm@6.23.6
 COPY package*.json ./
diff --git a/README.md b/README.md
index 0fe3f0ae6..9f03c410e 100644
--- a/README.md
+++ b/README.md
@@ -11,76 +11,22 @@
 # Ferdi
-<p align="center">
+<p>
-<img alt="GitHub Releases" src="https://img.shields.io/github/downloads/getferdi/ferdi/latest/total?label=Downloads&logo=iCloud&logoColor=%23FFFFFF">
+<a href="https://github.com/getferdi/ferdi/actions/workflows/builds.yml"><img alt="Build Status" src="https://github.com/getferdi/ferdi/actions/workflows/builds.yml/badge.svg?branch=develop&event=push"></a>
+<a title="Crowdin" target="_blank" href="https://crowdin.com/project/getferdi"><img src="https://badges.crowdin.net/getferdi/localized.svg"></a>
+<img alt="GitHub Releases" src="https://img.shields.io/github/downloads/getferdi/ferdi/latest/total?label=downloads">
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href='#contributors-'><img src='https://img.shields.io/badge/contributors-112-default.svg?logo=github' alt='Contributors'/></a>
+<a href='#contributors-'><img src='https://img.shields.io/badge/contributors-115-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>
-<a href="https://github.com/getferdi/ferdi/actions/workflows/ferdi-builds.yml"><img alt="Build Status" src="https://github.com/getferdi/ferdi/actions/workflows/ferdi-builds.yml/badge.svg?branch=develop&event=push"></a>
 <a href="https://gitter.im/getferdi/community"><img alt="Gitter Chat Room" src="https://img.shields.io/gitter/room/getferdi/community"></a>
-<a href="https://chat.stackoverflow.com/rooms/237341/ferdi"><img alt="Stackoverflow Chat Room" src="https://img.shields.io/badge/stackoverflow--chat-ferdi-blue"></a>
 </p>
-🤴🏽 Hard-fork of [Franz](https://github.com/meetfranz/franz), adding awesome features and removing unwanted ones.
+> 🤴🏽 Hard-fork of [Franz](https://github.com/meetfranz/franz), adding awesome features and removing unwanted ones.
-## Table of contents
-<details>
-<summary>Toggle navigation</summary>
- [Ferdi](#ferdi)
-  - [Table of contents](#table-of-contents)
-  - [What is Ferdi?](#what-is-ferdi)
-  - [Features](#features)
-  - [What does Ferdi look like?](#what-does-ferdi-look-like)
-  - [How to get and start using Ferdi](#how-to-get-and-start-using-ferdi)
-    - [Download Ferdi](#download-ferdi)
-    - [Or use Chocolatey (Windows only)](#or-use-chocolatey-windows-only)
-    - [Or use Windows Package Manager (Windows only)](#or-use-windows-package-manager-windows-only)
-    - [Or use homebrew (macOS or Linux)](#or-use-homebrew-macos-or-linux)
-    - [Or use snap (Linux only)](#or-use-snap-linux-only)
-    - [Or use AUR (Arch Linux)](#or-use-aur-arch-linux)
-  - [What makes Ferdi different from Franz?](#what-makes-ferdi-different-from-franz)
-    - [Removes unproductive paywalls and other other interruptions](#removes-unproductive-paywalls-and-other-other-interruptions)
-    - [Adds features to increase your productivity](#adds-features-to-increase-your-productivity)
-    - [Adds features to improve your privacy](#adds-features-to-improve-your-privacy)
-    - [Adds features to improve your experience using Ferdi](#adds-features-to-improve-your-experience-using-ferdi)
-    - [Fixes bugs](#fixes-bugs)
-    - [Adds new platforms](#adds-new-platforms)
-    - [Adds internal changes](#adds-internal-changes)
-  - [Contributing to Ferdi's development](#contributing-to-ferdis-development)
-  - [Nightly releases](#nightly-releases)
-  - [Troubleshooting recipes (self-help)](#troubleshooting-recipes-self-help)
-  - [Contributors ✨](#contributors-)
-  - [Backers via OpenCollective](#backers-via-opencollective)
-  - [Sponsors via OpenCollective](#sponsors-via-opencollective)
-  - [Other Sponsors](#other-sponsors)
-  </details>
-## What is Ferdi?
 Ferdi is a desktop app that helps you organize how you use your favourite apps by combining them into one application. It is based on Franz - a software already used by thousands of people - with the difference that Ferdi gives you many additional features and doesn't restrict its usage! Furthermore, Ferdi is compatible with your existing Franz account, so you can continue right where you left off. Please find out more about Ferdi and its features on [getferdi.com](https://getferdi.com).
-## Features
+## Screenshots
- [x] Ferdi puts all your web apps into one place
- [x] Native support for 189 services
- [x] Workspaces to keep your personal and work life separated
- [x] Support for multiple accounts on any service
- [x] Dark Mode support for all of your services
- [x] Optional cloud sync to keep your services synchronized between devices
- [x] Better control over when you get which notifications
- [x] Cross-platform so you can view your services on all your computers
- [x] Full proxy support to work in every network environment
- [x] Ferdi speaks your language: Support for 20+ languages
-...and best of all:
- [x] Its completely free! There are no restrictions on features, no paywalls, no ads
-## What does Ferdi look like?
 <details>
 <summary>Toggle screenshots</summary>
@@ -96,49 +42,18 @@ Ferdi is a desktop app that helps you organize how you use your favourite apps b
 </p>
 </details>
-## How to get and start using Ferdi
+## Download
-### Download Ferdi
-You can download Ferdi for Windows, Mac and Linux on [Ferdi's download page](https://getferdi.com/download) or you can find all variants in the [latest stable release](https://github.com/getferdi/ferdi/releases/latest) assets and [all the other releases here](https://github.com/getferdi/ferdi/releases).
-### Or use Chocolatey (Windows only)
-`$ choco install ferdi`
-(Don't know Chocolatey? [chocolatey.org](https://chocolatey.org/))
-### Or use Windows Package Manager (Windows only)
-`$ winget install --id AmineMouafik.Ferdi`
-(Don't know winget? [winget-cli](https://github.com/microsoft/winget-cli/))
-### Or use homebrew (macOS or Linux)
-`$ brew install --cask ferdi`
-(Don't know homebrew? [brew.sh](https://brew.sh/))
-### Or use snap (Linux only)
+👉 [getferdi.com/download](https://getferdi.com/download/)
-`$ snap install ferdi`
+Assets made available via [GitHub releases](https://github.com/getferdi/ferdi/releases/latest).
-You can find published releases as `stable`, `beta` and `nightly` channels on [snapcraft.io](https://snapcraft.io/ferdi).
+## What makes Ferdi different from Franz?
-(Don't know snap? [snapcraft.io](https://snapcraft.io/))
-### Or use AUR (Arch Linux)
-Ferdi has three separate AUR packages you can use:
- **[ferdi](https://aur.archlinux.org/packages/ferdi/)**: Uses your system electron version to run the latest release - this version will work best on most systems.
- **[ferdi-bin](https://aur.archlinux.org/packages/ferdi-bin/)**: Uses the latest Fedora release and extracts it to Arch. Use this version if you are having trouble with the `ferdi` package.
- **[ferdi-git](https://aur.archlinux.org/packages/ferdi-git/)**: Uses your system electron version to run the latest commit from the develop branch and may be unstable but may also give you features that are not yet available in other versions. Please only use `ferdi-git` if you accept these risks.
-If you use an AUR Helper, e.g. yay, install it via `yay -S ferdi`.
+_Find answers to other frequently asked questions on [getferdi.com/faq](https://getferdi.com/faq/)._
-## What makes Ferdi different from Franz?
+<details>
+<summary>Toggle answer</summary>
 ### Removes unproductive paywalls and other other interruptions
@@ -227,7 +142,7 @@ If you use an AUR Helper, e.g. yay, install it via `yay -S ferdi`.
 ### Adds internal changes
- [x] Upgrades to Electron 15.3.0
+- [x] Upgrades to Electron 15.3.2
 - [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
@@ -237,21 +152,16 @@ If you use an AUR Helper, e.g. yay, install it via `yay -S ferdi`.
 - [x] Adds retry commands to flaky build steps ([#498](https://github.com/getferdi/ferdi/issues/498))
 - [x] Runs utility scripts pre-commit instead of pre-push ([#515](https://github.com/getferdi/ferdi/issues/515))
-> Thanks to all our [contributors](#contributors-) who helped realize all these amazing features! 💖
+</details>
-## Contributing to Ferdi's development
-We welcome all contributors. Please read the [contributing guidelines](CONTRIBUTING.md) to setup your development machine and proceed.
-## Nightly releases
-Nightly releases are automatically triggered every day ([details](https://github.com/getferdi/ferdi/pull/990)) and available in [getferdi/ferdi](https://github.com/getferdi/ferdi/releases). Maintainers still need to verify and manually publish the draft releases as pre-releases for now.
+## Troubleshooting [recipes](https://github.com/getferdi/recipes)
-## Troubleshooting recipes (self-help)
+<details>
+<summary>Toggle answer</summary>
-One of the issues being raised by the awesome users of Ferdi is that certain service-functionalities do not work. As good example of this is either the unread count (badge) stops working for specific services or the gmail logins don't work anymore. (These are just 2 of the most common problems reported).
+One of the issues being raised by the users of Ferdi is that certain service-functionalities do not work. As good example of this is either the unread count (badge) stops working for specific services or the gmail logins don't work anymore. (These are just 2 of the most common problems reported).
-Since we (the contributors to Ferdi) also eat our own dog food, we use Ferdi as our day-to-day communication app - and most likely have faced the same/similar issue. As a first step before filing an issue, we request you to follow these simple steps to see if the issue gets fixed. These recipes will get automatically upgraded when you upgrade to the newer versions of Ferdi, but to get new recipes **between** Ferdi releases, this documentation is quite useful.
+Since we (the contributors to Ferdi) also eat our own food, we use Ferdi as our day-to-day communication app - and most likely have faced the same/similar issue. As a first step before filing an issue, we request you to follow these simple steps to see if the issue gets fixed. These recipes will get automatically upgraded when you upgrade to the newer versions of Ferdi, but to get new recipes **between** Ferdi releases, this documentation is quite useful.
 - Make sure you are on the latest version of Ferdi. As of this writing, since the nightly CI packaging process is broken, we request you to download the latest nightly from the link in [Nightly releases](#nightly-releases) section.
 - Stop Ferdi
@@ -269,168 +179,35 @@ Since we (the contributors to Ferdi) also eat our own dog food, we use Ferdi as
 - If this process did not fix the issue, please log a detailed bug report [here](https://github.com/getferdi/recipes/issues)
 - _Note:_ An automated process to perform these steps is being ideated and tracked [here](https://github.com/getferdi/ferdi/issues/1302)
+</details>
+## Contributing
+Please read the [contributing guidelines](CONTRIBUTING.md) to setup your development machine and proceed.
 ## Contributors ✨
-Thanks goes to these awesome people:
+Special thanks goes to these awesome people:
-<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<a href="https://github.com/getferdi/ferdi/blob/develop/.all-contributorsrc" target="_blank"><img src="https://opencollective.com/getferdi/contributors.svg?avatarHeight=42&width=890&button=off"></a>
-<!-- prettier-ignore-start -->
-<!-- markdownlint-disable -->
-<table>
-  <tr>
-    <td align="center"><a href='https://vantezzen.io' title='Bennett: code, design, doc, ideas, translation, example, bug, content, infra, userTesting, question, projectManagement, review'><img src='https://avatars2.githubusercontent.com/u/10333196?v=4' alt='vantezzen' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://twitter.com/kytwb' title='Amine Mouafik: code, design, doc, ideas, bug, content, infra, userTesting, question, projectManagement, review, maintenance, platform, fundingFinding, blog, translation'><img src='https://avatars0.githubusercontent.com/u/412895?v=4' alt='kytwb' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='http://www.adlk.io' title='Stefan Malzner: code, content, design, doc, ideas, infra, projectManagement, test, translation'><img src='https://avatars1.githubusercontent.com/u/3265004?v=4' alt='adlk' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/Makazzz' title='Makazzz: bug, code, translation, content, doc, platform'><img src='https://avatars2.githubusercontent.com/u/49844464?v=4' alt='Makazzz' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='http://seriesgt.com' title='ZeroCool: code, ideas'><img src='https://avatars3.githubusercontent.com/u/5977640?v=4' alt='ZeroCool940711' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/rseitbekov' title='rseitbekov: code'><img src='https://avatars2.githubusercontent.com/u/35684439?v=4' alt='rseitbekov' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://djangogigs.com/developers/peter-bittner/' title='Peter Bittner: ideas, bug'><img src='https://avatars2.githubusercontent.com/u/665072?v=4' alt='bittner' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/justus-saul' title='Justus Saul: bug, ideas'><img src='https://avatars1.githubusercontent.com/u/5861826?v=4' alt='justus-saul' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/igreil' title='igreil: ideas'><img src='https://avatars0.githubusercontent.com/u/17239151?v=4' alt='igreil' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='http://marcolopes.eu' title='Marco Lopes: ideas'><img src='https://avatars1.githubusercontent.com/u/431889?v=4' alt='marcolopes' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/dayzlun' title='dayzlun: bug'><img src='https://avatars3.githubusercontent.com/u/17259690?v=4' alt='dayzlun' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://twitter.com/tobigue_' title='Tobias Günther: ideas'><img src='https://avatars2.githubusercontent.com/u/1560152?v=4' alt='tobigue' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/AGCaesar' title='AGCaesar: platform'><img src='https://avatars3.githubusercontent.com/u/7844066?v=4' alt='AGCaesar' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/xthursdayx' title='xthursdayx: code, doc, infra, platform'><img src='https://avatars0.githubusercontent.com/u/18044308?v=4' alt='xthursdayx' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/Gaboris' title='Gaboris: question, bug'><img src='https://avatars2.githubusercontent.com/u/9462372?v=4' alt='Gaboris' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='http://www.cu3ed.com/' title='Ce: bug'><img src='https://avatars1.githubusercontent.com/u/61343?v=4' alt='incace' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href='http://pztrn.name/' title='Stanislav N.: bug'><img src='https://avatars1.githubusercontent.com/u/869402?v=4' alt='pztrn' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='http://www.patrickcurl.com' title='Patrick Curl: ideas'><img src='https://avatars1.githubusercontent.com/u/1470061?v=4' alt='patrickcurl' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/Stanzilla' title='Benjamin Staneck: design'><img src='https://avatars3.githubusercontent.com/u/75278?v=4' alt='Stanzilla' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/ammarmalhas' title='ammarmalhas: bug, security'><img src='https://avatars1.githubusercontent.com/u/57057209?v=4' alt='ammarmalhas' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/steliyan' title='Steliyan Stoyanov: code, ideas'><img src='https://avatars1.githubusercontent.com/u/1850292?v=4' alt='steliyan' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/brorbw' title='Bror Winther: doc'><img src='https://avatars2.githubusercontent.com/u/5909562?v=4' alt='brorbw' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://fwdekker.com/' title='Felix W. Dekker: doc'><img src='https://avatars0.githubusercontent.com/u/13442533?v=4' alt='FWDekker' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/Sauceee' title='Sauceee: design'><img src='https://avatars2.githubusercontent.com/u/17987941?v=4' alt='Sauceee' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='http://lhw.ring0.de' title='Lennart Weller: platform'><img src='https://avatars2.githubusercontent.com/u/351875?v=4' alt='lhw' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/jereksel' title='Andrzej Ressel: code'><img src='https://avatars0.githubusercontent.com/u/1307829?v=4' alt='jereksel' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://gitlab.com/dpeukert' title='Daniel Peukert: code'><img src='https://avatars2.githubusercontent.com/u/3451904?v=4' alt='dpeukert' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/Ali_Shiple' title='Ali M. Shiple: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/12895436/small/00917d09ca1b4b6d8e0ef36af07ecf6b.jpg' alt='Ali_Shiple' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/elviseras' title='elviseras: translation'><img src='https://www.gravatar.com/avatar/25c2cf0d8cb4a4141e71c3b8a2e9324f' alt='elviseras' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/J370' title='J370: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/14141203/small/7b12b5db419d8796450221c2eaaf6003.png' alt='J370' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/keunes' title='Koen: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/13018172/small/829115c606347b10218f34c637a2100c.png' alt='keunes' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/leandrogehlen' title='Leandro Gehlen: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/14099621/small/1d9503523839c310dbce0af3c226e894.jpeg' alt='leandrogehlen' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href='https://crowdin.com/profile/Matthieu42' title='Matthieu42: translation'><img src='https://www.gravatar.com/avatar/735217ccccf11ba97573deee517ddb19' alt='Matthieu42' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/nicky18013' title='Nikita Bibanaev: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/13468928/small/2b31e7ac19645d950a79b33ffd5721b8.png' alt='nicky18013' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/Tatjana1998' title='Tatjana1998: translation'><img src='https://www.gravatar.com/avatar/ade202a04fcbb2c177e4f1d9936af29e' alt='Tatjana1998' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/seayko' title='tinect: translation'><img src='https://www.gravatar.com/avatar/65e2aef738ddf828f822d8463fd04918' alt='seayko' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/Pusnow' title='Wonsup Yoon: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/13514833/small/65f0b45587cc7e34f2827830cd324b16.jpeg' alt='Pusnow' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/zutt' title='zutt: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/13320003/small/50fdf9f8c7e54a446925bd79696ea625.JPG' alt='zutt' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='http://twitter.com/noemis_exec' title='n0emis: code, translation'><img src='https://avatars3.githubusercontent.com/u/22817873?v=4' alt='n0emis' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://www.monke-agency.com/equipe.html' title='gmarec: code'><img src='https://avatars2.githubusercontent.com/u/3405028?v=4' alt='gmarec' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/127oo1' title='127oo1: translation'><img src='https://www.gravatar.com/avatar/060c722be11da16ae31902e9c98326b2' alt='127oo1' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/ChTBoner' title='ChTBoner: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/13273153/small/a810886febf5199cfa1c98644444dea7.jpeg' alt='ChTBoner' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/johanengstrand' title='Johan Engstrand: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/14152801/small/fd395f120efca971ca9b34c57fd02cca.png' alt='johanengstrand' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://mrassili.com' title='Marouane R: code'><img src='https://avatars0.githubusercontent.com/u/25288435?v=4' alt='mrassili' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/yourcontact' title='Roman: code, ideas'><img src='https://avatars2.githubusercontent.com/u/46404814?v=4' alt='yourcontact' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/mahadevans87' title='Mahadevan Sreenivasan: code, ideas, review, bug, doc, userTesting'><img src='https://avatars1.githubusercontent.com/u/1255523?v=4' alt='mahadevans87' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://jakelee.co.uk' title='Jake Lee: content'><img src='https://avatars2.githubusercontent.com/u/12380876?v=4' alt='JakeSteam' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/sampathBlam' title='Sampath Kumar Krishnan: code, review, ideas, bug, doc, userTesting'><img src='https://avatars1.githubusercontent.com/u/17728976?v=4' alt='sampathBlam' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href='https://github.com/saruwman' title='saruwman: doc, code'><img src='https://avatars2.githubusercontent.com/u/41330038?v=4' alt='saruwman' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/dorukkarinca' title='dorukkarinca: bug'><img src='https://avatars0.githubusercontent.com/u/9303867?v=4' alt='dorukkarinca' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://www.linkedin.com/in/gautamsi' title='Gautam Singh: code'><img src='https://avatars2.githubusercontent.com/u/5769869?v=4' alt='gautamsi' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://feikojoosten.com' title='Feiko Joosten: code'><img src='https://avatars0.githubusercontent.com/u/10920052?v=4' alt='FeikoJoosten' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/2bdelghafour' title='2bdelghafour: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/14219410/small/31ff20f60d352fb46e314f3c180a77b0.jpeg' alt='2bdelghafour' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/abdoutanta' title='Abderrahim Tantaoui: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/14213908/small/5b2fc8166f8a0a2b7313fbf49ee5b6b6.jpeg' alt='abdoutanta' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/AndiLeni' title='AndiLeni: translation'><img src='https://www.gravatar.com/avatar/4bd0da860de38afa735425ce2d4e10b5' alt='AndiLeni' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/brunofalmada' title='Bruno Almada: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/14200540/small/f6f1addceeeabc02488f9b08520a902f.jpeg' alt='brunofalmada' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/Catarino' title='Catarino Gonçalo: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/14208802/small/07287eb2de671257ca3d6bb4ba1cca67.jpeg' alt='Catarino' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/Alzemand' title='Edilson Alzemand Sigmaringa Junior: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/14184269/small/f5e68247f01988ae7951a282f0fd4d06.jpeg' alt='Alzemand' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/MAT-OUT' title='MAT-OUT: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/14201550/small/68dd2402bf2879bc3ca312d627710400.png' alt='MAT-OUT' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/mazzo98' title='mazzo98: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/12864917/small/69799b5fd7be2f67282715d5cdfd4ae1.png' alt='mazzo98' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/paprika-naught-tiffin-flyspeck' title='paprika-naught-tiffin-flyspeck: translation'><img src='https://www.gravatar.com/avatar/8671ebe7a7164dfa7624fbdbff69ed96' alt='paprika-naught-tiffin-flyspeck' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/patrickvalle' title='Patrick Valle: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/14217484/small/8b73f313ee79fe33625e819cdac86551.jpg' alt='patrickvalle' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/peq42' title='peq42_: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/14155811/small/b62a94dde7ec29948ec6a6af9fd24b1d.png' alt='peq42' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/karlinhos' title='Pumbinha: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/14161139/small/96450eb44c22b3141ab4401e547109b8.png' alt='karlinhos' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href='https://crowdin.com/profile/dies' title='Serhiy Dmytryshyn: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/1/small/e84bcdf6c084ffd52527931f988fb410.png' alt='dies' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/SMile61' title='SMile61: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/14177585/small/1bb4f6ba39bff3df8f579e61460ce016.png' alt='SMile61' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://crowdin.com/profile/tinect' title='tinect: translation'><img src='https://crowdin-static.downloads.crowdin.com/avatar/12521988/small/56c2041645746af9e51dd28782b828c3.jpeg' alt='tinect' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/gega7' title='gega7: bug'><img src='https://avatars0.githubusercontent.com/u/20799911?v=4' alt='gega7' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/tristanplouz' title='tristanplouz: code, ideas'><img src='https://avatars2.githubusercontent.com/u/6893466?v=4' alt='tristanplouz' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/dannyqiu' title='Danny Qiu: code, bug'><img src='https://avatars1.githubusercontent.com/u/1170755?v=4' alt='dannyqiu' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/belyazidi56' title='Youssef Belyazidi: code'><img src='https://avatars3.githubusercontent.com/u/35711540?v=4' alt='belyazidi56' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/gabspeck' title='Gabriel Speckhahn: platform'><img src='https://avatars2.githubusercontent.com/u/749488?v=4' alt='gabspeck' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/dandelionadia' title='Nadiia Ridko: code'><img src='https://avatars0.githubusercontent.com/u/33199975?v=4' alt='dandelionadia' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://hohner.dev' title='Jan Hohner: userTesting'><img src='https://avatars0.githubusercontent.com/u/649895?v=4' alt='janhohner' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://marussy.com' title='Kristóf Marussy: code, maintenance, review'><img src='https://avatars1.githubusercontent.com/u/38888?v=4' alt='kris7t' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://cl.linkedin.com/in/juanvalentinmoraruiz' title='Juan Mora: code'><img src='https://avatars0.githubusercontent.com/u/4575267?v=4' alt='raicerk' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://tofran.com' title='Francisco Marques: code'><img src='https://avatars2.githubusercontent.com/u/5692603?v=4' alt='tofran' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://digitalcoyote.github.io/NuGetDefense/' title='Curtis Carter: platform'><img src='https://avatars3.githubusercontent.com/u/16868093?v=4' alt='digitalcoyote' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/kawarimidoll' title='カワリミ人形: doc'><img src='https://avatars0.githubusercontent.com/u/8146876?v=4' alt='kawarimidoll' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://immortal-pc.info/' title='1mm0rt41PC: code'><img src='https://avatars0.githubusercontent.com/u/5358076?v=4' alt='1mm0rt41PC' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href='http://code-addict.pl' title='Michał Kostewicz: code'><img src='https://avatars.githubusercontent.com/u/6313392?v=4' alt='k0staa' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://www.linkedin.com/in/yogainformatika/' title='Yoga Setiawan: code, platform'><img src='https://avatars.githubusercontent.com/u/1139881?v=4' alt='arioki1' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/MosheGross' title='Moshe Gross: code'><img src='https://avatars.githubusercontent.com/u/77084755?v=4' alt='MosheGross' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/stnkl' title='Stephan Rumswinkel: code, bug'><img src='https://avatars.githubusercontent.com/u/17520641?v=4' alt='stnkl' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/vraravam' title='Vijay Raghavan Aravamudhan: maintenance, doc, code, mentoring, review, infra, ideas, bug, content, userTesting, projectManagement'><img src='https://avatars.githubusercontent.com/u/69629?v=4' alt='vraravam' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://dustin.meecolabs.eu/' title='Dustin: design'><img src='https://avatars.githubusercontent.com/u/124467?v=4' alt='alopix' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/jakobsudau' title='Jakob Felix Julius Sudau: design'><img src='https://avatars.githubusercontent.com/u/721715?v=4' alt='jakobsudau' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://prasans.info' title='Prasanna: code'><img src='https://avatars.githubusercontent.com/u/380340?v=4' alt='prasann' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/markandan' title='Markandan R: code'><img src='https://avatars.githubusercontent.com/u/7975763?v=4' alt='markandan' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://markushatvan.com' title='Markus Hatvan: code, ideas, design, review, infra'><img src='https://avatars.githubusercontent.com/u/16797721?v=4' alt='mhatvan' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://sergiu.dev/' title='Sergiu Ghitea: code'><img src='https://avatars.githubusercontent.com/u/28300158?v=4' alt='sergiughf' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/ArviTheMan' title='ArviTheMan: doc'><img src='https://avatars.githubusercontent.com/u/73516201?v=4' alt='ArviTheMan' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://bandism.net/' title='Ikko Ashimine: code'><img src='https://avatars.githubusercontent.com/u/22633385?v=4' alt='eltociear' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/madsmtm' title='Mads Marquart: translation'><img src='https://avatars.githubusercontent.com/u/10577181?v=4' alt='madsmtm' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='http://mateusz.loskot.net/' title='Mateusz Łoskot: doc'><img src='https://avatars.githubusercontent.com/u/80741?v=4' alt='mloskot' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/skoshy' title='Stefan K: doc'><img src='https://avatars.githubusercontent.com/u/369825?v=4' alt='skoshy' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href='https://github.com/graves501' title='graves501: doc'><img src='https://avatars.githubusercontent.com/u/11211125?v=4' alt='graves501' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <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>
-    <td align="center"><a href='https://github.com/Dee-Bajaj' title='Deepti: code'><img src='https://avatars.githubusercontent.com/u/66486870?v=4' alt='Dee-Bajaj' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-    <td align="center"><a href='https://github.com/DarsiSreelekha' title='DarsiSreelekha: code'><img src='https://avatars.githubusercontent.com/u/89741061?v=4' alt='DarsiSreelekha' style='border-radius:42px;width:42px;height:42px;'/></a></td>
-  </tr>
-</table>
-<!-- markdownlint-restore -->
-<!-- prettier-ignore-end -->
-<!-- ALL-CONTRIBUTORS-LIST:END -->
 This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
-## Backers via OpenCollective
+### Backers via Open Collective
-<a href="https://opencollective.com/getferdi#section-contribute" target="_blank"><img src="https://opencollective.com/getferdi/backers.svg?width=890"></a>
+<a href="https://opencollective.com/getferdi#section-contribute" target="_blank"><img src="https://opencollective.com/getferdi/backers.svg?avatarHeight=42&width=890"></a>
 Mention to the individuals backing us via [GitHub Sponsors](https://github.com/sponsors/getferdi) as well.
-## Sponsors via OpenCollective
+### Sponsors
-<a href="https://opencollective.com/getferdi#section-contribute" target="_blank"><img src="https://opencollective.com/getferdi/sponsors.svg?width=890"></a>
-## Other Sponsors
 <p>
  <a href="https://www.digitalocean.com/">
-    <img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/SVG/DO_Logo_horizontal_blue.svg" width="201px">
+    <img src="https://getferdi.com/wp-content/uploads/sites/4/2021/09/digitalocean-logo-vector-1-1.svg" height="32px">
  </a>
 </p>
 <p>
  <a href="https://www.parallels.com/">
-    <img src="https://user-images.githubusercontent.com/412895/87706297-3025e380-c797-11ea-94c4-bf8414b0b5ab.png" height="32px">
+    <img src="https://getferdi.com/wp-content/uploads/sites/4/2021/12/Parallels_logo.svg" height="30px">
  </a>
 </p>
diff --git a/branding/Ferdi.svg b/branding/Ferdi.svg
new file mode 100644
index 000000000..bb6e47939
--- /dev/null
+++ b/branding/Ferdi.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 1000 1000" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="Logo" transform="matrix(13.3662,0,0,13.3662,20.0535,18.5803)">
+        <g id="Lower-beard" serif:id="Lower beard" transform="matrix(0.0748156,0,0,0.0748156,-1.50032,-1.39009)">
+            <path d="M503.642,629.673C527.496,629.947 576.943,631.918 581,640C594.482,666.859 531.448,825.299 503.284,841.639L503.282,843C502.598,843 501.881,842.874 501.133,842.629C500.391,842.874 499.679,843 499,843L498.998,841.659C470.575,825.433 406.168,666.87 419.745,640C423.831,631.913 474.528,629.944 498.642,629.673L498.642,629.638C499.424,629.64 500.255,629.644 501.132,629.65C502.017,629.644 502.855,629.64 503.642,629.638L503.642,629.673Z" style="fill:white;"/>
+        </g>
+        <g id="Upper-beard" serif:id="Upper beard" transform="matrix(0.0748156,0,0,0.0748156,-1.50032,-1.39009)">
+            <path d="M498.733,357.203C547.473,355.78 574.716,313.221 627.233,336.042C700.337,367.808 723.258,456.308 806.959,474.341C838.428,481.121 857.323,456.253 877.092,437.581C883.524,431.506 893.049,418.562 896.807,419.813C900.441,421.022 900.267,433.842 898.85,440.69C896.129,453.836 892.451,467.441 884.685,478.393C874.137,493.269 860.132,505.776 845.238,516.299C802.136,546.753 740.569,558.817 688.631,557.703C652.806,556.934 612.989,546.685 579.942,534.342C549.791,523.08 533.28,483.381 498.234,482.887C463.111,483.381 446.563,523.08 416.345,534.342C383.226,546.685 343.32,556.934 307.416,557.703C255.363,558.817 193.659,546.753 150.461,516.299C135.535,505.776 121.498,493.269 110.927,478.393C103.144,467.441 99.458,453.836 96.731,440.69C95.311,433.842 95.136,421.022 98.778,419.813C102.545,418.562 112.091,431.506 118.537,437.581C138.35,456.253 157.286,481.121 188.826,474.341C272.712,456.308 295.684,367.808 368.949,336.042C421.583,313.221 449.854,355.78 498.733,357.203Z" style="fill:rgb(254,254,254);fill-rule:nonzero;"/>
+        </g>
+    </g>
+</svg>
diff --git a/docs/example-feature/actions.js b/docs/example-feature/actions.js
deleted file mode 100644
index c4d49b708..000000000
--- a/docs/example-feature/actions.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import PropTypes from 'prop-types';
-import { createActionsFromDefinitions } from '../../src/actions/lib/actions';
-export const exampleFeatureActions = createActionsFromDefinitions({
-  greet: {
-    name: PropTypes.string.isRequired,
-  },
-}, PropTypes.checkPropTypes);
-export default exampleFeatureActions;
diff --git a/docs/example-feature/api.js b/docs/example-feature/api.js
deleted file mode 100644
index d9c769c91..000000000
--- a/docs/example-feature/api.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-  async getName() {
-    return Promise.resolve('Ferdi');
-  },
-};
diff --git a/docs/example-feature/state.js b/docs/example-feature/state.js
deleted file mode 100644
index 676717da7..000000000
--- a/docs/example-feature/state.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { observable } from 'mobx';
-const defaultState = {
-  name: null,
-  isFeatureActive: false,
-};
-export const exampleFeatureState = observable(defaultState);
-export function resetState() {
-  Object.assign(exampleFeatureState, defaultState);
-}
-export default exampleFeatureState;
diff --git a/docs/example-feature/store.js b/docs/example-feature/store.js
deleted file mode 100644
index 9fc86de36..000000000
--- a/docs/example-feature/store.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { action, observable, reaction } from 'mobx';
-import Store from '../../src/stores/lib/Store';
-import Request from '../../src/stores/lib/Request';
-const debug = require('debug')('Ferdi:feature:EXAMPLE_FEATURE:store');
-export class ExampleFeatureStore extends Store {
-  @observable getNameRequest = new Request(this.api, 'getName');
-  constructor(stores, api, actions, state) {
-    super(stores, api, actions);
-    this.state = state;
-  }
-  setup() {
-    debug('fetching name from api');
-    this.getNameRequest.execute();
-    // Update the name on the state when the request resolved
-    reaction(
-      () => (
-        this.getNameRequest.result
-      ),
-      (name) => {
-        this._setName(name);
-      },
-    );
-  }
-  @action _setName = (name) => {
-    debug('setting name', name);
-    this.state.name = name;
-  };
-}
-export default ExampleFeatureStore;
diff --git a/package-lock.json b/package-lock.json
index be4610c33..d3f079ae7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "ferdi",
-  "version": "5.6.3",
+  "version": "5.6.4-nightly.34",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "ferdi",
-      "version": "5.6.3",
+      "version": "5.6.4-nightly.34",
      "license": "Apache-2.0",
      "dependencies": {
        "@adonisjs/ace": "^5.0.8",
@@ -29,6 +29,7 @@
        "auto-launch": "^5.0.5",
        "btoa": "^1.2.1",
        "classnames": "^2.3.1",
+        "cld": "^2.7.1",
        "color": "^4.0.1",
        "csstype": "^3.0.9",
        "darkreader": "^4.9.39",
@@ -38,7 +39,7 @@
        "electron-fetch": "^1.7.4",
        "electron-find": "^1.0.7",
        "electron-react-titlebar": "^1.1.0",
-        "electron-updater": "^4.3.9",
+        "electron-updater": "^4.6.2",
        "electron-window-state": "^5.0.3",
        "fast-folder-size": "^1.5.0",
        "fs-extra": "^10.0.0",
@@ -50,8 +51,8 @@
        "minimist": "^1.2.5",
        "mobx": "^5.15.0",
        "mobx-localstorage": "^1.2.0",
-        "mobx-react": "^5.4.2",
+        "mobx-react": "^6.3.1",
-        "mobx-react-form": "1.35.1",
+        "mobx-react-form": "^2.0.9",
        "mobx-react-router": "^3.1.2",
        "moment": "^2.29.1",
        "ms": "^2.1.3",
@@ -67,7 +68,7 @@
        "react-dropzone": "^11.4.2",
        "react-electron-web-view": "^2.0.1",
        "react-intl": "^5.21.0",
-        "react-jss": "^8.6.1",
+        "react-jss": "^10.8.2",
        "react-loader": "^2.4.7",
        "react-modal": "^3.14.3",
        "react-router": "^3.2.6",
@@ -84,14 +85,14 @@
        "ws": "^8.2.3"
      },
      "devDependencies": {
-        "@babel/eslint-parser": "^7.16.0",
+        "@babel/eslint-parser": "^7.16.3",
        "@babel/plugin-proposal-class-properties": "^7.14.5",
        "@babel/plugin-proposal-decorators": "^7.16.0",
        "@babel/preset-env": "^7.16.0",
        "@babel/preset-react": "^7.14.5",
        "@babel/register": "^7.15.3",
-        "@commitlint/cli": "^14.1.0",
+        "@commitlint/cli": "^15.0.0",
-        "@commitlint/config-conventional": "^14.1.0",
+        "@commitlint/config-conventional": "^15.0.0",
        "@formatjs/cli": "^4.4.0",
        "@types/color": "^3.0.2",
        "@types/expect.js": "^0.3.29",
@@ -107,8 +108,8 @@
        "@types/tar": "^6.1.0",
        "@types/uuid": "^8.3.1",
        "@types/validator": "^13.6.4",
-        "@typescript-eslint/eslint-plugin": "^5.1.0",
+        "@typescript-eslint/eslint-plugin": "^5.3.1",
-        "@typescript-eslint/parser": "^5.1.0",
+        "@typescript-eslint/parser": "^5.3.1",
        "all-contributors-cli": "^6.20.0",
        "babel-plugin-formatjs": "^10.3.11",
        "commitizen": "^4.2.4",
@@ -116,20 +117,20 @@
        "cross-env": "^7.0.3",
        "cz-conventional-changelog": "^3.3.0",
        "dotenv": "^10.0.0",
-        "electron": "15.3.0",
+        "electron": "15.3.3",
-        "electron-builder": "22.14.5",
+        "electron-builder": "22.14.10",
        "electron-notarize": "^1.1.1",
-        "eslint": "^8.1.0",
+        "eslint": "^8.2.0",
-        "eslint-config-airbnb": "^18.2.1",
+        "eslint-config-airbnb": "^19.0.0",
-        "eslint-config-airbnb-typescript": "^14.0.1",
+        "eslint-config-airbnb-typescript": "^16.0.0",
        "eslint-config-prettier": "^8.3.0",
-        "eslint-plugin-import": "^2.25.2",
+        "eslint-plugin-import": "^2.25.3",
-        "eslint-plugin-jest": "^25.2.2",
+        "eslint-plugin-jest": "^25.2.4",
-        "eslint-plugin-jsx-a11y": "^6.4.1",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
        "eslint-plugin-prettier": "^4.0.0",
-        "eslint-plugin-react": "^7.26.1",
+        "eslint-plugin-react": "^7.27.0",
-        "eslint-plugin-react-hooks": "^4.2.0",
+        "eslint-plugin-react-hooks": "^4.3.0",
-        "eslint-plugin-unicorn": "^37.0.1",
+        "eslint-plugin-unicorn": "^39.0.0",
        "expect.js": "^0.3.1",
        "gulp": "^4.0.2",
        "gulp-babel": "^8.0.0",
@@ -159,7 +160,7 @@
        "ts-loader": "^5.4.5",
        "ts-mocha": "^8.0.0",
        "ts-node": "^10.2.1",
-        "typescript": "4.2.4",
+        "typescript": "4.5.2",
        "wait-on": "^6.0.0",
        "webpack": "^4.46.0",
        "webpack-cli": "^3.3.12",
@@ -170,8 +171,7 @@
        "npm": "^8.1.0"
      },
      "optionalDependencies": {
-        "cld": "^2.7.0",
+        "node-mac-permissions": "git@github.com:vraravam/node-mac-permissions.git#3cffec37379e6584627d831611a8ff12b57bbcdb"
-        "node-mac-permissions": "^2.2.0"
      }
    },
    "node_modules/@adonisjs/ace": {
@@ -486,29 +486,29 @@
      }
    },
    "node_modules/@babel/compat-data": {
-      "version": "7.16.0",
+      "version": "7.16.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz",
-      "integrity": "sha512-DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew==",
+      "integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==",
      "dev": true,
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/core": {
-      "version": "7.15.8",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.0.tgz",
-      "integrity": "sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==",
+      "integrity": "sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==",
-      "dev": true,
+      "dev": true,
-      "dependencies": {
+      "dependencies": {
-        "@babel/code-frame": "^7.15.8",
+        "@babel/code-frame": "^7.16.0",
-        "@babel/generator": "^7.15.8",
+        "@babel/generator": "^7.16.0",
-        "@babel/helper-compilation-targets": "^7.15.4",
+        "@babel/helper-compilation-targets": "^7.16.0",
-        "@babel/helper-module-transforms": "^7.15.8",
+        "@babel/helper-module-transforms": "^7.16.0",
-        "@babel/helpers": "^7.15.4",
+        "@babel/helpers": "^7.16.0",
-        "@babel/parser": "^7.15.8",
+        "@babel/parser": "^7.16.0",
-        "@babel/template": "^7.15.4",
+        "@babel/template": "^7.16.0",
-        "@babel/traverse": "^7.15.4",
+        "@babel/traverse": "^7.16.0",
-        "@babel/types": "^7.15.6",
+        "@babel/types": "^7.16.0",
        "convert-source-map": "^1.7.0",
        "debug": "^4.1.0",
        "gensync": "^1.0.0-beta.2",
@@ -534,9 +534,9 @@
      }
    },
    "node_modules/@babel/eslint-parser": {
-      "version": "7.16.0",
+      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.16.3.tgz",
-      "integrity": "sha512-c+AsYOHjI+FgCa+ifLd8sDXp4U4mjkfFgL9NdQWhuA731kAUJs0WdJIXET4A14EJAR9Jv9FFF/MzPWJfV9Oirw==",
+      "integrity": "sha512-iB4ElZT0jAt7PKVaeVulOECdGe6UnmA/O0P9jlF5g5GBOwDVbna8AXhHRu4s27xQf6OkveyA8iTDv1jHdDejgQ==",
      "dev": true,
      "dependencies": {
        "eslint-scope": "^5.1.1",
@@ -600,14 +600,14 @@
      }
    },
    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.16.0",
+      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz",
-      "integrity": "sha512-S7iaOT1SYlqK0sQaCi21RX4+13hmdmnxIEAnQUB/eh7GeAnRjOUgTYpLkUOiRXzD+yog1JxP0qyAQZ7ZxVxLVg==",
+      "integrity": "sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==",
      "dev": true,
      "dependencies": {
        "@babel/compat-data": "^7.16.0",
        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.17.5",
        "semver": "^6.3.0"
      },
      "engines": {
@@ -663,9 +663,9 @@
      }
    },
    "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.2.4",
+      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz",
-      "integrity": "sha512-OrpPZ97s+aPi6h2n1OXzdhVis1SGSsMU2aMHgLcOKfsp4/v1NWpx3CWT3lBj5eeBq9cDkPkh+YCfdF7O12uNDQ==",
+      "integrity": "sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg==",
      "dev": true,
      "dependencies": {
        "@babel/helper-compilation-targets": "^7.13.0",
@@ -805,9 +805,9 @@
      }
    },
    "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.16.0",
+      "version": "7.16.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.4.tgz",
-      "integrity": "sha512-MLM1IOMe9aQBqMWxcRw8dcb9jlM86NIw7KA0Wri91Xkfied+dE0QuBFSBjMNvqzmS0OSIDsMNC24dBEkPUi7ew==",
+      "integrity": "sha512-vGERmmhR+s7eH5Y/cp8PCVzj4XEjerq8jooMfxFdA5xVtAk9Sh4AQsrWgiErUEBjtGrBtOFKDUcWQFW4/dFwMA==",
      "dev": true,
      "dependencies": {
        "@babel/helper-annotate-as-pure": "^7.16.0",
@@ -903,14 +903,14 @@
      }
    },
    "node_modules/@babel/helpers": {
-      "version": "7.15.4",
+      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.3.tgz",
-      "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==",
+      "integrity": "sha512-Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w==",
      "dev": true,
      "dependencies": {
-        "@babel/template": "^7.15.4",
+        "@babel/template": "^7.16.0",
-        "@babel/traverse": "^7.15.4",
+        "@babel/traverse": "^7.16.3",
-        "@babel/types": "^7.15.4"
+        "@babel/types": "^7.16.0"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -931,9 +931,9 @@
      }
    },
    "node_modules/@babel/parser": {
-      "version": "7.16.2",
+      "version": "7.16.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.2.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz",
-      "integrity": "sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw==",
+      "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==",
      "dev": true,
      "bin": {
        "parser": "bin/babel-parser.js"
@@ -975,13 +975,13 @@
      }
    },
    "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.16.0",
+      "version": "7.16.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.4.tgz",
-      "integrity": "sha512-nyYmIo7ZqKsY6P4lnVmBlxp9B3a96CscbLotlsNuktMHahkDwoPYEjXrZHU0Tj844Z9f1IthVxQln57mhkcExw==",
+      "integrity": "sha512-/CUekqaAaZCQHleSK/9HajvcD/zdnJiKRiuUFq8ITE+0HsPzquf53cpFiqAwl/UfmJbR6n5uGPQSPdrmKOvHHg==",
      "dev": true,
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.16.0",
+        "@babel/helper-remap-async-to-generator": "^7.16.4",
        "@babel/plugin-syntax-async-generators": "^7.8.4"
      },
      "engines": {
@@ -1025,9 +1025,9 @@
      }
    },
    "node_modules/@babel/plugin-proposal-decorators": {
-      "version": "7.16.0",
+      "version": "7.16.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.16.4.tgz",
-      "integrity": "sha512-ttvhKuVnQwoNQrcTd1oe6o49ahaZ1kns1fsJKzTVOaS/FJDJoK4qzgVS68xzJhYUMgTnbXW6z/T6rlP3lL7tJw==",
+      "integrity": "sha512-RESBNX16eNqnBeEVR5sCJpnW0mHiNLNNvGA8PrRuK/4ZJ4TO+6bHleRUuGQYDERVySOKtOhSya/C4MIhwAMAgg==",
      "dev": true,
      "dependencies": {
        "@babel/helper-create-class-features-plugin": "^7.16.0",
@@ -1354,9 +1354,9 @@
      }
    },
    "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.14.5",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.0.tgz",
-      "integrity": "sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==",
+      "integrity": "sha512-8zv2+xiPHwly31RK4RmnEYY5zziuF3O7W2kIDW+07ewWDh6Oi0dRq8kwvulRkFgt6DB97RlKs5c1y068iPlCUg==",
      "dev": true,
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.14.5"
@@ -1471,9 +1471,9 @@
      }
    },
    "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.14.5",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.0.tgz",
-      "integrity": "sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==",
+      "integrity": "sha512-Xv6mEXqVdaqCBfJFyeab0fH2DnUoMsDmhamxsSi4j8nLd4Vtw213WMJr55xxqipC/YVWyPY3K0blJncPYji+dQ==",
      "dev": true,
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.14.5"
@@ -1823,9 +1823,9 @@
      }
    },
    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.16.0",
+      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.3.tgz",
-      "integrity": "sha512-XgnQEm1CevKROPx+udOi/8f8TiGhrUWiHiaUCIp47tE0tpFDjzXNTZc9E5CmCwxNjXTWEVqvRfWZYOTFvMa/ZQ==",
+      "integrity": "sha512-3MaDpJrOXT1MZ/WCmkOFo7EtmVVC8H4EUZVrHvFOsmwkk4lOjQj8rzv8JKUZV4YoQKeoIgk07GO+acPU9IMu/w==",
      "dev": true,
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.14.5"
@@ -1853,9 +1853,9 @@
      }
    },
    "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.15.1",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.15.1.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.0.tgz",
-      "integrity": "sha512-yQZ/i/pUCJAHI/LbtZr413S3VT26qNrEm0M5RRxQJA947/YNYwbZbBaXGDrq6CG5QsZycI1VIP6d7pQaBfP+8Q==",
+      "integrity": "sha512-FJFdJAqaCpndL+pIf0aeD/qlQwT7QXOvR6Cc8JPvNhKJBi2zc/DPc4g05Y3fbD/0iWAMQFGij4+Xw+4L/BMpTg==",
      "dev": true,
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.14.5"
@@ -1868,16 +1868,16 @@
      }
    },
    "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.14.9",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.0.tgz",
-      "integrity": "sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==",
+      "integrity": "sha512-rqDgIbukZ44pqq7NIRPGPGNklshPkvlmvqjdx3OZcGPk4zGIenYkxDTvl3LsSL8gqcc3ZzGmXPE6hR/u/voNOw==",
      "dev": true,
      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-annotate-as-pure": "^7.16.0",
-        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-module-imports": "^7.16.0",
        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-jsx": "^7.14.5",
+        "@babel/plugin-syntax-jsx": "^7.16.0",
-        "@babel/types": "^7.14.9"
+        "@babel/types": "^7.16.0"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -1887,12 +1887,12 @@
      }
    },
    "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.14.5",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.0.tgz",
-      "integrity": "sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ==",
+      "integrity": "sha512-qq65iSqBRq0Hr3wq57YG2AmW0H6wgTnIzpffTphrUWUgLCOK+zf1f7G0vuOiXrp7dU1qq+fQBoqZ3wCDAkhFzw==",
      "dev": true,
      "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.14.5"
+        "@babel/plugin-transform-react-jsx": "^7.16.0"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -1902,12 +1902,12 @@
      }
    },
    "node_modules/@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.14.5",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.0.tgz",
-      "integrity": "sha512-3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g==",
+      "integrity": "sha512-NC/Bj2MG+t8Ef5Pdpo34Ay74X4Rt804h5y81PwOpfPtmAK3i6CizmQqwyBQzIepz1Yt8wNr2Z2L7Lu3qBMfZMA==",
      "dev": true,
      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-annotate-as-pure": "^7.16.0",
        "@babel/helper-plugin-utils": "^7.14.5"
      },
      "engines": {
@@ -2055,18 +2055,18 @@
      }
    },
    "node_modules/@babel/preset-env": {
-      "version": "7.16.0",
+      "version": "7.16.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.4.tgz",
-      "integrity": "sha512-cdTu/W0IrviamtnZiTfixPfIncr2M1VqRrkjzZWlr1B4TVYimCFK5jkyOdP4qw2MrlKHi+b3ORj6x8GoCew8Dg==",
+      "integrity": "sha512-v0QtNd81v/xKj4gNKeuAerQ/azeNn/G1B1qMLeXOcV8+4TWlD2j3NV1u8q29SDFBXx/NBq5kyEAO+0mpRgacjA==",
      "dev": true,
      "dependencies": {
-        "@babel/compat-data": "^7.16.0",
+        "@babel/compat-data": "^7.16.4",
-        "@babel/helper-compilation-targets": "^7.16.0",
+        "@babel/helper-compilation-targets": "^7.16.3",
        "@babel/helper-plugin-utils": "^7.14.5",
        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.0",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.2",
        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.0",
-        "@babel/plugin-proposal-async-generator-functions": "^7.16.0",
+        "@babel/plugin-proposal-async-generator-functions": "^7.16.4",
        "@babel/plugin-proposal-class-properties": "^7.16.0",
        "@babel/plugin-proposal-class-static-block": "^7.16.0",
        "@babel/plugin-proposal-dynamic-import": "^7.16.0",
@@ -2116,7 +2116,7 @@
        "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.0",
        "@babel/plugin-transform-new-target": "^7.16.0",
        "@babel/plugin-transform-object-super": "^7.16.0",
-        "@babel/plugin-transform-parameters": "^7.16.0",
+        "@babel/plugin-transform-parameters": "^7.16.3",
        "@babel/plugin-transform-property-literals": "^7.16.0",
        "@babel/plugin-transform-regenerator": "^7.16.0",
        "@babel/plugin-transform-reserved-words": "^7.16.0",
@@ -2129,10 +2129,10 @@
        "@babel/plugin-transform-unicode-regex": "^7.16.0",
        "@babel/preset-modules": "^0.1.5",
        "@babel/types": "^7.16.0",
-        "babel-plugin-polyfill-corejs2": "^0.2.3",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.4.0",
-        "babel-plugin-polyfill-regenerator": "^0.2.3",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "core-js-compat": "^3.19.0",
+        "core-js-compat": "^3.19.1",
        "semver": "^6.3.0"
      },
      "engines": {
@@ -2168,17 +2168,17 @@
      }
    },
    "node_modules/@babel/preset-react": {
-      "version": "7.14.5",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.16.0.tgz",
-      "integrity": "sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ==",
+      "integrity": "sha512-d31IFW2bLRB28uL1WoElyro8RH5l6531XfxMtCeCmp6RVAF1uTfxxUA0LH1tXl+psZdwfmIbwoG4U5VwgbhtLw==",
      "dev": true,
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.14.5",
        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-transform-react-display-name": "^7.14.5",
+        "@babel/plugin-transform-react-display-name": "^7.16.0",
-        "@babel/plugin-transform-react-jsx": "^7.14.5",
+        "@babel/plugin-transform-react-jsx": "^7.16.0",
-        "@babel/plugin-transform-react-jsx-development": "^7.14.5",
+        "@babel/plugin-transform-react-jsx-development": "^7.16.0",
-        "@babel/plugin-transform-react-pure-annotations": "^7.14.5"
+        "@babel/plugin-transform-react-pure-annotations": "^7.16.0"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -2188,9 +2188,9 @@
      }
    },
    "node_modules/@babel/register": {
-      "version": "7.15.3",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.15.3.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.16.0.tgz",
-      "integrity": "sha512-mj4IY1ZJkorClxKTImccn4T81+UKTo4Ux0+OFSV9hME1ooqS9UV+pJ6BjD0qXPK4T3XW/KNa79XByjeEMZz+fw==",
+      "integrity": "sha512-lzl4yfs0zVXnooeLE0AAfYaT7F3SPA8yB2Bj4W1BiZwLbMS3MZH35ZvCWSRHvneUugwuM+Wsnrj7h0F7UmU3NQ==",
      "dev": true,
      "dependencies": {
        "clone-deep": "^4.0.1",
@@ -2207,9 +2207,9 @@
      }
    },
    "node_modules/@babel/runtime": {
-      "version": "7.15.4",
+      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
-      "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+      "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
      "dependencies": {
        "regenerator-runtime": "^0.13.4"
      },
@@ -2218,12 +2218,12 @@
      }
    },
    "node_modules/@babel/runtime-corejs3": {
-      "version": "7.15.4",
+      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.16.3.tgz",
-      "integrity": "sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg==",
+      "integrity": "sha512-IAdDC7T0+wEB4y2gbIL0uOXEYpiZEeuFUTVbdGq+UwCcF35T/tS8KrmMomEwEc5wBbyfH3PJVpTSUqrhPDXFcQ==",
      "dev": true,
      "dependencies": {
-        "core-js-pure": "^3.16.0",
+        "core-js-pure": "^3.19.0",
        "regenerator-runtime": "^0.13.4"
      },
      "engines": {
@@ -2245,9 +2245,9 @@
      }
    },
    "node_modules/@babel/traverse": {
-      "version": "7.16.0",
+      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.3.tgz",
-      "integrity": "sha512-qQ84jIs1aRQxaGaxSysII9TuDaguZ5yVrEuC0BN2vcPlalwfLovVmCjbFDPECPXcYM/wLvNFfp8uDOliLxIoUQ==",
+      "integrity": "sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==",
      "dev": true,
      "dependencies": {
        "@babel/code-frame": "^7.16.0",
@@ -2255,7 +2255,7 @@
        "@babel/helper-function-name": "^7.16.0",
        "@babel/helper-hoist-variables": "^7.16.0",
        "@babel/helper-split-export-declaration": "^7.16.0",
-        "@babel/parser": "^7.16.0",
+        "@babel/parser": "^7.16.3",
        "@babel/types": "^7.16.0",
        "debug": "^4.1.0",
        "globals": "^11.1.0"
@@ -2284,16 +2284,16 @@
      "dev": true
    },
    "node_modules/@commitlint/cli": {
-      "version": "14.1.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-14.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-15.0.0.tgz",
-      "integrity": "sha512-Orq62jkl9qAGvjFqhehtAqjGY/duJ8hIRPPIHmGR2jIB96D4VTmazS3ZvqJz2Q9kKr61mLAk/171zm0FVzQCYA==",
+      "integrity": "sha512-Y5xmDCweytqzo4N4lOI2YRiuX35xTjcs8n5hUceBH8eyK0YbwtgWX50BJOH2XbkwEmII9blNhlBog6AdQsqicg==",
      "dev": true,
      "dependencies": {
-        "@commitlint/format": "^14.1.0",
+        "@commitlint/format": "^15.0.0",
-        "@commitlint/lint": "^14.1.0",
+        "@commitlint/lint": "^15.0.0",
-        "@commitlint/load": "^14.1.0",
+        "@commitlint/load": "^15.0.0",
-        "@commitlint/read": "^14.0.0",
+        "@commitlint/read": "^15.0.0",
-        "@commitlint/types": "^14.0.0",
+        "@commitlint/types": "^15.0.0",
        "lodash": "^4.17.19",
        "resolve-from": "5.0.0",
        "resolve-global": "1.0.0",
@@ -2307,9 +2307,9 @@
      }
    },
    "node_modules/@commitlint/config-conventional": {
-      "version": "14.1.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-14.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-15.0.0.tgz",
-      "integrity": "sha512-JuhCqkEv8jyqmd54EpXPsQFpYc/8k7sfP1UziRdEvZSJUCLxz+8Pk4cNS0oF1BtjaWO7ITgXPlIZg47PyApGmg==",
+      "integrity": "sha512-eZBRL8Lk3hMNHp1wUMYj0qrZQEsST1ai7KHR8J1IDD9aHgT7L2giciibuQ+Og7vxVhR5WtYDvh9xirXFVPaSkQ==",
      "dev": true,
      "dependencies": {
        "conventional-changelog-conventionalcommits": "^4.3.1"
@@ -2319,12 +2319,12 @@
      }
    },
    "node_modules/@commitlint/ensure": {
-      "version": "14.1.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-14.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-15.0.0.tgz",
-      "integrity": "sha512-xrYvFdqVepT3XA1BmSh88eKbvYKtLuQu98QLfgxVmwS99Kj3yW0sT3D7jGvNsynbIx2dhbXofDyubf/DKkpFrQ==",
+      "integrity": "sha512-7DV4iNIald3vycwaWBNGk5FbonaNzOlU8nBe5m5AgU2dIeNKuXwLm+zzJzG27j0Ho56rgz//3F6RIvmsoxY9ZA==",
      "dev": true,
      "dependencies": {
-        "@commitlint/types": "^14.0.0",
+        "@commitlint/types": "^15.0.0",
        "lodash": "^4.17.19"
      },
      "engines": {
@@ -2332,21 +2332,21 @@
      }
    },
    "node_modules/@commitlint/execute-rule": {
-      "version": "14.0.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-14.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-15.0.0.tgz",
-      "integrity": "sha512-Hh/HLpCBDlrD3Rx2x2pDBx6CU+OtVqGXh7mbFpNihAVx6B0zyZqm/vv0cdwdhfGW5OEn1BhCqHf1ZOvL/DwdWA==",
+      "integrity": "sha512-pyE4ApxjbWhb1TXz5vRiGwI2ssdMMgZbaaheZq1/7WC0xRnqnIhE1yUC1D2q20qPtvkZPstTYvMiRVtF+DvjUg==",
      "dev": true,
      "engines": {
        "node": ">=v12"
      }
    },
    "node_modules/@commitlint/format": {
-      "version": "14.1.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-14.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-15.0.0.tgz",
-      "integrity": "sha512-sF6engqqHjvxGctWRKjFs/HQeNowlpbVmmoP481b2UMQnVQnjjfXJvQsoLpaqFUvgc2sHM4L85F8BmAw+iHG1w==",
+      "integrity": "sha512-bPhAfqwRhPk92WiuY0ktEJNpRRHSCd+Eg1MdhGyL9Bl3U25E5zvuInA+dNctnzZiOBSH/37ZaD0eOKCpQE6acg==",
      "dev": true,
      "dependencies": {
-        "@commitlint/types": "^14.0.0",
+        "@commitlint/types": "^15.0.0",
        "chalk": "^4.0.0"
      },
      "engines": {
@@ -2424,12 +2424,12 @@
      }
    },
    "node_modules/@commitlint/is-ignored": {
-      "version": "14.0.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-14.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-15.0.0.tgz",
-      "integrity": "sha512-nJltYjXTa+mk+6SPe35nOZCCvt3Gh5mbDz008KQ4OPcn1GX1NG+pEgz1Kx3agDp/pc+JGnsrr5GV00gygIoloA==",
+      "integrity": "sha512-edtnkf2QZ/7e/YCJDgn1WDw9wfF1WfOitW5YEoSOb4SxjJEb/oE87kxNPZ2j8mnDMuunspcMfGHeg6fRlwaEWg==",
      "dev": true,
      "dependencies": {
-        "@commitlint/types": "^14.0.0",
+        "@commitlint/types": "^15.0.0",
        "semver": "7.3.5"
      },
      "engines": {
@@ -2437,29 +2437,29 @@
      }
    },
    "node_modules/@commitlint/lint": {
-      "version": "14.1.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-14.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-15.0.0.tgz",
-      "integrity": "sha512-CApGJEOtWU/CcuPD8HkOR1jdUYpjKutGPaeby9nSFzJhwl/UQOjxc4Nd+2g2ygsMi5l3N4j2sWQYEgccpFC3lA==",
+      "integrity": "sha512-hUi2+Im/2dJ5FBvWnodypTkg+5haCgsDzB0fyMApWLUA1IucYUAqRCQCW5em1Mhk9Crw1pd5YzFNikhIclkqCw==",
      "dev": true,
      "dependencies": {
-        "@commitlint/is-ignored": "^14.0.0",
+        "@commitlint/is-ignored": "^15.0.0",
-        "@commitlint/parse": "^14.0.0",
+        "@commitlint/parse": "^15.0.0",
-        "@commitlint/rules": "^14.1.0",
+        "@commitlint/rules": "^15.0.0",
-        "@commitlint/types": "^14.0.0"
+        "@commitlint/types": "^15.0.0"
      },
      "engines": {
        "node": ">=v12"
      }
    },
    "node_modules/@commitlint/load": {
-      "version": "14.1.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-14.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-15.0.0.tgz",
-      "integrity": "sha512-p+HbgjhkqLsnxyjOUdEYHztHCp8n2oLVUJTmRPuP5FXLNevh6Gwmxf+NYC2J0sgD084aV2CFi3qu1W4yHWIknA==",
+      "integrity": "sha512-Ak1YPeOhvxmY3ioe0o6m1yLGvUAYb4BdfGgShU8jiTCmU3Mnmms0Xh/kfQz8AybhezCC3AmVTyBLaBZxOHR8kg==",
      "dev": true,
      "dependencies": {
-        "@commitlint/execute-rule": "^14.0.0",
+        "@commitlint/execute-rule": "^15.0.0",
-        "@commitlint/resolve-extends": "^14.1.0",
+        "@commitlint/resolve-extends": "^15.0.0",
-        "@commitlint/types": "^14.0.0",
+        "@commitlint/types": "^15.0.0",
        "@endemolshinegroup/cosmiconfig-typescript-loader": "^3.0.2",
        "chalk": "^4.0.0",
        "cosmiconfig": "^7.0.0",
@@ -2541,35 +2541,22 @@
        "node": ">=8"
      }
    },
-    "node_modules/@commitlint/load/node_modules/typescript": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
-      "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
    "node_modules/@commitlint/message": {
-      "version": "14.0.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-14.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-15.0.0.tgz",
-      "integrity": "sha512-316Pum+bwDcZamOQw0DXSY17Dq9EjvL1zKdYIZqneu4lnXN6uFfi53Y/sP5crW6zlLdnuTHe1MnuewXPLHfH1Q==",
+      "integrity": "sha512-L8euabzboKavPuDJsdIYAY2wx97LbiGEYsckMo6NmV8pOun50c8hQx6ouXFSAx4pp+mX9yUGmMiVqfrk2LKDJQ==",
      "dev": true,
      "engines": {
        "node": ">=v12"
      }
    },
    "node_modules/@commitlint/parse": {
-      "version": "14.0.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-14.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-15.0.0.tgz",
-      "integrity": "sha512-49qkk0TcwdxJPZUX8MElEzMlRFIL/cg64P4pk8HotFEm2HYdbxxZp6v3cbVw5WOsnRA0frrs+NNoOcIT83ccMQ==",
+      "integrity": "sha512-7fweM67tZfBNS7zw1KTuuT5K2u9nGytUJqFqT/1Ln3Na9cBCsoAqR47mfsNOTlRCgGwakm4xiQ7BpS2gN0OGuw==",
      "dev": true,
      "dependencies": {
-        "@commitlint/types": "^14.0.0",
+        "@commitlint/types": "^15.0.0",
        "conventional-changelog-angular": "^5.0.11",
        "conventional-commits-parser": "^3.2.2"
      },
@@ -2578,13 +2565,13 @@
      }
    },
    "node_modules/@commitlint/read": {
-      "version": "14.0.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-14.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-15.0.0.tgz",
-      "integrity": "sha512-WXXcSLBqwXTqnEmB0lbU2TrayDJ2G3qI/lxy1ianVmpQol8p9BjodAA6bYxtYYHdQFVXUrIsclzFP/naWG+hlQ==",
+      "integrity": "sha512-5yI1o2HKZFVe7RTjL7IhuhHMKar/MDNY34vEHqqz9gMI7BK/rdP8uVb4Di1efl2V0UPnwID0nPKWESjQ8Ti0gw==",
      "dev": true,
      "dependencies": {
-        "@commitlint/top-level": "^14.0.0",
+        "@commitlint/top-level": "^15.0.0",
-        "@commitlint/types": "^14.0.0",
+        "@commitlint/types": "^15.0.0",
        "fs-extra": "^10.0.0",
        "git-raw-commits": "^2.0.0"
      },
@@ -2593,9 +2580,9 @@
      }
    },
    "node_modules/@commitlint/resolve-extends": {
-      "version": "14.1.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-14.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-15.0.0.tgz",
-      "integrity": "sha512-ko80k6QB6E6/OvGNWy4u7gzzWyluDT3VDNL2kfZaDywsnrYntUKyT4Do97gQ7orttITzj2GRtk3KWClVz4rUUQ==",
+      "integrity": "sha512-7apfRJjgJsKja7lHsPfEFixKjA/fk/UeD3owkOw1174yYu4u8xBDLSeU3IinGPdMuF9m245eX8wo7vLUy+EBSg==",
      "dev": true,
      "dependencies": {
        "import-fresh": "^3.0.0",
@@ -2608,15 +2595,15 @@
      }
    },
    "node_modules/@commitlint/rules": {
-      "version": "14.1.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-14.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-15.0.0.tgz",
-      "integrity": "sha512-6jmv414/1JzGzDI/DS+snAMhcL6roQKPdg0WB3kWTWN52EvWXBFm0HIMGt2H/FlRKxozwVXlQN60/1fNIl98xA==",
+      "integrity": "sha512-SqXfp6QUlwBS+0IZm4FEA/NmmAwcFQIkG3B05BtemOVWXQdZ8j1vV6hDwvA9oMPCmUSrrGpHOtZK7HaHhng2yA==",
      "dev": true,
      "dependencies": {
-        "@commitlint/ensure": "^14.1.0",
+        "@commitlint/ensure": "^15.0.0",
-        "@commitlint/message": "^14.0.0",
+        "@commitlint/message": "^15.0.0",
-        "@commitlint/to-lines": "^14.0.0",
+        "@commitlint/to-lines": "^15.0.0",
-        "@commitlint/types": "^14.0.0",
+        "@commitlint/types": "^15.0.0",
        "execa": "^5.0.0"
      },
      "engines": {
@@ -2624,18 +2611,18 @@
      }
    },
    "node_modules/@commitlint/to-lines": {
-      "version": "14.0.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-14.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-15.0.0.tgz",
-      "integrity": "sha512-uIXk54oJDuYyLpI208s3+cGmJ323yvSJ9LB7yUDMWUeJi2LgRxE2EBZL995kLQdnoAsBBXcLq+VDyppg5bV/cg==",
+      "integrity": "sha512-mY3MNA9ujPqVpiJjTYG9MDsYCobue5PJFO0MfcIzS1mCVvngH8ZFTPAh1fT5t+t1h876boS88+9WgqjRvbYItw==",
      "dev": true,
      "engines": {
        "node": ">=v12"
      }
    },
    "node_modules/@commitlint/top-level": {
-      "version": "14.0.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-14.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-15.0.0.tgz",
-      "integrity": "sha512-MZDKZfWfl9g4KozgWBGTCrI2cXkMHnBFlhwvEfrAu5G8wd5aL1f2uWEUMnBMjUikmhVj99i1pzge4XFWHQ29wQ==",
+      "integrity": "sha512-7Gz3t7xcuuUw1d1Nou6YLaztzp2Em+qZ6YdCzrqYc+aquca3Vt0O696nuiBDU/oE+tls4Hx2CNpAbWhTgEwB5A==",
      "dev": true,
      "dependencies": {
        "find-up": "^5.0.0"
@@ -2645,9 +2632,9 @@
      }
    },
    "node_modules/@commitlint/types": {
-      "version": "14.0.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-14.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-15.0.0.tgz",
-      "integrity": "sha512-sIls1nP2uSbGL466edYlh8mn7O/WP4i3bcvP+2DMhkscRCSgaPhNRWDilhYVsHt2Vu1HTQ27uT0Bj5/Lt2+EcQ==",
+      "integrity": "sha512-OMSLX+QJnyNoTwws54ULv9sOvuw9GdVezln76oyUd4YbMMJyaav62aSXDuCdWyL2sm9hTkSzyEi52PNaIj/vqw==",
      "dev": true,
      "dependencies": {
        "chalk": "^4.0.0"
@@ -2879,6 +2866,19 @@
        "graceful-fs": "^4.1.6"
      }
    },
+    "node_modules/@emotion/is-prop-valid": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.7.3.tgz",
+      "integrity": "sha512-uxJqm/sqwXw3YPA5GXX365OBcJGFtxUVkB6WyezqFHlNe9jqUWH5ur2O2M8dGBz61kn1g3ZBlzUunFQXQIClhA==",
+      "dependencies": {
+        "@emotion/memoize": "0.7.1"
+      }
+    },
+    "node_modules/@emotion/memoize": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.1.tgz",
+      "integrity": "sha512-Qv4LTqO11jepd5Qmlp3M1YEjBumoTHcHFdgPTQ+sFlIL5myi/7xu/POwP7IRu6odBdmLXdtIs1D6TuW6kbwbbg=="
+    },
    "node_modules/@endemolshinegroup/cosmiconfig-typescript-loader": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-3.0.2.tgz",
@@ -2933,9 +2933,9 @@
      }
    },
    "node_modules/@eslint/eslintrc": {
-      "version": "1.0.3",
+      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.4.tgz",
-      "integrity": "sha512-DHI1wDPoKCBPoLZA3qDR91+3te/wDSc1YhKg3jR8NxKKRJq2hwHwcWv31cSwSYvIBrmbENoYMWcenW8uproQqg==",
+      "integrity": "sha512-h8Vx6MdxwWI2WM8/zREHMoqdgLNXEL4QX3MWSVMdyNJGvXVOs+6lp+m2hc3FnuMHDc4poxFNI20vCk0OmI4G0Q==",
      "dev": true,
      "dependencies": {
        "ajv": "^6.12.4",
@@ -2944,7 +2944,7 @@
        "globals": "^13.9.0",
        "ignore": "^4.0.6",
        "import-fresh": "^3.2.1",
-        "js-yaml": "^3.13.1",
+        "js-yaml": "^4.1.0",
        "minimatch": "^3.0.4",
        "strip-json-comments": "^3.1.1"
      },
@@ -2952,15 +2952,6 @@
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
      }
    },
-    "node_modules/@eslint/eslintrc/node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
    "node_modules/@eslint/eslintrc/node_modules/globals": {
      "version": "13.12.0",
      "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
@@ -2985,25 +2976,6 @@
        "node": ">= 4"
      }
    },
-    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
    "node_modules/@eslint/eslintrc/node_modules/strip-json-comments": {
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -3056,9 +3028,9 @@
      }
    },
    "node_modules/@formatjs/cli/node_modules/@types/node": {
-      "version": "14.17.32",
+      "version": "14.17.34",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.32.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.34.tgz",
-      "integrity": "sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ==",
+      "integrity": "sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg==",
      "dev": true
    },
    "node_modules/@formatjs/cli/node_modules/ansi-styles": {
@@ -3140,19 +3112,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/@formatjs/cli/node_modules/typescript": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
-      "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
    "node_modules/@formatjs/ecma402-abstract": {
      "version": "1.10.0",
      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.10.0.tgz",
@@ -3190,16 +3149,16 @@
      }
    },
    "node_modules/@formatjs/intl": {
-      "version": "1.15.0",
+      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-1.15.0.tgz",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-1.15.2.tgz",
-      "integrity": "sha512-8apTN/j7+pF02U1pUbsORgvWHjVEXH6eXj1y1iw/bbPoVWqfTsUSj/u9hL9MMoLI04RnOQiuK2nIh0cKeOnh1Q==",
+      "integrity": "sha512-QYk0lUSrYprn2Lyui6iDhmHnSiXFTqKAMiveYOJPYQtcaWRwkCbcB0SALTZDc2kITrYxiP4/AS7ESF/0+SYSLQ==",
      "dependencies": {
        "@formatjs/ecma402-abstract": "1.10.0",
        "@formatjs/fast-memoize": "1.2.0",
        "@formatjs/icu-messageformat-parser": "2.0.14",
        "@formatjs/intl-displaynames": "5.2.5",
        "@formatjs/intl-listformat": "6.3.5",
-        "intl-messageformat": "9.9.4",
+        "intl-messageformat": "9.9.6",
        "tslib": "^2.1.0"
      },
      "peerDependencies": {
@@ -3330,19 +3289,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/@formatjs/ts-transformer/node_modules/typescript": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
-      "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
    "node_modules/@gar/promisify": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz",
@@ -3379,9 +3325,9 @@
      }
    },
    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.0",
+      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
      "dev": true
    },
    "node_modules/@istanbuljs/load-nyc-config": {
@@ -3832,26 +3778,6 @@
      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
      "dev": true
    },
-    "node_modules/@jest/reporters/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/@jest/reporters/node_modules/has-flag": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -4215,9 +4141,9 @@
      }
    },
    "node_modules/@mdi/js": {
-      "version": "6.4.95",
+      "version": "6.5.95",
-      "resolved": "https://registry.npmjs.org/@mdi/js/-/js-6.4.95.tgz",
+      "resolved": "https://registry.npmjs.org/@mdi/js/-/js-6.5.95.tgz",
-      "integrity": "sha512-b1/P//1D2KOzta8YRGyoSLGsAlWyUHfxzVBhV4e/ppnjM4DfBgay/vWz7Eg5Ee80JZ4zsQz8h54X+KOahtBk5Q=="
+      "integrity": "sha512-x/bwEoAGP+Mo10Dfk5audNIPi7Yz8ZBrILcbXLW3ShOI/njpgodzpgpC2WYK3D2ZSC392peRRemIFb/JsyzzYQ=="
    },
    "node_modules/@mdi/react": {
      "version": "1.5.0",
@@ -4565,9 +4491,9 @@
      }
    },
    "node_modules/@sinonjs/fake-timers": {
-      "version": "8.0.1",
+      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-      "integrity": "sha512-AU7kwFxreVd6OAXcAFlKSmZquiRUU0FvYm44k1Y1QbK7Co4m0aqfGMhjykIeQp/H6rcl+nFmj0zfdUcGVs9Dew==",
+      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
      "dev": true,
      "dependencies": {
        "@sinonjs/commons": "^1.7.0"
@@ -4828,9 +4754,9 @@
      "dev": true
    },
    "node_modules/@types/lodash": {
-      "version": "4.14.176",
+      "version": "4.14.177",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.176.tgz",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
-      "integrity": "sha512-xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ==",
+      "integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw==",
      "dev": true
    },
    "node_modules/@types/mime-types": {
@@ -4873,9 +4799,9 @@
      "dev": true
    },
    "node_modules/@types/node": {
-      "version": "16.11.6",
+      "version": "16.11.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.9.tgz",
-      "integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==",
+      "integrity": "sha512-MKmdASMf3LtPzwLyRrFjtFFZ48cMf8jmX5VRYrDQiJa8Ybu5VAmkqBWqKU8fdCwD8ysw4mQ9nrEHvzg6gunR7A==",
      "dev": true
    },
    "node_modules/@types/normalize-package-data": {
@@ -4902,9 +4828,9 @@
      }
    },
    "node_modules/@types/prettier": {
-      "version": "2.4.1",
+      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz",
-      "integrity": "sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw==",
+      "integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==",
      "dev": true
    },
    "node_modules/@types/prop-types": {
@@ -4913,9 +4839,9 @@
      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
    },
    "node_modules/@types/react": {
-      "version": "17.0.33",
+      "version": "17.0.35",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.33.tgz",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.35.tgz",
-      "integrity": "sha512-pLWntxXpDPaU+RTAuSGWGSEL2FRTNyRQOjSWDke/rxRg14ncsZvx8AKWMWZqvc1UOaJIAoObdZhAWvRaHFi5rw==",
+      "integrity": "sha512-r3C8/TJuri/SLZiiwwxQoLAoavaczARfT9up9b4Jr65+ErAUX3MIkU0oMOQnrpfgHme8zIqZLX7O5nnjm5Wayw==",
      "dependencies": {
        "@types/prop-types": "*",
        "@types/scheduler": "*",
@@ -4923,9 +4849,9 @@
      }
    },
    "node_modules/@types/react-dom": {
-      "version": "17.0.10",
+      "version": "17.0.11",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.10.tgz",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.11.tgz",
-      "integrity": "sha512-8oz3NAUId2z/zQdFI09IMhQPNgIbiP8Lslhv39DIDamr846/0spjZK0vnrMak0iB8EKb9QFTTIdg2Wj2zH5a3g==",
+      "integrity": "sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==",
      "dev": true,
      "dependencies": {
        "@types/react": "*"
@@ -4971,9 +4897,9 @@
      "dev": true
    },
    "node_modules/@types/tar": {
-      "version": "6.1.0",
+      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/@types/tar/-/tar-6.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@types/tar/-/tar-6.1.1.tgz",
-      "integrity": "sha512-uTZKMW7ZkdTJXX4+Bsp0ko9N7B5/NJ5wJRW14XTb6KNN+9i2NPel6iPKp8rTQahMW46BM9tM52dTeMSldB55og==",
+      "integrity": "sha512-8mto3YZfVpqB1CHMaYz1TUYIQfZFbh/QbEq5Hsn6D0ilCfqRVCdalmc89B7vi3jhl9UYIk+dWDABShNfOkv5HA==",
      "dev": true,
      "dependencies": {
        "@types/minipass": "*",
@@ -4999,15 +4925,15 @@
      }
    },
    "node_modules/@types/uuid": {
-      "version": "8.3.1",
+      "version": "8.3.3",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.3.tgz",
-      "integrity": "sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg==",
+      "integrity": "sha512-0LbEEx1zxrYB3pgpd1M5lEhLcXjKJnYghvhTRgaBeUivLHMDM1TzF3IJ6hXU2+8uA4Xz+5BA63mtZo5DjVT8iA==",
      "dev": true
    },
    "node_modules/@types/validator": {
-      "version": "13.6.6",
+      "version": "13.7.0",
-      "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.6.6.tgz",
+      "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.7.0.tgz",
-      "integrity": "sha512-+qogUELb4gMhrMjSh/seKmGVvN+uQLfyqJAqYRWqVHsvBsUO2xDBCL8CJ/ZSukbd8vXaoYbpIssAmfLEzzBHEw==",
+      "integrity": "sha512-+jBxVvXVuggZOrm04NR8z+5+bgoW4VZyLzUO+hmPPW1mVFL/HaitLAkizfv4yg9TbG8lkfHWVMQ11yDqrVVCzA==",
      "dev": true
    },
    "node_modules/@types/verror": {
@@ -5018,9 +4944,9 @@
      "optional": true
    },
    "node_modules/@types/webpack": {
-      "version": "4.41.31",
+      "version": "4.41.32",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.31.tgz",
+      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.32.tgz",
-      "integrity": "sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==",
+      "integrity": "sha512-cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg==",
      "dev": true,
      "dependencies": {
        "@types/node": "*",
@@ -5074,9 +5000,9 @@
      }
    },
    "node_modules/@types/yargs": {
-      "version": "17.0.4",
+      "version": "17.0.7",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.7.tgz",
-      "integrity": "sha512-D/wihO9WFYqwsmJI0e0qS+U09wIQtYRSBJlXWjTFGjouEuOCy0BU4N/ZK5utb00S5lW/9LO7vOpvGDd8M06NvQ==",
+      "integrity": "sha512-OvLKmpKdea1aWtqHv9bxVVcMoT6syAeK+198dfETIFkAevYRGwqh4H+KFxfjUETZuUuE5sQCAFwdOdoHUdo8eg==",
      "dev": true,
      "dependencies": {
        "@types/yargs-parser": "*"
@@ -5089,13 +5015,13 @@
      "dev": true
    },
    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.2.0",
+      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.4.0.tgz",
-      "integrity": "sha512-qQwg7sqYkBF4CIQSyRQyqsYvP+g/J0To9ZPVNJpfxfekl5RmdvQnFFTVVwpRtaUDFNvjfe/34TgY/dpc3MgNTw==",
+      "integrity": "sha512-9/yPSBlwzsetCsGEn9j24D8vGQgJkOTr4oMLas/w886ZtzKIs1iyoqFrwsX2fqYEeUwsdBpC21gcjRGo57u0eg==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/experimental-utils": "5.2.0",
+        "@typescript-eslint/experimental-utils": "5.4.0",
-        "@typescript-eslint/scope-manager": "5.2.0",
+        "@typescript-eslint/scope-manager": "5.4.0",
        "debug": "^4.3.2",
        "functional-red-black-tree": "^1.0.1",
        "ignore": "^5.1.8",
@@ -5121,15 +5047,15 @@
      }
    },
    "node_modules/@typescript-eslint/experimental-utils": {
-      "version": "5.2.0",
+      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.4.0.tgz",
-      "integrity": "sha512-fWyT3Agf7n7HuZZRpvUYdFYbPk3iDCq6fgu3ulia4c7yxmPnwVBovdSOX7RL+k8u6hLbrXcdAehlWUVpGh6IEw==",
+      "integrity": "sha512-Nz2JDIQUdmIGd6p33A+naQmwfkU5KVTLb/5lTk+tLVTDacZKoGQisj8UCxk7onJcrgjIvr8xWqkYI+DbI3TfXg==",
      "dev": true,
      "dependencies": {
        "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.2.0",
+        "@typescript-eslint/scope-manager": "5.4.0",
-        "@typescript-eslint/types": "5.2.0",
+        "@typescript-eslint/types": "5.4.0",
-        "@typescript-eslint/typescript-estree": "5.2.0",
+        "@typescript-eslint/typescript-estree": "5.4.0",
        "eslint-scope": "^5.1.1",
        "eslint-utils": "^3.0.0"
      },
@@ -5145,14 +5071,14 @@
      }
    },
    "node_modules/@typescript-eslint/parser": {
-      "version": "5.2.0",
+      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.4.0.tgz",
-      "integrity": "sha512-Uyy4TjJBlh3NuA8/4yIQptyJb95Qz5PX//6p8n7zG0QnN4o3NF9Je3JHbVU7fxf5ncSXTmnvMtd/LDQWDk0YqA==",
+      "integrity": "sha512-JoB41EmxiYpaEsRwpZEYAJ9XQURPFer8hpkIW9GiaspVLX8oqbqNM8P4EP8HOZg96yaALiLEVWllA2E8vwsIKw==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/scope-manager": "5.2.0",
+        "@typescript-eslint/scope-manager": "5.4.0",
-        "@typescript-eslint/types": "5.2.0",
+        "@typescript-eslint/types": "5.4.0",
-        "@typescript-eslint/typescript-estree": "5.2.0",
+        "@typescript-eslint/typescript-estree": "5.4.0",
        "debug": "^4.3.2"
      },
      "engines": {
@@ -5172,13 +5098,13 @@
      }
    },
    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.2.0",
+      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.4.0.tgz",
-      "integrity": "sha512-RW+wowZqPzQw8MUFltfKYZfKXqA2qgyi6oi/31J1zfXJRpOn6tCaZtd9b5u9ubnDG2n/EMvQLeZrsLNPpaUiFQ==",
+      "integrity": "sha512-pRxFjYwoi8R+n+sibjgF9iUiAELU9ihPBtHzocyW8v8D8G8KeQvXTsW7+CBYIyTYsmhtNk50QPGLE3vrvhM5KA==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "5.2.0",
+        "@typescript-eslint/types": "5.4.0",
-        "@typescript-eslint/visitor-keys": "5.2.0"
+        "@typescript-eslint/visitor-keys": "5.4.0"
      },
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -5189,9 +5115,9 @@
      }
    },
    "node_modules/@typescript-eslint/types": {
-      "version": "5.2.0",
+      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.4.0.tgz",
-      "integrity": "sha512-cTk6x08qqosps6sPyP2j7NxyFPlCNsJwSDasqPNjEQ8JMD5xxj2NHxcLin5AJQ8pAVwpQ8BMI3bTxR0zxmK9qQ==",
+      "integrity": "sha512-GjXNpmn+n1LvnttarX+sPD6+S7giO+9LxDIGlRl4wK3a7qMWALOHYuVSZpPTfEIklYjaWuMtfKdeByx0AcaThA==",
      "dev": true,
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -5202,13 +5128,13 @@
      }
    },
    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.2.0",
+      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.4.0.tgz",
-      "integrity": "sha512-RsdXq2XmVgKbm9nLsE3mjNUM7BTr/K4DYR9WfFVMUuozHWtH5gMpiNZmtrMG8GR385EOSQ3kC9HiEMJWimxd/g==",
+      "integrity": "sha512-nhlNoBdhKuwiLMx6GrybPT3SFILm5Gij2YBdPEPFlYNFAXUJWX6QRgvi/lwVoadaQEFsizohs6aFRMqsXI2ewA==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "5.2.0",
+        "@typescript-eslint/types": "5.4.0",
-        "@typescript-eslint/visitor-keys": "5.2.0",
+        "@typescript-eslint/visitor-keys": "5.4.0",
        "debug": "^4.3.2",
        "globby": "^11.0.4",
        "is-glob": "^4.0.3",
@@ -5229,12 +5155,12 @@
      }
    },
    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.2.0",
+      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.4.0.tgz",
-      "integrity": "sha512-Nk7HizaXWWCUBfLA/rPNKMzXzWS8Wg9qHMuGtT+v2/YpPij4nVXrVJc24N/r5WrrmqK31jCrZxeHqIgqRzs0Xg==",
+      "integrity": "sha512-PVbax7MeE7tdLfW5SA0fs8NGVVr+buMPrcj+CWYWPXsZCH8qZ1THufDzbXm1xrZ2b2PA1iENJ0sRq5fuUtvsJg==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "5.2.0",
+        "@typescript-eslint/types": "5.4.0",
        "eslint-visitor-keys": "^3.0.0"
      },
      "engines": {
@@ -5246,9 +5172,9 @@
      }
    },
    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-      "version": "3.0.0",
+      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz",
-      "integrity": "sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==",
+      "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==",
      "dev": true,
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -5261,13 +5187,13 @@
      "dev": true
    },
    "node_modules/@vue/compiler-core": {
-      "version": "3.2.20",
+      "version": "3.2.22",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.20.tgz",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.22.tgz",
-      "integrity": "sha512-vcEXlKXoPwBXFP5aUTHN9GTZaDfwCofa9Yu9bbW2C5O/QSa9Esdt7OG4+0RRd3EHEMxUvEdj4RZrd/KpQeiJbA==",
+      "integrity": "sha512-uAkovrVeTcjzpiM4ECmVaMrv/bjdgAaLzvjcGqQPBEyUrcqsCgccT9fHJ/+hWVGhyMahmBwLqcn4guULNx7sdw==",
      "dev": true,
      "dependencies": {
        "@babel/parser": "^7.15.0",
-        "@vue/shared": "3.2.20",
+        "@vue/shared": "3.2.22",
        "estree-walker": "^2.0.2",
        "source-map": "^0.6.1"
      }
@@ -5282,27 +5208,27 @@
      }
    },
    "node_modules/@vue/compiler-dom": {
-      "version": "3.2.20",
+      "version": "3.2.22",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.20.tgz",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.22.tgz",
-      "integrity": "sha512-QnI77ec/JtV7R0YBbcVayYTDCRcI9OCbxiUQK6izVyqQO0658n0zQuoNwe+bYgtqnvGAIqTR3FShTd5y4oOjdg==",
+      "integrity": "sha512-VZdsw/VuO1ODs8K7NQwnMQzKITDkIFlYYC03SVnunuf6eNRxBPEonSyqbWNoo6qNaHAEBTG6VVcZC5xC9bAx1g==",
      "dev": true,
      "dependencies": {
-        "@vue/compiler-core": "3.2.20",
+        "@vue/compiler-core": "3.2.22",
-        "@vue/shared": "3.2.20"
+        "@vue/shared": "3.2.22"
      }
    },
    "node_modules/@vue/compiler-sfc": {
-      "version": "3.2.20",
+      "version": "3.2.22",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.20.tgz",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.22.tgz",
-      "integrity": "sha512-03aZo+6tQKiFLfunHKSPZvdK4Jsn/ftRCyaro8AQIWkuxJbvSosbKK6HTTn+D2c3nPScG155akJoxKENw7rftQ==",
+      "integrity": "sha512-tWRQ5ge1tsTDhUwHgueicKJ8rYm6WUVAPTaIpFW3GSwZKcOEJ2rXdfkHFShNVGupeRALz2ET2H84OL0GeRxY0A==",
      "dev": true,
      "dependencies": {
        "@babel/parser": "^7.15.0",
-        "@vue/compiler-core": "3.2.20",
+        "@vue/compiler-core": "3.2.22",
-        "@vue/compiler-dom": "3.2.20",
+        "@vue/compiler-dom": "3.2.22",
-        "@vue/compiler-ssr": "3.2.20",
+        "@vue/compiler-ssr": "3.2.22",
-        "@vue/ref-transform": "3.2.20",
+        "@vue/ref-transform": "3.2.22",
-        "@vue/shared": "3.2.20",
+        "@vue/shared": "3.2.22",
        "estree-walker": "^2.0.2",
        "magic-string": "^0.25.7",
        "postcss": "^8.1.10",
@@ -5319,32 +5245,32 @@
      }
    },
    "node_modules/@vue/compiler-ssr": {
-      "version": "3.2.20",
+      "version": "3.2.22",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.20.tgz",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.22.tgz",
-      "integrity": "sha512-rzzVVYivm+EjbfiGQvNeyiYZWzr6Hkej97RZLZvcumacQlnKv9176Xo9rRyeWwFbBlxmtNdrVMslRXtipMXk2w==",
+      "integrity": "sha512-Cl6aoLJtXzzBkk1sKod8S0WBJLts3+ugVC91d22gGpbkw/64WnF12tOZi7Rg54PPLi1NovqyNWPsLH/SAFcu+w==",
      "dev": true,
      "dependencies": {
-        "@vue/compiler-dom": "3.2.20",
+        "@vue/compiler-dom": "3.2.22",
-        "@vue/shared": "3.2.20"
+        "@vue/shared": "3.2.22"
      }
    },
    "node_modules/@vue/ref-transform": {
-      "version": "3.2.20",
+      "version": "3.2.22",
-      "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.20.tgz",
+      "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.22.tgz",
-      "integrity": "sha512-Y42d3PGlYZ1lXcF3dbd3+qU/C/a3wYEZ949fyOI5ptzkjDWlkfU6vn74fmOjsLjEcjs10BXK2qO99FqQIK2r1Q==",
+      "integrity": "sha512-qalVWbq5xWWxLZ0L9OroBg/JZhzavQuCcDXblfErxyDEH6Xc5gIJ4feo1SVCICFzhAUgLgQTdSFLpgjBawbFpw==",
      "dev": true,
      "dependencies": {
        "@babel/parser": "^7.15.0",
-        "@vue/compiler-core": "3.2.20",
+        "@vue/compiler-core": "3.2.22",
-        "@vue/shared": "3.2.20",
+        "@vue/shared": "3.2.22",
        "estree-walker": "^2.0.2",
        "magic-string": "^0.25.7"
      }
    },
    "node_modules/@vue/shared": {
-      "version": "3.2.20",
+      "version": "3.2.22",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.20.tgz",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.22.tgz",
-      "integrity": "sha512-FbpX+hD5BvXCQerEYO7jtAGHlhAkhTQ4KIV73kmLWNlawWhTiVuQxizgVb0BOkX5oG9cIRZ42EG++d/k/Efp0w==",
+      "integrity": "sha512-qWVav014mpjEtbWbEgl0q9pEyrrIySKum8UVYjwhC6njrKzknLZPvfuYdQyVbApsqr94tf/3dP4pCuZmmjdCWQ==",
      "dev": true
    },
    "node_modules/@webassemblyjs/ast": {
@@ -5564,9 +5490,9 @@
      }
    },
    "node_modules/acorn": {
-      "version": "8.5.0",
+      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
-      "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
+      "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
      "dev": true,
      "bin": {
        "acorn": "bin/acorn"
@@ -6220,10 +6146,10 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/ansi-html": {
+    "node_modules/ansi-html-community": {
-      "version": "0.0.7",
+      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
      "dev": true,
      "engines": [
        "node >= 0.8.0"
@@ -6280,7 +6206,6 @@
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
      "engines": {
        "node": ">=8"
      }
@@ -6456,9 +6381,9 @@
      "dev": true
    },
    "node_modules/app-builder-lib": {
-      "version": "22.14.5",
+      "version": "22.14.10",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.14.10.tgz",
-      "integrity": "sha512-k3VwKP4kpsnUaXoUkm1s4zaSHPHIMFnN4kPMU9yXaKmE1LfHHqBaEah5bXeTAX5V/BC41wFdg8CF5vOjvgy8Rg==",
+      "integrity": "sha512-5g/0CztD/+OL3V6PH+hV5MeFDg1V827PoyPEnAzz4fXXhCzoBwDanyqKH9b7JwfHkLO6JqH5Des28qET3LkENg==",
      "dev": true,
      "dependencies": {
        "@develar/schema-utils": "~2.6.5",
@@ -6467,13 +6392,13 @@
        "7zip-bin": "~5.1.1",
        "async-exit-hook": "^2.0.1",
        "bluebird-lst": "^1.0.9",
-        "builder-util": "22.14.5",
+        "builder-util": "22.14.7",
-        "builder-util-runtime": "8.9.1",
+        "builder-util-runtime": "8.9.2",
        "chromium-pickle-js": "^0.2.0",
        "debug": "^4.3.2",
        "ejs": "^3.1.6",
        "electron-osx-sign": "^0.5.0",
-        "electron-publish": "22.14.5",
+        "electron-publish": "22.14.7",
        "form-data": "^4.0.0",
        "fs-extra": "^10.0.0",
        "hosted-git-info": "^4.0.2",
@@ -6841,30 +6766,10 @@
        "node": ">= 6"
      }
    },
-    "node_modules/asar/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/asn1": {
-      "version": "0.2.4",
+      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
      "optional": true,
      "dependencies": {
        "safer-buffer": "~2.1.0"
@@ -6936,6 +6841,16 @@
      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
      "dev": true
    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
    "node_modules/async": {
      "version": "3.2.2",
      "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz",
@@ -7053,9 +6968,9 @@
      "optional": true
    },
    "node_modules/axe-core": {
-      "version": "4.3.4",
+      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.4.tgz",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.5.tgz",
-      "integrity": "sha512-4Hk6iSA/H90rtiPoCpSkeJxNWCPBf7szwVvaUqrPdxo0j2Y04suHK9jPKXaE3WI7OET6wBSwsWw7FDc1DBq7iQ==",
+      "integrity": "sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==",
      "dev": true,
      "engines": {
        "node": ">=4"
@@ -7252,13 +7167,13 @@
      }
    },
    "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.2.3",
+      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.0.tgz",
-      "integrity": "sha512-NDZ0auNRzmAfE1oDDPW2JhzIMXUk+FFe2ICejmt5T4ocKgiQx3e0VCRx9NCAidcMtL2RUZaWtXnmjTCkx0tcbA==",
+      "integrity": "sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA==",
      "dev": true,
      "dependencies": {
        "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.2.4",
+        "@babel/helper-define-polyfill-provider": "^0.3.0",
        "semver": "^6.1.1"
      },
      "peerDependencies": {
@@ -7275,12 +7190,12 @@
      }
    },
    "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.3.0",
+      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz",
-      "integrity": "sha512-JLwi9vloVdXLjzACL80j24bG6/T1gYxwowG44dg6HN/7aTPdyPbJJidf6ajoA3RPHHtW0j9KMrSOLpIZpAnPpg==",
+      "integrity": "sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw==",
      "dev": true,
      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.2.4",
+        "@babel/helper-define-polyfill-provider": "^0.3.0",
        "core-js-compat": "^3.18.0"
      },
      "peerDependencies": {
@@ -7288,12 +7203,12 @@
      }
    },
    "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.2.3",
+      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz",
-      "integrity": "sha512-JVE78oRZPKFIeUqFGrSORNzQnrDwZR16oiWeGM8ZyjBn2XAT5OjP+wXx5ESuo33nUsFUEJYjtklnsKbxW5L+7g==",
+      "integrity": "sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg==",
      "dev": true,
      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.2.4"
+        "@babel/helper-define-polyfill-provider": "^0.3.0"
      },
      "peerDependencies": {
        "@babel/core": "^7.0.0-0"
@@ -7432,9 +7347,9 @@
      "integrity": "sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms="
    },
    "node_modules/big-integer": {
-      "version": "1.6.50",
+      "version": "1.6.51",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.50.tgz",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
-      "integrity": "sha512-+O2uoQWFRo8ysZNo/rjtri2jIwjr3XfeAgRjAUADRqGG+ZITvyn8J1kvXLTaKVr3hhGXk+f23tKfdzmklVM9vQ==",
+      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
      "engines": {
        "node": ">=0.6"
      }
@@ -7544,6 +7459,15 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/body-parser/node_modules/bytes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
    "node_modules/body-parser/node_modules/debug": {
      "version": "2.6.9",
      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -7623,6 +7547,15 @@
      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
      "dev": true
    },
+    "node_modules/body-parser/node_modules/toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
    "node_modules/body/node_modules/bytes": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
@@ -7713,9 +7646,9 @@
      }
    },
    "node_modules/boxen/node_modules/camelcase": {
-      "version": "6.2.0",
+      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+      "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
      "dev": true,
      "engines": {
        "node": ">=10"
@@ -7849,11 +7782,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/brcast": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/brcast/-/brcast-3.0.2.tgz",
-      "integrity": "sha512-f5XwwFCCuvgqP2nMH/hJ74FqnGmb4X3D+NC//HphxJzzhsZvSZa+Hk/syB7j3ZHpPDLMoYU8oBgviRWfNvEfKA=="
-    },
    "node_modules/brorand": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
@@ -7980,13 +7908,13 @@
      }
    },
    "node_modules/browserslist": {
-      "version": "4.17.6",
+      "version": "4.18.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.6.tgz",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz",
-      "integrity": "sha512-uPgz3vyRTlEiCv4ee9KlsKgo2V6qPk7Jsn0KAn2OBqbqKo3iNcPEC1Ti6J4dwnz+aIRfEEEuOzC9IBk8tXUomw==",
+      "integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==",
      "dev": true,
      "dependencies": {
-        "caniuse-lite": "^1.0.30001274",
+        "caniuse-lite": "^1.0.30001280",
-        "electron-to-chromium": "^1.3.886",
+        "electron-to-chromium": "^1.3.896",
        "escalade": "^3.1.1",
        "node-releases": "^2.0.1",
        "picocolors": "^1.0.0"
@@ -8135,9 +8063,9 @@
      }
    },
    "node_modules/builder-util": {
-      "version": "22.14.5",
+      "version": "22.14.7",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.14.7.tgz",
-      "integrity": "sha512-zqIHDFJwmA7jV7SC9aI+33MWwT2mWoijH+Ol9IntNAwuuRXoS+7XeJwnhLBXOhcDBzXT4kDzHnRk4JKeaygEYA==",
+      "integrity": "sha512-M8ql8WPW/P9UKsF00YZjiP5h29MYrJ3svJx5suszC5EGwIdAztIhFyXoXKI3hPtDaR5b6EoWD9nLa5/Gr+QToQ==",
      "dev": true,
      "dependencies": {
        "@types/debug": "^4.1.6",
@@ -8145,11 +8073,13 @@
        "7zip-bin": "~5.1.1",
        "app-builder-bin": "3.7.1",
        "bluebird-lst": "^1.0.9",
-        "builder-util-runtime": "8.9.1",
+        "builder-util-runtime": "8.9.2",
        "chalk": "^4.1.1",
        "cross-spawn": "^7.0.3",
        "debug": "^4.3.2",
        "fs-extra": "^10.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
        "is-ci": "^3.0.0",
        "js-yaml": "^4.1.0",
        "source-map-support": "^0.5.19",
@@ -8158,10 +8088,9 @@
      }
    },
    "node_modules/builder-util-runtime": {
-      "version": "8.9.1",
+      "version": "8.9.2",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz",
-      "integrity": "sha512-c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg==",
+      "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==",
-      "dev": true,
      "dependencies": {
        "debug": "^4.3.2",
        "sax": "^1.2.4"
@@ -8170,6 +8099,15 @@
        "node": ">=12.0.0"
      }
    },
+    "node_modules/builder-util/node_modules/@tootallnate/once": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
    "node_modules/builder-util/node_modules/ansi-styles": {
      "version": "4.3.0",
      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -8228,6 +8166,20 @@
        "node": ">=8"
      }
    },
+    "node_modules/builder-util/node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
    "node_modules/builder-util/node_modules/supports-color": {
      "version": "7.2.0",
      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -8259,9 +8211,9 @@
      "dev": true
    },
    "node_modules/bytes": {
-      "version": "3.1.0",
+      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "integrity": "sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==",
      "engines": {
        "node": ">= 0.8"
      }
@@ -8295,26 +8247,6 @@
        "node": ">= 10"
      }
    },
-    "node_modules/cacache/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/cacache/node_modules/mkdirp": {
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -8512,9 +8444,9 @@
      }
    },
    "node_modules/caniuse-lite": {
-      "version": "1.0.30001278",
+      "version": "1.0.30001286",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001278.tgz",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz",
-      "integrity": "sha512-mpF9KeH8u5cMoEmIic/cr7PNS+F5LWBk0t2ekGT60lFf0Wq+n9LspAj0g3P+o7DQhD3sUdlMln4YFAWhFYn9jg==",
+      "integrity": "sha512-zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ==",
      "dev": true,
      "funding": {
        "type": "opencollective",
@@ -8789,53 +8721,19 @@
      "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
    },
    "node_modules/cld": {
-      "version": "2.7.0",
+      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/cld/-/cld-2.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/cld/-/cld-2.7.1.tgz",
-      "integrity": "sha512-rM20jIISRqMYfZAlowCA4DwLLegJXqfCFdVb1vtS+RG7yKHn4FrYdFfUx2WGbmaqOQV/w4MRIszh43FH78/oRA==",
+      "integrity": "sha512-4RusGBKlhW/f7hrv4wFf19n461aO1XCCC4/pCawTJNGaNT+i4OIeAwREY9oeqT0vJyBmtY2dM9IG4cQyu5Pcng==",
      "hasInstallScript": true,
-      "optional": true,
      "dependencies": {
-        "glob": "^5.0.10",
+        "glob": "7",
        "node-addon-api": "*",
-        "rimraf": "^2.4.0",
+        "underscore": "^1.12.1"
-        "underscore": "^1.6.0"
      },
      "engines": {
        "node": ">=12.0.0"
      }
    },
-    "node_modules/cld/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "optional": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/cld/node_modules/rimraf/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "optional": true,
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/clean-css": {
      "version": "4.2.4",
      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
@@ -8903,28 +8801,64 @@
      }
    },
    "node_modules/cli-table": {
-      "version": "0.3.6",
+      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.6.tgz",
+      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.8.tgz",
-      "integrity": "sha512-ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ==",
+      "integrity": "sha512-5IO15fJRzgM+hHZjvQlqD6UPRuVGWR4Ny5ZzaM5VJxJEQqSIEVyVh9dMAUN6CBAVfMc4/6CFEzbhnRftLRCyug==",
      "dependencies": {
-        "colors": "1.0.3"
+        "colors": "1.0.3",
+        "strip-ansi": "^6.0.1"
      },
      "engines": {
-        "node": ">= 0.2.0"
+        "node": ">= 12"
      }
    },
    "node_modules/cli-truncate": {
-      "version": "1.1.0",
+      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==",
+      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
      "dev": true,
      "optional": true,
      "dependencies": {
-        "slice-ansi": "^1.0.0",
+        "slice-ansi": "^3.0.0",
-        "string-width": "^2.0.0"
+        "string-width": "^4.2.0"
      },
      "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-truncate/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/cli-truncate/node_modules/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,
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cli-truncate/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
      }
    },
    "node_modules/cli-width": {
@@ -9533,9 +9467,9 @@
      }
    },
    "node_modules/concurrently": {
-      "version": "6.3.0",
+      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.4.0.tgz",
-      "integrity": "sha512-k4k1jQGHHKsfbqzkUszVf29qECBrkvBKkcPJEUDTyVR7tZd1G/JOfnst4g1sYbFvJ4UjHZisj1aWQR8yLKpGPw==",
+      "integrity": "sha512-HZ3D0RTQMH3oS4gvtYj1P+NBc6PzE2McEra6yEFcQKrUQ9HvtTGU4Dbne083F034p+LRb7kWU0tPRNvSGs1UCQ==",
      "dev": true,
      "dependencies": {
        "chalk": "^4.1.0",
@@ -9927,26 +9861,6 @@
        "run-queue": "^1.0.0"
      }
    },
-    "node_modules/copy-concurrently/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/copy-concurrently/node_modules/rimraf": {
      "version": "2.7.1",
      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -10010,9 +9924,9 @@
      }
    },
    "node_modules/core-js-pure": {
-      "version": "3.19.0",
+      "version": "3.19.1",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.0.tgz",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.1.tgz",
-      "integrity": "sha512-UEQk8AxyCYvNAs6baNoPqDADv7BX0AmBLGxVsrAifPPx/C8EAzV4Q+2ZUJqVzfI2TQQEZITnwUkWcHpgc/IubQ==",
+      "integrity": "sha512-Q0Knr8Es84vtv62ei6/6jXH/7izKmOrtrxH9WJTHLCMAVeU+8TF8z8Nr08CsH4Ot0oJKzBzJJL9SJBYIv7WlfQ==",
      "dev": true,
      "hasInstallScript": true,
      "funding": {
@@ -10192,6 +10106,16 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/css-jss": {
+      "version": "10.8.2",
+      "resolved": "https://registry.npmjs.org/css-jss/-/css-jss-10.8.2.tgz",
+      "integrity": "sha512-KjsoKnBV4C9p+F+zW9jNXCai0UYU5K+3eyo+lJX/fY8UBEQd/yNREnHsLD1VMMzBwHRvrA8eQHvqmAL+XNLYcw==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2",
+        "jss-preset-default": "10.8.2"
+      }
+    },
    "node_modules/css-select": {
      "version": "4.1.3",
      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
@@ -10231,10 +10155,11 @@
      }
    },
    "node_modules/css-vendor": {
-      "version": "0.3.8",
+      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-0.3.8.tgz",
+      "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz",
-      "integrity": "sha1-ZCHP0wNM5mT+dnOXL9ARn8KJQfo=",
+      "integrity": "sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==",
      "dependencies": {
+        "@babel/runtime": "^7.8.3",
        "is-in-browser": "^1.0.2"
      }
    },
@@ -10287,9 +10212,9 @@
      "dev": true
    },
    "node_modules/csstype": {
-      "version": "3.0.9",
+      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz",
-      "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw=="
+      "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="
    },
    "node_modules/currently-unhandled": {
      "version": "0.4.1",
@@ -10355,9 +10280,9 @@
      }
    },
    "node_modules/darkreader": {
-      "version": "4.9.39",
+      "version": "4.9.40",
-      "resolved": "https://registry.npmjs.org/darkreader/-/darkreader-4.9.39.tgz",
+      "resolved": "https://registry.npmjs.org/darkreader/-/darkreader-4.9.40.tgz",
-      "integrity": "sha512-OikzTzTDasjq+e+PXRWZRxMA+PZddz9cDLiZGVUI48w1FbBDfXwwQyyWiO7eavdAQ1cV9dYA21g6KtdK/0OefA==",
+      "integrity": "sha512-Dm8S5jkXSIxvq9WitcvuH4KexV9ZuzGqDMsFOm2VwXzRkMo9VIg8udjq2Mm7cM6SaQSp/zzH4VIWioX93iWayQ==",
      "funding": {
        "type": "opencollective",
        "url": "https://opencollective.com/darkreader"
@@ -10390,9 +10315,9 @@
      }
    },
    "node_modules/date-fns": {
-      "version": "2.25.0",
+      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.25.0.tgz",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.26.0.tgz",
-      "integrity": "sha512-ovYRFnTrbGPD4nqaEqescPEv1mNwvt+UTqI3Ay9SzNtey9NZnYu6E2qCcBBgJ6/2VF1zGGygpyTDITqpQQ5e+w==",
+      "integrity": "sha512-VQI812dRi3cusdY/fhoBKvc6l2W8BPWU1FNVnFH9Nttjx4AFBRzfSVb/Eyc7jBT6e9sg1XtAGsYpBQ6c/jygbg==",
      "dev": true,
      "engines": {
        "node": ">=0.11"
@@ -10782,26 +10707,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/del/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/del/node_modules/globby": {
      "version": "6.1.0",
      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
@@ -11009,14 +10914,14 @@
      }
    },
    "node_modules/dmg-builder": {
-      "version": "22.14.5",
+      "version": "22.14.10",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.14.10.tgz",
-      "integrity": "sha512-1GvFGQE332bvPamcMwZDqWqfWfJTyyDLOsHMcGi0zs+Jh7JOn6/zuBkHJIWHdsj2QJbhzLVyd2/ZqttOKv7I8w==",
+      "integrity": "sha512-DMLdhVNvIEBo0tzODoFalbdahIxlNXDL4JmxjwGYS69csPTqg0ev+6GOMgWmXhvrdEyN8hQWl1kTFjM/jZ+qBA==",
      "dev": true,
      "dependencies": {
-        "app-builder-lib": "22.14.5",
+        "app-builder-lib": "22.14.10",
-        "builder-util": "22.14.5",
+        "builder-util": "22.14.7",
-        "builder-util-runtime": "8.9.1",
+        "builder-util-runtime": "8.9.2",
        "fs-extra": "^10.0.0",
        "iconv-lite": "^0.6.2",
        "js-yaml": "^4.1.0"
@@ -11026,9 +10931,9 @@
      }
    },
    "node_modules/dmg-license": {
-      "version": "1.0.9",
+      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.9.tgz",
+      "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.10.tgz",
-      "integrity": "sha512-Rq6qMDaDou2+aPN2SYy0x7LDznoJ/XaG6oDcH5wXUp+WRWQMUYE6eM+F+nex+/LSXOp1uw4HLFoed0YbfU8R/Q==",
+      "integrity": "sha512-SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A==",
      "dev": true,
      "optional": true,
      "os": [
@@ -11038,10 +10943,9 @@
        "@types/plist": "^3.0.1",
        "@types/verror": "^1.10.3",
        "ajv": "^6.10.0",
-        "cli-truncate": "^1.1.0",
        "crc": "^3.8.0",
-        "iconv-corefoundation": "^1.1.6",
+        "iconv-corefoundation": "^1.1.7",
-        "plist": "^3.0.1",
+        "plist": "^3.0.4",
        "smart-buffer": "^4.0.2",
        "verror": "^1.10.0"
      },
@@ -11366,9 +11270,9 @@
      }
    },
    "node_modules/electron": {
-      "version": "15.3.0",
+      "version": "15.3.3",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-15.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-15.3.3.tgz",
-      "integrity": "sha512-YLzaKCFmSniNlz9+NUTNs7ssPyDc+bYOCYZ0b/D6DjVkOeIFz4SR8EYKqlOc8TcqlDNu18BbWqz6zbJPyAAURg==",
+      "integrity": "sha512-tr4UaMosN6+s8vSbx6OxqRXDTTCBjjJkmDMv0b0sg8f+cRFQeY0u7xYbULpXS4B1+hHJmdh7Nz40Qpv0bJXa6w==",
      "dev": true,
      "hasInstallScript": true,
      "dependencies": {
@@ -11384,17 +11288,17 @@
      }
    },
    "node_modules/electron-builder": {
-      "version": "22.14.5",
+      "version": "22.14.10",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.14.10.tgz",
-      "integrity": "sha512-N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg==",
+      "integrity": "sha512-IGYziKc3/nz6P/HhsO6ls2ACIvkMOHUu5jKw+h4g/muT2iBUSNCuyh20VuLQnmR5ggo8uGVuv485GtJc/HP8ig==",
      "dev": true,
      "dependencies": {
        "@types/yargs": "^17.0.1",
-        "app-builder-lib": "22.14.5",
+        "app-builder-lib": "22.14.10",
-        "builder-util": "22.14.5",
+        "builder-util": "22.14.7",
-        "builder-util-runtime": "8.9.1",
+        "builder-util-runtime": "8.9.2",
        "chalk": "^4.1.1",
-        "dmg-builder": "22.14.5",
+        "dmg-builder": "22.14.10",
        "fs-extra": "^10.0.0",
        "is-ci": "^3.0.0",
        "lazy-val": "^1.0.5",
@@ -11481,9 +11385,9 @@
      }
    },
    "node_modules/electron-dl": {
-      "version": "3.2.1",
+      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-3.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-3.3.0.tgz",
-      "integrity": "sha512-k5DFjocJlXbrjshO1zeWe/Gz7HkGwCgnehHPemiyzN2B/LfLlnbIX7sCj5F+huTwZ2l+nQehTI4IR37xvCn6FQ==",
+      "integrity": "sha512-Zwaz/OMGPIfBLV2SQH4sTsdDOs/U4y5AOHfremMBXEpjIxX+SiTx845DZAvJJwgb5hfowyWOBLiJhd/emBNLLQ==",
      "dependencies": {
        "ext-name": "^5.0.0",
        "pupa": "^2.0.1",
@@ -11603,14 +11507,14 @@
      "dev": true
    },
    "node_modules/electron-publish": {
-      "version": "22.14.5",
+      "version": "22.14.7",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.14.7.tgz",
-      "integrity": "sha512-h+NANRdaA0PqGF15GKvorseWPzh1PXa/zx4I37//PIokW8eKIov8ky23foUSb55ZFWUHGpxQJux7y2NCfBtQeg==",
+      "integrity": "sha512-sqZX/64k0B7sQeaDzFDE6m7r2zOtFgdmWAFnkv10bLlbHagkH9AkwwcjiGBpIto7mUBp89ntL7Ij5QFvldqI4Q==",
      "dev": true,
      "dependencies": {
        "@types/fs-extra": "^9.0.11",
-        "builder-util": "22.14.5",
+        "builder-util": "22.14.7",
-        "builder-util-runtime": "8.9.1",
+        "builder-util-runtime": "8.9.2",
        "chalk": "^4.1.1",
        "fs-extra": "^10.0.0",
        "lazy-val": "^1.0.5",
@@ -11698,38 +11602,26 @@
      }
    },
    "node_modules/electron-to-chromium": {
-      "version": "1.3.890",
+      "version": "1.3.904",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.890.tgz",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.904.tgz",
-      "integrity": "sha512-VWlVXSkv0cA/OOehrEyqjUTHwV8YXCPTfPvbtoeU2aHR21vI4Ejh5aC4AxUwOmbLbBgb6Gd3URZahoCxtBqCYQ==",
+      "integrity": "sha512-x5uZWXcVNYkTh4JubD7KSC1VMKz0vZwJUqVwY3ihsW0bst1BXDe494Uqbg3Y0fDGVjJqA8vEeGuvO5foyH2+qw==",
      "dev": true
    },
    "node_modules/electron-updater": {
-      "version": "4.3.9",
+      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.3.9.tgz",
+      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.6.2.tgz",
-      "integrity": "sha512-LCNfedSwZfS4Hza+pDyPR05LqHtGorCStaBgVpRnfKxOlZcvpYEX0AbMeH5XUtbtGRoH2V8osbbf2qKPNb7AsA==",
+      "integrity": "sha512-KAloJQNXwW2j81n0o2KgBsiRsxp2OS15nty4nZLUjZYNuRyJ7yp2zeKPL4fVNGY6Ave491ht7/Dyz5OIykJf9g==",
      "dependencies": {
-        "@types/semver": "^7.3.5",
+        "@types/semver": "^7.3.6",
-        "builder-util-runtime": "8.7.5",
+        "builder-util-runtime": "8.9.2",
        "fs-extra": "^10.0.0",
        "js-yaml": "^4.1.0",
-        "lazy-val": "^1.0.4",
+        "lazy-val": "^1.0.5",
        "lodash.escaperegexp": "^4.1.2",
        "lodash.isequal": "^4.5.0",
        "semver": "^7.3.5"
      }
    },
-    "node_modules/electron-updater/node_modules/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==",
-      "dependencies": {
-        "debug": "^4.3.2",
-        "sax": "^1.2.4"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
    "node_modules/electron-util": {
      "version": "0.12.3",
      "resolved": "https://registry.npmjs.org/electron-util/-/electron-util-0.12.3.tgz",
@@ -11752,9 +11644,9 @@
      }
    },
    "node_modules/electron/node_modules/@types/node": {
-      "version": "14.17.32",
+      "version": "14.17.34",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.32.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.34.tgz",
-      "integrity": "sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ==",
+      "integrity": "sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg==",
      "dev": true
    },
    "node_modules/elliptic": {
@@ -12168,12 +12060,12 @@
      }
    },
    "node_modules/eslint": {
-      "version": "8.1.0",
+      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.2.0.tgz",
-      "integrity": "sha512-JZvNneArGSUsluHWJ8g8MMs3CfIEzwaLx9KyH4tZ2i+R2/rPWzL8c0zg3rHdwYVpN/1sB9gqnjHwz9HoeJpGHw==",
+      "integrity": "sha512-erw7XmM+CLxTOickrimJ1SiF55jiNlVSp2qqm0NuBWPtHYQCegD5ZMaW0c3i5ytPqL+SSLaCxdvQXFPLJn+ABw==",
      "dev": true,
      "dependencies": {
-        "@eslint/eslintrc": "^1.0.3",
+        "@eslint/eslintrc": "^1.0.4",
        "@humanwhocodes/config-array": "^0.6.0",
        "ajv": "^6.10.0",
        "chalk": "^4.0.0",
@@ -12207,7 +12099,7 @@
        "progress": "^2.0.0",
        "regexpp": "^3.2.0",
        "semver": "^7.2.1",
-        "strip-ansi": "^6.0.0",
+        "strip-ansi": "^6.0.1",
        "strip-json-comments": "^3.1.0",
        "text-table": "^0.2.0",
        "v8-compile-cache": "^2.0.3"
@@ -12223,55 +12115,65 @@
      }
    },
    "node_modules/eslint-config-airbnb": {
-      "version": "18.2.1",
+      "version": "19.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-18.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.0.tgz",
-      "integrity": "sha512-glZNDEZ36VdlZWoxn/bUR1r/sdFKPd1mHPbqUtkctgNG4yT2DLLtJ3D+yCV+jzZCc2V1nBVkmdknOJBZ5Hc0fg==",
+      "integrity": "sha512-f5FzCDw8osQJtifOGazdBtYuDOH38FVQSOwHvSU0iFjAmkdl4zQ1jG+YV6sVNt4gqVubqJwn98zZQzDoaCwDyw==",
      "dev": true,
      "dependencies": {
-        "eslint-config-airbnb-base": "^14.2.1",
+        "eslint-config-airbnb-base": "^15.0.0",
        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.2"
+        "object.entries": "^1.1.5"
      },
      "engines": {
-        "node": ">= 6"
+        "node": "^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0"
      },
      "peerDependencies": {
-        "eslint": "^5.16.0 || ^6.8.0 || ^7.2.0",
+        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.22.1",
+        "eslint-plugin-import": "^2.25.3",
-        "eslint-plugin-jsx-a11y": "^6.4.1",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
-        "eslint-plugin-react": "^7.21.5",
+        "eslint-plugin-react": "^7.27.0",
-        "eslint-plugin-react-hooks": "^4 || ^3 || ^2.3.0 || ^1.7.0"
+        "eslint-plugin-react-hooks": "^4.3.0"
      }
    },
    "node_modules/eslint-config-airbnb-base": {
-      "version": "14.2.1",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
      "dev": true,
      "dependencies": {
        "confusing-browser-globals": "^1.0.10",
        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.2"
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
      },
      "engines": {
-        "node": ">= 6"
+        "node": "^10.12.0 || >=12.0.0"
      },
      "peerDependencies": {
-        "eslint": "^5.16.0 || ^6.8.0 || ^7.2.0",
+        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.22.1"
+        "eslint-plugin-import": "^2.25.2"
+      }
+    },
+    "node_modules/eslint-config-airbnb-base/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
      }
    },
    "node_modules/eslint-config-airbnb-typescript": {
-      "version": "14.0.1",
+      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-14.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-16.0.0.tgz",
-      "integrity": "sha512-tF4GwC3sRrw8kEj4/yxX8F7AcLzj/1IESBnsCiFMplzYmxre459qm2z9DFkCpqBVQFSH6j2K4+VKVteX4m0GsQ==",
+      "integrity": "sha512-qDOyD0YYZo5Us1YvOnWig2Ly/+IlQKmMZpnqKnJgVtHdK8SkjaSyVBHKbD41dEaQxk8vRVGBC94PuR2ceSwbLQ==",
      "dev": true,
      "dependencies": {
-        "eslint-config-airbnb-base": "14.2.1"
+        "eslint-config-airbnb-base": "^15.0.0"
      },
      "peerDependencies": {
-        "@typescript-eslint/eslint-plugin": "^4.29.3",
+        "@typescript-eslint/eslint-plugin": "^5.0.0",
-        "@typescript-eslint/parser": "^4.29.3"
+        "@typescript-eslint/parser": "^5.0.0"
      }
    },
    "node_modules/eslint-config-prettier": {
@@ -12396,9 +12298,9 @@
      }
    },
    "node_modules/eslint-plugin-import": {
-      "version": "2.25.2",
+      "version": "2.25.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz",
-      "integrity": "sha512-qCwQr9TYfoBHOFcVGKY9C9unq05uOxxdklmBXLVvcwo68y5Hta6/GzCZEMx2zQiu0woKNEER0LE7ZgaOfBU14g==",
+      "integrity": "sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg==",
      "dev": true,
      "dependencies": {
        "array-includes": "^3.1.4",
@@ -12406,9 +12308,9 @@
        "debug": "^2.6.9",
        "doctrine": "^2.1.0",
        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.0",
+        "eslint-module-utils": "^2.7.1",
        "has": "^1.0.3",
-        "is-core-module": "^2.7.0",
+        "is-core-module": "^2.8.0",
        "is-glob": "^4.0.3",
        "minimatch": "^3.0.4",
        "object.values": "^1.1.5",
@@ -12450,9 +12352,9 @@
      "dev": true
    },
    "node_modules/eslint-plugin-jest": {
-      "version": "25.2.2",
+      "version": "25.2.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.2.4.tgz",
-      "integrity": "sha512-frn5yhOF60U4kcqozO3zKTNZQUk+mfx037XOy2iiYL8FhorEkuCuL3/flzKcY1ECDP2WYT9ydmvlO3fRW9o4mg==",
+      "integrity": "sha512-HRyinpgmEdkVr7pNPaYPHCoGqEzpgk79X8pg/xCeoAdurbyQjntJQ4pTzHl7BiVEBlam/F1Qsn+Dk0HtJO7Aaw==",
      "dev": true,
      "dependencies": {
        "@typescript-eslint/experimental-utils": "^5.0.0"
@@ -12467,32 +12369,36 @@
      "peerDependenciesMeta": {
        "@typescript-eslint/eslint-plugin": {
          "optional": true
+        },
+        "jest": {
+          "optional": true
        }
      }
    },
    "node_modules/eslint-plugin-jsx-a11y": {
-      "version": "6.4.1",
+      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz",
-      "integrity": "sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==",
+      "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
      "dev": true,
      "dependencies": {
-        "@babel/runtime": "^7.11.2",
+        "@babel/runtime": "^7.16.3",
        "aria-query": "^4.2.2",
-        "array-includes": "^3.1.1",
+        "array-includes": "^3.1.4",
        "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.0.2",
+        "axe-core": "^4.3.5",
        "axobject-query": "^2.2.0",
-        "damerau-levenshtein": "^1.0.6",
+        "damerau-levenshtein": "^1.0.7",
-        "emoji-regex": "^9.0.0",
+        "emoji-regex": "^9.2.2",
        "has": "^1.0.3",
-        "jsx-ast-utils": "^3.1.0",
+        "jsx-ast-utils": "^3.2.1",
-        "language-tags": "^1.0.5"
+        "language-tags": "^1.0.5",
+        "minimatch": "^3.0.4"
      },
      "engines": {
        "node": ">=4.0"
      },
      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7"
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
      }
    },
    "node_modules/eslint-plugin-prettier": {
@@ -12517,43 +12423,43 @@
      }
    },
    "node_modules/eslint-plugin-react": {
-      "version": "7.26.1",
+      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.26.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.27.1.tgz",
-      "integrity": "sha512-Lug0+NOFXeOE+ORZ5pbsh6mSKjBKXDXItUD2sQoT+5Yl0eoT82DqnXeTMfUare4QVCn9QwXbfzO/dBLjLXwVjQ==",
+      "integrity": "sha512-meyunDjMMYeWr/4EBLTV1op3iSG3mjT/pz5gti38UzfM4OPpNc2m0t2xvKCOMU5D6FSdd34BIMFOvQbW+i8GAA==",
      "dev": true,
      "dependencies": {
-        "array-includes": "^3.1.3",
+        "array-includes": "^3.1.4",
-        "array.prototype.flatmap": "^1.2.4",
+        "array.prototype.flatmap": "^1.2.5",
        "doctrine": "^2.1.0",
-        "estraverse": "^5.2.0",
+        "estraverse": "^5.3.0",
        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
        "minimatch": "^3.0.4",
-        "object.entries": "^1.1.4",
+        "object.entries": "^1.1.5",
-        "object.fromentries": "^2.0.4",
+        "object.fromentries": "^2.0.5",
-        "object.hasown": "^1.0.0",
+        "object.hasown": "^1.1.0",
-        "object.values": "^1.1.4",
+        "object.values": "^1.1.5",
        "prop-types": "^15.7.2",
        "resolve": "^2.0.0-next.3",
        "semver": "^6.3.0",
-        "string.prototype.matchall": "^4.0.5"
+        "string.prototype.matchall": "^4.0.6"
      },
      "engines": {
        "node": ">=4"
      },
      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7"
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
      }
    },
    "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.2.0",
+      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz",
-      "integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==",
+      "integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==",
      "dev": true,
      "engines": {
        "node": ">=10"
      },
      "peerDependencies": {
-        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
      }
    },
    "node_modules/eslint-plugin-react/node_modules/doctrine": {
@@ -12591,9 +12497,9 @@
      }
    },
    "node_modules/eslint-plugin-unicorn": {
-      "version": "37.0.1",
+      "version": "39.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-37.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-39.0.0.tgz",
-      "integrity": "sha512-E1jq5u9ojnadisJcPi+hMXTGSiIzkIUMDvWsBudsCGXvKUB2aNSU2TcfyW2/jAS5A4ryBXfzxLykMxX1EdluSQ==",
+      "integrity": "sha512-fd5RK2FtYjGcIx3wra7csIE/wkkmBo22T1gZtRTsLr1Mb+KsFKJ+JOdSqhHXQUrI/JTs/Mon64cEYzTgSCbltw==",
      "dev": true,
      "dependencies": {
        "@babel/helper-validator-identifier": "^7.14.9",
@@ -12792,9 +12698,9 @@
      }
    },
    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "3.0.0",
+      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz",
-      "integrity": "sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==",
+      "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==",
      "dev": true,
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -12892,9 +12798,9 @@
      }
    },
    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "3.0.0",
+      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz",
-      "integrity": "sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==",
+      "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==",
      "dev": true,
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -13369,6 +13275,15 @@
      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
      "dev": true
    },
+    "node_modules/express/node_modules/toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
    "node_modules/ext": {
      "version": "1.6.0",
      "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
@@ -13498,9 +13413,10 @@
      "dev": true
    },
    "node_modules/extsprintf": {
-      "version": "1.4.0",
+      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz",
-      "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=",
+      "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==",
+      "dev": true,
      "engines": [
        "node >=0.6.0"
      ],
@@ -13922,9 +13838,9 @@
      }
    },
    "node_modules/flatted": {
-      "version": "3.2.2",
+      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz",
-      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
+      "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==",
      "dev": true
    },
    "node_modules/flush-write-stream": {
@@ -13943,9 +13859,9 @@
      "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
    },
    "node_modules/follow-redirects": {
-      "version": "1.14.4",
+      "version": "1.14.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz",
-      "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==",
+      "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==",
      "dev": true,
      "funding": [
        {
@@ -14160,25 +14076,6 @@
        "node": ">=0.6"
      }
    },
-    "node_modules/fstream/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/fstream/node_modules/rimraf": {
      "version": "2.7.1",
      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -14368,19 +14265,22 @@
      }
    },
    "node_modules/glob": {
-      "version": "5.0.15",
+      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "optional": true,
      "dependencies": {
+        "fs.realpath": "^1.0.0",
        "inflight": "^1.0.4",
        "inherits": "2",
-        "minimatch": "2 || 3",
+        "minimatch": "^3.0.4",
        "once": "^1.3.0",
        "path-is-absolute": "^1.0.0"
      },
      "engines": {
        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
      }
    },
    "node_modules/glob-parent": {
@@ -14416,26 +14316,6 @@
        "node": ">= 0.10"
      }
    },
-    "node_modules/glob-stream/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/glob-stream/node_modules/glob-parent": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
@@ -15232,32 +15112,6 @@
        "node": ">=10"
      }
    },
-    "node_modules/gulp-terser/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/gulp-terser/node_modules/terser": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
-      "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
-      "dev": true,
-      "dependencies": {
-        "commander": "^2.20.0",
-        "source-map": "~0.7.2",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
    "node_modules/gulp-typescript": {
      "version": "6.0.0-alpha.1",
      "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-6.0.0-alpha.1.tgz",
@@ -15778,6 +15632,38 @@
        "tslib": "^2.0.3"
      }
    },
+    "node_modules/html-minifier-terser/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/html-minifier-terser/node_modules/terser": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
+      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^2.20.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/html-minifier-terser/node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
    "node_modules/html-minifier/node_modules/commander": {
      "version": "2.17.1",
      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
@@ -15870,15 +15756,15 @@
      "dev": true
    },
    "node_modules/http-errors": {
-      "version": "1.8.0",
+      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.0.tgz",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A==",
+      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
      "dependencies": {
        "depd": "~1.1.2",
        "inherits": "2.0.4",
        "setprototypeof": "1.2.0",
        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
+        "toidentifier": "1.0.1"
      },
      "engines": {
        "node": ">= 0.6"
@@ -16067,16 +15953,16 @@
      "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ=="
    },
    "node_modules/iconv-corefoundation": {
-      "version": "1.1.6",
+      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz",
+      "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz",
-      "integrity": "sha512-1NBe55C75bKGZaY9UHxvXG3G0gEp0ziht7quhuFrW3SPgZDw9HI6qvYXRSV5M/Eupyu8ljuJ6Cba+ec15PZ4Xw==",
+      "integrity": "sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==",
      "dev": true,
      "optional": true,
      "os": [
        "darwin"
      ],
      "dependencies": {
-        "cli-truncate": "^1.1.0",
+        "cli-truncate": "^2.1.0",
        "node-addon-api": "^1.6.3"
      },
      "engines": {
@@ -16128,9 +16014,9 @@
      "dev": true
    },
    "node_modules/ignore": {
-      "version": "5.1.8",
+      "version": "5.1.9",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==",
      "dev": true,
      "engines": {
        "node": ">= 4"
@@ -16481,9 +16367,9 @@
      }
    },
    "node_modules/intl-messageformat": {
-      "version": "9.9.4",
+      "version": "9.9.6",
-      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.9.4.tgz",
+      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.9.6.tgz",
-      "integrity": "sha512-+Mz5LMTV+JCybFBym69z+XnE47wnIjHC31Jz7We6SE0yKyjf/neaWAFz8teuT6OUw/AW3Orr5LO4SHVNXl5keg==",
+      "integrity": "sha512-xgoBydnw9zGUtgCiUcxNTzrRLzAbBIgWyKvMjL2jFNCx7H0148GGQWNVOpoiON5SlcFr8lyMWdbb0m+HjydanQ==",
      "dependencies": {
        "@formatjs/fast-memoize": "1.2.0",
        "@formatjs/icu-messageformat-parser": "2.0.14",
@@ -16749,11 +16635,6 @@
        "node": ">=4"
      }
    },
-    "node_modules/is-function": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
-      "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="
-    },
    "node_modules/is-generator-fn": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
@@ -17706,26 +17587,6 @@
      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
      "dev": true
    },
-    "node_modules/jest-config/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/jest-config/node_modules/has-flag": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -18662,26 +18523,6 @@
      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
      "dev": true
    },
-    "node_modules/jest-runtime/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/jest-runtime/node_modules/has-flag": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -18982,9 +18823,9 @@
      }
    },
    "node_modules/jest-validate/node_modules/camelcase": {
-      "version": "6.2.0",
+      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+      "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
      "dev": true,
      "engines": {
        "node": ">=10"
@@ -19549,6 +19390,12 @@
        "verror": "1.10.0"
      }
    },
+    "node_modules/jsprim/node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "optional": true
+    },
    "node_modules/jsprim/node_modules/extsprintf": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -19558,6 +19405,20 @@
      ],
      "optional": true
    },
+    "node_modules/jsprim/node_modules/verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "optional": true,
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
    "node_modules/jss": {
      "version": "10.8.2",
      "resolved": "https://registry.npmjs.org/jss/-/jss-10.8.2.tgz",
@@ -19573,122 +19434,141 @@
        "url": "https://opencollective.com/jss"
      }
    },
-    "node_modules/jss-camel-case": {
+    "node_modules/jss-plugin-camel-case": {
-      "version": "6.1.0",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-camel-case/-/jss-camel-case-6.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.8.2.tgz",
-      "integrity": "sha512-HPF2Q7wmNW1t79mCqSeU2vdd/vFFGpkazwvfHMOhPlMgXrJDzdj9viA2SaHk9ZbD5pfL63a8ylp4++irYbbzMQ==",
+      "integrity": "sha512-2INyxR+1UdNuKf4v9It3tNfPvf7IPrtkiwzofeKuMd5D58/dxDJVUQYRVg/n460rTlHUfsEQx43hDrcxi9dSPA==",
      "dependencies": {
-        "hyphenate-style-name": "^1.0.2"
+        "@babel/runtime": "^7.3.1",
-      },
+        "hyphenate-style-name": "^1.0.3",
-      "peerDependencies": {
+        "jss": "10.8.2"
-        "jss": "^9.7.0"
      }
    },
-    "node_modules/jss-compose": {
+    "node_modules/jss-plugin-compose": {
-      "version": "5.0.0",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-compose/-/jss-compose-5.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-compose/-/jss-plugin-compose-10.8.2.tgz",
-      "integrity": "sha512-YofRYuiA0+VbeOw0VjgkyO380sA4+TWDrW52nSluD9n+1FWOlDzNbgpZ/Sb3Y46+DcAbOS21W5jo6SAqUEiuwA==",
+      "integrity": "sha512-X7fDQJ6IlIJoT8A3zc++LuC1hmSGKVudb3LyXp+vHv8r2hzzfXEEZty3y2CaC5CGrWcLlYquXENjqLNmLYMgMA==",
      "dependencies": {
-        "warning": "^3.0.0"
+        "@babel/runtime": "^7.3.1",
-      },
+        "jss": "10.8.2",
-      "peerDependencies": {
+        "tiny-warning": "^1.0.2"
-        "jss": "^9.0.0"
      }
    },
-    "node_modules/jss-default-unit": {
+    "node_modules/jss-plugin-default-unit": {
-      "version": "8.0.2",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-default-unit/-/jss-default-unit-8.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.8.2.tgz",
-      "integrity": "sha512-WxNHrF/18CdoAGw2H0FqOEvJdREXVXLazn7PQYU7V6/BWkCV0GkmWsppNiExdw8dP4TU1ma1dT9zBNJ95feLmg==",
+      "integrity": "sha512-UZ7cwT9NFYSG+SEy7noRU50s4zifulFdjkUNKE+u6mW7vFP960+RglWjTgMfh79G6OENZmaYnjHV/gcKV4nSxg==",
-      "peerDependencies": {
+      "dependencies": {
-        "jss": "^9.4.0"
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2"
      }
    },
-    "node_modules/jss-expand": {
+    "node_modules/jss-plugin-expand": {
-      "version": "5.3.0",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-expand/-/jss-expand-5.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-expand/-/jss-plugin-expand-10.8.2.tgz",
-      "integrity": "sha512-NiM4TbDVE0ykXSAw6dfFmB1LIqXP/jdd0ZMnlvlGgEMkMt+weJIl8Ynq1DsuBY9WwkNyzWktdqcEW2VN0RAtQg==",
+      "integrity": "sha512-Iy4qsZbEcomXz5aBZJYGwnzK23vK3hqlwGleqmd19fY3L+WbqTmUnW8W0fWeXSuCkw2NknBTAJuEpFcgm3b0Pw==",
-      "peerDependencies": {
+      "dependencies": {
-        "jss": "^9.4.0"
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2"
      }
    },
-    "node_modules/jss-extend": {
+    "node_modules/jss-plugin-extend": {
-      "version": "6.2.0",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-extend/-/jss-extend-6.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-extend/-/jss-plugin-extend-10.8.2.tgz",
-      "integrity": "sha512-YszrmcB6o9HOsKPszK7NeDBNNjVyiW864jfoiHoMlgMIg2qlxKw70axZHqgczXHDcoyi/0/ikP1XaHDPRvYtEA==",
+      "integrity": "sha512-NYu0cJ/Zb50ySPkegzbXQQfhXza0VpaRVXdXDex30yXqZpGcAdmhSg4HTv8vzHiL1v3uIOm641FYQX9WvLgSWw==",
      "dependencies": {
-        "warning": "^3.0.0"
+        "@babel/runtime": "^7.3.1",
-      },
+        "jss": "10.8.2",
-      "peerDependencies": {
+        "tiny-warning": "^1.0.2"
-        "jss": "^9.7.0"
      }
    },
-    "node_modules/jss-global": {
+    "node_modules/jss-plugin-global": {
-      "version": "3.0.0",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-global/-/jss-global-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.8.2.tgz",
-      "integrity": "sha512-wxYn7vL+TImyQYGAfdplg7yaxnPQ9RaXY/cIA8hawaVnmmWxDHzBK32u1y+RAvWboa3lW83ya3nVZ/C+jyjZ5Q==",
+      "integrity": "sha512-UaYMSPsYZ7s/ECGoj4KoHC2jwQd5iQ7K+FFGnCAILdQrv7hPmvM2Ydg45ThT/sH46DqktCRV2SqjRuxeBH8nRA==",
-      "peerDependencies": {
+      "dependencies": {
-        "jss": "^9.0.0"
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2"
      }
    },
-    "node_modules/jss-nested": {
+    "node_modules/jss-plugin-nested": {
-      "version": "6.0.1",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-nested/-/jss-nested-6.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.8.2.tgz",
-      "integrity": "sha512-rn964TralHOZxoyEgeq3hXY8hyuCElnvQoVrQwKHVmu55VRDd6IqExAx9be5HgK0yN/+hQdgAXQl/GUrBbbSTA==",
+      "integrity": "sha512-acRvuPJOb930fuYmhkJaa994EADpt8TxI63Iyg96C8FJ9T2xRyU5T6R1IYKRwUiqZo+2Sr7fdGzRTDD4uBZaMA==",
      "dependencies": {
-        "warning": "^3.0.0"
+        "@babel/runtime": "^7.3.1",
-      },
+        "jss": "10.8.2",
-      "peerDependencies": {
+        "tiny-warning": "^1.0.2"
-        "jss": "^9.0.0"
      }
    },
-    "node_modules/jss-preset-default": {
+    "node_modules/jss-plugin-props-sort": {
-      "version": "4.5.0",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-preset-default/-/jss-preset-default-4.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.8.2.tgz",
-      "integrity": "sha512-qZbpRVtHT7hBPpZEBPFfafZKWmq3tA/An5RNqywDsZQGrlinIF/mGD9lmj6jGqu8GrED2SMHZ3pPKLmjCZoiaQ==",
+      "integrity": "sha512-wqdcjayKRWBZnNpLUrXvsWqh+5J5YToAQ+8HNBNw0kZxVvCDwzhK2Nx6AKs7p+5/MbAh2PLgNW5Ym/ysbVAuqQ==",
-      "dependencies": {
+      "dependencies": {
-        "jss-camel-case": "^6.1.0",
+        "@babel/runtime": "^7.3.1",
-        "jss-compose": "^5.0.0",
+        "jss": "10.8.2"
-        "jss-default-unit": "^8.0.2",
-        "jss-expand": "^5.3.0",
-        "jss-extend": "^6.2.0",
-        "jss-global": "^3.0.0",
-        "jss-nested": "^6.0.1",
-        "jss-props-sort": "^6.0.0",
-        "jss-template": "^1.0.1",
-        "jss-vendor-prefixer": "^7.0.0"
-      },
-      "peerDependencies": {
-        "jss": "^9.7.0"
      }
    },
-    "node_modules/jss-props-sort": {
+    "node_modules/jss-plugin-rule-value-function": {
-      "version": "6.0.0",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-props-sort/-/jss-props-sort-6.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.8.2.tgz",
-      "integrity": "sha512-E89UDcrphmI0LzmvYk25Hp4aE5ZBsXqMWlkFXS0EtPkunJkRr+WXdCNYbXbksIPnKlBenGB9OxzQY+mVc70S+g==",
+      "integrity": "sha512-bW0EKAs+0HXpb6BKJhrn94IDdiWb0CnSluTkh0rGEgyzY/nmD1uV/Wf6KGlesGOZ9gmJzQy+9FFdxIUID1c9Ug==",
-      "peerDependencies": {
+      "dependencies": {
-        "jss": "^9.0.0"
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2",
+        "tiny-warning": "^1.0.2"
      }
    },
-    "node_modules/jss-template": {
+    "node_modules/jss-plugin-rule-value-observable": {
-      "version": "1.0.1",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-template/-/jss-template-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-observable/-/jss-plugin-rule-value-observable-10.8.2.tgz",
-      "integrity": "sha512-m5BqEWha17fmIVXm1z8xbJhY6GFJxNB9H68GVnCWPyGYfxiAgY9WTQyvDAVj+pYRgrXSOfN5V1T4+SzN1sJTeg==",
+      "integrity": "sha512-NaJCfsEg8/6l/E8HstwL2w8kHj2LHhwoG4fXxefmdvNKmJMwBpnjech5dEPL72It4bZfIIYoynWbyxo3Q0ZKQQ==",
      "dependencies": {
-        "warning": "^3.0.0"
+        "@babel/runtime": "^7.3.1",
-      },
+        "jss": "10.8.2",
-      "peerDependencies": {
+        "symbol-observable": "^1.2.0"
-        "jss": "^9.0.0"
      }
    },
-    "node_modules/jss-vendor-prefixer": {
+    "node_modules/jss-plugin-template": {
-      "version": "7.0.0",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-vendor-prefixer/-/jss-vendor-prefixer-7.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-template/-/jss-plugin-template-10.8.2.tgz",
-      "integrity": "sha512-Agd+FKmvsI0HLcYXkvy8GYOw3AAASBUpsmIRvVQheps+JWaN892uFOInTr0DRydwaD91vSSUCU4NssschvF7MA==",
+      "integrity": "sha512-oTVwYRUCuCLslHxuH73F15kFmDxc4YEJIn8kHBnNpGr99ZbQdRIgPabosVTfkgE8czuyTx0KM5u8zEeuL+v66A==",
      "dependencies": {
-        "css-vendor": "^0.3.8"
+        "@babel/runtime": "^7.3.1",
-      },
+        "jss": "10.8.2",
-      "peerDependencies": {
+        "tiny-warning": "^1.0.2"
-        "jss": "^9.0.0"
+      }
+    },
+    "node_modules/jss-plugin-vendor-prefixer": {
+      "version": "10.8.2",
+      "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.8.2.tgz",
+      "integrity": "sha512-DeGv18QsSiYLSVIEB2+l0af6OToUe0JB+trpzUxyqD2QRC/5AzzDrCrYffO5AHZ81QbffYvSN/pkfZaTWpRXlg==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "css-vendor": "^2.0.8",
+        "jss": "10.8.2"
+      }
+    },
+    "node_modules/jss-preset-default": {
+      "version": "10.8.2",
+      "resolved": "https://registry.npmjs.org/jss-preset-default/-/jss-preset-default-10.8.2.tgz",
+      "integrity": "sha512-mgkr6DAZuvkEleHFEpOkm8Y+sTdK/r0HH8PxToLHgaWHbYS0JAb0g1tBSUMG24kFj98VOYLTllK1o0J4lWU/uw==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2",
+        "jss-plugin-camel-case": "10.8.2",
+        "jss-plugin-compose": "10.8.2",
+        "jss-plugin-default-unit": "10.8.2",
+        "jss-plugin-expand": "10.8.2",
+        "jss-plugin-extend": "10.8.2",
+        "jss-plugin-global": "10.8.2",
+        "jss-plugin-nested": "10.8.2",
+        "jss-plugin-props-sort": "10.8.2",
+        "jss-plugin-rule-value-function": "10.8.2",
+        "jss-plugin-rule-value-observable": "10.8.2",
+        "jss-plugin-template": "10.8.2",
+        "jss-plugin-vendor-prefixer": "10.8.2"
      }
    },
    "node_modules/jsx-ast-utils": {
@@ -20438,9 +20318,9 @@
      }
    },
    "node_modules/loglevel": {
-      "version": "1.7.1",
+      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.0.tgz",
-      "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==",
+      "integrity": "sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==",
      "dev": true,
      "engines": {
        "node": ">= 0.6.0"
@@ -21012,9 +20892,9 @@
      "dev": true
    },
    "node_modules/mime": {
-      "version": "2.5.2",
+      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
      "dev": true,
      "bin": {
        "mime": "cli.js"
@@ -21024,19 +20904,19 @@
      }
    },
    "node_modules/mime-db": {
-      "version": "1.50.0",
+      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-      "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==",
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
      "engines": {
        "node": ">= 0.6"
      }
    },
    "node_modules/mime-types": {
-      "version": "2.1.33",
+      "version": "2.1.34",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
-      "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==",
+      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
      "dependencies": {
-        "mime-db": "1.50.0"
+        "mime-db": "1.51.0"
      },
      "engines": {
        "node": ">= 0.6"
@@ -21326,32 +21206,48 @@
      }
    },
    "node_modules/mobx-react": {
-      "version": "5.4.4",
+      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-5.4.4.tgz",
+      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-6.3.1.tgz",
-      "integrity": "sha512-2mTzpyEjVB/RGk2i6KbcmP4HWcAUFox5ZRCrGvSyz49w20I4C4qql63grPpYrS9E9GKwgydBHQlA4y665LuRCQ==",
+      "integrity": "sha512-IOxdJGnRSNSJrL2uGpWO5w9JH5q5HoxEqwOF4gye1gmZYdjoYkkMzSGMDnRCUpN/BNzZcFoMdHXrjvkwO7KgaQ==",
      "dependencies": {
-        "hoist-non-react-statics": "^3.0.0",
+        "mobx-react-lite": "^2.2.0"
-        "react-lifecycles-compat": "^3.0.2"
      },
      "peerDependencies": {
-        "mobx": "^4.0.0 || ^5.0.0",
+        "mobx": "^5.15.4 || ^4.15.4",
-        "react": "^0.13.0 || ^0.14.0 || ^15.0.0 || ^16.0.0"
+        "react": "^16.8.0 || 16.9.0-alpha.0"
      }
    },
    "node_modules/mobx-react-form": {
-      "version": "1.35.1",
+      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/mobx-react-form/-/mobx-react-form-1.35.1.tgz",
+      "resolved": "https://registry.npmjs.org/mobx-react-form/-/mobx-react-form-2.0.9.tgz",
-      "integrity": "sha1-iSrsZykiThHCl4+4LmetxOgOOmo=",
+      "integrity": "sha512-YLbtXVUF6BtifeVr6XWJ76dQWJs3T/+aPNI/DKvNs1Opcl4jNCzENahqlqNsNI+RgXZbP36zck//IGWBNZsr0A==",
      "dependencies": {
-        "lodash": "^4.16.2"
+        "lodash": "^4.17.11"
      },
      "engines": {
-        "node": ">=6.0.0"
+        "node": ">=8.0.0"
      },
      "peerDependencies": {
        "mobx": "^2.5.0 || ^3.0.0 || ^4.0.0 || ^5.0.0"
      }
    },
+    "node_modules/mobx-react-lite": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-2.2.2.tgz",
+      "integrity": "sha512-2SlXALHIkyUPDsV4VTKVR9DW7K3Ksh1aaIv3NrNJygTbhXe2A9GrcKHZ2ovIiOp/BXilOcTYemfHHZubP431dg==",
+      "peerDependencies": {
+        "mobx": "^4.0.0 || ^5.0.0",
+        "react": "^16.8.0"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/mobx-react-router": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/mobx-react-router/-/mobx-react-router-3.1.2.tgz",
@@ -21705,26 +21601,6 @@
        "run-queue": "^1.0.3"
      }
    },
-    "node_modules/move-concurrently/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/move-concurrently/node_modules/rimraf": {
      "version": "2.7.1",
      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -21982,8 +21858,7 @@
    "node_modules/node-addon-api": {
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.2.0.tgz",
-      "integrity": "sha512-eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q==",
+      "integrity": "sha512-eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q=="
-      "optional": true
    },
    "node_modules/node-cookie": {
      "version": "2.1.2",
@@ -22020,9 +21895,9 @@
      "integrity": "sha512-pFhMAqdN1avrFwtZs66HxYiVnbnH9wjXB4m8IKs5Z9+r7U5voqxT+EDbVkRfge+V7JnkOgKhN4HfKBn1o5g9Wg=="
    },
    "node_modules/node-fetch": {
-      "version": "2.6.5",
+      "version": "2.6.6",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz",
-      "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
+      "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==",
      "dependencies": {
        "whatwg-url": "^5.0.0"
      },
@@ -22087,26 +21962,6 @@
        "node": ">= 10.12.0"
      }
    },
-    "node_modules/node-gyp/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/node-int64": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -22163,19 +22018,23 @@
    },
    "node_modules/node-mac-permissions": {
      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/node-mac-permissions/-/node-mac-permissions-2.2.0.tgz",
+      "resolved": "git+ssh://git@github.com/vraravam/node-mac-permissions.git#3cffec37379e6584627d831611a8ff12b57bbcdb",
-      "integrity": "sha512-oLEZY46M47A/rcMacPEqo/5z6u7alXdMXhtE7xPDyMixZF35Grl9KGx3N2adE3//lEtGL6Tig98p+1gkonkwQg==",
+      "integrity": "sha512-kl87EmBwDK4Rn/uI/WsjMvqpr8Ivk5ptNU/HYEie/5uBqQdW3jWCHnlL5guCbNprXtLM5a+ROT1TiFNMkIM+fQ==",
      "hasInstallScript": true,
+      "license": "MIT",
      "optional": true,
+      "os": [
+        "darwin"
+      ],
      "dependencies": {
        "bindings": "^1.5.0",
-        "node-addon-api": "^2.0.0"
+        "node-addon-api": "^3.0.2"
      }
    },
    "node_modules/node-mac-permissions/node_modules/node-addon-api": {
-      "version": "2.0.2",
+      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-      "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==",
+      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
      "optional": true
    },
    "node_modules/node-modules-regexp": {
@@ -22221,25 +22080,6 @@
        "minipass": "^2.6.0"
      }
    },
-    "node_modules/node-pre-gyp/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/node-pre-gyp/node_modules/minipass": {
      "version": "2.9.0",
      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
@@ -24678,12 +24518,12 @@
      }
    },
    "node_modules/raw-body": {
-      "version": "2.4.1",
+      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz",
-      "integrity": "sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==",
+      "integrity": "sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==",
      "dependencies": {
-        "bytes": "3.1.0",
+        "bytes": "3.1.1",
-        "http-errors": "1.7.3",
+        "http-errors": "1.8.1",
        "iconv-lite": "0.4.24",
        "unpipe": "1.0.0"
      },
@@ -24691,21 +24531,6 @@
        "node": ">= 0.8"
      }
    },
-    "node_modules/raw-body/node_modules/http-errors": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
-      "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
    "node_modules/raw-body/node_modules/iconv-lite": {
      "version": "0.4.24",
      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -24717,11 +24542,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/raw-body/node_modules/setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-    },
    "node_modules/rc": {
      "version": "1.2.8",
      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -24781,6 +24601,11 @@
        "react": "^16.3.0 || ^17.0.1"
      }
    },
+    "node_modules/react-display-name": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/react-display-name/-/react-display-name-0.2.5.tgz",
+      "integrity": "sha512-I+vcaK9t4+kypiSgaiVWAipqHRXYmZIuAiS8vzFvXHHXVigg/sMKwlRgLy6LH2i3rmP+0Vzfl5lFsFRwF1r3pg=="
+    },
    "node_modules/react-dom": {
      "version": "17.0.2",
      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
@@ -24823,19 +24648,19 @@
      }
    },
    "node_modules/react-intl": {
-      "version": "5.21.0",
+      "version": "5.21.2",
-      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-5.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-5.21.2.tgz",
-      "integrity": "sha512-tRXg0JrMFpHgOokj+gFXvEbm4ZEePnidfVWFh3fbYc2FlJGnwxLjsvzCvRVv2qyNMHCy8xX6frRGe52WDOiYOg==",
+      "integrity": "sha512-pRKndhmjbFOq9CoJHHnUgXYf1tz9t3nIfInZg5TQ9EqYs9PPlkHBp4WtFDcFcW5UGV/QX4no6irpfXFsVKNWUA==",
      "dependencies": {
        "@formatjs/ecma402-abstract": "1.10.0",
        "@formatjs/icu-messageformat-parser": "2.0.14",
-        "@formatjs/intl": "1.15.0",
+        "@formatjs/intl": "1.15.2",
        "@formatjs/intl-displaynames": "5.2.5",
        "@formatjs/intl-listformat": "6.3.5",
        "@types/hoist-non-react-statics": "^3.3.1",
        "@types/react": "16 || 17",
        "hoist-non-react-statics": "^3.3.2",
-        "intl-messageformat": "9.9.4",
+        "intl-messageformat": "9.9.6",
        "tslib": "^2.1.0"
      },
      "peerDependencies": {
@@ -24854,40 +24679,24 @@
      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
    },
    "node_modules/react-jss": {
-      "version": "8.6.1",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/react-jss/-/react-jss-8.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/react-jss/-/react-jss-10.8.2.tgz",
-      "integrity": "sha512-SH6XrJDJkAphp602J14JTy3puB2Zxz1FkM3bKVE8wON+va99jnUTKWnzGECb3NfIn9JPR5vHykge7K3/A747xQ==",
+      "integrity": "sha512-/lLFIv1H6GA5RkvNb7TdXcJMBaSvSpfmSYsDisj4WI7MmqXUouoKfkZUJzG7CWq8xnIxik0WWYjFcGOvx0Sasw==",
      "dependencies": {
-        "hoist-non-react-statics": "^2.5.0",
+        "@babel/runtime": "^7.3.1",
-        "jss": "^9.7.0",
+        "@emotion/is-prop-valid": "^0.7.3",
-        "jss-preset-default": "^4.3.0",
+        "css-jss": "10.8.2",
+        "hoist-non-react-statics": "^3.2.0",
+        "is-in-browser": "^1.1.3",
+        "jss": "10.8.2",
+        "jss-preset-default": "10.8.2",
        "prop-types": "^15.6.0",
-        "theming": "^1.3.0"
+        "shallow-equal": "^1.2.0",
-      },
+        "theming": "^3.3.0",
-      "engines": {
+        "tiny-warning": "^1.0.2"
-        "node": ">=4"
      },
      "peerDependencies": {
-        "react": ">=0.13"
+        "react": ">=16.8.6"
-      }
-    },
-    "node_modules/react-jss/node_modules/hoist-non-react-statics": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
-      "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
-    },
-    "node_modules/react-jss/node_modules/jss": {
-      "version": "9.8.7",
-      "resolved": "https://registry.npmjs.org/jss/-/jss-9.8.7.tgz",
-      "integrity": "sha512-awj3XRZYxbrmmrx9LUSj5pXSUfm12m8xzi/VKeqI1ZwWBtQ0kVPTs3vYs32t4rFw83CgFDukA8wKzOE9sMQnoQ==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "is-in-browser": "^1.1.3",
-        "symbol-observable": "^1.1.0",
-        "warning": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
      }
    },
    "node_modules/react-lifecycles-compat": {
@@ -24910,9 +24719,9 @@
      }
    },
    "node_modules/react-modal": {
-      "version": "3.14.3",
+      "version": "3.14.4",
-      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.14.3.tgz",
+      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.14.4.tgz",
-      "integrity": "sha512-+C2KODVKyu20zHXPJxfOOcf571L1u/EpFlH+oS/3YDn8rgVE51QZuxuuIwabJ8ZFnOEHaD+r6XNjqwtxZnXO0g==",
+      "integrity": "sha512-8surmulejafYCH9wfUmFyj4UfbSJwjcgbS9gf3oOItu4Hwd6ivJyVBETI0yHRhpJKCLZMUtnhzk76wXTsNL6Qg==",
      "dependencies": {
        "exenv": "^1.2.0",
        "prop-types": "^15.7.2",
@@ -25963,26 +25772,6 @@
        "url": "https://github.com/sponsors/isaacs"
      }
    },
-    "node_modules/rimraf/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "devOptional": true,
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/ripemd160": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
@@ -26665,6 +26454,14 @@
      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
    },
+    "node_modules/serve-static/node_modules/toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
    "node_modules/set-blocking": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -26731,6 +26528,11 @@
        "node": ">=8"
      }
    },
+    "node_modules/shallow-equal": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz",
+      "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA=="
+    },
    "node_modules/shebang-command": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -26764,9 +26566,9 @@
      }
    },
    "node_modules/signal-exit": {
-      "version": "3.0.5",
+      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
-      "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ=="
+      "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="
    },
    "node_modules/simple-encryptor": {
      "version": "2.0.0",
@@ -26816,16 +26618,64 @@
      }
    },
    "node_modules/slice-ansi": {
-      "version": "1.0.0",
+      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
      "dev": true,
      "optional": true,
      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0"
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
      },
      "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/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,
+      "optional": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/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,
+      "optional": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/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,
+      "optional": true
+    },
+    "node_modules/slice-ansi/node_modules/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,
+      "optional": true,
+      "engines": {
+        "node": ">=8"
      }
    },
    "node_modules/smart-buffer": {
@@ -27134,9 +26984,9 @@
      }
    },
    "node_modules/source-map-support": {
-      "version": "0.5.20",
+      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
      "dev": true,
      "dependencies": {
        "buffer-from": "^1.0.0",
@@ -27205,9 +27055,9 @@
      }
    },
    "node_modules/spdx-license-ids": {
-      "version": "3.0.10",
+      "version": "3.0.11",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
-      "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==",
+      "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
      "dev": true
    },
    "node_modules/spdy": {
@@ -27355,26 +27205,6 @@
        }
      }
    },
-    "node_modules/sqlite3/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "optional": true,
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/sqlite3/node_modules/node-addon-api": {
      "version": "3.2.1",
      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
@@ -27802,7 +27632,6 @@
      "version": "6.0.1",
      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
      "dependencies": {
        "ansi-regex": "^5.0.1"
      },
@@ -28082,20 +27911,28 @@
      }
    },
    "node_modules/terser": {
-      "version": "4.8.0",
+      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz",
-      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+      "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==",
      "dev": true,
      "dependencies": {
        "commander": "^2.20.0",
-        "source-map": "~0.6.1",
+        "source-map": "~0.7.2",
-        "source-map-support": "~0.5.12"
+        "source-map-support": "~0.5.20"
      },
      "bin": {
        "terser": "bin/terser"
      },
      "engines": {
-        "node": ">=6.0.0"
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "acorn": "^8.5.0"
+      },
+      "peerDependenciesMeta": {
+        "acorn": {
+          "optional": true
+        }
      }
    },
    "node_modules/terser-webpack-plugin": {
@@ -28150,26 +27987,6 @@
      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
      "dev": true
    },
-    "node_modules/terser-webpack-plugin/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/terser-webpack-plugin/node_modules/lru-cache": {
      "version": "5.1.1",
      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -28218,6 +28035,23 @@
        "figgy-pudding": "^3.5.1"
      }
    },
+    "node_modules/terser-webpack-plugin/node_modules/terser": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
+      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^2.20.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
    "node_modules/terser-webpack-plugin/node_modules/y18n": {
      "version": "4.0.3",
      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
@@ -28231,12 +28065,12 @@
      "dev": true
    },
    "node_modules/terser/node_modules/source-map": {
-      "version": "0.6.1",
+      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
      "dev": true,
      "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 8"
      }
    },
    "node_modules/test-exclude": {
@@ -28253,26 +28087,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/test-exclude/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/text-extensions": {
      "version": "1.9.0",
      "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
@@ -28294,17 +28108,20 @@
      "dev": true
    },
    "node_modules/theming": {
-      "version": "1.3.0",
+      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/theming/-/theming-1.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/theming/-/theming-3.3.0.tgz",
-      "integrity": "sha512-ya5Ef7XDGbTPBv5ENTwrwkPUexrlPeiAg/EI9kdlUAZhNlRbCdhMKRgjNX1IcmsmiPcqDQZE6BpSaH+cr31FKw==",
+      "integrity": "sha512-u6l4qTJRDaWZsqa8JugaNt7Xd8PPl9+gonZaIe28vAhqgHMIG/DOyFPqiKN/gQLQYj05tHv+YQdNILL4zoiAVA==",
      "dependencies": {
-        "brcast": "^3.0.1",
+        "hoist-non-react-statics": "^3.3.0",
-        "is-function": "^1.0.1",
+        "prop-types": "^15.5.8",
-        "is-plain-object": "^2.0.1",
+        "react-display-name": "^0.2.4",
-        "prop-types": "^15.5.8"
+        "tiny-warning": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=8"
      },
      "peerDependencies": {
-        "react": ">=0.15"
+        "react": ">=16.3"
      }
    },
    "node_modules/throat": {
@@ -28623,9 +28440,9 @@
      }
    },
    "node_modules/toidentifier": {
-      "version": "1.0.0",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
      "engines": {
        "node": ">=0.6"
      }
@@ -28922,9 +28739,9 @@
      }
    },
    "node_modules/tsconfig-paths": {
-      "version": "3.11.0",
+      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz",
-      "integrity": "sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==",
+      "integrity": "sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==",
      "dev": true,
      "dependencies": {
        "@types/json5": "^0.0.29",
@@ -29110,9 +28927,9 @@
      }
    },
    "node_modules/typescript": {
-      "version": "4.2.4",
+      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz",
-      "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==",
+      "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==",
      "dev": true,
      "bin": {
        "tsc": "bin/tsc",
@@ -29123,9 +28940,9 @@
      }
    },
    "node_modules/uglify-js": {
-      "version": "3.14.2",
+      "version": "3.14.3",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.2.tgz",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.3.tgz",
-      "integrity": "sha512-rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A==",
+      "integrity": "sha512-mic3aOdiq01DuSVx0TseaEzMIVqebMZ0Z3vaeDhFEh9bsc24hV1TFvN74reA2vs08D0ZWfNjAcJ3UbVLaBss+g==",
      "dev": true,
      "bin": {
        "uglifyjs": "bin/uglifyjs"
@@ -29171,8 +28988,7 @@
    "node_modules/underscore": {
      "version": "1.13.1",
      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
+      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
-      "optional": true
    },
    "node_modules/undertaker": {
      "version": "1.3.0",
@@ -29753,26 +29569,6 @@
        "node-gyp": "^7.1.2"
      }
    },
-    "node_modules/usocket/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "optional": true,
-      "dependencies": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/usocket/node_modules/node-gyp": {
      "version": "7.1.2",
      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz",
@@ -29907,9 +29703,9 @@
      }
    },
    "node_modules/validator": {
-      "version": "13.6.0",
+      "version": "13.7.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-13.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz",
-      "integrity": "sha512-gVgKbdbHgtxpRyR8K0O6oFZPhhB5tT1jeEHZR0Znr9Svg03U0+r9DXWMrnRAB+HtCStDQKlaIZm42tVsVjqtjg==",
+      "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==",
      "engines": {
        "node": ">= 0.10"
      }
@@ -29932,23 +29728,25 @@
      }
    },
    "node_modules/verror": {
-      "version": "1.10.0",
+      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==",
-      "engines": [
+      "dev": true,
-        "node >=0.6.0"
-      ],
      "optional": true,
      "dependencies": {
        "assert-plus": "^1.0.0",
        "core-util-is": "1.0.2",
        "extsprintf": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.6.0"
      }
    },
    "node_modules/verror/node_modules/core-util-is": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true,
      "optional": true
    },
    "node_modules/vinyl": {
@@ -30820,12 +30618,12 @@
      }
    },
    "node_modules/webpack-dev-server": {
-      "version": "3.11.2",
+      "version": "3.11.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz",
-      "integrity": "sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==",
+      "integrity": "sha512-3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA==",
      "dev": true,
      "dependencies": {
-        "ansi-html": "0.0.7",
+        "ansi-html-community": "0.0.8",
        "bonjour": "^3.5.0",
        "chokidar": "^2.1.8",
        "compression": "^1.7.4",
@@ -31879,9 +31677,9 @@
      }
    },
    "node_modules/yargs-unparser/node_modules/camelcase": {
-      "version": "6.2.0",
+      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+      "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
      "dev": true,
      "engines": {
        "node": ">=10"
@@ -32289,26 +32087,26 @@
      }
    },
    "@babel/compat-data": {
-      "version": "7.16.0",
+      "version": "7.16.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz",
-      "integrity": "sha512-DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew==",
+      "integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==",
      "dev": true
    },
    "@babel/core": {
-      "version": "7.15.8",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.0.tgz",
-      "integrity": "sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==",
+      "integrity": "sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==",
-      "dev": true,
+      "dev": true,
-      "requires": {
+      "requires": {
-        "@babel/code-frame": "^7.15.8",
+        "@babel/code-frame": "^7.16.0",
-        "@babel/generator": "^7.15.8",
+        "@babel/generator": "^7.16.0",
-        "@babel/helper-compilation-targets": "^7.15.4",
+        "@babel/helper-compilation-targets": "^7.16.0",
-        "@babel/helper-module-transforms": "^7.15.8",
+        "@babel/helper-module-transforms": "^7.16.0",
-        "@babel/helpers": "^7.15.4",
+        "@babel/helpers": "^7.16.0",
-        "@babel/parser": "^7.15.8",
+        "@babel/parser": "^7.16.0",
-        "@babel/template": "^7.15.4",
+        "@babel/template": "^7.16.0",
-        "@babel/traverse": "^7.15.4",
+        "@babel/traverse": "^7.16.0",
-        "@babel/types": "^7.15.6",
+        "@babel/types": "^7.16.0",
        "convert-source-map": "^1.7.0",
        "debug": "^4.1.0",
        "gensync": "^1.0.0-beta.2",
@@ -32326,9 +32124,9 @@
      }
    },
    "@babel/eslint-parser": {
-      "version": "7.16.0",
+      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.16.3.tgz",
-      "integrity": "sha512-c+AsYOHjI+FgCa+ifLd8sDXp4U4mjkfFgL9NdQWhuA731kAUJs0WdJIXET4A14EJAR9Jv9FFF/MzPWJfV9Oirw==",
+      "integrity": "sha512-iB4ElZT0jAt7PKVaeVulOECdGe6UnmA/O0P9jlF5g5GBOwDVbna8AXhHRu4s27xQf6OkveyA8iTDv1jHdDejgQ==",
      "dev": true,
      "requires": {
        "eslint-scope": "^5.1.1",
@@ -32375,14 +32173,14 @@
      }
    },
    "@babel/helper-compilation-targets": {
-      "version": "7.16.0",
+      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz",
-      "integrity": "sha512-S7iaOT1SYlqK0sQaCi21RX4+13hmdmnxIEAnQUB/eh7GeAnRjOUgTYpLkUOiRXzD+yog1JxP0qyAQZ7ZxVxLVg==",
+      "integrity": "sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==",
      "dev": true,
      "requires": {
        "@babel/compat-data": "^7.16.0",
        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.17.5",
        "semver": "^6.3.0"
      },
      "dependencies": {
@@ -32419,9 +32217,9 @@
      }
    },
    "@babel/helper-define-polyfill-provider": {
-      "version": "0.2.4",
+      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz",
-      "integrity": "sha512-OrpPZ97s+aPi6h2n1OXzdhVis1SGSsMU2aMHgLcOKfsp4/v1NWpx3CWT3lBj5eeBq9cDkPkh+YCfdF7O12uNDQ==",
+      "integrity": "sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg==",
      "dev": true,
      "requires": {
        "@babel/helper-compilation-targets": "^7.13.0",
@@ -32530,9 +32328,9 @@
      "dev": true
    },
    "@babel/helper-remap-async-to-generator": {
-      "version": "7.16.0",
+      "version": "7.16.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.4.tgz",
-      "integrity": "sha512-MLM1IOMe9aQBqMWxcRw8dcb9jlM86NIw7KA0Wri91Xkfied+dE0QuBFSBjMNvqzmS0OSIDsMNC24dBEkPUi7ew==",
+      "integrity": "sha512-vGERmmhR+s7eH5Y/cp8PCVzj4XEjerq8jooMfxFdA5xVtAk9Sh4AQsrWgiErUEBjtGrBtOFKDUcWQFW4/dFwMA==",
      "dev": true,
      "requires": {
        "@babel/helper-annotate-as-pure": "^7.16.0",
@@ -32604,14 +32402,14 @@
      }
    },
    "@babel/helpers": {
-      "version": "7.15.4",
+      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.3.tgz",
-      "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==",
+      "integrity": "sha512-Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w==",
      "dev": true,
      "requires": {
-        "@babel/template": "^7.15.4",
+        "@babel/template": "^7.16.0",
-        "@babel/traverse": "^7.15.4",
+        "@babel/traverse": "^7.16.3",
-        "@babel/types": "^7.15.4"
+        "@babel/types": "^7.16.0"
      }
    },
    "@babel/highlight": {
@@ -32626,9 +32424,9 @@
      }
    },
    "@babel/parser": {
-      "version": "7.16.2",
+      "version": "7.16.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.2.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz",
-      "integrity": "sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw==",
+      "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==",
      "dev": true
    },
    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
@@ -32652,13 +32450,13 @@
      }
    },
    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.16.0",
+      "version": "7.16.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.4.tgz",
-      "integrity": "sha512-nyYmIo7ZqKsY6P4lnVmBlxp9B3a96CscbLotlsNuktMHahkDwoPYEjXrZHU0Tj844Z9f1IthVxQln57mhkcExw==",
+      "integrity": "sha512-/CUekqaAaZCQHleSK/9HajvcD/zdnJiKRiuUFq8ITE+0HsPzquf53cpFiqAwl/UfmJbR6n5uGPQSPdrmKOvHHg==",
      "dev": true,
      "requires": {
        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.16.0",
+        "@babel/helper-remap-async-to-generator": "^7.16.4",
        "@babel/plugin-syntax-async-generators": "^7.8.4"
      }
    },
@@ -32684,9 +32482,9 @@
      }
    },
    "@babel/plugin-proposal-decorators": {
-      "version": "7.16.0",
+      "version": "7.16.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.16.4.tgz",
-      "integrity": "sha512-ttvhKuVnQwoNQrcTd1oe6o49ahaZ1kns1fsJKzTVOaS/FJDJoK4qzgVS68xzJhYUMgTnbXW6z/T6rlP3lL7tJw==",
+      "integrity": "sha512-RESBNX16eNqnBeEVR5sCJpnW0mHiNLNNvGA8PrRuK/4ZJ4TO+6bHleRUuGQYDERVySOKtOhSya/C4MIhwAMAgg==",
      "dev": true,
      "requires": {
        "@babel/helper-create-class-features-plugin": "^7.16.0",
@@ -32902,9 +32700,9 @@
      }
    },
    "@babel/plugin-syntax-jsx": {
-      "version": "7.14.5",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.0.tgz",
-      "integrity": "sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==",
+      "integrity": "sha512-8zv2+xiPHwly31RK4RmnEYY5zziuF3O7W2kIDW+07ewWDh6Oi0dRq8kwvulRkFgt6DB97RlKs5c1y068iPlCUg==",
      "dev": true,
      "requires": {
        "@babel/helper-plugin-utils": "^7.14.5"
@@ -32983,9 +32781,9 @@
      }
    },
    "@babel/plugin-syntax-typescript": {
-      "version": "7.14.5",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.0.tgz",
-      "integrity": "sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==",
+      "integrity": "sha512-Xv6mEXqVdaqCBfJFyeab0fH2DnUoMsDmhamxsSi4j8nLd4Vtw213WMJr55xxqipC/YVWyPY3K0blJncPYji+dQ==",
      "dev": true,
      "requires": {
        "@babel/helper-plugin-utils": "^7.14.5"
@@ -33203,9 +33001,9 @@
      }
    },
    "@babel/plugin-transform-parameters": {
-      "version": "7.16.0",
+      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.3.tgz",
-      "integrity": "sha512-XgnQEm1CevKROPx+udOi/8f8TiGhrUWiHiaUCIp47tE0tpFDjzXNTZc9E5CmCwxNjXTWEVqvRfWZYOTFvMa/ZQ==",
+      "integrity": "sha512-3MaDpJrOXT1MZ/WCmkOFo7EtmVVC8H4EUZVrHvFOsmwkk4lOjQj8rzv8JKUZV4YoQKeoIgk07GO+acPU9IMu/w==",
      "dev": true,
      "requires": {
        "@babel/helper-plugin-utils": "^7.14.5"
@@ -33221,43 +33019,43 @@
      }
    },
    "@babel/plugin-transform-react-display-name": {
-      "version": "7.15.1",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.15.1.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.0.tgz",
-      "integrity": "sha512-yQZ/i/pUCJAHI/LbtZr413S3VT26qNrEm0M5RRxQJA947/YNYwbZbBaXGDrq6CG5QsZycI1VIP6d7pQaBfP+8Q==",
+      "integrity": "sha512-FJFdJAqaCpndL+pIf0aeD/qlQwT7QXOvR6Cc8JPvNhKJBi2zc/DPc4g05Y3fbD/0iWAMQFGij4+Xw+4L/BMpTg==",
      "dev": true,
      "requires": {
        "@babel/helper-plugin-utils": "^7.14.5"
      }
    },
    "@babel/plugin-transform-react-jsx": {
-      "version": "7.14.9",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.0.tgz",
-      "integrity": "sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==",
+      "integrity": "sha512-rqDgIbukZ44pqq7NIRPGPGNklshPkvlmvqjdx3OZcGPk4zGIenYkxDTvl3LsSL8gqcc3ZzGmXPE6hR/u/voNOw==",
      "dev": true,
      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-annotate-as-pure": "^7.16.0",
-        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-module-imports": "^7.16.0",
        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-jsx": "^7.14.5",
+        "@babel/plugin-syntax-jsx": "^7.16.0",
-        "@babel/types": "^7.14.9"
+        "@babel/types": "^7.16.0"
      }
    },
    "@babel/plugin-transform-react-jsx-development": {
-      "version": "7.14.5",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.0.tgz",
-      "integrity": "sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ==",
+      "integrity": "sha512-qq65iSqBRq0Hr3wq57YG2AmW0H6wgTnIzpffTphrUWUgLCOK+zf1f7G0vuOiXrp7dU1qq+fQBoqZ3wCDAkhFzw==",
      "dev": true,
      "requires": {
-        "@babel/plugin-transform-react-jsx": "^7.14.5"
+        "@babel/plugin-transform-react-jsx": "^7.16.0"
      }
    },
    "@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.14.5",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.0.tgz",
-      "integrity": "sha512-3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g==",
+      "integrity": "sha512-NC/Bj2MG+t8Ef5Pdpo34Ay74X4Rt804h5y81PwOpfPtmAK3i6CizmQqwyBQzIepz1Yt8wNr2Z2L7Lu3qBMfZMA==",
      "dev": true,
      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-annotate-as-pure": "^7.16.0",
        "@babel/helper-plugin-utils": "^7.14.5"
      }
    },
@@ -33345,18 +33143,18 @@
      }
    },
    "@babel/preset-env": {
-      "version": "7.16.0",
+      "version": "7.16.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.4.tgz",
-      "integrity": "sha512-cdTu/W0IrviamtnZiTfixPfIncr2M1VqRrkjzZWlr1B4TVYimCFK5jkyOdP4qw2MrlKHi+b3ORj6x8GoCew8Dg==",
+      "integrity": "sha512-v0QtNd81v/xKj4gNKeuAerQ/azeNn/G1B1qMLeXOcV8+4TWlD2j3NV1u8q29SDFBXx/NBq5kyEAO+0mpRgacjA==",
      "dev": true,
      "requires": {
-        "@babel/compat-data": "^7.16.0",
+        "@babel/compat-data": "^7.16.4",
-        "@babel/helper-compilation-targets": "^7.16.0",
+        "@babel/helper-compilation-targets": "^7.16.3",
        "@babel/helper-plugin-utils": "^7.14.5",
        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.0",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.2",
        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.0",
-        "@babel/plugin-proposal-async-generator-functions": "^7.16.0",
+        "@babel/plugin-proposal-async-generator-functions": "^7.16.4",
        "@babel/plugin-proposal-class-properties": "^7.16.0",
        "@babel/plugin-proposal-class-static-block": "^7.16.0",
        "@babel/plugin-proposal-dynamic-import": "^7.16.0",
@@ -33406,7 +33204,7 @@
        "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.0",
        "@babel/plugin-transform-new-target": "^7.16.0",
        "@babel/plugin-transform-object-super": "^7.16.0",
-        "@babel/plugin-transform-parameters": "^7.16.0",
+        "@babel/plugin-transform-parameters": "^7.16.3",
        "@babel/plugin-transform-property-literals": "^7.16.0",
        "@babel/plugin-transform-regenerator": "^7.16.0",
        "@babel/plugin-transform-reserved-words": "^7.16.0",
@@ -33419,10 +33217,10 @@
        "@babel/plugin-transform-unicode-regex": "^7.16.0",
        "@babel/preset-modules": "^0.1.5",
        "@babel/types": "^7.16.0",
-        "babel-plugin-polyfill-corejs2": "^0.2.3",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.4.0",
-        "babel-plugin-polyfill-regenerator": "^0.2.3",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "core-js-compat": "^3.19.0",
+        "core-js-compat": "^3.19.1",
        "semver": "^6.3.0"
      },
      "dependencies": {
@@ -33448,23 +33246,23 @@
      }
    },
    "@babel/preset-react": {
-      "version": "7.14.5",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.16.0.tgz",
-      "integrity": "sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ==",
+      "integrity": "sha512-d31IFW2bLRB28uL1WoElyro8RH5l6531XfxMtCeCmp6RVAF1uTfxxUA0LH1tXl+psZdwfmIbwoG4U5VwgbhtLw==",
      "dev": true,
      "requires": {
        "@babel/helper-plugin-utils": "^7.14.5",
        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-transform-react-display-name": "^7.14.5",
+        "@babel/plugin-transform-react-display-name": "^7.16.0",
-        "@babel/plugin-transform-react-jsx": "^7.14.5",
+        "@babel/plugin-transform-react-jsx": "^7.16.0",
-        "@babel/plugin-transform-react-jsx-development": "^7.14.5",
+        "@babel/plugin-transform-react-jsx-development": "^7.16.0",
-        "@babel/plugin-transform-react-pure-annotations": "^7.14.5"
+        "@babel/plugin-transform-react-pure-annotations": "^7.16.0"
      }
    },
    "@babel/register": {
-      "version": "7.15.3",
+      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.15.3.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.16.0.tgz",
-      "integrity": "sha512-mj4IY1ZJkorClxKTImccn4T81+UKTo4Ux0+OFSV9hME1ooqS9UV+pJ6BjD0qXPK4T3XW/KNa79XByjeEMZz+fw==",
+      "integrity": "sha512-lzl4yfs0zVXnooeLE0AAfYaT7F3SPA8yB2Bj4W1BiZwLbMS3MZH35ZvCWSRHvneUugwuM+Wsnrj7h0F7UmU3NQ==",
      "dev": true,
      "requires": {
        "clone-deep": "^4.0.1",
@@ -33475,20 +33273,20 @@
      }
    },
    "@babel/runtime": {
-      "version": "7.15.4",
+      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
-      "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+      "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
      "requires": {
        "regenerator-runtime": "^0.13.4"
      }
    },
    "@babel/runtime-corejs3": {
-      "version": "7.15.4",
+      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.16.3.tgz",
-      "integrity": "sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg==",
+      "integrity": "sha512-IAdDC7T0+wEB4y2gbIL0uOXEYpiZEeuFUTVbdGq+UwCcF35T/tS8KrmMomEwEc5wBbyfH3PJVpTSUqrhPDXFcQ==",
      "dev": true,
      "requires": {
-        "core-js-pure": "^3.16.0",
+        "core-js-pure": "^3.19.0",
        "regenerator-runtime": "^0.13.4"
      }
    },
@@ -33504,9 +33302,9 @@
      }
    },
    "@babel/traverse": {
-      "version": "7.16.0",
+      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.3.tgz",
-      "integrity": "sha512-qQ84jIs1aRQxaGaxSysII9TuDaguZ5yVrEuC0BN2vcPlalwfLovVmCjbFDPECPXcYM/wLvNFfp8uDOliLxIoUQ==",
+      "integrity": "sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==",
      "dev": true,
      "requires": {
        "@babel/code-frame": "^7.16.0",
@@ -33514,7 +33312,7 @@
        "@babel/helper-function-name": "^7.16.0",
        "@babel/helper-hoist-variables": "^7.16.0",
        "@babel/helper-split-export-declaration": "^7.16.0",
-        "@babel/parser": "^7.16.0",
+        "@babel/parser": "^7.16.3",
        "@babel/types": "^7.16.0",
        "debug": "^4.1.0",
        "globals": "^11.1.0"
@@ -33537,16 +33335,16 @@
      "dev": true
    },
    "@commitlint/cli": {
-      "version": "14.1.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-14.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-15.0.0.tgz",
-      "integrity": "sha512-Orq62jkl9qAGvjFqhehtAqjGY/duJ8hIRPPIHmGR2jIB96D4VTmazS3ZvqJz2Q9kKr61mLAk/171zm0FVzQCYA==",
+      "integrity": "sha512-Y5xmDCweytqzo4N4lOI2YRiuX35xTjcs8n5hUceBH8eyK0YbwtgWX50BJOH2XbkwEmII9blNhlBog6AdQsqicg==",
      "dev": true,
      "requires": {
-        "@commitlint/format": "^14.1.0",
+        "@commitlint/format": "^15.0.0",
-        "@commitlint/lint": "^14.1.0",
+        "@commitlint/lint": "^15.0.0",
-        "@commitlint/load": "^14.1.0",
+        "@commitlint/load": "^15.0.0",
-        "@commitlint/read": "^14.0.0",
+        "@commitlint/read": "^15.0.0",
-        "@commitlint/types": "^14.0.0",
+        "@commitlint/types": "^15.0.0",
        "lodash": "^4.17.19",
        "resolve-from": "5.0.0",
        "resolve-global": "1.0.0",
@@ -33554,37 +33352,37 @@
      }
    },
    "@commitlint/config-conventional": {
-      "version": "14.1.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-14.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-15.0.0.tgz",
-      "integrity": "sha512-JuhCqkEv8jyqmd54EpXPsQFpYc/8k7sfP1UziRdEvZSJUCLxz+8Pk4cNS0oF1BtjaWO7ITgXPlIZg47PyApGmg==",
+      "integrity": "sha512-eZBRL8Lk3hMNHp1wUMYj0qrZQEsST1ai7KHR8J1IDD9aHgT7L2giciibuQ+Og7vxVhR5WtYDvh9xirXFVPaSkQ==",
      "dev": true,
      "requires": {
        "conventional-changelog-conventionalcommits": "^4.3.1"
      }
    },
    "@commitlint/ensure": {
-      "version": "14.1.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-14.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-15.0.0.tgz",
-      "integrity": "sha512-xrYvFdqVepT3XA1BmSh88eKbvYKtLuQu98QLfgxVmwS99Kj3yW0sT3D7jGvNsynbIx2dhbXofDyubf/DKkpFrQ==",
+      "integrity": "sha512-7DV4iNIald3vycwaWBNGk5FbonaNzOlU8nBe5m5AgU2dIeNKuXwLm+zzJzG27j0Ho56rgz//3F6RIvmsoxY9ZA==",
      "dev": true,
      "requires": {
-        "@commitlint/types": "^14.0.0",
+        "@commitlint/types": "^15.0.0",
        "lodash": "^4.17.19"
      }
    },
    "@commitlint/execute-rule": {
-      "version": "14.0.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-14.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-15.0.0.tgz",
-      "integrity": "sha512-Hh/HLpCBDlrD3Rx2x2pDBx6CU+OtVqGXh7mbFpNihAVx6B0zyZqm/vv0cdwdhfGW5OEn1BhCqHf1ZOvL/DwdWA==",
+      "integrity": "sha512-pyE4ApxjbWhb1TXz5vRiGwI2ssdMMgZbaaheZq1/7WC0xRnqnIhE1yUC1D2q20qPtvkZPstTYvMiRVtF+DvjUg==",
      "dev": true
    },
    "@commitlint/format": {
-      "version": "14.1.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-14.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-15.0.0.tgz",
-      "integrity": "sha512-sF6engqqHjvxGctWRKjFs/HQeNowlpbVmmoP481b2UMQnVQnjjfXJvQsoLpaqFUvgc2sHM4L85F8BmAw+iHG1w==",
+      "integrity": "sha512-bPhAfqwRhPk92WiuY0ktEJNpRRHSCd+Eg1MdhGyL9Bl3U25E5zvuInA+dNctnzZiOBSH/37ZaD0eOKCpQE6acg==",
      "dev": true,
      "requires": {
-        "@commitlint/types": "^14.0.0",
+        "@commitlint/types": "^15.0.0",
        "chalk": "^4.0.0"
      },
      "dependencies": {
@@ -33640,36 +33438,36 @@
      }
    },
    "@commitlint/is-ignored": {
-      "version": "14.0.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-14.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-15.0.0.tgz",
-      "integrity": "sha512-nJltYjXTa+mk+6SPe35nOZCCvt3Gh5mbDz008KQ4OPcn1GX1NG+pEgz1Kx3agDp/pc+JGnsrr5GV00gygIoloA==",
+      "integrity": "sha512-edtnkf2QZ/7e/YCJDgn1WDw9wfF1WfOitW5YEoSOb4SxjJEb/oE87kxNPZ2j8mnDMuunspcMfGHeg6fRlwaEWg==",
      "dev": true,
      "requires": {
-        "@commitlint/types": "^14.0.0",
+        "@commitlint/types": "^15.0.0",
        "semver": "7.3.5"
      }
    },
    "@commitlint/lint": {
-      "version": "14.1.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-14.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-15.0.0.tgz",
-      "integrity": "sha512-CApGJEOtWU/CcuPD8HkOR1jdUYpjKutGPaeby9nSFzJhwl/UQOjxc4Nd+2g2ygsMi5l3N4j2sWQYEgccpFC3lA==",
+      "integrity": "sha512-hUi2+Im/2dJ5FBvWnodypTkg+5haCgsDzB0fyMApWLUA1IucYUAqRCQCW5em1Mhk9Crw1pd5YzFNikhIclkqCw==",
      "dev": true,
      "requires": {
-        "@commitlint/is-ignored": "^14.0.0",
+        "@commitlint/is-ignored": "^15.0.0",
-        "@commitlint/parse": "^14.0.0",
+        "@commitlint/parse": "^15.0.0",
-        "@commitlint/rules": "^14.1.0",
+        "@commitlint/rules": "^15.0.0",
-        "@commitlint/types": "^14.0.0"
+        "@commitlint/types": "^15.0.0"
      }
    },
    "@commitlint/load": {
-      "version": "14.1.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-14.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-15.0.0.tgz",
-      "integrity": "sha512-p+HbgjhkqLsnxyjOUdEYHztHCp8n2oLVUJTmRPuP5FXLNevh6Gwmxf+NYC2J0sgD084aV2CFi3qu1W4yHWIknA==",
+      "integrity": "sha512-Ak1YPeOhvxmY3ioe0o6m1yLGvUAYb4BdfGgShU8jiTCmU3Mnmms0Xh/kfQz8AybhezCC3AmVTyBLaBZxOHR8kg==",
      "dev": true,
      "requires": {
-        "@commitlint/execute-rule": "^14.0.0",
+        "@commitlint/execute-rule": "^15.0.0",
-        "@commitlint/resolve-extends": "^14.1.0",
+        "@commitlint/resolve-extends": "^15.0.0",
-        "@commitlint/types": "^14.0.0",
+        "@commitlint/types": "^15.0.0",
        "@endemolshinegroup/cosmiconfig-typescript-loader": "^3.0.2",
        "chalk": "^4.0.0",
        "cosmiconfig": "^7.0.0",
@@ -33726,48 +33524,42 @@
          "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
        }
      }
    },
    "@commitlint/message": {
-      "version": "14.0.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-14.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-15.0.0.tgz",
-      "integrity": "sha512-316Pum+bwDcZamOQw0DXSY17Dq9EjvL1zKdYIZqneu4lnXN6uFfi53Y/sP5crW6zlLdnuTHe1MnuewXPLHfH1Q==",
+      "integrity": "sha512-L8euabzboKavPuDJsdIYAY2wx97LbiGEYsckMo6NmV8pOun50c8hQx6ouXFSAx4pp+mX9yUGmMiVqfrk2LKDJQ==",
      "dev": true
    },
    "@commitlint/parse": {
-      "version": "14.0.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-14.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-15.0.0.tgz",
-      "integrity": "sha512-49qkk0TcwdxJPZUX8MElEzMlRFIL/cg64P4pk8HotFEm2HYdbxxZp6v3cbVw5WOsnRA0frrs+NNoOcIT83ccMQ==",
+      "integrity": "sha512-7fweM67tZfBNS7zw1KTuuT5K2u9nGytUJqFqT/1Ln3Na9cBCsoAqR47mfsNOTlRCgGwakm4xiQ7BpS2gN0OGuw==",
      "dev": true,
      "requires": {
-        "@commitlint/types": "^14.0.0",
+        "@commitlint/types": "^15.0.0",
        "conventional-changelog-angular": "^5.0.11",
        "conventional-commits-parser": "^3.2.2"
      }
    },
    "@commitlint/read": {
-      "version": "14.0.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-14.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-15.0.0.tgz",
-      "integrity": "sha512-WXXcSLBqwXTqnEmB0lbU2TrayDJ2G3qI/lxy1ianVmpQol8p9BjodAA6bYxtYYHdQFVXUrIsclzFP/naWG+hlQ==",
+      "integrity": "sha512-5yI1o2HKZFVe7RTjL7IhuhHMKar/MDNY34vEHqqz9gMI7BK/rdP8uVb4Di1efl2V0UPnwID0nPKWESjQ8Ti0gw==",
      "dev": true,
      "requires": {
-        "@commitlint/top-level": "^14.0.0",
+        "@commitlint/top-level": "^15.0.0",
-        "@commitlint/types": "^14.0.0",
+        "@commitlint/types": "^15.0.0",
        "fs-extra": "^10.0.0",
        "git-raw-commits": "^2.0.0"
      }
    },
    "@commitlint/resolve-extends": {
-      "version": "14.1.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-14.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-15.0.0.tgz",
-      "integrity": "sha512-ko80k6QB6E6/OvGNWy4u7gzzWyluDT3VDNL2kfZaDywsnrYntUKyT4Do97gQ7orttITzj2GRtk3KWClVz4rUUQ==",
+      "integrity": "sha512-7apfRJjgJsKja7lHsPfEFixKjA/fk/UeD3owkOw1174yYu4u8xBDLSeU3IinGPdMuF9m245eX8wo7vLUy+EBSg==",
      "dev": true,
      "requires": {
        "import-fresh": "^3.0.0",
@@ -33777,37 +33569,37 @@
      }
    },
    "@commitlint/rules": {
-      "version": "14.1.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-14.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-15.0.0.tgz",
-      "integrity": "sha512-6jmv414/1JzGzDI/DS+snAMhcL6roQKPdg0WB3kWTWN52EvWXBFm0HIMGt2H/FlRKxozwVXlQN60/1fNIl98xA==",
+      "integrity": "sha512-SqXfp6QUlwBS+0IZm4FEA/NmmAwcFQIkG3B05BtemOVWXQdZ8j1vV6hDwvA9oMPCmUSrrGpHOtZK7HaHhng2yA==",
      "dev": true,
      "requires": {
-        "@commitlint/ensure": "^14.1.0",
+        "@commitlint/ensure": "^15.0.0",
-        "@commitlint/message": "^14.0.0",
+        "@commitlint/message": "^15.0.0",
-        "@commitlint/to-lines": "^14.0.0",
+        "@commitlint/to-lines": "^15.0.0",
-        "@commitlint/types": "^14.0.0",
+        "@commitlint/types": "^15.0.0",
        "execa": "^5.0.0"
      }
    },
    "@commitlint/to-lines": {
-      "version": "14.0.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-14.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-15.0.0.tgz",
-      "integrity": "sha512-uIXk54oJDuYyLpI208s3+cGmJ323yvSJ9LB7yUDMWUeJi2LgRxE2EBZL995kLQdnoAsBBXcLq+VDyppg5bV/cg==",
+      "integrity": "sha512-mY3MNA9ujPqVpiJjTYG9MDsYCobue5PJFO0MfcIzS1mCVvngH8ZFTPAh1fT5t+t1h876boS88+9WgqjRvbYItw==",
      "dev": true
    },
    "@commitlint/top-level": {
-      "version": "14.0.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-14.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-15.0.0.tgz",
-      "integrity": "sha512-MZDKZfWfl9g4KozgWBGTCrI2cXkMHnBFlhwvEfrAu5G8wd5aL1f2uWEUMnBMjUikmhVj99i1pzge4XFWHQ29wQ==",
+      "integrity": "sha512-7Gz3t7xcuuUw1d1Nou6YLaztzp2Em+qZ6YdCzrqYc+aquca3Vt0O696nuiBDU/oE+tls4Hx2CNpAbWhTgEwB5A==",
      "dev": true,
      "requires": {
        "find-up": "^5.0.0"
      }
    },
    "@commitlint/types": {
-      "version": "14.0.0",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-14.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-15.0.0.tgz",
-      "integrity": "sha512-sIls1nP2uSbGL466edYlh8mn7O/WP4i3bcvP+2DMhkscRCSgaPhNRWDilhYVsHt2Vu1HTQ27uT0Bj5/Lt2+EcQ==",
+      "integrity": "sha512-OMSLX+QJnyNoTwws54ULv9sOvuw9GdVezln76oyUd4YbMMJyaav62aSXDuCdWyL2sm9hTkSzyEi52PNaIj/vqw==",
      "dev": true,
      "requires": {
        "chalk": "^4.0.0"
@@ -33983,6 +33775,19 @@
        }
      }
    },
+    "@emotion/is-prop-valid": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.7.3.tgz",
+      "integrity": "sha512-uxJqm/sqwXw3YPA5GXX365OBcJGFtxUVkB6WyezqFHlNe9jqUWH5ur2O2M8dGBz61kn1g3ZBlzUunFQXQIClhA==",
+      "requires": {
+        "@emotion/memoize": "0.7.1"
+      }
+    },
+    "@emotion/memoize": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.1.tgz",
+      "integrity": "sha512-Qv4LTqO11jepd5Qmlp3M1YEjBumoTHcHFdgPTQ+sFlIL5myi/7xu/POwP7IRu6odBdmLXdtIs1D6TuW6kbwbbg=="
+    },
    "@endemolshinegroup/cosmiconfig-typescript-loader": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-3.0.2.tgz",
@@ -34018,9 +33823,9 @@
      }
    },
    "@eslint/eslintrc": {
-      "version": "1.0.3",
+      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.4.tgz",
-      "integrity": "sha512-DHI1wDPoKCBPoLZA3qDR91+3te/wDSc1YhKg3jR8NxKKRJq2hwHwcWv31cSwSYvIBrmbENoYMWcenW8uproQqg==",
+      "integrity": "sha512-h8Vx6MdxwWI2WM8/zREHMoqdgLNXEL4QX3MWSVMdyNJGvXVOs+6lp+m2hc3FnuMHDc4poxFNI20vCk0OmI4G0Q==",
      "dev": true,
      "requires": {
        "ajv": "^6.12.4",
@@ -34029,20 +33834,11 @@
        "globals": "^13.9.0",
        "ignore": "^4.0.6",
        "import-fresh": "^3.2.1",
-        "js-yaml": "^3.13.1",
+        "js-yaml": "^4.1.0",
        "minimatch": "^3.0.4",
        "strip-json-comments": "^3.1.1"
      },
      "dependencies": {
-        "argparse": {
-          "version": "1.0.10",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-          "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-          "dev": true,
-          "requires": {
-            "sprintf-js": "~1.0.2"
-          }
-        },
        "globals": {
          "version": "13.12.0",
          "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
@@ -34058,22 +33854,6 @@
          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
          "dev": true
        },
-        "js-yaml": {
-          "version": "3.14.1",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-          "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-          "dev": true,
-          "requires": {
-            "argparse": "^1.0.7",
-            "esprima": "^4.0.0"
-          }
-        },
-        "sprintf-js": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-          "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-          "dev": true
-        },
        "strip-json-comments": {
          "version": "3.1.1",
          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -34113,9 +33893,9 @@
      },
      "dependencies": {
        "@types/node": {
-          "version": "14.17.32",
+          "version": "14.17.34",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.32.tgz",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.34.tgz",
-          "integrity": "sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ==",
+          "integrity": "sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg==",
          "dev": true
        },
        "ansi-styles": {
@@ -34172,12 +33952,6 @@
          "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
        }
      }
    },
@@ -34218,16 +33992,16 @@
      }
    },
    "@formatjs/intl": {
-      "version": "1.15.0",
+      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-1.15.0.tgz",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-1.15.2.tgz",
-      "integrity": "sha512-8apTN/j7+pF02U1pUbsORgvWHjVEXH6eXj1y1iw/bbPoVWqfTsUSj/u9hL9MMoLI04RnOQiuK2nIh0cKeOnh1Q==",
+      "integrity": "sha512-QYk0lUSrYprn2Lyui6iDhmHnSiXFTqKAMiveYOJPYQtcaWRwkCbcB0SALTZDc2kITrYxiP4/AS7ESF/0+SYSLQ==",
      "requires": {
        "@formatjs/ecma402-abstract": "1.10.0",
        "@formatjs/fast-memoize": "1.2.0",
        "@formatjs/icu-messageformat-parser": "2.0.14",
        "@formatjs/intl-displaynames": "5.2.5",
        "@formatjs/intl-listformat": "6.3.5",
-        "intl-messageformat": "9.9.4",
+        "intl-messageformat": "9.9.6",
        "tslib": "^2.1.0"
      }
    },
@@ -34320,12 +34094,6 @@
          "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
        }
      }
    },
@@ -34362,9 +34130,9 @@
      }
    },
    "@humanwhocodes/object-schema": {
-      "version": "1.2.0",
+      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
      "dev": true
    },
    "@istanbuljs/load-nyc-config": {
@@ -34706,20 +34474,6 @@
          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
          "dev": true
        },
-        "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"
-          }
-        },
        "has-flag": {
          "version": "4.0.0",
          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -35000,9 +34754,9 @@
      }
    },
    "@mdi/js": {
-      "version": "6.4.95",
+      "version": "6.5.95",
-      "resolved": "https://registry.npmjs.org/@mdi/js/-/js-6.4.95.tgz",
+      "resolved": "https://registry.npmjs.org/@mdi/js/-/js-6.5.95.tgz",
-      "integrity": "sha512-b1/P//1D2KOzta8YRGyoSLGsAlWyUHfxzVBhV4e/ppnjM4DfBgay/vWz7Eg5Ee80JZ4zsQz8h54X+KOahtBk5Q=="
+      "integrity": "sha512-x/bwEoAGP+Mo10Dfk5audNIPi7Yz8ZBrILcbXLW3ShOI/njpgodzpgpC2WYK3D2ZSC392peRRemIFb/JsyzzYQ=="
    },
    "@mdi/react": {
      "version": "1.5.0",
@@ -35305,9 +35059,9 @@
      }
    },
    "@sinonjs/fake-timers": {
-      "version": "8.0.1",
+      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-      "integrity": "sha512-AU7kwFxreVd6OAXcAFlKSmZquiRUU0FvYm44k1Y1QbK7Co4m0aqfGMhjykIeQp/H6rcl+nFmj0zfdUcGVs9Dew==",
+      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
      "dev": true,
      "requires": {
        "@sinonjs/commons": "^1.7.0"
@@ -35561,9 +35315,9 @@
      "dev": true
    },
    "@types/lodash": {
-      "version": "4.14.176",
+      "version": "4.14.177",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.176.tgz",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
-      "integrity": "sha512-xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ==",
+      "integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw==",
      "dev": true
    },
    "@types/mime-types": {
@@ -35606,9 +35360,9 @@
      "dev": true
    },
    "@types/node": {
-      "version": "16.11.6",
+      "version": "16.11.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.9.tgz",
-      "integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==",
+      "integrity": "sha512-MKmdASMf3LtPzwLyRrFjtFFZ48cMf8jmX5VRYrDQiJa8Ybu5VAmkqBWqKU8fdCwD8ysw4mQ9nrEHvzg6gunR7A==",
      "dev": true
    },
    "@types/normalize-package-data": {
@@ -35635,9 +35389,9 @@
      }
    },
    "@types/prettier": {
-      "version": "2.4.1",
+      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz",
-      "integrity": "sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw==",
+      "integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==",
      "dev": true
    },
    "@types/prop-types": {
@@ -35646,9 +35400,9 @@
      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
    },
    "@types/react": {
-      "version": "17.0.33",
+      "version": "17.0.35",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.33.tgz",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.35.tgz",
-      "integrity": "sha512-pLWntxXpDPaU+RTAuSGWGSEL2FRTNyRQOjSWDke/rxRg14ncsZvx8AKWMWZqvc1UOaJIAoObdZhAWvRaHFi5rw==",
+      "integrity": "sha512-r3C8/TJuri/SLZiiwwxQoLAoavaczARfT9up9b4Jr65+ErAUX3MIkU0oMOQnrpfgHme8zIqZLX7O5nnjm5Wayw==",
      "requires": {
        "@types/prop-types": "*",
        "@types/scheduler": "*",
@@ -35656,9 +35410,9 @@
      }
    },
    "@types/react-dom": {
-      "version": "17.0.10",
+      "version": "17.0.11",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.10.tgz",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.11.tgz",
-      "integrity": "sha512-8oz3NAUId2z/zQdFI09IMhQPNgIbiP8Lslhv39DIDamr846/0spjZK0vnrMak0iB8EKb9QFTTIdg2Wj2zH5a3g==",
+      "integrity": "sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==",
      "dev": true,
      "requires": {
        "@types/react": "*"
@@ -35704,9 +35458,9 @@
      "dev": true
    },
    "@types/tar": {
-      "version": "6.1.0",
+      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/@types/tar/-/tar-6.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@types/tar/-/tar-6.1.1.tgz",
-      "integrity": "sha512-uTZKMW7ZkdTJXX4+Bsp0ko9N7B5/NJ5wJRW14XTb6KNN+9i2NPel6iPKp8rTQahMW46BM9tM52dTeMSldB55og==",
+      "integrity": "sha512-8mto3YZfVpqB1CHMaYz1TUYIQfZFbh/QbEq5Hsn6D0ilCfqRVCdalmc89B7vi3jhl9UYIk+dWDABShNfOkv5HA==",
      "dev": true,
      "requires": {
        "@types/minipass": "*",
@@ -35731,15 +35485,15 @@
      }
    },
    "@types/uuid": {
-      "version": "8.3.1",
+      "version": "8.3.3",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.3.tgz",
-      "integrity": "sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg==",
+      "integrity": "sha512-0LbEEx1zxrYB3pgpd1M5lEhLcXjKJnYghvhTRgaBeUivLHMDM1TzF3IJ6hXU2+8uA4Xz+5BA63mtZo5DjVT8iA==",
      "dev": true
    },
    "@types/validator": {
-      "version": "13.6.6",
+      "version": "13.7.0",
-      "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.6.6.tgz",
+      "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.7.0.tgz",
-      "integrity": "sha512-+qogUELb4gMhrMjSh/seKmGVvN+uQLfyqJAqYRWqVHsvBsUO2xDBCL8CJ/ZSukbd8vXaoYbpIssAmfLEzzBHEw==",
+      "integrity": "sha512-+jBxVvXVuggZOrm04NR8z+5+bgoW4VZyLzUO+hmPPW1mVFL/HaitLAkizfv4yg9TbG8lkfHWVMQ11yDqrVVCzA==",
      "dev": true
    },
    "@types/verror": {
@@ -35750,9 +35504,9 @@
      "optional": true
    },
    "@types/webpack": {
-      "version": "4.41.31",
+      "version": "4.41.32",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.31.tgz",
+      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.32.tgz",
-      "integrity": "sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==",
+      "integrity": "sha512-cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg==",
      "dev": true,
      "requires": {
        "@types/node": "*",
@@ -35801,9 +35555,9 @@
      }
    },
    "@types/yargs": {
-      "version": "17.0.4",
+      "version": "17.0.7",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.7.tgz",
-      "integrity": "sha512-D/wihO9WFYqwsmJI0e0qS+U09wIQtYRSBJlXWjTFGjouEuOCy0BU4N/ZK5utb00S5lW/9LO7vOpvGDd8M06NvQ==",
+      "integrity": "sha512-OvLKmpKdea1aWtqHv9bxVVcMoT6syAeK+198dfETIFkAevYRGwqh4H+KFxfjUETZuUuE5sQCAFwdOdoHUdo8eg==",
      "dev": true,
      "requires": {
        "@types/yargs-parser": "*"
@@ -35816,13 +35570,13 @@
      "dev": true
    },
    "@typescript-eslint/eslint-plugin": {
-      "version": "5.2.0",
+      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.4.0.tgz",
-      "integrity": "sha512-qQwg7sqYkBF4CIQSyRQyqsYvP+g/J0To9ZPVNJpfxfekl5RmdvQnFFTVVwpRtaUDFNvjfe/34TgY/dpc3MgNTw==",
+      "integrity": "sha512-9/yPSBlwzsetCsGEn9j24D8vGQgJkOTr4oMLas/w886ZtzKIs1iyoqFrwsX2fqYEeUwsdBpC21gcjRGo57u0eg==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/experimental-utils": "5.2.0",
+        "@typescript-eslint/experimental-utils": "5.4.0",
-        "@typescript-eslint/scope-manager": "5.2.0",
+        "@typescript-eslint/scope-manager": "5.4.0",
        "debug": "^4.3.2",
        "functional-red-black-tree": "^1.0.1",
        "ignore": "^5.1.8",
@@ -35832,55 +35586,55 @@
      }
    },
    "@typescript-eslint/experimental-utils": {
-      "version": "5.2.0",
+      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.4.0.tgz",
-      "integrity": "sha512-fWyT3Agf7n7HuZZRpvUYdFYbPk3iDCq6fgu3ulia4c7yxmPnwVBovdSOX7RL+k8u6hLbrXcdAehlWUVpGh6IEw==",
+      "integrity": "sha512-Nz2JDIQUdmIGd6p33A+naQmwfkU5KVTLb/5lTk+tLVTDacZKoGQisj8UCxk7onJcrgjIvr8xWqkYI+DbI3TfXg==",
      "dev": true,
      "requires": {
        "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.2.0",
+        "@typescript-eslint/scope-manager": "5.4.0",
-        "@typescript-eslint/types": "5.2.0",
+        "@typescript-eslint/types": "5.4.0",
-        "@typescript-eslint/typescript-estree": "5.2.0",
+        "@typescript-eslint/typescript-estree": "5.4.0",
        "eslint-scope": "^5.1.1",
        "eslint-utils": "^3.0.0"
      }
    },
    "@typescript-eslint/parser": {
-      "version": "5.2.0",
+      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.4.0.tgz",
-      "integrity": "sha512-Uyy4TjJBlh3NuA8/4yIQptyJb95Qz5PX//6p8n7zG0QnN4o3NF9Je3JHbVU7fxf5ncSXTmnvMtd/LDQWDk0YqA==",
+      "integrity": "sha512-JoB41EmxiYpaEsRwpZEYAJ9XQURPFer8hpkIW9GiaspVLX8oqbqNM8P4EP8HOZg96yaALiLEVWllA2E8vwsIKw==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/scope-manager": "5.2.0",
+        "@typescript-eslint/scope-manager": "5.4.0",
-        "@typescript-eslint/types": "5.2.0",
+        "@typescript-eslint/types": "5.4.0",
-        "@typescript-eslint/typescript-estree": "5.2.0",
+        "@typescript-eslint/typescript-estree": "5.4.0",
        "debug": "^4.3.2"
      }
    },
    "@typescript-eslint/scope-manager": {
-      "version": "5.2.0",
+      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.4.0.tgz",
-      "integrity": "sha512-RW+wowZqPzQw8MUFltfKYZfKXqA2qgyi6oi/31J1zfXJRpOn6tCaZtd9b5u9ubnDG2n/EMvQLeZrsLNPpaUiFQ==",
+      "integrity": "sha512-pRxFjYwoi8R+n+sibjgF9iUiAELU9ihPBtHzocyW8v8D8G8KeQvXTsW7+CBYIyTYsmhtNk50QPGLE3vrvhM5KA==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/types": "5.2.0",
+        "@typescript-eslint/types": "5.4.0",
-        "@typescript-eslint/visitor-keys": "5.2.0"
+        "@typescript-eslint/visitor-keys": "5.4.0"
      }
    },
    "@typescript-eslint/types": {
-      "version": "5.2.0",
+      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.4.0.tgz",
-      "integrity": "sha512-cTk6x08qqosps6sPyP2j7NxyFPlCNsJwSDasqPNjEQ8JMD5xxj2NHxcLin5AJQ8pAVwpQ8BMI3bTxR0zxmK9qQ==",
+      "integrity": "sha512-GjXNpmn+n1LvnttarX+sPD6+S7giO+9LxDIGlRl4wK3a7qMWALOHYuVSZpPTfEIklYjaWuMtfKdeByx0AcaThA==",
      "dev": true
    },
    "@typescript-eslint/typescript-estree": {
-      "version": "5.2.0",
+      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.4.0.tgz",
-      "integrity": "sha512-RsdXq2XmVgKbm9nLsE3mjNUM7BTr/K4DYR9WfFVMUuozHWtH5gMpiNZmtrMG8GR385EOSQ3kC9HiEMJWimxd/g==",
+      "integrity": "sha512-nhlNoBdhKuwiLMx6GrybPT3SFILm5Gij2YBdPEPFlYNFAXUJWX6QRgvi/lwVoadaQEFsizohs6aFRMqsXI2ewA==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/types": "5.2.0",
+        "@typescript-eslint/types": "5.4.0",
-        "@typescript-eslint/visitor-keys": "5.2.0",
+        "@typescript-eslint/visitor-keys": "5.4.0",
        "debug": "^4.3.2",
        "globby": "^11.0.4",
        "is-glob": "^4.0.3",
@@ -35889,19 +35643,19 @@
      }
    },
    "@typescript-eslint/visitor-keys": {
-      "version": "5.2.0",
+      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.4.0.tgz",
-      "integrity": "sha512-Nk7HizaXWWCUBfLA/rPNKMzXzWS8Wg9qHMuGtT+v2/YpPij4nVXrVJc24N/r5WrrmqK31jCrZxeHqIgqRzs0Xg==",
+      "integrity": "sha512-PVbax7MeE7tdLfW5SA0fs8NGVVr+buMPrcj+CWYWPXsZCH8qZ1THufDzbXm1xrZ2b2PA1iENJ0sRq5fuUtvsJg==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/types": "5.2.0",
+        "@typescript-eslint/types": "5.4.0",
        "eslint-visitor-keys": "^3.0.0"
      },
      "dependencies": {
        "eslint-visitor-keys": {
-          "version": "3.0.0",
+          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz",
-          "integrity": "sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==",
+          "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==",
          "dev": true
        }
      }
@@ -35913,13 +35667,13 @@
      "dev": true
    },
    "@vue/compiler-core": {
-      "version": "3.2.20",
+      "version": "3.2.22",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.20.tgz",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.22.tgz",
-      "integrity": "sha512-vcEXlKXoPwBXFP5aUTHN9GTZaDfwCofa9Yu9bbW2C5O/QSa9Esdt7OG4+0RRd3EHEMxUvEdj4RZrd/KpQeiJbA==",
+      "integrity": "sha512-uAkovrVeTcjzpiM4ECmVaMrv/bjdgAaLzvjcGqQPBEyUrcqsCgccT9fHJ/+hWVGhyMahmBwLqcn4guULNx7sdw==",
      "dev": true,
      "requires": {
        "@babel/parser": "^7.15.0",
-        "@vue/shared": "3.2.20",
+        "@vue/shared": "3.2.22",
        "estree-walker": "^2.0.2",
        "source-map": "^0.6.1"
      },
@@ -35933,27 +35687,27 @@
      }
    },
    "@vue/compiler-dom": {
-      "version": "3.2.20",
+      "version": "3.2.22",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.20.tgz",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.22.tgz",
-      "integrity": "sha512-QnI77ec/JtV7R0YBbcVayYTDCRcI9OCbxiUQK6izVyqQO0658n0zQuoNwe+bYgtqnvGAIqTR3FShTd5y4oOjdg==",
+      "integrity": "sha512-VZdsw/VuO1ODs8K7NQwnMQzKITDkIFlYYC03SVnunuf6eNRxBPEonSyqbWNoo6qNaHAEBTG6VVcZC5xC9bAx1g==",
      "dev": true,
      "requires": {
-        "@vue/compiler-core": "3.2.20",
+        "@vue/compiler-core": "3.2.22",
-        "@vue/shared": "3.2.20"
+        "@vue/shared": "3.2.22"
      }
    },
    "@vue/compiler-sfc": {
-      "version": "3.2.20",
+      "version": "3.2.22",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.20.tgz",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.22.tgz",
-      "integrity": "sha512-03aZo+6tQKiFLfunHKSPZvdK4Jsn/ftRCyaro8AQIWkuxJbvSosbKK6HTTn+D2c3nPScG155akJoxKENw7rftQ==",
+      "integrity": "sha512-tWRQ5ge1tsTDhUwHgueicKJ8rYm6WUVAPTaIpFW3GSwZKcOEJ2rXdfkHFShNVGupeRALz2ET2H84OL0GeRxY0A==",
      "dev": true,
      "requires": {
        "@babel/parser": "^7.15.0",
-        "@vue/compiler-core": "3.2.20",
+        "@vue/compiler-core": "3.2.22",
-        "@vue/compiler-dom": "3.2.20",
+        "@vue/compiler-dom": "3.2.22",
-        "@vue/compiler-ssr": "3.2.20",
+        "@vue/compiler-ssr": "3.2.22",
-        "@vue/ref-transform": "3.2.20",
+        "@vue/ref-transform": "3.2.22",
-        "@vue/shared": "3.2.20",
+        "@vue/shared": "3.2.22",
        "estree-walker": "^2.0.2",
        "magic-string": "^0.25.7",
        "postcss": "^8.1.10",
@@ -35969,32 +35723,32 @@
      }
    },
    "@vue/compiler-ssr": {
-      "version": "3.2.20",
+      "version": "3.2.22",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.20.tgz",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.22.tgz",
-      "integrity": "sha512-rzzVVYivm+EjbfiGQvNeyiYZWzr6Hkej97RZLZvcumacQlnKv9176Xo9rRyeWwFbBlxmtNdrVMslRXtipMXk2w==",
+      "integrity": "sha512-Cl6aoLJtXzzBkk1sKod8S0WBJLts3+ugVC91d22gGpbkw/64WnF12tOZi7Rg54PPLi1NovqyNWPsLH/SAFcu+w==",
      "dev": true,
      "requires": {
-        "@vue/compiler-dom": "3.2.20",
+        "@vue/compiler-dom": "3.2.22",
-        "@vue/shared": "3.2.20"
+        "@vue/shared": "3.2.22"
      }
    },
    "@vue/ref-transform": {
-      "version": "3.2.20",
+      "version": "3.2.22",
-      "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.20.tgz",
+      "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.22.tgz",
-      "integrity": "sha512-Y42d3PGlYZ1lXcF3dbd3+qU/C/a3wYEZ949fyOI5ptzkjDWlkfU6vn74fmOjsLjEcjs10BXK2qO99FqQIK2r1Q==",
+      "integrity": "sha512-qalVWbq5xWWxLZ0L9OroBg/JZhzavQuCcDXblfErxyDEH6Xc5gIJ4feo1SVCICFzhAUgLgQTdSFLpgjBawbFpw==",
      "dev": true,
      "requires": {
        "@babel/parser": "^7.15.0",
-        "@vue/compiler-core": "3.2.20",
+        "@vue/compiler-core": "3.2.22",
-        "@vue/shared": "3.2.20",
+        "@vue/shared": "3.2.22",
        "estree-walker": "^2.0.2",
        "magic-string": "^0.25.7"
      }
    },
    "@vue/shared": {
-      "version": "3.2.20",
+      "version": "3.2.22",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.20.tgz",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.22.tgz",
-      "integrity": "sha512-FbpX+hD5BvXCQerEYO7jtAGHlhAkhTQ4KIV73kmLWNlawWhTiVuQxizgVb0BOkX5oG9cIRZ42EG++d/k/Efp0w==",
+      "integrity": "sha512-qWVav014mpjEtbWbEgl0q9pEyrrIySKum8UVYjwhC6njrKzknLZPvfuYdQyVbApsqr94tf/3dP4pCuZmmjdCWQ==",
      "dev": true
    },
    "@webassemblyjs/ast": {
@@ -36211,9 +35965,9 @@
      }
    },
    "acorn": {
-      "version": "8.5.0",
+      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
-      "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
+      "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
      "dev": true
    },
    "acorn-globals": {
@@ -36702,10 +36456,10 @@
        "ansi-wrap": "0.1.0"
      }
    },
-    "ansi-html": {
+    "ansi-html-community": {
-      "version": "0.0.7",
+      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
      "dev": true
    },
    "ansi-inverse": {
@@ -36743,8 +36497,7 @@
    "ansi-regex": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-      "dev": true
    },
    "ansi-reset": {
      "version": "0.1.1",
@@ -36883,9 +36636,9 @@
      "dev": true
    },
    "app-builder-lib": {
-      "version": "22.14.5",
+      "version": "22.14.10",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.14.10.tgz",
-      "integrity": "sha512-k3VwKP4kpsnUaXoUkm1s4zaSHPHIMFnN4kPMU9yXaKmE1LfHHqBaEah5bXeTAX5V/BC41wFdg8CF5vOjvgy8Rg==",
+      "integrity": "sha512-5g/0CztD/+OL3V6PH+hV5MeFDg1V827PoyPEnAzz4fXXhCzoBwDanyqKH9b7JwfHkLO6JqH5Des28qET3LkENg==",
      "dev": true,
      "requires": {
        "@develar/schema-utils": "~2.6.5",
@@ -36894,13 +36647,13 @@
        "7zip-bin": "~5.1.1",
        "async-exit-hook": "^2.0.1",
        "bluebird-lst": "^1.0.9",
-        "builder-util": "22.14.5",
+        "builder-util": "22.14.7",
-        "builder-util-runtime": "8.9.1",
+        "builder-util-runtime": "8.9.2",
        "chromium-pickle-js": "^0.2.0",
        "debug": "^4.3.2",
        "ejs": "^3.1.6",
        "electron-osx-sign": "^0.5.0",
-        "electron-publish": "22.14.5",
+        "electron-publish": "22.14.7",
        "form-data": "^4.0.0",
        "fs-extra": "^10.0.0",
        "hosted-git-info": "^4.0.2",
@@ -37175,27 +36928,13 @@
          "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
          "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
          "dev": true
-        },
-        "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"
-          }
        }
      }
    },
    "asn1": {
-      "version": "0.2.4",
+      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
      "optional": true,
      "requires": {
        "safer-buffer": "~2.1.0"
@@ -37265,6 +37004,13 @@
      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
      "dev": true
    },
+    "astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "optional": true
+    },
    "async": {
      "version": "3.2.2",
      "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz",
@@ -37355,9 +37101,9 @@
      "optional": true
    },
    "axe-core": {
-      "version": "4.3.4",
+      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.4.tgz",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.5.tgz",
-      "integrity": "sha512-4Hk6iSA/H90rtiPoCpSkeJxNWCPBf7szwVvaUqrPdxo0j2Y04suHK9jPKXaE3WI7OET6wBSwsWw7FDc1DBq7iQ==",
+      "integrity": "sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==",
      "dev": true
    },
    "axios": {
@@ -37516,13 +37262,13 @@
      }
    },
    "babel-plugin-polyfill-corejs2": {
-      "version": "0.2.3",
+      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.0.tgz",
-      "integrity": "sha512-NDZ0auNRzmAfE1oDDPW2JhzIMXUk+FFe2ICejmt5T4ocKgiQx3e0VCRx9NCAidcMtL2RUZaWtXnmjTCkx0tcbA==",
+      "integrity": "sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA==",
      "dev": true,
      "requires": {
        "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.2.4",
+        "@babel/helper-define-polyfill-provider": "^0.3.0",
        "semver": "^6.1.1"
      },
      "dependencies": {
@@ -37535,22 +37281,22 @@
      }
    },
    "babel-plugin-polyfill-corejs3": {
-      "version": "0.3.0",
+      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz",
-      "integrity": "sha512-JLwi9vloVdXLjzACL80j24bG6/T1gYxwowG44dg6HN/7aTPdyPbJJidf6ajoA3RPHHtW0j9KMrSOLpIZpAnPpg==",
+      "integrity": "sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw==",
      "dev": true,
      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.2.4",
+        "@babel/helper-define-polyfill-provider": "^0.3.0",
        "core-js-compat": "^3.18.0"
      }
    },
    "babel-plugin-polyfill-regenerator": {
-      "version": "0.2.3",
+      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz",
-      "integrity": "sha512-JVE78oRZPKFIeUqFGrSORNzQnrDwZR16oiWeGM8ZyjBn2XAT5OjP+wXx5ESuo33nUsFUEJYjtklnsKbxW5L+7g==",
+      "integrity": "sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg==",
      "dev": true,
      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.2.4"
+        "@babel/helper-define-polyfill-provider": "^0.3.0"
      }
    },
    "babel-preset-current-node-syntax": {
@@ -37654,9 +37400,9 @@
      "integrity": "sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms="
    },
    "big-integer": {
-      "version": "1.6.50",
+      "version": "1.6.51",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.50.tgz",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
-      "integrity": "sha512-+O2uoQWFRo8ysZNo/rjtri2jIwjr3XfeAgRjAUADRqGG+ZITvyn8J1kvXLTaKVr3hhGXk+f23tKfdzmklVM9vQ=="
+      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg=="
    },
    "big.js": {
      "version": "5.2.2",
@@ -37772,6 +37518,12 @@
        "type-is": "~1.6.17"
      },
      "dependencies": {
+        "bytes": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+          "dev": true
+        },
        "debug": {
          "version": "2.6.9",
          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -37838,6 +37590,12 @@
          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
          "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
          "dev": true
+        },
+        "toidentifier": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+          "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+          "dev": true
        }
      }
    },
@@ -37894,9 +37652,9 @@
          }
        },
        "camelcase": {
-          "version": "6.2.0",
+          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
-          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+          "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
          "dev": true
        },
        "chalk": {
@@ -37996,11 +37754,6 @@
        "to-regex": "^3.0.1"
      }
    },
-    "brcast": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/brcast/-/brcast-3.0.2.tgz",
-      "integrity": "sha512-f5XwwFCCuvgqP2nMH/hJ74FqnGmb4X3D+NC//HphxJzzhsZvSZa+Hk/syB7j3ZHpPDLMoYU8oBgviRWfNvEfKA=="
-    },
    "brorand": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
@@ -38112,13 +37865,13 @@
      }
    },
    "browserslist": {
-      "version": "4.17.6",
+      "version": "4.18.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.6.tgz",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz",
-      "integrity": "sha512-uPgz3vyRTlEiCv4ee9KlsKgo2V6qPk7Jsn0KAn2OBqbqKo3iNcPEC1Ti6J4dwnz+aIRfEEEuOzC9IBk8tXUomw==",
+      "integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==",
      "dev": true,
      "requires": {
-        "caniuse-lite": "^1.0.30001274",
+        "caniuse-lite": "^1.0.30001280",
-        "electron-to-chromium": "^1.3.886",
+        "electron-to-chromium": "^1.3.896",
        "escalade": "^3.1.1",
        "node-releases": "^2.0.1",
        "picocolors": "^1.0.0"
@@ -38222,9 +37975,9 @@
      "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s="
    },
    "builder-util": {
-      "version": "22.14.5",
+      "version": "22.14.7",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.14.7.tgz",
-      "integrity": "sha512-zqIHDFJwmA7jV7SC9aI+33MWwT2mWoijH+Ol9IntNAwuuRXoS+7XeJwnhLBXOhcDBzXT4kDzHnRk4JKeaygEYA==",
+      "integrity": "sha512-M8ql8WPW/P9UKsF00YZjiP5h29MYrJ3svJx5suszC5EGwIdAztIhFyXoXKI3hPtDaR5b6EoWD9nLa5/Gr+QToQ==",
      "dev": true,
      "requires": {
        "@types/debug": "^4.1.6",
@@ -38232,11 +37985,13 @@
        "7zip-bin": "~5.1.1",
        "app-builder-bin": "3.7.1",
        "bluebird-lst": "^1.0.9",
-        "builder-util-runtime": "8.9.1",
+        "builder-util-runtime": "8.9.2",
        "chalk": "^4.1.1",
        "cross-spawn": "^7.0.3",
        "debug": "^4.3.2",
        "fs-extra": "^10.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
        "is-ci": "^3.0.0",
        "js-yaml": "^4.1.0",
        "source-map-support": "^0.5.19",
@@ -38244,6 +37999,12 @@
        "temp-file": "^3.4.0"
      },
      "dependencies": {
+        "@tootallnate/once": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+          "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+          "dev": true
+        },
        "ansi-styles": {
          "version": "4.3.0",
          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -38284,6 +38045,17 @@
          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
          "dev": true
        },
+        "http-proxy-agent": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+          "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+          "dev": true,
+          "requires": {
+            "@tootallnate/once": "2",
+            "agent-base": "6",
+            "debug": "4"
+          }
+        },
        "supports-color": {
          "version": "7.2.0",
          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -38296,10 +38068,9 @@
      }
    },
    "builder-util-runtime": {
-      "version": "8.9.1",
+      "version": "8.9.2",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz",
-      "integrity": "sha512-c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg==",
+      "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==",
-      "dev": true,
      "requires": {
        "debug": "^4.3.2",
        "sax": "^1.2.4"
@@ -38318,9 +38089,9 @@
      "dev": true
    },
    "bytes": {
-      "version": "3.1.0",
+      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+      "integrity": "sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="
    },
    "cacache": {
      "version": "15.3.0",
@@ -38348,20 +38119,6 @@
        "unique-filename": "^1.1.1"
      },
      "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"
-          }
-        },
        "mkdirp": {
          "version": "1.0.4",
          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -38516,9 +38273,9 @@
      }
    },
    "caniuse-lite": {
-      "version": "1.0.30001278",
+      "version": "1.0.30001286",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001278.tgz",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz",
-      "integrity": "sha512-mpF9KeH8u5cMoEmIic/cr7PNS+F5LWBk0t2ekGT60lFf0Wq+n9LspAj0g3P+o7DQhD3sUdlMln4YFAWhFYn9jg==",
+      "integrity": "sha512-zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ==",
      "dev": true
    },
    "caseless": {
@@ -38753,42 +38510,13 @@
      "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
    },
    "cld": {
-      "version": "2.7.0",
+      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/cld/-/cld-2.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/cld/-/cld-2.7.1.tgz",
-      "integrity": "sha512-rM20jIISRqMYfZAlowCA4DwLLegJXqfCFdVb1vtS+RG7yKHn4FrYdFfUx2WGbmaqOQV/w4MRIszh43FH78/oRA==",
+      "integrity": "sha512-4RusGBKlhW/f7hrv4wFf19n461aO1XCCC4/pCawTJNGaNT+i4OIeAwREY9oeqT0vJyBmtY2dM9IG4cQyu5Pcng==",
-      "optional": true,
      "requires": {
-        "glob": "^5.0.10",
+        "glob": "7",
        "node-addon-api": "*",
-        "rimraf": "^2.4.0",
+        "underscore": "^1.12.1"
-        "underscore": "^1.6.0"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "optional": true,
-          "requires": {
-            "glob": "^7.1.3"
-          },
-          "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"
-              }
-            }
-          }
-        }
      }
    },
    "clean-css": {
@@ -38839,22 +38567,51 @@
      }
    },
    "cli-table": {
-      "version": "0.3.6",
+      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.6.tgz",
+      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.8.tgz",
-      "integrity": "sha512-ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ==",
+      "integrity": "sha512-5IO15fJRzgM+hHZjvQlqD6UPRuVGWR4Ny5ZzaM5VJxJEQqSIEVyVh9dMAUN6CBAVfMc4/6CFEzbhnRftLRCyug==",
      "requires": {
-        "colors": "1.0.3"
+        "colors": "1.0.3",
+        "strip-ansi": "^6.0.1"
      }
    },
    "cli-truncate": {
-      "version": "1.1.0",
+      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==",
+      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
      "dev": true,
      "optional": true,
      "requires": {
-        "slice-ansi": "^1.0.0",
+        "slice-ansi": "^3.0.0",
-        "string-width": "^2.0.0"
+        "string-width": "^4.2.0"
+      },
+      "dependencies": {
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true,
+          "optional": 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,
+          "optional": true
+        },
+        "string-width": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
+          }
+        }
      }
    },
    "cli-width": {
@@ -39363,9 +39120,9 @@
      }
    },
    "concurrently": {
-      "version": "6.3.0",
+      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.4.0.tgz",
-      "integrity": "sha512-k4k1jQGHHKsfbqzkUszVf29qECBrkvBKkcPJEUDTyVR7tZd1G/JOfnst4g1sYbFvJ4UjHZisj1aWQR8yLKpGPw==",
+      "integrity": "sha512-HZ3D0RTQMH3oS4gvtYj1P+NBc6PzE2McEra6yEFcQKrUQ9HvtTGU4Dbne083F034p+LRb7kWU0tPRNvSGs1UCQ==",
      "dev": true,
      "requires": {
        "chalk": "^4.1.0",
@@ -39678,20 +39435,6 @@
        "run-queue": "^1.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"
-          }
-        },
        "rimraf": {
          "version": "2.7.1",
          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -39745,9 +39488,9 @@
      }
    },
    "core-js-pure": {
-      "version": "3.19.0",
+      "version": "3.19.1",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.0.tgz",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.1.tgz",
-      "integrity": "sha512-UEQk8AxyCYvNAs6baNoPqDADv7BX0AmBLGxVsrAifPPx/C8EAzV4Q+2ZUJqVzfI2TQQEZITnwUkWcHpgc/IubQ==",
+      "integrity": "sha512-Q0Knr8Es84vtv62ei6/6jXH/7izKmOrtrxH9WJTHLCMAVeU+8TF8z8Nr08CsH4Ot0oJKzBzJJL9SJBYIv7WlfQ==",
      "dev": true
    },
    "core-util-is": {
@@ -39900,6 +39643,16 @@
        "uid-safe": "2.1.5"
      }
    },
+    "css-jss": {
+      "version": "10.8.2",
+      "resolved": "https://registry.npmjs.org/css-jss/-/css-jss-10.8.2.tgz",
+      "integrity": "sha512-KjsoKnBV4C9p+F+zW9jNXCai0UYU5K+3eyo+lJX/fY8UBEQd/yNREnHsLD1VMMzBwHRvrA8eQHvqmAL+XNLYcw==",
+      "requires": {
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2",
+        "jss-preset-default": "10.8.2"
+      }
+    },
    "css-select": {
      "version": "4.1.3",
      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
@@ -39932,10 +39685,11 @@
      }
    },
    "css-vendor": {
-      "version": "0.3.8",
+      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-0.3.8.tgz",
+      "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz",
-      "integrity": "sha1-ZCHP0wNM5mT+dnOXL9ARn8KJQfo=",
+      "integrity": "sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==",
      "requires": {
+        "@babel/runtime": "^7.8.3",
        "is-in-browser": "^1.0.2"
      }
    },
@@ -39978,9 +39732,9 @@
      }
    },
    "csstype": {
-      "version": "3.0.9",
+      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz",
-      "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw=="
+      "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="
    },
    "currently-unhandled": {
      "version": "0.4.1",
@@ -40035,9 +39789,9 @@
      "dev": true
    },
    "darkreader": {
-      "version": "4.9.39",
+      "version": "4.9.40",
-      "resolved": "https://registry.npmjs.org/darkreader/-/darkreader-4.9.39.tgz",
+      "resolved": "https://registry.npmjs.org/darkreader/-/darkreader-4.9.40.tgz",
-      "integrity": "sha512-OikzTzTDasjq+e+PXRWZRxMA+PZddz9cDLiZGVUI48w1FbBDfXwwQyyWiO7eavdAQ1cV9dYA21g6KtdK/0OefA=="
+      "integrity": "sha512-Dm8S5jkXSIxvq9WitcvuH4KexV9ZuzGqDMsFOm2VwXzRkMo9VIg8udjq2Mm7cM6SaQSp/zzH4VIWioX93iWayQ=="
    },
    "dashdash": {
      "version": "1.14.1",
@@ -40060,9 +39814,9 @@
      }
    },
    "date-fns": {
-      "version": "2.25.0",
+      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.25.0.tgz",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.26.0.tgz",
-      "integrity": "sha512-ovYRFnTrbGPD4nqaEqescPEv1mNwvt+UTqI3Ay9SzNtey9NZnYu6E2qCcBBgJ6/2VF1zGGygpyTDITqpQQ5e+w==",
+      "integrity": "sha512-VQI812dRi3cusdY/fhoBKvc6l2W8BPWU1FNVnFH9Nttjx4AFBRzfSVb/Eyc7jBT6e9sg1XtAGsYpBQ6c/jygbg==",
      "dev": true
    },
    "dbus-next": {
@@ -40362,20 +40116,6 @@
            "array-uniq": "^1.0.1"
          }
        },
-        "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"
-          }
-        },
        "globby": {
          "version": "6.1.0",
          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
@@ -40543,14 +40283,14 @@
      }
    },
    "dmg-builder": {
-      "version": "22.14.5",
+      "version": "22.14.10",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.14.10.tgz",
-      "integrity": "sha512-1GvFGQE332bvPamcMwZDqWqfWfJTyyDLOsHMcGi0zs+Jh7JOn6/zuBkHJIWHdsj2QJbhzLVyd2/ZqttOKv7I8w==",
+      "integrity": "sha512-DMLdhVNvIEBo0tzODoFalbdahIxlNXDL4JmxjwGYS69csPTqg0ev+6GOMgWmXhvrdEyN8hQWl1kTFjM/jZ+qBA==",
      "dev": true,
      "requires": {
-        "app-builder-lib": "22.14.5",
+        "app-builder-lib": "22.14.10",
-        "builder-util": "22.14.5",
+        "builder-util": "22.14.7",
-        "builder-util-runtime": "8.9.1",
+        "builder-util-runtime": "8.9.2",
        "dmg-license": "^1.0.9",
        "fs-extra": "^10.0.0",
        "iconv-lite": "^0.6.2",
@@ -40558,19 +40298,18 @@
      }
    },
    "dmg-license": {
-      "version": "1.0.9",
+      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.9.tgz",
+      "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.10.tgz",
-      "integrity": "sha512-Rq6qMDaDou2+aPN2SYy0x7LDznoJ/XaG6oDcH5wXUp+WRWQMUYE6eM+F+nex+/LSXOp1uw4HLFoed0YbfU8R/Q==",
+      "integrity": "sha512-SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A==",
      "dev": true,
      "optional": true,
      "requires": {
        "@types/plist": "^3.0.1",
        "@types/verror": "^1.10.3",
        "ajv": "^6.10.0",
-        "cli-truncate": "^1.1.0",
        "crc": "^3.8.0",
-        "iconv-corefoundation": "^1.1.6",
+        "iconv-corefoundation": "^1.1.7",
-        "plist": "^3.0.1",
+        "plist": "^3.0.4",
        "smart-buffer": "^4.0.2",
        "verror": "^1.10.0"
      }
@@ -40851,9 +40590,9 @@
      }
    },
    "electron": {
-      "version": "15.3.0",
+      "version": "15.3.3",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-15.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-15.3.3.tgz",
-      "integrity": "sha512-YLzaKCFmSniNlz9+NUTNs7ssPyDc+bYOCYZ0b/D6DjVkOeIFz4SR8EYKqlOc8TcqlDNu18BbWqz6zbJPyAAURg==",
+      "integrity": "sha512-tr4UaMosN6+s8vSbx6OxqRXDTTCBjjJkmDMv0b0sg8f+cRFQeY0u7xYbULpXS4B1+hHJmdh7Nz40Qpv0bJXa6w==",
      "dev": true,
      "requires": {
        "@electron/get": "^1.13.0",
@@ -40862,25 +40601,25 @@
      },
      "dependencies": {
        "@types/node": {
-          "version": "14.17.32",
+          "version": "14.17.34",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.32.tgz",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.34.tgz",
-          "integrity": "sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ==",
+          "integrity": "sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg==",
          "dev": true
        }
      }
    },
    "electron-builder": {
-      "version": "22.14.5",
+      "version": "22.14.10",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.14.10.tgz",
-      "integrity": "sha512-N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg==",
+      "integrity": "sha512-IGYziKc3/nz6P/HhsO6ls2ACIvkMOHUu5jKw+h4g/muT2iBUSNCuyh20VuLQnmR5ggo8uGVuv485GtJc/HP8ig==",
      "dev": true,
      "requires": {
        "@types/yargs": "^17.0.1",
-        "app-builder-lib": "22.14.5",
+        "app-builder-lib": "22.14.10",
-        "builder-util": "22.14.5",
+        "builder-util": "22.14.7",
-        "builder-util-runtime": "8.9.1",
+        "builder-util-runtime": "8.9.2",
        "chalk": "^4.1.1",
-        "dmg-builder": "22.14.5",
+        "dmg-builder": "22.14.10",
        "fs-extra": "^10.0.0",
        "is-ci": "^3.0.0",
        "lazy-val": "^1.0.5",
@@ -40941,9 +40680,9 @@
      }
    },
    "electron-dl": {
-      "version": "3.2.1",
+      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-3.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-3.3.0.tgz",
-      "integrity": "sha512-k5DFjocJlXbrjshO1zeWe/Gz7HkGwCgnehHPemiyzN2B/LfLlnbIX7sCj5F+huTwZ2l+nQehTI4IR37xvCn6FQ==",
+      "integrity": "sha512-Zwaz/OMGPIfBLV2SQH4sTsdDOs/U4y5AOHfremMBXEpjIxX+SiTx845DZAvJJwgb5hfowyWOBLiJhd/emBNLLQ==",
      "requires": {
        "ext-name": "^5.0.0",
        "pupa": "^2.0.1",
@@ -41043,14 +40782,14 @@
      }
    },
    "electron-publish": {
-      "version": "22.14.5",
+      "version": "22.14.7",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.14.7.tgz",
-      "integrity": "sha512-h+NANRdaA0PqGF15GKvorseWPzh1PXa/zx4I37//PIokW8eKIov8ky23foUSb55ZFWUHGpxQJux7y2NCfBtQeg==",
+      "integrity": "sha512-sqZX/64k0B7sQeaDzFDE6m7r2zOtFgdmWAFnkv10bLlbHagkH9AkwwcjiGBpIto7mUBp89ntL7Ij5QFvldqI4Q==",
      "dev": true,
      "requires": {
        "@types/fs-extra": "^9.0.11",
-        "builder-util": "22.14.5",
+        "builder-util": "22.14.7",
-        "builder-util-runtime": "8.9.1",
+        "builder-util-runtime": "8.9.2",
        "chalk": "^4.1.1",
        "fs-extra": "^10.0.0",
        "lazy-val": "^1.0.5",
@@ -41119,35 +40858,24 @@
      }
    },
    "electron-to-chromium": {
-      "version": "1.3.890",
+      "version": "1.3.904",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.890.tgz",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.904.tgz",
-      "integrity": "sha512-VWlVXSkv0cA/OOehrEyqjUTHwV8YXCPTfPvbtoeU2aHR21vI4Ejh5aC4AxUwOmbLbBgb6Gd3URZahoCxtBqCYQ==",
+      "integrity": "sha512-x5uZWXcVNYkTh4JubD7KSC1VMKz0vZwJUqVwY3ihsW0bst1BXDe494Uqbg3Y0fDGVjJqA8vEeGuvO5foyH2+qw==",
      "dev": true
    },
    "electron-updater": {
-      "version": "4.3.9",
+      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.3.9.tgz",
+      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.6.2.tgz",
-      "integrity": "sha512-LCNfedSwZfS4Hza+pDyPR05LqHtGorCStaBgVpRnfKxOlZcvpYEX0AbMeH5XUtbtGRoH2V8osbbf2qKPNb7AsA==",
+      "integrity": "sha512-KAloJQNXwW2j81n0o2KgBsiRsxp2OS15nty4nZLUjZYNuRyJ7yp2zeKPL4fVNGY6Ave491ht7/Dyz5OIykJf9g==",
      "requires": {
-        "@types/semver": "^7.3.5",
+        "@types/semver": "^7.3.6",
-        "builder-util-runtime": "8.7.5",
+        "builder-util-runtime": "8.9.2",
        "fs-extra": "^10.0.0",
        "js-yaml": "^4.1.0",
-        "lazy-val": "^1.0.4",
+        "lazy-val": "^1.0.5",
        "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-util": {
@@ -41510,12 +41238,12 @@
      }
    },
    "eslint": {
-      "version": "8.1.0",
+      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.2.0.tgz",
-      "integrity": "sha512-JZvNneArGSUsluHWJ8g8MMs3CfIEzwaLx9KyH4tZ2i+R2/rPWzL8c0zg3rHdwYVpN/1sB9gqnjHwz9HoeJpGHw==",
+      "integrity": "sha512-erw7XmM+CLxTOickrimJ1SiF55jiNlVSp2qqm0NuBWPtHYQCegD5ZMaW0c3i5ytPqL+SSLaCxdvQXFPLJn+ABw==",
      "dev": true,
      "requires": {
-        "@eslint/eslintrc": "^1.0.3",
+        "@eslint/eslintrc": "^1.0.4",
        "@humanwhocodes/config-array": "^0.6.0",
        "ajv": "^6.10.0",
        "chalk": "^4.0.0",
@@ -41549,7 +41277,7 @@
        "progress": "^2.0.0",
        "regexpp": "^3.2.0",
        "semver": "^7.2.1",
-        "strip-ansi": "^6.0.0",
+        "strip-ansi": "^6.0.1",
        "strip-json-comments": "^3.1.0",
        "text-table": "^0.2.0",
        "v8-compile-cache": "^2.0.3"
@@ -41621,9 +41349,9 @@
          }
        },
        "eslint-visitor-keys": {
-          "version": "3.0.0",
+          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz",
-          "integrity": "sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==",
+          "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==",
          "dev": true
        },
        "globals": {
@@ -41671,34 +41399,43 @@
      }
    },
    "eslint-config-airbnb": {
-      "version": "18.2.1",
+      "version": "19.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-18.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.0.tgz",
-      "integrity": "sha512-glZNDEZ36VdlZWoxn/bUR1r/sdFKPd1mHPbqUtkctgNG4yT2DLLtJ3D+yCV+jzZCc2V1nBVkmdknOJBZ5Hc0fg==",
+      "integrity": "sha512-f5FzCDw8osQJtifOGazdBtYuDOH38FVQSOwHvSU0iFjAmkdl4zQ1jG+YV6sVNt4gqVubqJwn98zZQzDoaCwDyw==",
      "dev": true,
      "requires": {
-        "eslint-config-airbnb-base": "^14.2.1",
+        "eslint-config-airbnb-base": "^15.0.0",
        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.2"
+        "object.entries": "^1.1.5"
      }
    },
    "eslint-config-airbnb-base": {
-      "version": "14.2.1",
+      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
      "dev": true,
      "requires": {
        "confusing-browser-globals": "^1.0.10",
        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.2"
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
      }
    },
    "eslint-config-airbnb-typescript": {
-      "version": "14.0.1",
+      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-14.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-16.0.0.tgz",
-      "integrity": "sha512-tF4GwC3sRrw8kEj4/yxX8F7AcLzj/1IESBnsCiFMplzYmxre459qm2z9DFkCpqBVQFSH6j2K4+VKVteX4m0GsQ==",
+      "integrity": "sha512-qDOyD0YYZo5Us1YvOnWig2Ly/+IlQKmMZpnqKnJgVtHdK8SkjaSyVBHKbD41dEaQxk8vRVGBC94PuR2ceSwbLQ==",
      "dev": true,
      "requires": {
-        "eslint-config-airbnb-base": "14.2.1"
+        "eslint-config-airbnb-base": "^15.0.0"
      }
    },
    "eslint-config-prettier": {
@@ -41800,9 +41537,9 @@
      }
    },
    "eslint-plugin-import": {
-      "version": "2.25.2",
+      "version": "2.25.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz",
-      "integrity": "sha512-qCwQr9TYfoBHOFcVGKY9C9unq05uOxxdklmBXLVvcwo68y5Hta6/GzCZEMx2zQiu0woKNEER0LE7ZgaOfBU14g==",
+      "integrity": "sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg==",
      "dev": true,
      "requires": {
        "array-includes": "^3.1.4",
@@ -41810,9 +41547,9 @@
        "debug": "^2.6.9",
        "doctrine": "^2.1.0",
        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.0",
+        "eslint-module-utils": "^2.7.1",
        "has": "^1.0.3",
-        "is-core-module": "^2.7.0",
+        "is-core-module": "^2.8.0",
        "is-glob": "^4.0.3",
        "minimatch": "^3.0.4",
        "object.values": "^1.1.5",
@@ -41847,31 +41584,32 @@
      }
    },
    "eslint-plugin-jest": {
-      "version": "25.2.2",
+      "version": "25.2.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.2.4.tgz",
-      "integrity": "sha512-frn5yhOF60U4kcqozO3zKTNZQUk+mfx037XOy2iiYL8FhorEkuCuL3/flzKcY1ECDP2WYT9ydmvlO3fRW9o4mg==",
+      "integrity": "sha512-HRyinpgmEdkVr7pNPaYPHCoGqEzpgk79X8pg/xCeoAdurbyQjntJQ4pTzHl7BiVEBlam/F1Qsn+Dk0HtJO7Aaw==",
      "dev": true,
      "requires": {
        "@typescript-eslint/experimental-utils": "^5.0.0"
      }
    },
    "eslint-plugin-jsx-a11y": {
-      "version": "6.4.1",
+      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz",
-      "integrity": "sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==",
+      "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
      "dev": true,
      "requires": {
-        "@babel/runtime": "^7.11.2",
+        "@babel/runtime": "^7.16.3",
        "aria-query": "^4.2.2",
-        "array-includes": "^3.1.1",
+        "array-includes": "^3.1.4",
        "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.0.2",
+        "axe-core": "^4.3.5",
        "axobject-query": "^2.2.0",
-        "damerau-levenshtein": "^1.0.6",
+        "damerau-levenshtein": "^1.0.7",
-        "emoji-regex": "^9.0.0",
+        "emoji-regex": "^9.2.2",
        "has": "^1.0.3",
-        "jsx-ast-utils": "^3.1.0",
+        "jsx-ast-utils": "^3.2.1",
-        "language-tags": "^1.0.5"
+        "language-tags": "^1.0.5",
+        "minimatch": "^3.0.4"
      }
    },
    "eslint-plugin-prettier": {
@@ -41884,25 +41622,25 @@
      }
    },
    "eslint-plugin-react": {
-      "version": "7.26.1",
+      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.26.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.27.1.tgz",
-      "integrity": "sha512-Lug0+NOFXeOE+ORZ5pbsh6mSKjBKXDXItUD2sQoT+5Yl0eoT82DqnXeTMfUare4QVCn9QwXbfzO/dBLjLXwVjQ==",
+      "integrity": "sha512-meyunDjMMYeWr/4EBLTV1op3iSG3mjT/pz5gti38UzfM4OPpNc2m0t2xvKCOMU5D6FSdd34BIMFOvQbW+i8GAA==",
      "dev": true,
      "requires": {
-        "array-includes": "^3.1.3",
+        "array-includes": "^3.1.4",
-        "array.prototype.flatmap": "^1.2.4",
+        "array.prototype.flatmap": "^1.2.5",
        "doctrine": "^2.1.0",
-        "estraverse": "^5.2.0",
+        "estraverse": "^5.3.0",
        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
        "minimatch": "^3.0.4",
-        "object.entries": "^1.1.4",
+        "object.entries": "^1.1.5",
-        "object.fromentries": "^2.0.4",
+        "object.fromentries": "^2.0.5",
-        "object.hasown": "^1.0.0",
+        "object.hasown": "^1.1.0",
-        "object.values": "^1.1.4",
+        "object.values": "^1.1.5",
        "prop-types": "^15.7.2",
        "resolve": "^2.0.0-next.3",
        "semver": "^6.3.0",
-        "string.prototype.matchall": "^4.0.5"
+        "string.prototype.matchall": "^4.0.6"
      },
      "dependencies": {
        "doctrine": {
@@ -41933,15 +41671,15 @@
      }
    },
    "eslint-plugin-react-hooks": {
-      "version": "4.2.0",
+      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz",
-      "integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==",
+      "integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==",
      "dev": true
    },
    "eslint-plugin-unicorn": {
-      "version": "37.0.1",
+      "version": "39.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-37.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-39.0.0.tgz",
-      "integrity": "sha512-E1jq5u9ojnadisJcPi+hMXTGSiIzkIUMDvWsBudsCGXvKUB2aNSU2TcfyW2/jAS5A4ryBXfzxLykMxX1EdluSQ==",
+      "integrity": "sha512-fd5RK2FtYjGcIx3wra7csIE/wkkmBo22T1gZtRTsLr1Mb+KsFKJ+JOdSqhHXQUrI/JTs/Mon64cEYzTgSCbltw==",
      "dev": true,
      "requires": {
        "@babel/helper-validator-identifier": "^7.14.9",
@@ -42032,9 +41770,9 @@
      },
      "dependencies": {
        "eslint-visitor-keys": {
-          "version": "3.0.0",
+          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz",
-          "integrity": "sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==",
+          "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==",
          "dev": true
        }
      }
@@ -42423,6 +42161,12 @@
          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
          "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
          "dev": true
+        },
+        "toidentifier": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+          "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+          "dev": true
        }
      }
    },
@@ -42540,9 +42284,10 @@
      }
    },
    "extsprintf": {
-      "version": "1.4.0",
+      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz",
-      "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=",
+      "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==",
+      "dev": true,
      "optional": true
    },
    "fancy-log": {
@@ -42888,9 +42633,9 @@
      }
    },
    "flatted": {
-      "version": "3.2.2",
+      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz",
-      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
+      "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==",
      "dev": true
    },
    "flush-write-stream": {
@@ -42909,9 +42654,9 @@
      "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
    },
    "follow-redirects": {
-      "version": "1.14.4",
+      "version": "1.14.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz",
-      "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==",
+      "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==",
      "dev": true
    },
    "for-in": {
@@ -43073,19 +42818,6 @@
        "rimraf": "2"
      },
      "dependencies": {
-        "glob": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-          "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-          "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"
-          }
-        },
        "rimraf": {
          "version": "2.7.1",
          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -43231,14 +42963,14 @@
      }
    },
    "glob": {
-      "version": "5.0.15",
+      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "optional": true,
      "requires": {
+        "fs.realpath": "^1.0.0",
        "inflight": "^1.0.4",
        "inherits": "2",
-        "minimatch": "2 || 3",
+        "minimatch": "^3.0.4",
        "once": "^1.3.0",
        "path-is-absolute": "^1.0.0"
      }
@@ -43270,20 +43002,6 @@
        "unique-stream": "^2.0.2"
      },
      "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"
-          }
-        },
        "glob-parent": {
          "version": "3.1.0",
          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
@@ -43948,25 +43666,6 @@
        "terser": "^5.9.0",
        "through2": "^4.0.2",
        "vinyl-sourcemaps-apply": "^0.2.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        },
-        "terser": {
-          "version": "5.9.0",
-          "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
-          "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
-          "dev": true,
-          "requires": {
-            "commander": "^2.20.0",
-            "source-map": "~0.7.2",
-            "source-map-support": "~0.5.20"
-          }
-        }
      }
    },
    "gulp-typescript": {
@@ -44405,6 +44104,31 @@
            "dot-case": "^3.0.4",
            "tslib": "^2.0.3"
          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "terser": {
+          "version": "4.8.0",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
+          "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+          "dev": true,
+          "requires": {
+            "commander": "^2.20.0",
+            "source-map": "~0.6.1",
+            "source-map-support": "~0.5.12"
+          },
+          "dependencies": {
+            "commander": {
+              "version": "2.20.3",
+              "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+              "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+              "dev": true
+            }
+          }
        }
      }
    },
@@ -44450,15 +44174,15 @@
      "dev": true
    },
    "http-errors": {
-      "version": "1.8.0",
+      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.0.tgz",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A==",
+      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
      "requires": {
        "depd": "~1.1.2",
        "inherits": "2.0.4",
        "setprototypeof": "1.2.0",
        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
+        "toidentifier": "1.0.1"
      }
    },
    "http-parser-js": {
@@ -44606,13 +44330,13 @@
      "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ=="
    },
    "iconv-corefoundation": {
-      "version": "1.1.6",
+      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz",
+      "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz",
-      "integrity": "sha512-1NBe55C75bKGZaY9UHxvXG3G0gEp0ziht7quhuFrW3SPgZDw9HI6qvYXRSV5M/Eupyu8ljuJ6Cba+ec15PZ4Xw==",
+      "integrity": "sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==",
      "dev": true,
      "optional": true,
      "requires": {
-        "cli-truncate": "^1.1.0",
+        "cli-truncate": "^2.1.0",
        "node-addon-api": "^1.6.3"
      },
      "dependencies": {
@@ -44646,9 +44370,9 @@
      "dev": true
    },
    "ignore": {
-      "version": "5.1.8",
+      "version": "5.1.9",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==",
      "dev": true
    },
    "ignore-walk": {
@@ -44915,9 +44639,9 @@
      "dev": true
    },
    "intl-messageformat": {
-      "version": "9.9.4",
+      "version": "9.9.6",
-      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.9.4.tgz",
+      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.9.6.tgz",
-      "integrity": "sha512-+Mz5LMTV+JCybFBym69z+XnE47wnIjHC31Jz7We6SE0yKyjf/neaWAFz8teuT6OUw/AW3Orr5LO4SHVNXl5keg==",
+      "integrity": "sha512-xgoBydnw9zGUtgCiUcxNTzrRLzAbBIgWyKvMjL2jFNCx7H0148GGQWNVOpoiON5SlcFr8lyMWdbb0m+HjydanQ==",
      "requires": {
        "@formatjs/fast-memoize": "1.2.0",
        "@formatjs/icu-messageformat-parser": "2.0.14",
@@ -45108,11 +44832,6 @@
      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
    },
-    "is-function": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
-      "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="
-    },
    "is-generator-fn": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
@@ -45798,20 +45517,6 @@
          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
          "dev": true
        },
-        "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"
-          }
-        },
        "has-flag": {
          "version": "4.0.0",
          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -46524,20 +46229,6 @@
          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
          "dev": true
        },
-        "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"
-          }
-        },
        "has-flag": {
          "version": "4.0.0",
          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -46769,9 +46460,9 @@
          }
        },
        "camelcase": {
-          "version": "6.2.0",
+          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
-          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+          "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
          "dev": true
        },
        "chalk": {
@@ -47201,11 +46892,28 @@
        "verror": "1.10.0"
      },
      "dependencies": {
+        "core-util-is": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+          "optional": true
+        },
        "extsprintf": {
          "version": "1.3.0",
          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
          "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
          "optional": true
+        },
+        "verror": {
+          "version": "1.10.0",
+          "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+          "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+          "optional": true,
+          "requires": {
+            "assert-plus": "^1.0.0",
+            "core-util-is": "1.0.2",
+            "extsprintf": "^1.2.0"
+          }
        }
      }
    },
@@ -47220,89 +46928,141 @@
        "tiny-warning": "^1.0.2"
      }
    },
-    "jss-camel-case": {
+    "jss-plugin-camel-case": {
-      "version": "6.1.0",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-camel-case/-/jss-camel-case-6.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.8.2.tgz",
-      "integrity": "sha512-HPF2Q7wmNW1t79mCqSeU2vdd/vFFGpkazwvfHMOhPlMgXrJDzdj9viA2SaHk9ZbD5pfL63a8ylp4++irYbbzMQ==",
+      "integrity": "sha512-2INyxR+1UdNuKf4v9It3tNfPvf7IPrtkiwzofeKuMd5D58/dxDJVUQYRVg/n460rTlHUfsEQx43hDrcxi9dSPA==",
      "requires": {
-        "hyphenate-style-name": "^1.0.2"
+        "@babel/runtime": "^7.3.1",
+        "hyphenate-style-name": "^1.0.3",
+        "jss": "10.8.2"
      }
    },
-    "jss-compose": {
+    "jss-plugin-compose": {
-      "version": "5.0.0",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-compose/-/jss-compose-5.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-compose/-/jss-plugin-compose-10.8.2.tgz",
-      "integrity": "sha512-YofRYuiA0+VbeOw0VjgkyO380sA4+TWDrW52nSluD9n+1FWOlDzNbgpZ/Sb3Y46+DcAbOS21W5jo6SAqUEiuwA==",
+      "integrity": "sha512-X7fDQJ6IlIJoT8A3zc++LuC1hmSGKVudb3LyXp+vHv8r2hzzfXEEZty3y2CaC5CGrWcLlYquXENjqLNmLYMgMA==",
      "requires": {
-        "warning": "^3.0.0"
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2",
+        "tiny-warning": "^1.0.2"
      }
    },
-    "jss-default-unit": {
+    "jss-plugin-default-unit": {
-      "version": "8.0.2",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-default-unit/-/jss-default-unit-8.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.8.2.tgz",
-      "integrity": "sha512-WxNHrF/18CdoAGw2H0FqOEvJdREXVXLazn7PQYU7V6/BWkCV0GkmWsppNiExdw8dP4TU1ma1dT9zBNJ95feLmg=="
+      "integrity": "sha512-UZ7cwT9NFYSG+SEy7noRU50s4zifulFdjkUNKE+u6mW7vFP960+RglWjTgMfh79G6OENZmaYnjHV/gcKV4nSxg==",
+      "requires": {
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2"
+      }
    },
-    "jss-expand": {
+    "jss-plugin-expand": {
-      "version": "5.3.0",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-expand/-/jss-expand-5.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-expand/-/jss-plugin-expand-10.8.2.tgz",
-      "integrity": "sha512-NiM4TbDVE0ykXSAw6dfFmB1LIqXP/jdd0ZMnlvlGgEMkMt+weJIl8Ynq1DsuBY9WwkNyzWktdqcEW2VN0RAtQg=="
+      "integrity": "sha512-Iy4qsZbEcomXz5aBZJYGwnzK23vK3hqlwGleqmd19fY3L+WbqTmUnW8W0fWeXSuCkw2NknBTAJuEpFcgm3b0Pw==",
+      "requires": {
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2"
+      }
    },
-    "jss-extend": {
+    "jss-plugin-extend": {
-      "version": "6.2.0",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-extend/-/jss-extend-6.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-extend/-/jss-plugin-extend-10.8.2.tgz",
-      "integrity": "sha512-YszrmcB6o9HOsKPszK7NeDBNNjVyiW864jfoiHoMlgMIg2qlxKw70axZHqgczXHDcoyi/0/ikP1XaHDPRvYtEA==",
+      "integrity": "sha512-NYu0cJ/Zb50ySPkegzbXQQfhXza0VpaRVXdXDex30yXqZpGcAdmhSg4HTv8vzHiL1v3uIOm641FYQX9WvLgSWw==",
      "requires": {
-        "warning": "^3.0.0"
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2",
+        "tiny-warning": "^1.0.2"
      }
    },
-    "jss-global": {
+    "jss-plugin-global": {
-      "version": "3.0.0",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-global/-/jss-global-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.8.2.tgz",
-      "integrity": "sha512-wxYn7vL+TImyQYGAfdplg7yaxnPQ9RaXY/cIA8hawaVnmmWxDHzBK32u1y+RAvWboa3lW83ya3nVZ/C+jyjZ5Q=="
+      "integrity": "sha512-UaYMSPsYZ7s/ECGoj4KoHC2jwQd5iQ7K+FFGnCAILdQrv7hPmvM2Ydg45ThT/sH46DqktCRV2SqjRuxeBH8nRA==",
+      "requires": {
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2"
+      }
    },
-    "jss-nested": {
+    "jss-plugin-nested": {
-      "version": "6.0.1",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-nested/-/jss-nested-6.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.8.2.tgz",
-      "integrity": "sha512-rn964TralHOZxoyEgeq3hXY8hyuCElnvQoVrQwKHVmu55VRDd6IqExAx9be5HgK0yN/+hQdgAXQl/GUrBbbSTA==",
+      "integrity": "sha512-acRvuPJOb930fuYmhkJaa994EADpt8TxI63Iyg96C8FJ9T2xRyU5T6R1IYKRwUiqZo+2Sr7fdGzRTDD4uBZaMA==",
      "requires": {
-        "warning": "^3.0.0"
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2",
+        "tiny-warning": "^1.0.2"
      }
    },
-    "jss-preset-default": {
+    "jss-plugin-props-sort": {
-      "version": "4.5.0",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-preset-default/-/jss-preset-default-4.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.8.2.tgz",
-      "integrity": "sha512-qZbpRVtHT7hBPpZEBPFfafZKWmq3tA/An5RNqywDsZQGrlinIF/mGD9lmj6jGqu8GrED2SMHZ3pPKLmjCZoiaQ==",
+      "integrity": "sha512-wqdcjayKRWBZnNpLUrXvsWqh+5J5YToAQ+8HNBNw0kZxVvCDwzhK2Nx6AKs7p+5/MbAh2PLgNW5Ym/ysbVAuqQ==",
-      "requires": {
+      "requires": {
-        "jss-camel-case": "^6.1.0",
+        "@babel/runtime": "^7.3.1",
-        "jss-compose": "^5.0.0",
+        "jss": "10.8.2"
-        "jss-default-unit": "^8.0.2",
+      }
-        "jss-expand": "^5.3.0",
-        "jss-extend": "^6.2.0",
-        "jss-global": "^3.0.0",
-        "jss-nested": "^6.0.1",
-        "jss-props-sort": "^6.0.0",
-        "jss-template": "^1.0.1",
-        "jss-vendor-prefixer": "^7.0.0"
-      }
-    },
-    "jss-props-sort": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/jss-props-sort/-/jss-props-sort-6.0.0.tgz",
-      "integrity": "sha512-E89UDcrphmI0LzmvYk25Hp4aE5ZBsXqMWlkFXS0EtPkunJkRr+WXdCNYbXbksIPnKlBenGB9OxzQY+mVc70S+g=="
    },
-    "jss-template": {
+    "jss-plugin-rule-value-function": {
-      "version": "1.0.1",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-template/-/jss-template-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.8.2.tgz",
-      "integrity": "sha512-m5BqEWha17fmIVXm1z8xbJhY6GFJxNB9H68GVnCWPyGYfxiAgY9WTQyvDAVj+pYRgrXSOfN5V1T4+SzN1sJTeg==",
+      "integrity": "sha512-bW0EKAs+0HXpb6BKJhrn94IDdiWb0CnSluTkh0rGEgyzY/nmD1uV/Wf6KGlesGOZ9gmJzQy+9FFdxIUID1c9Ug==",
      "requires": {
-        "warning": "^3.0.0"
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2",
+        "tiny-warning": "^1.0.2"
      }
    },
-    "jss-vendor-prefixer": {
+    "jss-plugin-rule-value-observable": {
-      "version": "7.0.0",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-vendor-prefixer/-/jss-vendor-prefixer-7.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-observable/-/jss-plugin-rule-value-observable-10.8.2.tgz",
-      "integrity": "sha512-Agd+FKmvsI0HLcYXkvy8GYOw3AAASBUpsmIRvVQheps+JWaN892uFOInTr0DRydwaD91vSSUCU4NssschvF7MA==",
+      "integrity": "sha512-NaJCfsEg8/6l/E8HstwL2w8kHj2LHhwoG4fXxefmdvNKmJMwBpnjech5dEPL72It4bZfIIYoynWbyxo3Q0ZKQQ==",
      "requires": {
-        "css-vendor": "^0.3.8"
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2",
+        "symbol-observable": "^1.2.0"
+      }
+    },
+    "jss-plugin-template": {
+      "version": "10.8.2",
+      "resolved": "https://registry.npmjs.org/jss-plugin-template/-/jss-plugin-template-10.8.2.tgz",
+      "integrity": "sha512-oTVwYRUCuCLslHxuH73F15kFmDxc4YEJIn8kHBnNpGr99ZbQdRIgPabosVTfkgE8czuyTx0KM5u8zEeuL+v66A==",
+      "requires": {
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2",
+        "tiny-warning": "^1.0.2"
+      }
+    },
+    "jss-plugin-vendor-prefixer": {
+      "version": "10.8.2",
+      "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.8.2.tgz",
+      "integrity": "sha512-DeGv18QsSiYLSVIEB2+l0af6OToUe0JB+trpzUxyqD2QRC/5AzzDrCrYffO5AHZ81QbffYvSN/pkfZaTWpRXlg==",
+      "requires": {
+        "@babel/runtime": "^7.3.1",
+        "css-vendor": "^2.0.8",
+        "jss": "10.8.2"
+      }
+    },
+    "jss-preset-default": {
+      "version": "10.8.2",
+      "resolved": "https://registry.npmjs.org/jss-preset-default/-/jss-preset-default-10.8.2.tgz",
+      "integrity": "sha512-mgkr6DAZuvkEleHFEpOkm8Y+sTdK/r0HH8PxToLHgaWHbYS0JAb0g1tBSUMG24kFj98VOYLTllK1o0J4lWU/uw==",
+      "requires": {
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2",
+        "jss-plugin-camel-case": "10.8.2",
+        "jss-plugin-compose": "10.8.2",
+        "jss-plugin-default-unit": "10.8.2",
+        "jss-plugin-expand": "10.8.2",
+        "jss-plugin-extend": "10.8.2",
+        "jss-plugin-global": "10.8.2",
+        "jss-plugin-nested": "10.8.2",
+        "jss-plugin-props-sort": "10.8.2",
+        "jss-plugin-rule-value-function": "10.8.2",
+        "jss-plugin-rule-value-observable": "10.8.2",
+        "jss-plugin-template": "10.8.2",
+        "jss-plugin-vendor-prefixer": "10.8.2"
      }
    },
    "jsx-ast-utils": {
@@ -47901,9 +47661,9 @@
      }
    },
    "loglevel": {
-      "version": "1.7.1",
+      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.0.tgz",
-      "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==",
+      "integrity": "sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==",
      "dev": true
    },
    "long": {
@@ -48358,22 +48118,22 @@
      }
    },
    "mime": {
-      "version": "2.5.2",
+      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
      "dev": true
    },
    "mime-db": {
-      "version": "1.50.0",
+      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-      "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A=="
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
    },
    "mime-types": {
-      "version": "2.1.33",
+      "version": "2.1.34",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
-      "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==",
+      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
      "requires": {
-        "mime-db": "1.50.0"
+        "mime-db": "1.51.0"
      }
    },
    "mimic-fn": {
@@ -48603,22 +48363,26 @@
      }
    },
    "mobx-react": {
-      "version": "5.4.4",
+      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-5.4.4.tgz",
+      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-6.3.1.tgz",
-      "integrity": "sha512-2mTzpyEjVB/RGk2i6KbcmP4HWcAUFox5ZRCrGvSyz49w20I4C4qql63grPpYrS9E9GKwgydBHQlA4y665LuRCQ==",
+      "integrity": "sha512-IOxdJGnRSNSJrL2uGpWO5w9JH5q5HoxEqwOF4gye1gmZYdjoYkkMzSGMDnRCUpN/BNzZcFoMdHXrjvkwO7KgaQ==",
      "requires": {
-        "hoist-non-react-statics": "^3.0.0",
+        "mobx-react-lite": "^2.2.0"
-        "react-lifecycles-compat": "^3.0.2"
      }
    },
    "mobx-react-form": {
-      "version": "1.35.1",
+      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/mobx-react-form/-/mobx-react-form-1.35.1.tgz",
+      "resolved": "https://registry.npmjs.org/mobx-react-form/-/mobx-react-form-2.0.9.tgz",
-      "integrity": "sha1-iSrsZykiThHCl4+4LmetxOgOOmo=",
+      "integrity": "sha512-YLbtXVUF6BtifeVr6XWJ76dQWJs3T/+aPNI/DKvNs1Opcl4jNCzENahqlqNsNI+RgXZbP36zck//IGWBNZsr0A==",
      "requires": {
-        "lodash": "^4.16.2"
+        "lodash": "^4.17.11"
      }
    },
+    "mobx-react-lite": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-2.2.2.tgz",
+      "integrity": "sha512-2SlXALHIkyUPDsV4VTKVR9DW7K3Ksh1aaIv3NrNJygTbhXe2A9GrcKHZ2ovIiOp/BXilOcTYemfHHZubP431dg=="
+    },
    "mobx-react-router": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/mobx-react-router/-/mobx-react-router-3.1.2.tgz",
@@ -48872,20 +48636,6 @@
        "run-queue": "^1.0.3"
      },
      "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"
-          }
-        },
        "rimraf": {
          "version": "2.7.1",
          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -49089,8 +48839,7 @@
    "node-addon-api": {
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.2.0.tgz",
-      "integrity": "sha512-eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q==",
+      "integrity": "sha512-eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q=="
-      "optional": true
    },
    "node-cookie": {
      "version": "2.1.2",
@@ -49126,9 +48875,9 @@
      "integrity": "sha512-pFhMAqdN1avrFwtZs66HxYiVnbnH9wjXB4m8IKs5Z9+r7U5voqxT+EDbVkRfge+V7JnkOgKhN4HfKBn1o5g9Wg=="
    },
    "node-fetch": {
-      "version": "2.6.5",
+      "version": "2.6.6",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz",
-      "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
+      "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==",
      "requires": {
        "whatwg-url": "^5.0.0"
      },
@@ -49181,22 +48930,6 @@
        "semver": "^7.3.5",
        "tar": "^6.1.2",
        "which": "^2.0.2"
-      },
-      "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"
-          }
-        }
      }
    },
    "node-int64": {
@@ -49256,19 +48989,19 @@
      }
    },
    "node-mac-permissions": {
-      "version": "2.2.0",
+      "version": "git+ssh://git@github.com/vraravam/node-mac-permissions.git#3cffec37379e6584627d831611a8ff12b57bbcdb",
-      "resolved": "https://registry.npmjs.org/node-mac-permissions/-/node-mac-permissions-2.2.0.tgz",
+      "integrity": "sha512-kl87EmBwDK4Rn/uI/WsjMvqpr8Ivk5ptNU/HYEie/5uBqQdW3jWCHnlL5guCbNprXtLM5a+ROT1TiFNMkIM+fQ==",
-      "integrity": "sha512-oLEZY46M47A/rcMacPEqo/5z6u7alXdMXhtE7xPDyMixZF35Grl9KGx3N2adE3//lEtGL6Tig98p+1gkonkwQg==",
+      "from": "node-mac-permissions@git@github.com:vraravam/node-mac-permissions.git#3cffec37379e6584627d831611a8ff12b57bbcdb",
      "optional": true,
      "requires": {
        "bindings": "^1.5.0",
-        "node-addon-api": "^2.0.0"
+        "node-addon-api": "^3.0.2"
      },
      "dependencies": {
        "node-addon-api": {
-          "version": "2.0.2",
+          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz",
+          "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-          "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==",
+          "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
          "optional": true
        }
      }
@@ -49309,19 +49042,6 @@
            "minipass": "^2.6.0"
          }
        },
-        "glob": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-          "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-          "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"
-          }
-        },
        "minipass": {
          "version": "2.9.0",
          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
@@ -51260,28 +50980,16 @@
      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
    },
    "raw-body": {
-      "version": "2.4.1",
+      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz",
-      "integrity": "sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==",
+      "integrity": "sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==",
      "requires": {
-        "bytes": "3.1.0",
+        "bytes": "3.1.1",
-        "http-errors": "1.7.3",
+        "http-errors": "1.8.1",
        "iconv-lite": "0.4.24",
        "unpipe": "1.0.0"
      },
      "dependencies": {
-        "http-errors": {
-          "version": "1.7.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
-          "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.4",
-            "setprototypeof": "1.1.1",
-            "statuses": ">= 1.5.0 < 2",
-            "toidentifier": "1.0.0"
-          }
-        },
        "iconv-lite": {
          "version": "0.4.24",
          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -51289,11 +50997,6 @@
          "requires": {
            "safer-buffer": ">= 2.1.2 < 3"
          }
-        },
-        "setprototypeof": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-          "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
        }
      }
    },
@@ -51340,6 +51043,11 @@
        "tween-functions": "^1.2.0"
      }
    },
+    "react-display-name": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/react-display-name/-/react-display-name-0.2.5.tgz",
+      "integrity": "sha512-I+vcaK9t4+kypiSgaiVWAipqHRXYmZIuAiS8vzFvXHHXVigg/sMKwlRgLy6LH2i3rmP+0Vzfl5lFsFRwF1r3pg=="
+    },
    "react-dom": {
      "version": "17.0.2",
      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
@@ -51369,19 +51077,19 @@
      }
    },
    "react-intl": {
-      "version": "5.21.0",
+      "version": "5.21.2",
-      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-5.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-5.21.2.tgz",
-      "integrity": "sha512-tRXg0JrMFpHgOokj+gFXvEbm4ZEePnidfVWFh3fbYc2FlJGnwxLjsvzCvRVv2qyNMHCy8xX6frRGe52WDOiYOg==",
+      "integrity": "sha512-pRKndhmjbFOq9CoJHHnUgXYf1tz9t3nIfInZg5TQ9EqYs9PPlkHBp4WtFDcFcW5UGV/QX4no6irpfXFsVKNWUA==",
      "requires": {
        "@formatjs/ecma402-abstract": "1.10.0",
        "@formatjs/icu-messageformat-parser": "2.0.14",
-        "@formatjs/intl": "1.15.0",
+        "@formatjs/intl": "1.15.2",
        "@formatjs/intl-displaynames": "5.2.5",
        "@formatjs/intl-listformat": "6.3.5",
        "@types/hoist-non-react-statics": "^3.3.1",
        "@types/react": "16 || 17",
        "hoist-non-react-statics": "^3.3.2",
-        "intl-messageformat": "9.9.4",
+        "intl-messageformat": "9.9.6",
        "tslib": "^2.1.0"
      }
    },
@@ -51391,32 +51099,21 @@
      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
    },
    "react-jss": {
-      "version": "8.6.1",
+      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/react-jss/-/react-jss-8.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/react-jss/-/react-jss-10.8.2.tgz",
-      "integrity": "sha512-SH6XrJDJkAphp602J14JTy3puB2Zxz1FkM3bKVE8wON+va99jnUTKWnzGECb3NfIn9JPR5vHykge7K3/A747xQ==",
+      "integrity": "sha512-/lLFIv1H6GA5RkvNb7TdXcJMBaSvSpfmSYsDisj4WI7MmqXUouoKfkZUJzG7CWq8xnIxik0WWYjFcGOvx0Sasw==",
      "requires": {
-        "hoist-non-react-statics": "^2.5.0",
+        "@babel/runtime": "^7.3.1",
-        "jss": "^9.7.0",
+        "@emotion/is-prop-valid": "^0.7.3",
-        "jss-preset-default": "^4.3.0",
+        "css-jss": "10.8.2",
+        "hoist-non-react-statics": "^3.2.0",
+        "is-in-browser": "^1.1.3",
+        "jss": "10.8.2",
+        "jss-preset-default": "10.8.2",
        "prop-types": "^15.6.0",
-        "theming": "^1.3.0"
+        "shallow-equal": "^1.2.0",
-      },
+        "theming": "^3.3.0",
-      "dependencies": {
+        "tiny-warning": "^1.0.2"
-        "hoist-non-react-statics": {
-          "version": "2.5.5",
-          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
-          "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
-        },
-        "jss": {
-          "version": "9.8.7",
-          "resolved": "https://registry.npmjs.org/jss/-/jss-9.8.7.tgz",
-          "integrity": "sha512-awj3XRZYxbrmmrx9LUSj5pXSUfm12m8xzi/VKeqI1ZwWBtQ0kVPTs3vYs32t4rFw83CgFDukA8wKzOE9sMQnoQ==",
-          "requires": {
-            "is-in-browser": "^1.1.3",
-            "symbol-observable": "^1.1.0",
-            "warning": "^3.0.0"
-          }
-        }
      }
    },
    "react-lifecycles-compat": {
@@ -51435,9 +51132,9 @@
      }
    },
    "react-modal": {
-      "version": "3.14.3",
+      "version": "3.14.4",
-      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.14.3.tgz",
+      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.14.4.tgz",
-      "integrity": "sha512-+C2KODVKyu20zHXPJxfOOcf571L1u/EpFlH+oS/3YDn8rgVE51QZuxuuIwabJ8ZFnOEHaD+r6XNjqwtxZnXO0g==",
+      "integrity": "sha512-8surmulejafYCH9wfUmFyj4UfbSJwjcgbS9gf3oOItu4Hwd6ivJyVBETI0yHRhpJKCLZMUtnhzk76wXTsNL6Qg==",
      "requires": {
        "exenv": "^1.2.0",
        "prop-types": "^15.7.2",
@@ -52277,22 +51974,6 @@
      "devOptional": true,
      "requires": {
        "glob": "^7.1.3"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-          "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-          "devOptional": 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"
-          }
-        }
      }
    },
    "ripemd160": {
@@ -52852,6 +52533,11 @@
          "version": "1.1.1",
          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
          "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+        },
+        "toidentifier": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+          "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
        }
      }
    },
@@ -52908,6 +52594,11 @@
        "kind-of": "^6.0.2"
      }
    },
+    "shallow-equal": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz",
+      "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA=="
+    },
    "shebang-command": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -52932,9 +52623,9 @@
      }
    },
    "signal-exit": {
-      "version": "3.0.5",
+      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
-      "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ=="
+      "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="
    },
    "simple-encryptor": {
      "version": "2.0.0",
@@ -52983,13 +52674,51 @@
      "dev": true
    },
    "slice-ansi": {
-      "version": "1.0.0",
+      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
      "dev": true,
      "optional": true,
      "requires": {
-        "is-fullwidth-code-point": "^2.0.0"
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "dependencies": {
+        "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,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "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,
+          "optional": 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,
+          "optional": 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,
+          "optional": true
+        }
      }
    },
    "smart-buffer": {
@@ -53244,9 +52973,9 @@
      }
    },
    "source-map-support": {
-      "version": "0.5.20",
+      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
      "dev": true,
      "requires": {
        "buffer-from": "^1.0.0",
@@ -53311,9 +53040,9 @@
      }
    },
    "spdx-license-ids": {
-      "version": "3.0.10",
+      "version": "3.0.11",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
-      "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==",
+      "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
      "dev": true
    },
    "spdy": {
@@ -53435,20 +53164,6 @@
        "node-pre-gyp": "^0.11.0"
      },
      "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-addon-api": {
          "version": "3.2.1",
          "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
@@ -53795,7 +53510,6 @@
      "version": "6.0.1",
      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
      "requires": {
        "ansi-regex": "^5.0.1"
      }
@@ -54017,20 +53731,20 @@
      }
    },
    "terser": {
-      "version": "4.8.0",
+      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz",
-      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+      "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==",
      "dev": true,
      "requires": {
        "commander": "^2.20.0",
-        "source-map": "~0.6.1",
+        "source-map": "~0.7.2",
-        "source-map-support": "~0.5.12"
+        "source-map-support": "~0.5.20"
      },
      "dependencies": {
        "source-map": {
-          "version": "0.6.1",
+          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
          "dev": true
        }
      }
@@ -54081,20 +53795,6 @@
          "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
          "dev": true
        },
-        "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",
@@ -54137,6 +53837,17 @@
            "figgy-pudding": "^3.5.1"
          }
        },
+        "terser": {
+          "version": "4.8.0",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
+          "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+          "dev": true,
+          "requires": {
+            "commander": "^2.20.0",
+            "source-map": "~0.6.1",
+            "source-map-support": "~0.5.12"
+          }
+        },
        "y18n": {
          "version": "4.0.3",
          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
@@ -54160,22 +53871,6 @@
        "@istanbuljs/schema": "^0.1.2",
        "glob": "^7.1.4",
        "minimatch": "^3.0.4"
-      },
-      "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"
-          }
-        }
      }
    },
    "text-extensions": {
@@ -54196,14 +53891,14 @@
      "dev": true
    },
    "theming": {
-      "version": "1.3.0",
+      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/theming/-/theming-1.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/theming/-/theming-3.3.0.tgz",
-      "integrity": "sha512-ya5Ef7XDGbTPBv5ENTwrwkPUexrlPeiAg/EI9kdlUAZhNlRbCdhMKRgjNX1IcmsmiPcqDQZE6BpSaH+cr31FKw==",
+      "integrity": "sha512-u6l4qTJRDaWZsqa8JugaNt7Xd8PPl9+gonZaIe28vAhqgHMIG/DOyFPqiKN/gQLQYj05tHv+YQdNILL4zoiAVA==",
      "requires": {
-        "brcast": "^3.0.1",
+        "hoist-non-react-statics": "^3.3.0",
-        "is-function": "^1.0.1",
+        "prop-types": "^15.5.8",
-        "is-plain-object": "^2.0.1",
+        "react-display-name": "^0.2.4",
-        "prop-types": "^15.5.8"
+        "tiny-warning": "^1.0.2"
      }
    },
    "throat": {
@@ -54482,9 +54177,9 @@
      }
    },
    "toidentifier": {
-      "version": "1.0.0",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
    },
    "tough-cookie": {
      "version": "4.0.0",
@@ -54697,9 +54392,9 @@
      }
    },
    "tsconfig-paths": {
-      "version": "3.11.0",
+      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz",
-      "integrity": "sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==",
+      "integrity": "sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==",
      "dev": true,
      "requires": {
        "@types/json5": "^0.0.29",
@@ -54849,15 +54544,15 @@
      }
    },
    "typescript": {
-      "version": "4.2.4",
+      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz",
-      "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==",
+      "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==",
      "dev": true
    },
    "uglify-js": {
-      "version": "3.14.2",
+      "version": "3.14.3",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.2.tgz",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.3.tgz",
-      "integrity": "sha512-rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A==",
+      "integrity": "sha512-mic3aOdiq01DuSVx0TseaEzMIVqebMZ0Z3vaeDhFEh9bsc24hV1TFvN74reA2vs08D0ZWfNjAcJ3UbVLaBss+g==",
      "dev": true
    },
    "uid-safe": {
@@ -54888,8 +54583,7 @@
    "underscore": {
      "version": "1.13.1",
      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
+      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
-      "optional": true
    },
    "undertaker": {
      "version": "1.3.0",
@@ -55366,20 +55060,6 @@
        "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",
@@ -55499,9 +55179,9 @@
      }
    },
    "validator": {
-      "version": "13.6.0",
+      "version": "13.7.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-13.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz",
-      "integrity": "sha512-gVgKbdbHgtxpRyR8K0O6oFZPhhB5tT1jeEHZR0Znr9Svg03U0+r9DXWMrnRAB+HtCStDQKlaIZm42tVsVjqtjg=="
+      "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw=="
    },
    "value-or-function": {
      "version": "3.0.0",
@@ -55515,9 +55195,10 @@
      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
    },
    "verror": {
-      "version": "1.10.0",
+      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==",
+      "dev": true,
      "optional": true,
      "requires": {
        "assert-plus": "^1.0.0",
@@ -55529,6 +55210,7 @@
          "version": "1.0.2",
          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+          "dev": true,
          "optional": true
        }
      }
@@ -56310,12 +55992,12 @@
      }
    },
    "webpack-dev-server": {
-      "version": "3.11.2",
+      "version": "3.11.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz",
-      "integrity": "sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==",
+      "integrity": "sha512-3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA==",
      "dev": true,
      "requires": {
-        "ansi-html": "0.0.7",
+        "ansi-html-community": "0.0.8",
        "bonjour": "^3.5.0",
        "chokidar": "^2.1.8",
        "compression": "^1.7.4",
@@ -57081,9 +56763,9 @@
      },
      "dependencies": {
        "camelcase": {
-          "version": "6.2.0",
+          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
-          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+          "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
          "dev": true
        },
        "decamelize": {
diff --git a/package.json b/package.json
index 7cd375949..a8619bf15 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
  "productName": "Ferdi",
  "desktopName": "ferdi.desktop",
  "appId": "com.kytwb.ferdi",
-  "version": "5.6.3",
+  "version": "5.6.4-nightly.34",
  "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
  "copyright": "kytwb",
  "main": "index.js",
@@ -35,8 +35,8 @@
    "contributors": "all-contributors",
    "reformat-files": "./node_modules/.bin/prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\"",
    "apply-branding": "ts-node ./src/i18n/apply-branding.ts",
-    "update-submodules": "git submodule update --remote --force",
+    "update-submodules": "git submodule update --init --recursive --remote --rebase --force",
-    "prepare-code": "npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding",
+    "prepare-code": "npm run lint:fix && npm run reformat-files && npm run manage-translations && npm run apply-branding",
    "link-readme": "ts-node scripts/link-readme.ts",
    "minify-images": "./scripts/minify-images.sh",
    "start:server": "ts-node src/internal-server/test.ts",
@@ -66,6 +66,7 @@
    "auto-launch": "^5.0.5",
    "btoa": "^1.2.1",
    "classnames": "^2.3.1",
+    "cld": "^2.7.1",
    "color": "^4.0.1",
    "csstype": "^3.0.9",
    "darkreader": "^4.9.39",
@@ -75,7 +76,7 @@
    "electron-fetch": "^1.7.4",
    "electron-find": "^1.0.7",
    "electron-react-titlebar": "^1.1.0",
-    "electron-updater": "^4.3.9",
+    "electron-updater": "^4.6.2",
    "electron-window-state": "^5.0.3",
    "fast-folder-size": "^1.5.0",
    "fs-extra": "^10.0.0",
@@ -87,8 +88,8 @@
    "minimist": "^1.2.5",
    "mobx": "^5.15.0",
    "mobx-localstorage": "^1.2.0",
-    "mobx-react": "^5.4.2",
+    "mobx-react": "^6.3.1",
-    "mobx-react-form": "1.35.1",
+    "mobx-react-form": "^2.0.9",
    "mobx-react-router": "^3.1.2",
    "moment": "^2.29.1",
    "ms": "^2.1.3",
@@ -104,7 +105,7 @@
    "react-dropzone": "^11.4.2",
    "react-electron-web-view": "^2.0.1",
    "react-intl": "^5.21.0",
-    "react-jss": "^8.6.1",
+    "react-jss": "^10.8.2",
    "react-loader": "^2.4.7",
    "react-modal": "^3.14.3",
    "react-router": "^3.2.6",
@@ -121,14 +122,14 @@
    "ws": "^8.2.3"
  },
  "devDependencies": {
-    "@babel/eslint-parser": "^7.16.0",
+    "@babel/eslint-parser": "^7.16.3",
    "@babel/plugin-proposal-class-properties": "^7.14.5",
    "@babel/plugin-proposal-decorators": "^7.16.0",
    "@babel/preset-env": "^7.16.0",
    "@babel/preset-react": "^7.14.5",
    "@babel/register": "^7.15.3",
-    "@commitlint/cli": "^14.1.0",
+    "@commitlint/cli": "^15.0.0",
-    "@commitlint/config-conventional": "^14.1.0",
+    "@commitlint/config-conventional": "^15.0.0",
    "@formatjs/cli": "^4.4.0",
    "@types/color": "^3.0.2",
    "@types/expect.js": "^0.3.29",
@@ -144,8 +145,8 @@
    "@types/tar": "^6.1.0",
    "@types/uuid": "^8.3.1",
    "@types/validator": "^13.6.4",
-    "@typescript-eslint/eslint-plugin": "^5.1.0",
+    "@typescript-eslint/eslint-plugin": "^5.3.1",
-    "@typescript-eslint/parser": "^5.1.0",
+    "@typescript-eslint/parser": "^5.3.1",
    "all-contributors-cli": "^6.20.0",
    "babel-plugin-formatjs": "^10.3.11",
    "commitizen": "^4.2.4",
@@ -153,20 +154,20 @@
    "cross-env": "^7.0.3",
    "cz-conventional-changelog": "^3.3.0",
    "dotenv": "^10.0.0",
-    "electron": "15.3.0",
+    "electron": "15.3.3",
-    "electron-builder": "22.14.5",
+    "electron-builder": "22.14.10",
    "electron-notarize": "^1.1.1",
-    "eslint": "^8.1.0",
+    "eslint": "^8.2.0",
-    "eslint-config-airbnb": "^18.2.1",
+    "eslint-config-airbnb": "^19.0.0",
-    "eslint-config-airbnb-typescript": "^14.0.1",
+    "eslint-config-airbnb-typescript": "^16.0.0",
    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.25.2",
+    "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-jest": "^25.2.2",
+    "eslint-plugin-jest": "^25.2.4",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-jsx-a11y": "^6.5.1",
    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.26.1",
+    "eslint-plugin-react": "^7.27.0",
-    "eslint-plugin-react-hooks": "^4.2.0",
+    "eslint-plugin-react-hooks": "^4.3.0",
-    "eslint-plugin-unicorn": "^37.0.1",
+    "eslint-plugin-unicorn": "^39.0.0",
    "expect.js": "^0.3.1",
    "gulp": "^4.0.2",
    "gulp-babel": "^8.0.0",
@@ -196,15 +197,14 @@
    "ts-loader": "^5.4.5",
    "ts-mocha": "^8.0.0",
    "ts-node": "^10.2.1",
-    "typescript": "4.2.4",
+    "typescript": "4.5.2",
    "wait-on": "^6.0.0",
    "webpack": "^4.46.0",
    "webpack-cli": "^3.3.12",
    "webpack-dev-server": "^3.11.2"
  },
  "optionalDependencies": {
-    "cld": "^2.7.0",
+    "node-mac-permissions": "git@github.com:vraravam/node-mac-permissions.git#3cffec37379e6584627d831611a8ff12b57bbcdb"
-    "node-mac-permissions": "^2.2.0"
  },
  "config": {
    "commitizen": {
diff --git a/recipes b/recipes
-Subproject 1e2a7c3ba221baa1bca04db8f9231a3a9d35e1a
+Subproject be4c5abcae4ef3d49bec8dba632381989af0531
diff --git a/src/I18n.js b/src/I18n.tsx
index b10c5a94b..5d969da1f 100644
--- a/src/I18n.js
+++ b/src/I18n.tsx
@@ -1,16 +1,22 @@
-import { Component } from 'react';
+import { Component, ReactNode } from 'react';
-import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import { IntlProvider } from 'react-intl';
-import { oneOrManyChildElements } from './prop-types';
+import { generatedTranslations } from './i18n/translations';
-import translations from './i18n/translations';
 import UserStore from './stores/UserStore';
 import AppStore from './stores/AppStore';
-@inject('stores')
+const translations = generatedTranslations();
-@observer
-class I18N extends Component {
+type Props = {
+  stores: {
+    app: typeof AppStore;
+    user: typeof UserStore;
+  };
+  children: ReactNode;
+};
+class I18N extends Component<Props> {
  componentDidUpdate() {
    window['ferdi'].menu.rebuild();
  }
@@ -31,12 +37,4 @@ class I18N extends Component {
  }
 }
-I18N.wrappedComponent.propTypes = {
+export default inject('stores')(observer(I18N));
-  stores: PropTypes.shape({
-    app: PropTypes.instanceOf(AppStore).isRequired,
-    user: PropTypes.instanceOf(UserStore).isRequired,
-  }).isRequired,
-  children: oneOrManyChildElements.isRequired,
-};
-export default I18N;
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.ts
index 6bbf572fa..2fd1a8d0d 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.ts
@@ -1,3 +1,4 @@
+/* eslint-disable import/no-import-module-exports */
 /* eslint-disable global-require */
 import { join } from 'path';
 import tar from 'tar';
@@ -10,6 +11,7 @@ import {
  pathExistsSync,
  readJsonSync,
  removeSync,
+  PathOrFileDescriptor,
 } from 'fs-extra';
 import fetch from 'electron-fetch';
@@ -39,12 +41,12 @@ const debug = require('debug')('Ferdi:ServerApi');
 module.paths.unshift(getDevRecipeDirectory(), getRecipeDirectory());
 export default class ServerApi {
-  recipePreviews = [];
+  recipePreviews: any[] = [];
-  recipes = [];
+  recipes: any[] = [];
  // User
-  async login(email, passwordHash) {
+  async login(email: string, passwordHash: string) {
    const request = await sendAuthRequest(
      `${apiBase()}/auth/login`,
      {
@@ -56,7 +58,7 @@ export default class ServerApi {
      false,
    );
    if (!request.ok) {
-      throw request;
+      throw new Error(request.statusText);
    }
    const u = await request.json();
@@ -64,7 +66,7 @@ export default class ServerApi {
    return u.token;
  }
-  async signup(data) {
+  async signup(data: any) {
    const request = await sendAuthRequest(
      `${apiBase()}/auth/signup`,
      {
@@ -74,7 +76,7 @@ export default class ServerApi {
      false,
    );
    if (!request.ok) {
-      throw request;
+      throw new Error(request.statusText);
    }
    const u = await request.json();
@@ -82,20 +84,20 @@ export default class ServerApi {
    return u.token;
  }
-  async inviteUser(data) {
+  async inviteUser(data: any) {
    const request = await sendAuthRequest(`${apiBase()}/invite`, {
      method: 'POST',
      body: JSON.stringify(data),
    });
    if (!request.ok) {
-      throw request;
+      throw new Error(request.statusText);
    }
    debug('ServerApi::inviteUser');
    return true;
  }
-  async retrievePassword(email) {
+  async retrievePassword(email: string) {
    const request = await sendAuthRequest(
      `${apiBase()}/auth/password`,
      {
@@ -107,7 +109,7 @@ export default class ServerApi {
      false,
    );
    if (!request.ok) {
-      throw request;
+      throw new Error(request.statusText);
    }
    const r = await request.json();
@@ -122,7 +124,7 @@ export default class ServerApi {
    const request = await sendAuthRequest(`${apiBase()}/me`);
    if (!request.ok) {
-      throw request;
+      throw new Error(request.statusText);
    }
    const data = await request.json();
@@ -132,13 +134,13 @@ export default class ServerApi {
    return user;
  }
-  async updateUserInfo(data) {
+  async updateUserInfo(data: any) {
    const request = await sendAuthRequest(`${apiBase()}/me`, {
      method: 'PUT',
      body: JSON.stringify(data),
    });
    if (!request.ok) {
-      throw request;
+      throw new Error(request.statusText);
    }
    const updatedData = await request.json();
@@ -154,7 +156,7 @@ export default class ServerApi {
      method: 'DELETE',
    });
    if (!request.ok) {
-      throw request;
+      throw new Error(request.statusText);
    }
    const data = await request.json();
@@ -170,7 +172,7 @@ export default class ServerApi {
    const request = await sendAuthRequest(`${apiBase()}/me/services`);
    if (!request.ok) {
-      throw request;
+      throw new Error(request.statusText);
    }
    const data = await request.json();
@@ -180,13 +182,13 @@ export default class ServerApi {
    return filteredServices;
  }
-  async createService(recipeId, data) {
+  async createService(recipeId: string, data: { iconFile: any }) {
    const request = await sendAuthRequest(`${apiBase()}/service`, {
      method: 'POST',
      body: JSON.stringify({ recipeId, ...data }),
    });
    if (!request.ok) {
-      throw request;
+      throw new Error(request.statusText);
    }
    const serviceData = await request.json();
@@ -207,7 +209,7 @@ export default class ServerApi {
    return service;
  }
-  async updateService(serviceId, rawData) {
+  async updateService(serviceId: string, rawData: any) {
    const data = rawData;
    if (data.iconFile) {
@@ -220,7 +222,7 @@ export default class ServerApi {
    });
    if (!request.ok) {
-      throw request;
+      throw new Error(request.statusText);
    }
    const serviceData = await request.json();
@@ -233,12 +235,13 @@ export default class ServerApi {
    return service;
  }
-  async uploadServiceIcon(serviceId, icon) {
+  async uploadServiceIcon(serviceId: string, icon: string | Blob) {
    const formData = new FormData();
    formData.append('icon', icon);
    const requestData = prepareAuthRequest({
      method: 'PUT',
+      // @ts-expect-error Argument of type '{ method: string; body: FormData; }' is not assignable to parameter of type '{ method: string; }'.
      body: formData,
    });
@@ -246,11 +249,12 @@ export default class ServerApi {
    const request = await window.fetch(
      `${apiBase()}/service/${serviceId}`,
+      // @ts-expect-error Argument of type '{ method: string; } & { mode: string; headers: any; }' is not assignable to parameter of type 'RequestInit | undefined'.
      requestData,
    );
    if (!request.ok) {
-      throw request;
+      throw new Error(request.statusText);
    }
    const serviceData = await request.json();
@@ -258,25 +262,25 @@ export default class ServerApi {
    return serviceData.data;
  }
-  async reorderService(data) {
+  async reorderService(data: any) {
    const request = await sendAuthRequest(`${apiBase()}/service/reorder`, {
      method: 'PUT',
      body: JSON.stringify(data),
    });
    if (!request.ok) {
-      throw request;
+      throw new Error(request.statusText);
    }
    const serviceData = await request.json();
    debug('ServerApi::reorderService resolves', serviceData);
    return serviceData;
  }
-  async deleteService(id) {
+  async deleteService(id: string) {
    const request = await sendAuthRequest(`${apiBase()}/service/${id}`, {
      method: 'DELETE',
    });
    if (!request.ok) {
-      throw request;
+      throw new Error(request.statusText);
    }
    const data = await request.json();
@@ -290,7 +294,7 @@ export default class ServerApi {
  async getDefaultFeatures() {
    const request = await sendAuthRequest(`${apiBase()}/features/default`);
    if (!request.ok) {
-      throw request;
+      throw new Error(request.statusText);
    }
    const data = await request.json();
@@ -306,7 +310,7 @@ export default class ServerApi {
    const request = await sendAuthRequest(`${apiBase()}/features`);
    if (!request.ok) {
-      throw request;
+      throw new Error(request.statusText);
    }
    const data = await request.json();
@@ -340,13 +344,13 @@ export default class ServerApi {
    return this.recipes;
  }
-  async getRecipeUpdates(recipeVersions) {
+  async getRecipeUpdates(recipeVersions: any) {
    const request = await sendAuthRequest(`${apiBase()}/recipes/update`, {
      method: 'POST',
      body: JSON.stringify(recipeVersions),
    });
    if (!request.ok) {
-      throw request;
+      throw new Error(request.statusText);
    }
    const recipes = await request.json();
    debug('ServerApi::getRecipeUpdates resolves', recipes);
@@ -356,7 +360,7 @@ export default class ServerApi {
  // Recipes Previews
  async getRecipePreviews() {
    const request = await sendAuthRequest(`${apiBase()}/recipes`);
-    if (!request.ok) throw request;
+    if (!request.ok) throw new Error(request.statusText);
    const data = await request.json();
    const recipePreviews = this._mapRecipePreviewModel(data);
    debug('ServerApi::getRecipes resolves', recipePreviews);
@@ -366,7 +370,7 @@ export default class ServerApi {
  async getFeaturedRecipePreviews() {
    // TODO: If we are hitting the internal-server, we need to return an empty list, else we can hit the remote server and get the data
    const request = await sendAuthRequest(`${apiBase()}/recipes/popular`);
-    if (!request.ok) throw request;
+    if (!request.ok) throw new Error(request.statusText);
    const data = await request.json();
    const recipePreviews = this._mapRecipePreviewModel(data);
@@ -374,10 +378,10 @@ export default class ServerApi {
    return recipePreviews;
  }
-  async searchRecipePreviews(needle) {
+  async searchRecipePreviews(needle: string) {
    const url = `${apiBase()}/recipes/search?needle=${needle}`;
    const request = await sendAuthRequest(url);
-    if (!request.ok) throw request;
+    if (!request.ok) throw new Error(request.statusText);
    const data = await request.json();
    const recipePreviews = this._mapRecipePreviewModel(data);
@@ -385,7 +389,7 @@ export default class ServerApi {
    return recipePreviews;
  }
-  async getRecipePackage(recipeId) {
+  async getRecipePackage(recipeId: string) {
    try {
      const recipesDirectory = userDataRecipesPath();
      const recipeTempDirectory = join(recipesDirectory, 'temp', recipeId);
@@ -395,7 +399,7 @@ export default class ServerApi {
      ensureDirSync(recipeTempDirectory);
-      let archivePath;
+      let archivePath: PathOrFileDescriptor;
      if (pathExistsSync(internalRecipeFile)) {
        debug('[ServerApi::getRecipePackage] Using internal recipe file');
@@ -415,6 +419,7 @@ export default class ServerApi {
      await sleep(10);
+      // @ts-expect-error No overload matches this call.
      await tar.x({
        file: archivePath,
        cwd: recipeTempDirectory,
@@ -454,7 +459,7 @@ export default class ServerApi {
      false,
    );
    if (!request.ok) {
-      throw request;
+      throw new Error(request.statusText);
    }
    debug('ServerApi::healthCheck resolves');
  }
@@ -467,7 +472,7 @@ export default class ServerApi {
      if (Object.prototype.hasOwnProperty.call(config, 'services')) {
        const services = await Promise.all(
-          config.services.map(async s => {
+          config.services.map(async (s: { service: any }) => {
            const service = s;
            const request = await sendAuthRequest(
              `${apiBase()}/recipes/${s.service}`,
@@ -475,6 +480,7 @@ export default class ServerApi {
            if (request.status === 200) {
              const data = await request.json();
+              // @ts-expect-error Property 'recipe' does not exist on type '{ service: any; }'.
              service.recipe = new RecipePreviewModel(data);
            }
@@ -493,18 +499,18 @@ export default class ServerApi {
  }
  // Helper
-  async _mapServiceModels(services) {
+  async _mapServiceModels(services: any[]) {
-    const recipes = services.map(s => s.recipeId);
+    const recipes = services.map((s: { recipeId: string }) => s.recipeId);
    await this._bulkRecipeCheck(recipes);
    /* eslint-disable no-return-await */
    return Promise.all(
-      services.map(async service => await this._prepareServiceModel(service)),
+      services.map(async (service: any) => this._prepareServiceModel(service)),
    );
    /* eslint-enable no-return-await */
  }
-  async _prepareServiceModel(service) {
+  async _prepareServiceModel(service: { recipeId: string }) {
-    let recipe;
+    let recipe: undefined;
    try {
      recipe = this.recipes.find(r => r.id === service.recipeId);
@@ -520,14 +526,15 @@ export default class ServerApi {
    }
  }
-  async _bulkRecipeCheck(unfilteredRecipes) {
+  async _bulkRecipeCheck(unfilteredRecipes: any[]) {
    // Filter recipe duplicates as we don't need to download 3 Slack recipes
    const recipes = unfilteredRecipes.filter(
-      (elem, pos, arr) => arr.indexOf(elem) === pos,
+      (elem: any, pos: number, arr: string | any[]) =>
+        arr.indexOf(elem) === pos,
    );
    return Promise.all(
-      recipes.map(async recipeId => {
+      recipes.map(async (recipeId: string) => {
        let recipe = this.recipes.find(r => r.id === recipeId);
        if (!recipe) {
@@ -553,7 +560,7 @@ export default class ServerApi {
    ).catch(error => console.error("Can't load recipe", error));
  }
-  _mapRecipePreviewModel(recipes) {
+  _mapRecipePreviewModel(recipes: any[]) {
    return recipes
      .map(recipe => {
        try {
diff --git a/src/api/utils/auth.ts b/src/api/utils/auth.ts
index 98295d1a4..899881e88 100644
--- a/src/api/utils/auth.ts
+++ b/src/api/utils/auth.ts
@@ -31,7 +31,7 @@ export const prepareAuthRequest = (
 export const sendAuthRequest = (
  url: RequestInfo,
-  options: { method: string } | undefined,
+  options?: { method: string; headers?: any; body?: any },
  auth?: boolean,
 ) =>
  // @ts-expect-error Argument of type '{ method: string; } & { mode: string; headers: any; }' is not assignable to parameter of type 'RequestInit | undefined'.
diff --git a/src/assets/images/logo-beard-only.svg b/src/assets/images/logo-beard-only.svg
new file mode 100644
index 000000000..bb6e47939
--- /dev/null
+++ b/src/assets/images/logo-beard-only.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 1000 1000" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="Logo" transform="matrix(13.3662,0,0,13.3662,20.0535,18.5803)">
+        <g id="Lower-beard" serif:id="Lower beard" transform="matrix(0.0748156,0,0,0.0748156,-1.50032,-1.39009)">
+            <path d="M503.642,629.673C527.496,629.947 576.943,631.918 581,640C594.482,666.859 531.448,825.299 503.284,841.639L503.282,843C502.598,843 501.881,842.874 501.133,842.629C500.391,842.874 499.679,843 499,843L498.998,841.659C470.575,825.433 406.168,666.87 419.745,640C423.831,631.913 474.528,629.944 498.642,629.673L498.642,629.638C499.424,629.64 500.255,629.644 501.132,629.65C502.017,629.644 502.855,629.64 503.642,629.638L503.642,629.673Z" style="fill:white;"/>
+        </g>
+        <g id="Upper-beard" serif:id="Upper beard" transform="matrix(0.0748156,0,0,0.0748156,-1.50032,-1.39009)">
+            <path d="M498.733,357.203C547.473,355.78 574.716,313.221 627.233,336.042C700.337,367.808 723.258,456.308 806.959,474.341C838.428,481.121 857.323,456.253 877.092,437.581C883.524,431.506 893.049,418.562 896.807,419.813C900.441,421.022 900.267,433.842 898.85,440.69C896.129,453.836 892.451,467.441 884.685,478.393C874.137,493.269 860.132,505.776 845.238,516.299C802.136,546.753 740.569,558.817 688.631,557.703C652.806,556.934 612.989,546.685 579.942,534.342C549.791,523.08 533.28,483.381 498.234,482.887C463.111,483.381 446.563,523.08 416.345,534.342C383.226,546.685 343.32,556.934 307.416,557.703C255.363,558.817 193.659,546.753 150.461,516.299C135.535,505.776 121.498,493.269 110.927,478.393C103.144,467.441 99.458,453.836 96.731,440.69C95.311,433.842 95.136,421.022 98.778,419.813C102.545,418.562 112.091,431.506 118.537,437.581C138.35,456.253 157.286,481.121 188.826,474.341C272.712,456.308 295.684,367.808 368.949,336.042C421.583,313.221 449.854,355.78 498.733,357.203Z" style="fill:rgb(254,254,254);fill-rule:nonzero;"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js
index f26282cfc..94ff5d54d 100644
--- a/src/components/auth/AuthLayout.js
+++ b/src/components/auth/AuthLayout.js
@@ -19,7 +19,6 @@ import AppUpdateInfoBar from '../AppUpdateInfoBar';
 import { GITHUB_FERDI_URL } from '../../config';
 import { Icon } from '../ui/icon';
-@observer
 class AuthLayout extends Component {
  static propTypes = {
    children: oneOrManyChildElements.isRequired,
@@ -107,4 +106,4 @@ class AuthLayout extends Component {
  }
 }
-export default injectIntl(AuthLayout);
+export default injectIntl(observer(AuthLayout));
diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js
index 9aeebc5c8..4c69b2821 100644
--- a/src/components/auth/ChangeServer.js
+++ b/src/components/auth/ChangeServer.js
@@ -6,6 +6,7 @@ import Form from '../../lib/Form';
 import Input from '../ui/Input';
 import Select from '../ui/Select';
 import Button from '../ui/Button';
+import Link from '../ui/Link';
 import Infobox from '../ui/Infobox';
 import { url, required } from '../../helpers/validation-helpers';
 import { LIVE_FERDI_API, LIVE_FRANZ_API } from '../../config';
@@ -34,7 +35,6 @@ const messages = defineMessages({
  },
 });
-@observer
 class ChangeServer extends Component {
  static propTypes = {
    onSubmit: PropTypes.func.isRequired,
@@ -106,6 +106,7 @@ class ChangeServer extends Component {
    return (
      <div className="auth__container">
        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
+          <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link>
          <h1>{intl.formatMessage(messages.headline)}</h1>
          {form.$('server').value === this.franzServer && (
            <Infobox type="warning">
@@ -131,4 +132,4 @@ class ChangeServer extends Component {
  }
 }
-export default injectIntl(ChangeServer);
+export default injectIntl(observer(ChangeServer));
diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js
index fe2fe9872..8f70318ed 100644
--- a/src/components/auth/Import.js
+++ b/src/components/auth/Import.js
@@ -28,7 +28,6 @@ const messages = defineMessages({
  },
 });
-@observer
 class Import extends Component {
  static propTypes = {
    services: MobxPropTypes.arrayOrObservableArray.isRequired,
@@ -166,4 +165,4 @@ class Import extends Component {
  }
 }
-export default injectIntl(Import);
+export default injectIntl(observer(Import));
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index f23417870..a23af7c6b 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -43,7 +43,6 @@ const messages = defineMessages({
  },
 });
-@observer
 class Invite extends Component {
  static propTypes = {
    onSubmit: PropTypes.func.isRequired,
@@ -125,8 +124,8 @@ class Invite extends Component {
      .some(emailValue => emailValue.trim() !== '');
    const sendButtonClassName = classnames({
-      'auth__button': true,
+      auth__button: true,
-      'invite__embed--button': embed
+      'invite__embed--button': embed,
    });
    const renderForm = (
@@ -198,4 +197,4 @@ class Invite extends Component {
  }
 }
-export default injectIntl(Invite);
+export default injectIntl(observer(Invite));
diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js
index 5b36b9fc2..ac1bc4e8c 100644
--- a/src/components/auth/Locked.js
+++ b/src/components/auth/Locked.js
@@ -7,7 +7,6 @@ import { defineMessages, injectIntl } from 'react-intl';
 import Form from '../../lib/Form';
 import Input from '../ui/Input';
 import Button from '../ui/Button';
-import Infobox from '../ui/Infobox';
 import { isMac } from '../../environment';
 import { globalError as globalErrorPropType } from '../../prop-types';
@@ -17,11 +16,6 @@ const messages = defineMessages({
    id: 'locked.headline',
    defaultMessage: 'Locked',
  },
-  info: {
-    id: 'locked.info',
-    defaultMessage:
-      'Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.',
-  },
  touchId: {
    id: 'locked.touchId',
    defaultMessage: 'Unlock with Touch ID',
@@ -48,7 +42,6 @@ const messages = defineMessages({
  },
 });
-@observer
 class Locked extends Component {
  static propTypes = {
    onSubmit: PropTypes.func.isRequired,
@@ -108,7 +101,6 @@ class Locked extends Component {
        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
          <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
          <h1>{intl.formatMessage(messages.headline)}</h1>
-          <Infobox type="warning">{intl.formatMessage(messages.info)}</Infobox>
          {touchIdEnabled && (
            <>
@@ -149,4 +141,4 @@ class Locked extends Component {
  }
 }
-export default injectIntl(Locked);
+export default injectIntl(observer(Locked));
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index 956205258..bd01f25cd 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -5,14 +5,12 @@ import { observer, inject } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import { LIVE_FRANZ_API } from '../../config';
-import { API_VERSION, isDevMode, useLiveAPI } from '../../environment-remote';
+import { API_VERSION } from '../../environment-remote';
 import Form from '../../lib/Form';
 import { required, email } from '../../helpers/validation-helpers';
-import serverlessLogin from '../../helpers/serverless-helpers';
 import Input from '../ui/Input';
 import Button from '../ui/Button';
 import Link from '../ui/Link';
-import Infobox from '../ui/Infobox';
 import { globalError as globalErrorPropType } from '../../prop-types';
@@ -57,22 +55,12 @@ const messages = defineMessages({
    id: 'login.link.signup',
    defaultMessage: 'Create a free account',
  },
-  changeServer: {
-    id: 'login.changeServer',
-    defaultMessage: 'Change server',
-  },
-  serverless: {
-    id: 'services.serverless',
-    defaultMessage: 'Use Ferdi without an Account',
-  },
  passwordLink: {
    id: 'login.link.password',
    defaultMessage: 'Reset password',
  },
 });
-@inject('actions')
-@observer
 class Login extends Component {
  static propTypes = {
    onSubmit: PropTypes.func.isRequired,
@@ -81,9 +69,7 @@ class Login extends Component {
    isServerLogout: PropTypes.bool.isRequired,
    signupRoute: PropTypes.string.isRequired,
    passwordRoute: PropTypes.string.isRequired,
-    changeServerRoute: PropTypes.string.isRequired,
    error: globalErrorPropType.isRequired,
-    actions: PropTypes.object.isRequired,
  };
  form = new Form(
@@ -105,8 +91,6 @@ class Login extends Component {
    this.props.intl,
  );
-  emailField = null;
  submit(e) {
    e.preventDefault();
    this.form.submit({
@@ -117,10 +101,6 @@ class Login extends Component {
    });
  }
-  useLocalServer() {
-    serverlessLogin(this.props.actions);
-  }
  render() {
    const { form } = this;
    const { intl } = this.props;
@@ -130,21 +110,14 @@ class Login extends Component {
      isServerLogout,
      signupRoute,
      passwordRoute,
-      changeServerRoute,
      error,
    } = this.props;
    return (
      <div className="auth__container">
        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
-          <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
+          <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link>
          <h1>{intl.formatMessage(messages.headline)}</h1>
-          {isDevMode && !useLiveAPI && (
-            <Infobox type="warning">
-              In Dev Mode your data is not persistent. Please use the live app
-              for accessing the production API.
-            </Infobox>
-          )}
          {isTokenExpired && (
            <p className="error-message center">
              {intl.formatMessage(messages.tokenExpired)}
@@ -155,13 +128,7 @@ class Login extends Component {
              {intl.formatMessage(messages.serverLogout)}
            </p>
          )}
-          <Input
+          <Input field={form.$('email')} focus />
-            field={form.$('email')}
-            ref={element => {
-              this.emailField = element;
-            }}
-            focus
-          />
          <Input field={form.$('password')} showPasswordToggle />
          {error.code === 'invalid-credentials' && (
            <>
@@ -205,12 +172,6 @@ class Login extends Component {
          )}
        </form>
        <div className="auth__links">
-          <Link to={changeServerRoute}>
-            {intl.formatMessage(messages.changeServer)}
-          </Link>
-          <a onClick={this.useLocalServer.bind(this)}>
-            {intl.formatMessage(messages.serverless)}
-          </a>
          <Link to={signupRoute}>
            {intl.formatMessage(messages.signupLink)}
          </Link>
@@ -223,4 +184,4 @@ class Login extends Component {
  }
 }
-export default injectIntl(Login);
+export default injectIntl(inject('actions')(observer(Login)));
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js
index d5bc7fa80..49930f6bd 100644
--- a/src/components/auth/Password.js
+++ b/src/components/auth/Password.js
@@ -38,7 +38,6 @@ const messages = defineMessages({
  },
 });
-@observer
 class Password extends Component {
  static propTypes = {
    onSubmit: PropTypes.func.isRequired,
@@ -79,7 +78,7 @@ class Password extends Component {
    return (
      <div className="auth__container">
        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
-          <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
+          <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link>
          <h1>{intl.formatMessage(messages.headline)}</h1>
          {status.length > 0 && status.includes('sent') && (
            <Infobox type="success" icon="checkbox-marked-circle-outline">
@@ -119,4 +118,4 @@ class Password extends Component {
  }
 }
-export default injectIntl(Password);
+export default injectIntl(observer(Password));
diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js
index 1665bf837..a24f4e4d5 100644
--- a/src/components/auth/SetupAssistant.js
+++ b/src/components/auth/SetupAssistant.js
@@ -9,7 +9,7 @@ import { Input } from '../ui/input/index';
 import { Button } from '../ui/button/index';
 import { Badge } from '../ui/badge';
 import Modal from '../ui/Modal';
-import Infobox from '../ui/Infobox';
+import * as Infobox from '../ui/Infobox';
 import Appear from '../ui/effects/Appear';
 import globalMessages from '../../i18n/globalMessages';
@@ -131,8 +131,6 @@ const styles = theme => ({
  },
 });
-@injectSheet(styles)
-@observer
 class SetupAssistant extends Component {
  static propTypes = {
    classes: PropTypes.object.isRequired,
@@ -327,4 +325,6 @@ class SetupAssistant extends Component {
  }
 }
-export default injectIntl(SetupAssistant);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(SetupAssistant)),
+);
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 00625a3ac..00b387b25 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -4,14 +4,11 @@ import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
-import { isDevMode, useLiveAPI } from '../../environment-remote';
 import Form from '../../lib/Form';
 import { required, email, minLength } from '../../helpers/validation-helpers';
-import serverlessLogin from '../../helpers/serverless-helpers';
 import Input from '../ui/Input';
 import Button from '../ui/Button';
 import Link from '../ui/Link';
-import Infobox from '../ui/Infobox';
 import { globalError as globalErrorPropType } from '../../prop-types';
 import { termsBase } from '../../api/apiBase';
@@ -61,30 +58,18 @@ const messages = defineMessages({
    id: 'signup.link.login',
    defaultMessage: 'Already have an account, sign in?',
  },
-  changeServer: {
-    id: 'login.changeServer',
-    defaultMessage: 'Change server',
-  },
-  serverless: {
-    id: 'services.serverless',
-    defaultMessage: 'Use Ferdi without an Account',
-  },
  emailDuplicate: {
    id: 'signup.emailDuplicate',
    defaultMessage: 'A user with that email address already exists',
  },
 });
-@inject('actions')
-@observer
 class Signup extends Component {
  static propTypes = {
    onSubmit: PropTypes.func.isRequired,
    isSubmitting: PropTypes.bool.isRequired,
    loginRoute: PropTypes.string.isRequired,
-    changeServerRoute: PropTypes.string.isRequired,
    error: globalErrorPropType.isRequired,
-    actions: PropTypes.object.isRequired,
  };
  form = new Form(
@@ -126,14 +111,10 @@ class Signup extends Component {
    });
  }
-  useLocalServer() {
-    serverlessLogin(this.props.actions);
-  }
  render() {
    const { form } = this;
    const { intl } = this.props;
-    const { isSubmitting, loginRoute, error, changeServerRoute } = this.props;
+    const { isSubmitting, loginRoute, error } = this.props;
    return (
      <div className="auth__scroll-container">
@@ -142,14 +123,8 @@ class Signup extends Component {
            className="franz-form auth__form"
            onSubmit={e => this.submit(e)}
          >
-            <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
+            <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link>
            <h1>{intl.formatMessage(messages.headline)}</h1>
-            {isDevMode && !useLiveAPI && (
-              <Infobox type="warning">
-                In Dev Mode your data is not persistent. Please use the live app
-                for accesing the production API.
-              </Infobox>
-            )}
            <div className="grid__row">
              <Input field={form.$('firstname')} focus />
              <Input field={form.$('lastname')} />
@@ -201,12 +176,6 @@ class Signup extends Component {
            </p>
          </form>
          <div className="auth__links">
-            <Link to={changeServerRoute}>
-              {intl.formatMessage(messages.changeServer)}
-            </Link>
-            <a onClick={this.useLocalServer.bind(this)}>
-              {intl.formatMessage(messages.serverless)}
-            </a>
            <Link to={loginRoute}>
              {intl.formatMessage(messages.loginLink)}
            </Link>
@@ -217,4 +186,4 @@ class Signup extends Component {
  }
 }
-export default injectIntl(Signup);
+export default injectIntl(inject('actions')(observer(Signup)));
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js
index 809ec67a7..4f7a5ce30 100644
--- a/src/components/auth/Welcome.js
+++ b/src/components/auth/Welcome.js
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import serverlessLogin from '../../helpers/serverless-helpers';
+import { shuffleArray } from '../../helpers/array-helpers';
 import Link from '../ui/Link';
@@ -16,14 +17,16 @@ const messages = defineMessages({
    id: 'welcome.loginButton',
    defaultMessage: 'Login to your account',
  },
+  changeServer: {
+    id: 'login.changeServer',
+    defaultMessage: 'Change server'
+  },
  serverless: {
    id: 'services.serverless',
    defaultMessage: 'Use Ferdi without an Account',
  },
 });
-@inject('actions')
-@observer
 class Login extends Component {
  static propTypes = {
    loginRoute: PropTypes.string.isRequired,
@@ -39,8 +42,10 @@ class Login extends Component {
  render() {
    const { intl } = this.props;
-    const { loginRoute, signupRoute, changeServerRoute, recipes } = this.props;
+    const { loginRoute, signupRoute, changeServerRoute } = this.props;
+    let { recipes } = this.props;
+    recipes = shuffleArray(recipes);
+    recipes.length = 8 * 2;
    return (
      <div className="welcome">
        <div className="welcome__content">
@@ -61,25 +66,22 @@ class Login extends Component {
          <Link to={loginRoute} className="button">
            {intl.formatMessage(messages.loginButton)}
          </Link>
-          <br />
-          <br />
-          <a className="button" onClick={this.useLocalServer.bind(this)}>
-            {intl.formatMessage(messages.serverless)}
-          </a>
-          <br />
-          <br />
          <Link to={changeServerRoute}>
            <span
              style={{
-                textAlign: 'center',
+                color: '#fff'
-                width: '100%',
-                cursor: 'pointer',
              }}
            >
-              Change server
+              {intl.formatMessage(messages.changeServer)}
            </span>
          </Link>
+          <br />
+          <br />
+          <hr />
+          <br />
+          <a className="button" onClick={this.useLocalServer.bind(this)}>
+            {intl.formatMessage(messages.serverless)}
+          </a>
        </div>
        <div className="welcome__featured-services">
          {recipes.map(recipe => (
@@ -93,4 +95,4 @@ class Login extends Component {
  }
 }
-export default injectIntl(Login);
+export default injectIntl(inject('actions')(observer(Login)));
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index a31419a5e..084d93ecd 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -74,8 +74,6 @@ const toggleFullScreen = () => {
  ipcRenderer.send('window.toolbar-double-clicked');
 };
-@injectSheet(styles)
-@observer
 class AppLayout extends Component {
  static propTypes = {
    classes: PropTypes.object.isRequired,
@@ -208,4 +206,6 @@ class AppLayout extends Component {
  }
 }
-export default injectIntl(AppLayout);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(AppLayout)),
+);
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 728613f42..4f67a8719 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -66,8 +66,6 @@ const messages = defineMessages({
  },
 });
-@inject('stores', 'actions')
-@observer
 class Sidebar extends Component {
  static propTypes = {
    openSettings: PropTypes.func.isRequired,
@@ -262,4 +260,4 @@ class Sidebar extends Component {
  }
 }
-export default injectIntl(Sidebar);
+export default injectIntl(inject('stores', 'actions')(observer(Sidebar)));
diff --git a/src/components/services/content/ConnectionLostBanner.js b/src/components/services/content/ConnectionLostBanner.js
index 5111a081a..5adb22c84 100644
--- a/src/components/services/content/ConnectionLostBanner.js
+++ b/src/components/services/content/ConnectionLostBanner.js
@@ -1,4 +1,4 @@
-import { createRef, Component } from 'react';
+import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
@@ -68,8 +68,6 @@ const styles = theme => ({
  },
 });
-@injectSheet(styles)
-@observer
 class ConnectionLostBanner extends Component {
  static propTypes = {
    classes: PropTypes.object.isRequired,
@@ -77,8 +75,6 @@ class ConnectionLostBanner extends Component {
    reload: PropTypes.func.isRequired,
  };
-  inputRef = createRef();
  render() {
    const { classes, name, reload } = this.props;
@@ -105,4 +101,4 @@ class ConnectionLostBanner extends Component {
  }
 }
-export default injectIntl(ConnectionLostBanner);
+export default injectIntl(injectSheet(styles)(observer(ConnectionLostBanner)));
diff --git a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
index 5c93de80f..d605b3a52 100644
--- a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
+++ b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
@@ -31,8 +31,6 @@ const messages = defineMessages({
  },
 });
-@injectSheet(styles)
-@observer
 class WebviewErrorHandler extends Component {
  static propTypes = {
    name: PropTypes.string.isRequired,
@@ -71,4 +69,6 @@ class WebviewErrorHandler extends Component {
  }
 }
-export default injectIntl(WebviewErrorHandler);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(WebviewErrorHandler)),
+);
diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js
index 476b23235..b4658618e 100644
--- a/src/components/services/content/ServiceDisabled.js
+++ b/src/components/services/content/ServiceDisabled.js
@@ -16,17 +16,12 @@ const messages = defineMessages({
  },
 });
-@observer
 class ServiceDisabled extends Component {
  static propTypes = {
    name: PropTypes.string.isRequired,
    enable: PropTypes.func.isRequired,
  };
-  countdownInterval = null;
-  countdownIntervalTimeout = 1000;
  render() {
    const { name, enable } = this.props;
    const { intl } = this.props;
@@ -44,4 +39,4 @@ class ServiceDisabled extends Component {
  }
 }
-export default injectIntl(ServiceDisabled);
+export default injectIntl(observer(ServiceDisabled));
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index 1bc1fbf5f..3ea36ae97 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -1,3 +1,4 @@
+/* eslint-disable react/jsx-no-useless-fragment */
 import { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { autorun } from 'mobx';
@@ -15,8 +16,6 @@ import SettingsStore from '../../../stores/SettingsStore';
 import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen';
 import { CUSTOM_WEBSITE_RECIPE_ID } from '../../../config';
-@inject('stores', 'actions')
-@observer
 class ServiceView extends Component {
  static propTypes = {
    service: PropTypes.instanceOf(ServiceModel).isRequired,
@@ -65,17 +64,6 @@ class ServiceView extends Component {
    clearTimeout(this.hibernationTimer);
  }
-  updateTargetUrl = event => {
-    let visible = true;
-    if (event.url === '' || event.url === '#') {
-      visible = false;
-    }
-    this.setState({
-      targetUrl: event.url,
-      statusBarVisible: visible,
-    });
-  };
  render() {
    const {
      detachService,
@@ -121,6 +109,7 @@ class ServiceView extends Component {
            {service.isEnabled &&
              service.isLoading &&
              service.isFirstLoad &&
+              !service.isHibernating &&
              !service.isServiceAccessRestricted && (
                <WebviewLoader loaded={false} name={service.name} />
              )}
@@ -157,12 +146,12 @@ class ServiceView extends Component {
                />
              </>
            ) : (
-              <div>
+              <div style={{display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', textAlign: 'center' }}>
-                <span role="img" aria-label="Sleeping Emoji">
+                <span role="img" aria-label="Sleeping Emoji" style={{fontSize: 42}}>
                  😴
-                </span>{' '}
+                </span><br/><br/>
-                This service is currently hibernating. If this page doesn&#x27;t
+                This service is currently hibernating.<br/>
-                close soon, please try reloading Ferdi.
+                Try switching services or reloading Ferdi.
              </div>
            )}
          </>
@@ -173,4 +162,4 @@ class ServiceView extends Component {
  }
 }
-export default ServiceView;
+export default inject('stores', 'actions')(observer(ServiceView));
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 187785f82..12aaf70b7 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -9,7 +9,6 @@ import ServiceModel from '../../../models/Service';
 const debug = require('debug')('Ferdi:Services');
-@observer
 class ServiceWebview extends Component {
  static propTypes = {
    service: PropTypes.instanceOf(ServiceModel).isRequired,
@@ -31,11 +30,13 @@ class ServiceWebview extends Component {
            debug('Service logged a message:', e.message);
          });
          this.webview.view.addEventListener('did-navigate', () => {
-            document.title = `Ferdi - ${this.props.service.name} ${
+            if (this.props.service._webview) {
-              this.props.service.dialogTitle
+              document.title = `Ferdi - ${this.props.service.name} ${
-                ? ` - ${this.props.service.dialogTitle}`
+                this.props.service.dialogTitle
-                : ''
+                  ? ` - ${this.props.service.dialogTitle}`
-            } ${`- ${this.props.service._webview.getTitle()}`}`;
+                  : ''
+              } ${`- ${this.props.service._webview.getTitle()}`}`;
+            }
          });
        }
      },
@@ -108,10 +109,10 @@ class ServiceWebview extends Component {
        nodeintegration
        webpreferences={`spellcheck=${
          isSpellcheckerEnabled ? 1 : 0
-        }, contextIsolation=1, enableRemoteModule=1`}
+        }, contextIsolation=1, nativeWindowOpen=1, enableRemoteModule=1`}
      />
    );
  }
 }
-export default ServiceWebview;
+export default observer(ServiceWebview);
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index 1edf31bd3..cbc70563d 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -12,10 +12,6 @@ import Appear from '../../ui/effects/Appear';
 import serverlessLogin from '../../../helpers/serverless-helpers';
 const messages = defineMessages({
-  welcome: {
-    id: 'services.welcome',
-    defaultMessage: 'Welcome to Ferdi',
-  },
  getStarted: {
    id: 'services.getStarted',
    defaultMessage: 'Get started',
@@ -44,9 +40,6 @@ const styles = {
  },
 };
-@injectSheet(styles)
-@inject('actions')
-@observer
 class Services extends Component {
  static propTypes = {
    services: MobxPropTypes.arrayOrObservableArray,
@@ -132,11 +125,10 @@ class Services extends Component {
          <Appear timeout={1500} transitionName="slideUp">
            <div className="services__no-service">
              <img
-                src="./assets/images/logo.svg"
+                src="./assets/images/logo-beard-only.svg"
                alt="Logo"
                style={{ maxHeight: '50vh' }}
              />
-              <h1>{intl.formatMessage(messages.welcome)}</h1>
              {!isLoggedIn && (
                <>
                  <p>{intl.formatMessage(messages.login)}</p>
@@ -197,4 +189,8 @@ class Services extends Component {
  }
 }
-export default injectIntl(Services);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(
+    inject('actions')(observer(Services)),
+  ),
+);
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js
index 3607435b3..1ca5ba415 100644
--- a/src/components/services/content/WebviewCrashHandler.js
+++ b/src/components/services/content/WebviewCrashHandler.js
@@ -26,7 +26,6 @@ const messages = defineMessages({
  },
 });
-@observer
 class WebviewCrashHandler extends Component {
  static propTypes = {
    name: PropTypes.string.isRequired,
@@ -81,4 +80,4 @@ class WebviewCrashHandler extends Component {
  }
 }
-export default injectIntl(WebviewCrashHandler);
+export default injectIntl(observer(WebviewCrashHandler));
diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js
index 3049b6efa..e01461e5c 100644
--- a/src/components/services/tabs/TabBarSortableList.js
+++ b/src/components/services/tabs/TabBarSortableList.js
@@ -5,7 +5,6 @@ import { SortableContainer } from 'react-sortable-hoc';
 import TabItem from './TabItem';
-@observer
 class TabBarSortableList extends Component {
  static propTypes = {
    services: MobxPropTypes.arrayOrObservableArray.isRequired,
@@ -75,4 +74,4 @@ class TabBarSortableList extends Component {
  }
 }
-export default SortableContainer(TabBarSortableList);
+export default SortableContainer(observer(TabBarSortableList));
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index 5381d7c2b..f5ced7a31 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -114,9 +114,6 @@ const styles = {
  },
 };
-@injectSheet(styles)
-@inject('stores')
-@observer
 class TabItem extends Component {
  static propTypes = {
    classes: PropTypes.object.isRequired,
@@ -239,6 +236,7 @@ class TabItem extends Component {
        label: intl.formatMessage(messages.reload),
        click: reload,
        accelerator: `${cmdOrCtrlShortcutKey()}+R`,
+        enabled: service.isEnabled,
      },
      {
        label: intl.formatMessage(globalMessages.edit),
@@ -256,6 +254,7 @@ class TabItem extends Component {
          : intl.formatMessage(messages.enableNotifications),
        click: () => toggleNotifications(),
        accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+N`,
+        enabled: service.isEnabled,
      },
      {
        label: service.isMuted
@@ -263,6 +262,7 @@ class TabItem extends Component {
          : intl.formatMessage(messages.disableAudio),
        click: () => toggleAudio(),
        accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+A`,
+        enabled: service.isEnabled,
      },
      {
        label: service.isDarkModeEnabled
@@ -270,13 +270,14 @@ class TabItem extends Component {
          : intl.formatMessage(messages.enableDarkMode),
        click: () => toggleDarkMode(),
        accelerator: `${shiftKey()}+${altKey()}+D`,
+        enabled: service.isEnabled,
      },
      {
        label: intl.formatMessage(
          service.isEnabled ? messages.disableService : messages.enableService,
        ),
        click: () => (service.isEnabled ? disableService() : enableService()),
-       accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+S`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+S`,
      },
      {
        label: intl.formatMessage(
@@ -287,7 +288,7 @@ class TabItem extends Component {
        // eslint-disable-next-line no-confusing-arrow
        click: () =>
          service.isHibernating ? wakeUpService() : hibernateService(),
-        enabled: service.canHibernate,
+        enabled: service.isEnabled && service.canHibernate,
      },
      {
        type: 'separator',
@@ -402,4 +403,10 @@ class TabItem extends Component {
  }
 }
-export default injectIntl(SortableElement(TabItem));
+export default injectIntl(
+  SortableElement(
+    injectSheet(styles, { injectTheme: true })(
+      inject('stores')(observer(TabItem)),
+    ),
+  ),
+);
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js
index 94d6f33c1..d9e11df41 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -4,7 +4,6 @@ import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import TabBarSortableList from './TabBarSortableList';
-@observer
 class TabBar extends Component {
  static propTypes = {
    services: MobxPropTypes.arrayOrObservableArray.isRequired,
@@ -120,4 +119,4 @@ class TabBar extends Component {
  }
 }
-export default TabBar;
+export default observer(TabBar);
diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js
index e9119a944..de13e95ab 100644
--- a/src/components/settings/SettingsLayout.js
+++ b/src/components/settings/SettingsLayout.js
@@ -16,7 +16,6 @@ const messages = defineMessages({
  },
 });
-@observer
 class SettingsLayout extends Component {
  static propTypes = {
    navigation: PropTypes.element.isRequired,
@@ -78,4 +77,4 @@ class SettingsLayout extends Component {
  }
 }
-export default injectIntl(SettingsLayout);
+export default injectIntl(observer(SettingsLayout));
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 6c489e64b..d0c56af05 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -64,7 +64,6 @@ const messages = defineMessages({
  },
 });
-@observer
 class AccountDashboard extends Component {
  static propTypes = {
    user: MobxPropTypes.observableObject.isRequired,
@@ -229,4 +228,4 @@ class AccountDashboard extends Component {
  }
 }
-export default injectIntl(AccountDashboard);
+export default injectIntl(observer(AccountDashboard));
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index dbb1365b0..2fdb6e574 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -42,8 +42,6 @@ const messages = defineMessages({
  },
 });
-@inject('stores', 'actions')
-@observer
 class SettingsNavigation extends Component {
  static propTypes = {
    stores: PropTypes.shape({
@@ -175,4 +173,4 @@ class SettingsNavigation extends Component {
  }
 }
-export default injectIntl(SettingsNavigation);
+export default injectIntl(inject('stores', 'actions')(observer(SettingsNavigation)));
diff --git a/src/components/settings/recipes/RecipeItem.js b/src/components/settings/recipes/RecipeItem.js
index 1e910e6dc..df5b42222 100644
--- a/src/components/settings/recipes/RecipeItem.js
+++ b/src/components/settings/recipes/RecipeItem.js
@@ -4,7 +4,6 @@ import { observer } from 'mobx-react';
 import RecipePreviewModel from '../../../models/RecipePreview';
-@observer
 class RecipeItem extends Component {
  static propTypes = {
    recipe: PropTypes.instanceOf(RecipePreviewModel).isRequired,
@@ -31,4 +30,4 @@ class RecipeItem extends Component {
  }
 }
-export default RecipeItem;
+export default observer(RecipeItem);
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index dcf7a4784..0ba295369 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -51,7 +51,8 @@ const messages = defineMessages({
  },
  customRecipeIntro: {
    id: 'settings.recipes.customService.intro',
-    defaultMessage: 'To add a custom service, copy the service recipe to:',
+    defaultMessage:
+      'To add a custom service, copy the service recipe folder inside:',
  },
  openFolder: {
    id: 'settings.recipes.customService.openFolder',
@@ -104,8 +105,6 @@ const styles = {
  },
 };
-@injectSheet(styles)
-@observer
 class RecipesDashboard extends Component {
  static propTypes = {
    recipes: MobxPropTypes.arrayOrObservableArray.isRequired,
@@ -236,28 +235,6 @@ class RecipesDashboard extends Component {
                <H3>{intl.formatMessage(messages.headlineCommunityRecipes)}</H3>
              )}
              <div className="recipes__list">
-                {recipes.length === 0 && recipeFilter !== 'dev' && (
-                  <div className="align-middle settings__empty-state">
-                    <span className="emoji">
-                      <img src="./assets/images/emoji/dontknow.png" alt="" />
-                    </span>
-                    <p className="settings__empty-state-text">
-                      {intl.formatMessage(messages.nothingFound)}
-                    </p>
-                    <RecipeItem
-                      key={customWebsiteRecipe.id}
-                      recipe={customWebsiteRecipe}
-                      onClick={() =>
-                        isLoggedIn &&
-                        showAddServiceInterface({
-                          recipeId: customWebsiteRecipe.id,
-                        })
-                      }
-                    />
-                  </div>
-                )}
                {communityRecipes.map(recipe => (
                  <RecipeItem
                    key={recipe.id}
@@ -269,6 +246,25 @@ class RecipesDashboard extends Component {
                  />
                ))}
              </div>
+              {recipes.length === 0 && recipeFilter !== 'dev' && (
+                <div className="align-middle settings__empty-state">
+                  {customWebsiteRecipe && customWebsiteRecipe.id && (
+                    <RecipeItem
+                      key={customWebsiteRecipe.id}
+                      recipe={customWebsiteRecipe}
+                      onClick={() =>
+                        isLoggedIn &&
+                        showAddServiceInterface({
+                          recipeId: customWebsiteRecipe.id,
+                        })
+                      }
+                    />
+                  )}
+                  <p className="settings__empty-state-text">
+                    {intl.formatMessage(messages.nothingFound)}
+                  </p>
+                </div>
+              )}
              {recipeFilter === 'dev' && devRecipes.length > 0 && (
                <div className={classes.devRecipeList}>
                  <H3>{intl.formatMessage(messages.headlineDevRecipes)}</H3>
@@ -294,4 +290,6 @@ class RecipesDashboard extends Component {
  }
 }
-export default injectIntl(RecipesDashboard);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(RecipesDashboard)),
+);
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 2c451d7bf..f0e791b87 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -134,7 +134,6 @@ const messages = defineMessages({
  },
 });
-@observer
 class EditServiceForm extends Component {
  static propTypes = {
    recipe: PropTypes.instanceOf(Recipe).isRequired,
@@ -182,6 +181,7 @@ class EditServiceForm extends Component {
          this.setState({ isValidatingCustomUrl: true });
          try {
            values.customUrl = normalizeUrl(values.customUrl, {
+              stripAuthentication: false,
              stripWWW: false,
              removeTrailingSlash: false,
            });
@@ -499,4 +499,4 @@ class EditServiceForm extends Component {
  }
 }
-export default injectIntl(EditServiceForm);
+export default injectIntl(observer(EditServiceForm));
diff --git a/src/components/settings/services/ServiceError.js b/src/components/settings/services/ServiceError.js
index 6dd53a102..bcbbca3de 100644
--- a/src/components/settings/services/ServiceError.js
+++ b/src/components/settings/services/ServiceError.js
@@ -25,7 +25,6 @@ const messages = defineMessages({
  },
 });
-@observer
 class ServiceError extends Component {
  render() {
    const { intl } = this.props;
@@ -60,4 +59,4 @@ class ServiceError extends Component {
  }
 }
-export default injectIntl(ServiceError);
+export default injectIntl(observer(ServiceError));
diff --git a/src/components/settings/services/ServiceItem.js b/src/components/settings/services/ServiceItem.js
index d83e5fd56..23250ad09 100644
--- a/src/components/settings/services/ServiceItem.js
+++ b/src/components/settings/services/ServiceItem.js
@@ -24,7 +24,6 @@ const messages = defineMessages({
  },
 });
-@observer
 class ServiceItem extends Component {
  static propTypes = {
    service: PropTypes.instanceOf(ServiceModel).isRequired,
@@ -91,4 +90,4 @@ class ServiceItem extends Component {
  }
 }
-export default injectIntl(ServiceItem);
+export default injectIntl(observer(ServiceItem));
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js
index aae6eb855..b405593fd 100644
--- a/src/components/settings/services/ServicesDashboard.js
+++ b/src/components/settings/services/ServicesDashboard.js
@@ -27,7 +27,7 @@ const messages = defineMessages({
  noServiceFound: {
    id: 'settings.services.nothingFound',
    defaultMessage:
-      '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.',
+      'Sorry, but no service matched your search term.',
  },
  discoverServices: {
    id: 'settings.services.discoverServices',
@@ -51,7 +51,6 @@ const messages = defineMessages({
  },
 });
-@observer
 class ServicesDashboard extends Component {
  static propTypes = {
    services: MobxPropTypes.arrayOrObservableArray.isRequired,
@@ -188,4 +187,4 @@ class ServicesDashboard extends Component {
  }
 }
-export default injectIntl(ServicesDashboard);
+export default injectIntl(observer(ServicesDashboard));
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 7e86ea79a..1757ac297 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -5,7 +5,7 @@ import { observer } from 'mobx-react';
 import prettyBytes from 'pretty-bytes';
 import { defineMessages, injectIntl } from 'react-intl';
-import { mdiGithub, mdiInformation, mdiOpenInNew } from '@mdi/js';
+import { mdiGithub, mdiOpenInNew } from '@mdi/js';
 import Form from '../../../lib/Form';
 import Button from '../../ui/Button';
 import Toggle from '../../ui/Toggle';
@@ -17,6 +17,8 @@ import {
  DEFAULT_APP_SETTINGS,
  FRANZ_TRANSLATION,
  GITHUB_FRANZ_URL,
+  SPLIT_COLUMNS_MAX,
+  SPLIT_COLUMNS_MIN,
 } from '../../../config';
 import { isMac, isWindows, lockFerdiShortcutKey } from '../../../environment';
 import {
@@ -173,16 +175,14 @@ const messages = defineMessages({
    id: 'settings.app.restartRequired',
    defaultMessage: 'Changes require restart',
  },
-  languageDisclaimer: {
+  numberOfColumns: {
-    id: 'settings.app.languageDisclaimer',
+    id: 'settings.app.form.splitColumns',
-    defaultMessage:
+    defaultMessage: 'Number of columns',
-      'Official translations are English & German. All other languages are community based translations.',
  },
 });
 const Hr = () => <hr style={{ marginBottom: 20 }} />;
-@observer
 class EditSettingsForm extends Component {
  static propTypes = {
    checkForUpdates: PropTypes.func.isRequired,
@@ -200,6 +200,7 @@ class EditSettingsForm extends Component {
    automaticUpdates: PropTypes.bool.isRequired,
    isDarkmodeEnabled: PropTypes.bool.isRequired,
    isAdaptableDarkModeEnabled: PropTypes.bool.isRequired,
+    isSplitModeEnabled: PropTypes.bool.isRequired,
    isNightlyEnabled: PropTypes.bool.isRequired,
    hasAddedTodosAsService: PropTypes.bool.isRequired,
    isOnline: PropTypes.bool.isRequired,
@@ -246,6 +247,7 @@ class EditSettingsForm extends Component {
      getCacheSize,
      automaticUpdates,
      isDarkmodeEnabled,
+      isSplitModeEnabled,
      isTodosActivated,
      isNightlyEnabled,
      hasAddedTodosAsService,
@@ -412,10 +414,8 @@ class EditSettingsForm extends Component {
                <Hr />
-                <>
+                <Toggle field={form.$('keepAllWorkspacesLoaded')} />
-                  <Toggle field={form.$('keepAllWorkspacesLoaded')} />
+                <Hr />
-                  <Hr />
-                </>
                {!hasAddedTodosAsService && (
                  <>
@@ -540,6 +540,16 @@ class EditSettingsForm extends Component {
                <Hr />
                <Toggle field={form.$('splitMode')} />
+                {isSplitModeEnabled && (
+                  <Input
+                    type="number"
+                    min={SPLIT_COLUMNS_MIN}
+                    max={SPLIT_COLUMNS_MAX}
+                    placeholder={`${SPLIT_COLUMNS_MIN}-${SPLIT_COLUMNS_MAX}`}
+                    onChange={e => this.submit(e)}
+                    field={form.$('splitColumns')}
+                  />
+                )}
                <Hr />
@@ -800,27 +810,22 @@ class EditSettingsForm extends Component {
                )}
                <p className="settings__message">
                  <Icon icon={mdiGithub} />
-                  <span>
+                  Ferdi is based on{' '}
-                    Ferdi is based on{' '}
+                  <a
-                    <a
+                    href={`${GITHUB_FRANZ_URL}/franz`}
-                      href={`${GITHUB_FRANZ_URL}/franz`}
+                    target="_blank"
-                      target="_blank"
+                    rel="noreferrer"
-                      rel="noreferrer"
+                  >
-                    >
+                    Franz
-                      Franz
+                  </a>
-                    </a>
+                  , a project published under the{' '}
-                    , a project published under the{' '}
+                  <a
-                    <a
+                    href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`}
-                      href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`}
+                    target="_blank"
-                      target="_blank"
+                    rel="noreferrer"
-                      rel="noreferrer"
+                  >
-                    >
+                    Apache-2.0 License
-                      Apache-2.0 License
+                  </a>
-                    </a>
-                  </span>
-                  <br />
-                  <Icon icon={mdiInformation} />
-                  {intl.formatMessage(messages.languageDisclaimer)}
                </p>
              </div>
            )}
@@ -831,4 +836,4 @@ class EditSettingsForm extends Component {
  }
 }
-export default injectIntl(EditSettingsForm);
+export default injectIntl(observer(EditSettingsForm));
diff --git a/src/components/settings/supportFerdi/SupportFerdiDashboard.tsx b/src/components/settings/supportFerdi/SupportFerdiDashboard.tsx
index 88e936b71..acebc979f 100644
--- a/src/components/settings/supportFerdi/SupportFerdiDashboard.tsx
+++ b/src/components/settings/supportFerdi/SupportFerdiDashboard.tsx
@@ -1,7 +1,5 @@
 import { defineMessages, useIntl } from 'react-intl';
-import { BrowserWindow } from '@electron/remote';
 import { mdiOpenInNew } from '@mdi/js';
-import InfoBar from '../../ui/InfoBar';
 import { Icon } from '../../ui/icon';
 const messages = defineMessages({
@@ -9,10 +7,6 @@ const messages = defineMessages({
    id: 'settings.supportFerdi.headline',
    defaultMessage: 'About Ferdi',
  },
-  title: {
-    id: 'settings.supportFerdi.title',
-    defaultMessage: 'Do you like Ferdi?',
-  },
  aboutIntro: {
    id: 'settings.supportFerdi.aboutIntro',
    defaultMessage:
@@ -62,26 +56,8 @@ const messages = defineMessages({
    id: 'settings.supportFerdi.textGitHubSponsors',
    defaultMessage: 'GitHub Sponsors',
  },
-  openSurvey: {
-    id: 'settings.supportFerdi.openSurvey',
-    defaultMessage: 'Open survey',
-  },
-  bannerText: {
-    id: 'settings.supportFerdi.bannerText',
-    defaultMessage: 'Do you want to help us improve Ferdi?',
-  },
 });
-const openSurveyWindow = () => {
-  let win = new BrowserWindow({ width: 670, height: 400 });
-  win.on('closed', () => {
-    // @ts-expect-error Type 'null' is not assignable to type 'BrowserWindow'.
-    win = null;
-  });
-  win.loadURL('https://rp28.typeform.com/to/E3phJT');
-};
 const SupportFerdiDashboard = () => {
  const intl = useIntl();
@@ -95,7 +71,6 @@ const SupportFerdiDashboard = () => {
        </span>
      </div>
      <div className="settings__body">
-        <h1>{intl.formatMessage(messages.title)}</h1>
        <div>
          <p className="settings__support-badges">
            <a
@@ -219,14 +194,6 @@ const SupportFerdiDashboard = () => {
          </p>
        </div>
      </div>
-      <InfoBar
-        sticky
-        type="primary"
-        ctaLabel={intl.formatMessage(messages.openSurvey)}
-        onClick={openSurveyWindow}
-      >
-        {intl.formatMessage(messages.bannerText)}
-      </InfoBar>
    </div>
  );
 };
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js
index 4a1a02571..802284051 100644
--- a/src/components/settings/team/TeamDashboard.js
+++ b/src/components/settings/team/TeamDashboard.js
@@ -90,8 +90,6 @@ const styles = {
  },
 };
-@injectSheet(styles)
-@observer
 class TeamDashboard extends Component {
  static propTypes = {
    isLoading: PropTypes.bool.isRequired,
@@ -136,40 +134,34 @@ class TeamDashboard extends Component {
              </Infobox>
            )}
-            {!userInfoRequestFailed && (
+            {!userInfoRequestFailed && !isLoading && (
              <>
-                {!isLoading && (
+                <h1
-                  <>
+                  className={classnames({
-                    <>
+                    [classes.headline]: true,
-                      <h1
+                    [classes.headlineWithSpacing]: true,
-                        className={classnames({
+                  })}
-                          [classes.headline]: true,
+                >
-                          [classes.headlineWithSpacing]: true,
+                  {intl.formatMessage(messages.contentHeadline)}
-                        })}
+                </h1>
-                      >
+                <div className={classes.container}>
-                        {intl.formatMessage(messages.contentHeadline)}
+                  <div className={classes.content}>
-                      </h1>
+                    <p>{intl.formatMessage(messages.intro)}</p>
-                      <div className={classes.container}>
+                    <p>{intl.formatMessage(messages.copy)}</p>
-                        <div className={classes.content}>
+                  </div>
-                          <p>{intl.formatMessage(messages.intro)}</p>
+                  <img
-                          <p>{intl.formatMessage(messages.copy)}</p>
+                    className={classes.image}
-                        </div>
+                    src="https://cdn.franzinfra.com/announcements/assets/teams.png"
-                        <img
+                    alt="Ferdi for Teams"
-                          className={classes.image}
+                  />
-                          src="https://cdn.franzinfra.com/announcements/assets/teams.png"
+                </div>
-                          alt="Ferdi for Teams"
+                <div className={classes.buttonContainer}>
-                        />
+                  <Button
-                      </div>
+                    label={intl.formatMessage(messages.manageButton)}
-                      <div className={classes.buttonContainer}>
+                    onClick={openTeamManagement}
-                        <Button
+                    className={classes.cta}
-                          label={intl.formatMessage(messages.manageButton)}
+                  />
-                          onClick={openTeamManagement}
+                </div>
-                          className={classes.cta}
-                        />
-                      </div>
-                    </>
-                  </>
-                )}
              </>
            )}
          </div>
@@ -203,4 +195,6 @@ class TeamDashboard extends Component {
  }
 }
-export default injectIntl(TeamDashboard);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(TeamDashboard)),
+);
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js
index 1b8a4f25a..95498d9bb 100644
--- a/src/components/settings/user/EditUserForm.js
+++ b/src/components/settings/user/EditUserForm.js
@@ -37,7 +37,6 @@ const messages = defineMessages({
  },
 });
-@observer
 class EditUserForm extends Component {
  static propTypes = {
    status: MobxPropTypes.observableArray.isRequired,
@@ -128,4 +127,4 @@ class EditUserForm extends Component {
  }
 }
-export default injectIntl(EditUserForm);
+export default injectIntl(observer(EditUserForm));
diff --git a/src/components/ui/AppLoader/index.tsx b/src/components/ui/AppLoader/index.tsx
index c7c290a57..e80371e47 100644
--- a/src/components/ui/AppLoader/index.tsx
+++ b/src/components/ui/AppLoader/index.tsx
@@ -1,7 +1,7 @@
 import { Component } from 'react';
-import injectSheet, { withTheme } from 'react-jss';
 import classnames from 'classnames';
+import injectStyle from 'react-jss';
 import FullscreenLoader from '../FullscreenLoader';
 import { shuffleArray } from '../../../helpers/array-helpers';
@@ -24,8 +24,6 @@ type Props = {
  texts: string[];
 };
-@injectSheet(styles)
-@withTheme
 class AppLoader extends Component<Props> {
  static defaultProps = {
    texts: textList,
@@ -57,7 +55,6 @@ class AppLoader extends Component<Props> {
    return (
      <FullscreenLoader
-        title="Ferdi"
        className={classes.component}
        spinnerColor={theme.colorAppLoaderSpinner}
      >
@@ -77,4 +74,4 @@ class AppLoader extends Component<Props> {
  }
 }
-export default AppLoader;
+export default injectStyle(styles, { injectTheme: true })(AppLoader);
diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js
index 67c801d98..a52f1cadb 100644
--- a/src/components/ui/Button.js
+++ b/src/components/ui/Button.js
@@ -4,8 +4,6 @@ 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,
@@ -35,8 +33,6 @@ class Button extends Component {
    htmlForm: '',
  };
-  element = null;
  render() {
    const {
      label,
@@ -92,4 +88,4 @@ class Button extends Component {
  }
 }
-export default Button;
+export default inject('stores')(observer(Button));
diff --git a/src/components/ui/FAB.tsx b/src/components/ui/FAB.tsx
index 583c9d556..cb9c5f126 100644
--- a/src/components/ui/FAB.tsx
+++ b/src/components/ui/FAB.tsx
@@ -14,7 +14,6 @@ type Props = {
  htmlForm: string;
 };
-@observer
 class Button extends Component<Props> {
  static defaultProps = {
    disabled: false,
@@ -23,8 +22,6 @@ class Button extends Component<Props> {
    htmlForm: '',
  };
-  element = null;
  render() {
    const { className, disabled, onClick, type, children, htmlForm } =
      this.props;
@@ -48,4 +45,4 @@ class Button extends Component<Props> {
  }
 }
-export default Button;
+export default observer(Button);
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js
index f5943f3f3..39b6c5a4c 100644
--- a/src/components/ui/FullscreenLoader/index.js
+++ b/src/components/ui/FullscreenLoader/index.js
@@ -1,16 +1,13 @@
 import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import injectSheet, { withTheme } from 'react-jss';
+import injectStyle from 'react-jss';
 import classnames from 'classnames';
 import Loader from '../Loader';
 import styles from './styles';
-@withTheme
-@injectSheet(styles)
-@observer
 class FullscreenLoader extends Component {
  static propTypes = {
    className: PropTypes.string,
@@ -48,4 +45,6 @@ class FullscreenLoader extends Component {
  }
 }
-export default FullscreenLoader;
+export default injectStyle(styles, { injectTheme: true })(
+  observer(FullscreenLoader),
+);
diff --git a/src/components/ui/ImageUpload.tsx b/src/components/ui/ImageUpload.tsx
index 118e6b206..b07e211c2 100644
--- a/src/components/ui/ImageUpload.tsx
+++ b/src/components/ui/ImageUpload.tsx
@@ -2,7 +2,7 @@ import { Component } from 'react';
 import { observer } from 'mobx-react';
 import { Field } from 'mobx-react-form';
 import classnames from 'classnames';
-import Dropzone, { DropzoneRef } from 'react-dropzone';
+import Dropzone from 'react-dropzone';
 import { mdiDelete, mdiFileImage } from '@mdi/js';
 import { isWindows } from '../../environment';
 import { Icon } from './icon';
@@ -15,7 +15,6 @@ type Props = {
  textUpload: string;
 };
-@observer
 class ImageUpload extends Component<Props> {
  static defaultProps = {
    multiple: false,
@@ -25,8 +24,6 @@ class ImageUpload extends Component<Props> {
    path: null,
  };
-  dropzoneRef: DropzoneRef | null = null;
  onDrop(acceptedFiles) {
    const { field } = this.props;
@@ -85,9 +82,6 @@ class ImageUpload extends Component<Props> {
            </>
          ) : (
            <Dropzone
-              ref={node => {
-                this.dropzoneRef = node;
-              }}
              onDrop={this.onDrop.bind(this)}
              multiple={multiple}
              accept="image/jpeg, image/png, image/svg+xml"
@@ -107,4 +101,4 @@ class ImageUpload extends Component<Props> {
  }
 }
-export default ImageUpload;
+export default observer(ImageUpload);
diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js
index 89b085907..c1a6013c2 100644
--- a/src/components/ui/InfoBar.js
+++ b/src/components/ui/InfoBar.js
@@ -16,7 +16,6 @@ const messages = defineMessages({
  },
 });
-@observer
 class InfoBar extends Component {
  static propTypes = {
    // eslint-disable-next-line react/forbid-prop-types
@@ -102,4 +101,4 @@ class InfoBar extends Component {
  }
 }
-export default injectIntl(InfoBar);
+export default injectIntl(observer(InfoBar));
diff --git a/src/components/ui/Infobox.js b/src/components/ui/Infobox.js
index c0ba8f13c..6634a6808 100644
--- a/src/components/ui/Infobox.js
+++ b/src/components/ui/Infobox.js
@@ -19,7 +19,6 @@ const messages = defineMessages({
  },
 });
-@observer
 class Infobox extends Component {
  static propTypes = {
    // eslint-disable-next-line react/forbid-prop-types
@@ -112,4 +111,4 @@ class Infobox extends Component {
  }
 }
-export default injectIntl(Infobox);
+export default injectIntl(observer(Infobox));
diff --git a/src/components/ui/Input.js b/src/components/ui/Input.js
index 8d37d7a05..fa1b44699 100644
--- a/src/components/ui/Input.js
+++ b/src/components/ui/Input.js
@@ -5,7 +5,9 @@ import { Field } from 'mobx-react-form';
 import classnames from 'classnames';
 import { defineMessages, injectIntl } from 'react-intl';
+import { mdiEye, mdiEyeOff } from '@mdi/js';
 import { scorePassword as scorePasswordFunc } from '../../helpers/password-helpers';
+import { Icon } from './icon';
 const messages = defineMessages({
  passwordToggle: {
@@ -14,7 +16,6 @@ const messages = defineMessages({
  },
 });
-@observer
 class Input extends Component {
  static propTypes = {
    field: PropTypes.instanceOf(Field).isRequired,
@@ -115,9 +116,6 @@ class Input extends Component {
              type="button"
              className={classnames({
                'franz-form__input-modifier': true,
-                mdi: true,
-                'mdi-eye': !this.state.showPassword,
-                'mdi-eye-off': this.state.showPassword,
              })}
              onClick={() =>
                this.setState(prevState => ({
@@ -126,7 +124,9 @@ class Input extends Component {
              }
              tabIndex={-1}
              aria-label={intl.formatMessage(messages.passwordToggle)}
-            />
+            >
+              <Icon icon={this.state.showPassword ? mdiEye : mdiEyeOff} />
+            </button>
          )}
          {scorePassword && (
            <div className="franz-form__password-score">
@@ -152,4 +152,4 @@ class Input extends Component {
  }
 }
-export default injectIntl(Input);
+export default injectIntl(observer(Input));
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js
index 40766c984..565547736 100644
--- a/src/components/ui/Link.js
+++ b/src/components/ui/Link.js
@@ -9,8 +9,6 @@ import { matchRoute } from '../../helpers/routing-helpers';
 import { openExternalUrl } from '../../helpers/url-helpers';
 // TODO: create container component for this component
-@inject('stores')
-@observer
 class Link extends Component {
  onClick(e) {
    if (this.props.disabled) {
@@ -60,7 +58,7 @@ class Link extends Component {
  }
 }
-Link.wrappedComponent.propTypes = {
+Link.propTypes = {
  stores: PropTypes.shape({
    router: PropTypes.instanceOf(RouterStore).isRequired,
  }).isRequired,
@@ -75,7 +73,7 @@ Link.wrappedComponent.propTypes = {
  disabled: PropTypes.bool,
 };
-Link.wrappedComponent.defaultProps = {
+Link.defaultProps = {
  className: '',
  activeClassName: '',
  strictFilter: false,
@@ -84,4 +82,4 @@ Link.wrappedComponent.defaultProps = {
  style: {},
 };
-export default Link;
+export default inject('stores')(observer(Link));
diff --git a/src/components/ui/Loader.tsx b/src/components/ui/Loader.tsx
index 1173c11e7..171d0e290 100644
--- a/src/components/ui/Loader.tsx
+++ b/src/components/ui/Loader.tsx
@@ -12,8 +12,6 @@ type Props = {
  stores: FerdiStores;
 };
-@inject('stores')
-@observer
 class LoaderComponent extends Component<Props> {
  static defaultProps = {
    loaded: false,
@@ -43,4 +41,4 @@ class LoaderComponent extends Component<Props> {
  }
 }
-export default LoaderComponent;
+export default inject('stores')(observer(LoaderComponent));
diff --git a/src/components/ui/Modal/index.tsx b/src/components/ui/Modal/index.tsx
index f2f4461b8..c3c78b419 100644
--- a/src/components/ui/Modal/index.tsx
+++ b/src/components/ui/Modal/index.tsx
@@ -18,7 +18,6 @@ type Props = {
  showClose: boolean;
 };
-@injectCSS(styles)
 class Modal extends Component<Props> {
  static defaultProps = {
    className: null,
@@ -64,4 +63,4 @@ class Modal extends Component<Props> {
  }
 }
-export default Modal;
+export default injectCSS(styles)(Modal);
diff --git a/src/components/ui/Radio.tsx b/src/components/ui/Radio.tsx
index 594ea70e4..a033a5fe0 100644
--- a/src/components/ui/Radio.tsx
+++ b/src/components/ui/Radio.tsx
@@ -10,7 +10,6 @@ type Props = {
  showLabel: boolean;
 };
-@observer
 class Radio extends Component<Props> {
  static defaultProps = {
    focus: false,
@@ -74,4 +73,4 @@ class Radio extends Component<Props> {
  }
 }
-export default Radio;
+export default observer(Radio);
diff --git a/src/components/ui/SearchInput.tsx b/src/components/ui/SearchInput.tsx
index 49a50a4a0..6a6a1692e 100644
--- a/src/components/ui/SearchInput.tsx
+++ b/src/components/ui/SearchInput.tsx
@@ -17,7 +17,6 @@ type Props = {
  autoFocus: boolean;
 };
-@observer
 class SearchInput extends Component<Props> {
  static defaultProps = {
    value: '',
@@ -115,4 +114,4 @@ class SearchInput extends Component<Props> {
  }
 }
-export default SearchInput;
+export default observer(SearchInput);
diff --git a/src/components/ui/Select.js b/src/components/ui/Select.js
index a560da332..0fc32e573 100644
--- a/src/components/ui/Select.js
+++ b/src/components/ui/Select.js
@@ -4,7 +4,6 @@ import { observer } from 'mobx-react';
 import { Field } from 'mobx-react-form';
 import classnames from 'classnames';
-@observer
 class Select extends Component {
  static propTypes = {
    field: PropTypes.instanceOf(Field).isRequired,
@@ -98,4 +97,4 @@ class Select extends Component {
  }
 }
-export default Select;
+export default observer(Select);
diff --git a/src/components/ui/ServiceIcon.js b/src/components/ui/ServiceIcon.js
index f067f8955..d403d107d 100644
--- a/src/components/ui/ServiceIcon.js
+++ b/src/components/ui/ServiceIcon.js
@@ -24,8 +24,6 @@ const styles = theme => ({
  },
 });
-@injectSheet(styles)
-@observer
 class ServiceIcon extends Component {
  static propTypes = {
    classes: PropTypes.object.isRequired,
@@ -56,4 +54,6 @@ class ServiceIcon extends Component {
  }
 }
-export default ServiceIcon;
+export default injectSheet(styles, { injectTheme: true })(
+  observer(ServiceIcon),
+);
diff --git a/src/components/ui/Slider.js b/src/components/ui/Slider.js
index dea6e0563..a581e7a65 100644
--- a/src/components/ui/Slider.js
+++ b/src/components/ui/Slider.js
@@ -4,7 +4,6 @@ import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import { Field } from 'mobx-react-form';
-@observer
 class Slider extends Component {
  static propTypes = {
    field: PropTypes.instanceOf(Field).isRequired,
@@ -64,4 +63,4 @@ class Slider extends Component {
  }
 }
-export default Slider;
+export default observer(Slider);
diff --git a/src/components/ui/StatusBarTargetUrl.js b/src/components/ui/StatusBarTargetUrl.js
index 38b436742..d8d329d52 100644
--- a/src/components/ui/StatusBarTargetUrl.js
+++ b/src/components/ui/StatusBarTargetUrl.js
@@ -5,7 +5,6 @@ import classnames from 'classnames';
 import Appear from './effects/Appear';
-@observer
 class StatusBarTargetUrl extends Component {
  static propTypes = {
    className: PropTypes.string,
@@ -33,4 +32,4 @@ class StatusBarTargetUrl extends Component {
  }
 }
-export default StatusBarTargetUrl;
+export default observer(StatusBarTargetUrl);
diff --git a/src/components/ui/Tabs/Tabs.js b/src/components/ui/Tabs/Tabs.js
index 77803974b..5d2da6293 100644
--- a/src/components/ui/Tabs/Tabs.js
+++ b/src/components/ui/Tabs/Tabs.js
@@ -5,7 +5,6 @@ import classnames from 'classnames';
 import { oneOrManyChildElements } from '../../../prop-types';
-@observer
 class Tab extends Component {
  constructor(props) {
    super(props);
@@ -69,4 +68,4 @@ class Tab extends Component {
  }
 }
-export default Tab;
+export default observer(Tab);
diff --git a/src/components/ui/Toggle.js b/src/components/ui/Toggle.js
index dfc319735..a82be690e 100644
--- a/src/components/ui/Toggle.js
+++ b/src/components/ui/Toggle.js
@@ -4,7 +4,6 @@ import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import { Field } from 'mobx-react-form';
-@observer
 class Toggle extends Component {
  static propTypes = {
    field: PropTypes.instanceOf(Field).isRequired,
@@ -69,4 +68,4 @@ class Toggle extends Component {
  }
 }
-export default Toggle;
+export default observer(Toggle);
diff --git a/src/components/ui/ToggleRaw.js b/src/components/ui/ToggleRaw.js
index 74292a870..e482b97b4 100644
--- a/src/components/ui/ToggleRaw.js
+++ b/src/components/ui/ToggleRaw.js
@@ -6,7 +6,6 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
-@observer
 class ToggleRaw extends Component {
  static propTypes = {
    onChange: PropTypes.func.isRequired,
@@ -74,4 +73,4 @@ class ToggleRaw extends Component {
  }
 }
-export default ToggleRaw;
+export default observer(ToggleRaw);
diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js
index 8d4513172..20945d191 100644
--- a/src/components/ui/WebviewLoader/index.js
+++ b/src/components/ui/WebviewLoader/index.js
@@ -14,8 +14,6 @@ const messages = defineMessages({
  },
 });
-@injectSheet(styles)
-@observer
 class WebviewLoader extends Component {
  static propTypes = {
    name: PropTypes.string.isRequired,
@@ -34,4 +32,6 @@ class WebviewLoader extends Component {
  }
 }
-export default injectIntl(WebviewLoader);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(WebviewLoader)),
+);
diff --git a/src/components/ui/badge/ProBadge.tsx b/src/components/ui/badge/ProBadge.tsx
index dc1e76f7f..410748a64 100644
--- a/src/components/ui/badge/ProBadge.tsx
+++ b/src/components/ui/badge/ProBadge.tsx
@@ -1,14 +1,13 @@
 import { mdiStar } from '@mdi/js';
 import classnames from 'classnames';
 import { Component } from 'react';
-import injectStyle from 'react-jss';
+import injectStyle, { WithStylesProps } from 'react-jss';
 import { Theme } from '../../../themes';
 import { Icon } from '../icon';
 import { Badge } from './index';
-import { IWithStyle } from '../typings/generic';
-interface IProps extends IWithStyle {
+interface IProps extends WithStylesProps<typeof styles> {
  badgeClasses?: string;
  iconClasses?: string;
  inverted?: boolean;
@@ -61,4 +60,6 @@ class ProBadgeComponent extends Component<IProps> {
  }
 }
-export const ProBadge = injectStyle(styles)(ProBadgeComponent);
+export const ProBadge = injectStyle(styles, { injectTheme: true })(
+  ProBadgeComponent,
+);
diff --git a/src/components/ui/badge/index.tsx b/src/components/ui/badge/index.tsx
index 61bede937..a7ed866a5 100644
--- a/src/components/ui/badge/index.tsx
+++ b/src/components/ui/badge/index.tsx
@@ -1,11 +1,10 @@
 import classnames from 'classnames';
 import { Component, ReactNode } from 'react';
-import injectStyle from 'react-jss';
+import injectStyle, { WithStylesProps } from 'react-jss';
 import { Theme } from '../../../themes';
-import { IWithStyle } from '../typings/generic';
-interface IProps extends IWithStyle {
+interface IProps extends WithStylesProps<typeof styles> {
  type: string;
  className?: string;
  children: ReactNode;
@@ -68,4 +67,4 @@ class BadgeComponent extends Component<IProps> {
  }
 }
-export const Badge = injectStyle(styles)(BadgeComponent);
+export const Badge = injectStyle(styles, { injectTheme: true })(BadgeComponent);
diff --git a/src/components/ui/button/index.tsx b/src/components/ui/button/index.tsx
index 12e5e4449..d91b1ee19 100644
--- a/src/components/ui/button/index.tsx
+++ b/src/components/ui/button/index.tsx
@@ -2,11 +2,11 @@ import Icon from '@mdi/react';
 import classnames from 'classnames';
 import { Property } from 'csstype';
 import { Component, MouseEvent } from 'react';
-import injectStyle, { withTheme } from 'react-jss';
+import injectStyle, { WithStylesProps } from 'react-jss';
 import Loader from 'react-loader';
 import { Theme } from '../../../themes';
-import { IFormField, IWithStyle } from '../typings/generic';
+import { IFormField } from '../typings/generic';
 type ButtonType =
  | 'primary'
@@ -16,7 +16,7 @@ type ButtonType =
  | 'warning'
  | 'inverted';
-interface IProps extends IFormField, IWithStyle {
+interface IProps extends IFormField, WithStylesProps<typeof styles> {
  className?: string;
  disabled?: boolean;
  id?: string;
@@ -179,7 +179,7 @@ class ButtonComponent extends Component<IProps> {
    const {
      classes,
      className,
-      theme,
+      // theme,
      disabled,
      id,
      label,
@@ -213,7 +213,7 @@ class ButtonComponent extends Component<IProps> {
              loaded={false}
              width={4}
              scale={0.45}
-              color={theme.buttonLoaderColor[buttonType!]}
+              // color={theme.buttonLoaderColor[buttonType!]}
              parentClassName={classes.loader}
            />
          )}
@@ -262,4 +262,6 @@ class ButtonComponent extends Component<IProps> {
  }
 }
-export const Button = injectStyle(styles)(withTheme(ButtonComponent));
+export const Button = injectStyle(styles, { injectTheme: true })(
+  ButtonComponent,
+);
diff --git a/src/components/ui/error/index.tsx b/src/components/ui/error/index.tsx
index 8439bfc8b..ff3bc31c6 100644
--- a/src/components/ui/error/index.tsx
+++ b/src/components/ui/error/index.tsx
@@ -17,4 +17,4 @@ class ErrorComponent extends Component<IProps> {
  }
 }
-export const Error = injectSheet(styles)(ErrorComponent);
+export const Error = injectSheet(styles, { injectTheme: true })(ErrorComponent);
diff --git a/src/components/ui/headline/index.tsx b/src/components/ui/headline/index.tsx
index ea2949102..d9954c38f 100644
--- a/src/components/ui/headline/index.tsx
+++ b/src/components/ui/headline/index.tsx
@@ -1,11 +1,11 @@
 import classnames from 'classnames';
 import { Component, createElement, ReactNode } from 'react';
-import injectStyle from 'react-jss';
+import injectStyle, { WithStylesProps } from 'react-jss';
 import { Theme } from '../../../themes';
-import { IWithStyle, Omit } from '../typings/generic';
+import { Omit } from '../typings/generic';
-interface IProps extends IWithStyle {
+interface IProps extends WithStylesProps<typeof styles> {
  level?: number;
  className?: string;
  children: string | ReactNode;
@@ -55,9 +55,9 @@ class HeadlineComponent extends Component<IProps> {
  }
 }
-const Headline = injectStyle(styles)(HeadlineComponent);
+const Headline = injectStyle(styles, { injectTheme: true })(HeadlineComponent);
-const createH = (level: number) => (props: Omit<IProps, 'classes' | 'theme'>) =>
+const createH = (level: number) => (props: Omit<IProps, 'classes'>) =>
  (
    <Headline level={level} {...props}>
      {props.children}
diff --git a/src/components/ui/icon/index.tsx b/src/components/ui/icon/index.tsx
index 85bb61d13..52f61d2d7 100644
--- a/src/components/ui/icon/index.tsx
+++ b/src/components/ui/icon/index.tsx
@@ -1,12 +1,11 @@
 import MdiIcon from '@mdi/react';
 import classnames from 'classnames';
 import { Component } from 'react';
-import injectStyle from 'react-jss';
+import injectStyle, { WithStylesProps } from 'react-jss';
 import { Theme } from '../../../themes';
-import { IWithStyle } from '../typings/generic';
-interface IProps extends IWithStyle {
+interface IProps extends WithStylesProps<typeof styles> {
  icon: string;
  size?: number;
  className?: string;
@@ -43,4 +42,4 @@ class IconComponent extends Component<IProps> {
  }
 }
-export const Icon = injectStyle(styles)(IconComponent);
+export const Icon = injectStyle(styles, { injectTheme: true })(IconComponent);
diff --git a/src/components/ui/infobox/index.tsx b/src/components/ui/infobox/index.tsx
index 87940c4d4..c0767a342 100644
--- a/src/components/ui/infobox/index.tsx
+++ b/src/components/ui/infobox/index.tsx
@@ -1,13 +1,12 @@
 import { mdiClose } from '@mdi/js';
 import classnames from 'classnames';
 import { Component, ReactNode } from 'react';
-import injectStyle from 'react-jss';
+import injectStyle, { WithStylesProps } from 'react-jss';
 import { Theme } from '../../../themes';
 import { Icon } from '../icon';
-import { IWithStyle } from '../typings/generic';
-interface IProps extends IWithStyle {
+interface IProps extends WithStylesProps<typeof styles> {
  icon?: string;
  type?: string;
  dismissable?: boolean;
@@ -58,7 +57,6 @@ const styles = (theme: Theme) => ({
    position: 'relative',
    overflow: 'hidden',
    height: 'auto',
-    marginBottom: 30,
  },
  infobox: {
    alignItems: 'center',
@@ -69,6 +67,7 @@ const styles = (theme: Theme) => ({
    top: 0,
    transition: infoBoxTransition,
    opacity: 1,
+    marginBottom: 30,
  },
  dismissing: {
    // position: 'absolute',
@@ -202,4 +201,6 @@ class InfoboxComponent extends Component<IProps, IState> {
  }
 }
-export const Infobox = injectStyle(styles)(InfoboxComponent);
+export const Infobox = injectStyle(styles, { injectTheme: true })(
+  InfoboxComponent,
+);
diff --git a/src/components/ui/input/index.tsx b/src/components/ui/input/index.tsx
index c46cafc5c..bfbee33b9 100644
--- a/src/components/ui/input/index.tsx
+++ b/src/components/ui/input/index.tsx
@@ -2,9 +2,9 @@ import { mdiEye, mdiEyeOff } from '@mdi/js';
 import Icon from '@mdi/react';
 import classnames from 'classnames';
 import { Component, createRef, InputHTMLAttributes } from 'react';
-import injectSheet from 'react-jss';
+import injectSheet, { WithStylesProps } from 'react-jss';
-import { IFormField, IWithStyle } from '../typings/generic';
+import { IFormField } from '../typings/generic';
 import { Error } from '../error';
 import { Label } from '../label';
@@ -20,7 +20,7 @@ interface IData {
 interface IProps
  extends InputHTMLAttributes<HTMLInputElement>,
    IFormField,
-    IWithStyle {
+    WithStylesProps<typeof styles> {
  focus?: boolean;
  prefix?: string;
  suffix?: string;
@@ -205,4 +205,4 @@ class InputComponent extends Component<IProps, IState> {
  }
 }
-export const Input = injectSheet(styles)(InputComponent);
+export const Input = injectSheet(styles, { injectTheme: true })(InputComponent);
diff --git a/src/components/ui/label/index.tsx b/src/components/ui/label/index.tsx
index 4d86f23f7..dcc14bff4 100644
--- a/src/components/ui/label/index.tsx
+++ b/src/components/ui/label/index.tsx
@@ -1,15 +1,16 @@
 import classnames from 'classnames';
-import { Classes } from 'jss';
 import { Component, LabelHTMLAttributes } from 'react';
-import injectSheet from 'react-jss';
+import injectSheet, { WithStylesProps } from 'react-jss';
 import { IFormField } from '../typings/generic';
 import styles from './styles';
-interface ILabel extends IFormField, LabelHTMLAttributes<HTMLLabelElement> {
+interface ILabel
-  classes: Classes;
+  extends IFormField,
-  isRequired: boolean;
+    LabelHTMLAttributes<HTMLLabelElement>,
+    WithStylesProps<typeof styles> {
+  isRequired?: boolean;
 }
 class LabelComponent extends Component<ILabel> {
@@ -49,4 +50,4 @@ class LabelComponent extends Component<ILabel> {
  }
 }
-export const Label = injectSheet(styles)(LabelComponent);
+export const Label = injectSheet(styles, { injectTheme: true })(LabelComponent);
diff --git a/src/components/ui/loader/index.tsx b/src/components/ui/loader/index.tsx
index 0607bd48b..d56995ccc 100644
--- a/src/components/ui/loader/index.tsx
+++ b/src/components/ui/loader/index.tsx
@@ -1,25 +1,25 @@
 import classnames from 'classnames';
 import { Component } from 'react';
-import injectStyle, { withTheme } from 'react-jss';
+import injectStyle, { WithStylesProps } from 'react-jss';
 import ReactLoader from 'react-loader';
-import { IWithStyle } from '../typings/generic';
+interface IProps extends WithStylesProps<typeof styles> {
-interface IProps extends IWithStyle {
  className?: string;
  color?: string;
 }
-const styles = () => ({
+const styles = theme => ({
  container: {
    position: 'relative',
    height: 60,
  },
+  loader: {},
+  color: theme.colorText,
 });
 class LoaderComponent extends Component<IProps> {
  render() {
-    const { classes, className, color, theme } = this.props;
+    const { classes, className, color } = this.props;
    return (
      <div
@@ -33,7 +33,7 @@ class LoaderComponent extends Component<IProps> {
          loaded={false}
          width={4}
          scale={0.75}
-          color={color || theme.colorText}
+          color={color || classes.color}
          parentClassName={classes.loader}
        />
      </div>
@@ -41,4 +41,6 @@ class LoaderComponent extends Component<IProps> {
  }
 }
-export const Loader = injectStyle(styles)(withTheme(LoaderComponent));
+export const Loader = injectStyle(styles, { injectTheme: true })(
+  LoaderComponent,
+);
diff --git a/src/components/ui/select/index.tsx b/src/components/ui/select/index.tsx
index 2605503a3..ac509aa7c 100644
--- a/src/components/ui/select/index.tsx
+++ b/src/components/ui/select/index.tsx
@@ -6,10 +6,10 @@ import {
 import Icon from '@mdi/react';
 import classnames from 'classnames';
 import { ChangeEvent, Component, createRef } from 'react';
-import injectStyle from 'react-jss';
+import injectStyle, { WithStylesProps } from 'react-jss';
 import { Theme } from '../../../themes';
-import { IFormField, IWithStyle } from '../typings/generic';
+import { IFormField } from '../typings/generic';
 import { Error } from '../error';
 import { Label } from '../label';
@@ -23,7 +23,7 @@ interface IData {
  [index: string]: string;
 }
-interface IProps extends IFormField, IWithStyle {
+interface IProps extends IFormField, WithStylesProps<typeof styles> {
  actionText: string;
  className?: string;
  inputClassName?: string;
@@ -146,6 +146,7 @@ const styles = (theme: Theme) => ({
  disabled: {
    opacity: theme.selectDisabledOpacity,
  },
+  input: {},
 });
 class SelectComponent extends Component<IProps> {
@@ -457,4 +458,6 @@ class SelectComponent extends Component<IProps> {
  }
 }
-export const Select = injectStyle(styles)(SelectComponent);
+export const Select = injectStyle(styles, { injectTheme: true })(
+  SelectComponent,
+);
diff --git a/src/components/ui/textarea/index.tsx b/src/components/ui/textarea/index.tsx
index 1b16698eb..a47465806 100644
--- a/src/components/ui/textarea/index.tsx
+++ b/src/components/ui/textarea/index.tsx
@@ -1,8 +1,8 @@
 import classnames from 'classnames';
 import { Component, createRef, TextareaHTMLAttributes } from 'react';
-import injectSheet from 'react-jss';
+import injectSheet, { WithStylesProps } from 'react-jss';
-import { IFormField, IWithStyle } from '../typings/generic';
+import { IFormField } from '../typings/generic';
 import { Error } from '../error';
 import { Label } from '../label';
@@ -17,7 +17,7 @@ interface IData {
 interface IProps
  extends TextareaHTMLAttributes<HTMLTextAreaElement>,
    IFormField,
-    IWithStyle {
+    WithStylesProps<typeof styles> {
  focus?: boolean;
  data: IData;
  textareaClassName?: string;
@@ -123,4 +123,6 @@ class TextareaComponent extends Component<IProps> {
  }
 }
-export const Textarea = injectSheet(styles)(TextareaComponent);
+export const Textarea = injectSheet(styles, { injectTheme: true })(
+  TextareaComponent,
+);
diff --git a/src/components/ui/toggle/index.tsx b/src/components/ui/toggle/index.tsx
index 7b6ba147f..856581a21 100644
--- a/src/components/ui/toggle/index.tsx
+++ b/src/components/ui/toggle/index.tsx
@@ -1,10 +1,10 @@
 import classnames from 'classnames';
 import { Property } from 'csstype';
 import { Component, InputHTMLAttributes } from 'react';
-import injectStyle from 'react-jss';
+import injectStyle, { WithStylesProps } from 'react-jss';
 import { Theme } from '../../../themes';
-import { IFormField, IWithStyle } from '../typings/generic';
+import { IFormField } from '../typings/generic';
 import { Error } from '../error';
 import { Label } from '../label';
@@ -13,7 +13,7 @@ import { Wrapper } from '../wrapper';
 interface IProps
  extends InputHTMLAttributes<HTMLInputElement>,
    IFormField,
-    IWithStyle {
+    WithStylesProps<typeof styles> {
  className?: string;
 }
@@ -122,4 +122,6 @@ class ToggleComponent extends Component<IProps> {
  }
 }
-export const Toggle = injectStyle(styles)(ToggleComponent);
+export const Toggle = injectStyle(styles, { injectTheme: true })(
+  ToggleComponent,
+);
diff --git a/src/components/ui/typings/generic.ts b/src/components/ui/typings/generic.ts
index 65b996d59..3aec0bc40 100644
--- a/src/components/ui/typings/generic.ts
+++ b/src/components/ui/typings/generic.ts
@@ -1,7 +1,3 @@
-import { Classes } from 'jss';
-import { Theme } from '../../../themes';
 export interface IFormField {
  showLabel?: boolean;
  label?: string;
@@ -10,10 +6,5 @@ export interface IFormField {
  noMargin?: boolean;
 }
-export interface IWithStyle {
-  classes: Classes;
-  theme: Theme;
-}
 export type Merge<M, N> = Omit<M, Extract<keyof M, keyof N>> & N;
 export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
diff --git a/src/components/ui/wrapper/index.tsx b/src/components/ui/wrapper/index.tsx
index ffcd6fe0b..bc385d319 100644
--- a/src/components/ui/wrapper/index.tsx
+++ b/src/components/ui/wrapper/index.tsx
@@ -1,9 +1,8 @@
 import classnames from 'classnames';
 import { Component, ReactNode } from 'react';
-import injectStyle from 'react-jss';
+import injectStyle, { WithStylesProps } from 'react-jss';
-import { IWithStyle } from '../typings/generic';
-interface IProps extends IWithStyle {
+interface IProps extends WithStylesProps<typeof styles> {
  children: ReactNode;
  className?: string;
  identifier: string;
@@ -34,4 +33,6 @@ class WrapperComponent extends Component<IProps> {
  }
 }
-export const Wrapper = injectStyle(styles)(WrapperComponent);
+export const Wrapper = injectStyle(styles, { injectTheme: true })(
+  WrapperComponent,
+);
diff --git a/src/components/util/ErrorBoundary/index.js b/src/components/util/ErrorBoundary/index.js
index cddcd91c2..6a8b126f1 100644
--- a/src/components/util/ErrorBoundary/index.js
+++ b/src/components/util/ErrorBoundary/index.js
@@ -18,7 +18,6 @@ const messages = defineMessages({
  },
 });
-@injectSheet(styles)
 class ErrorBoundary extends Component {
  state = {
    hasError: false,
@@ -56,4 +55,6 @@ class ErrorBoundary extends Component {
  }
 }
-export default injectIntl(ErrorBoundary);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(ErrorBoundary),
+);
diff --git a/src/config.ts b/src/config.ts
index fb073c062..9600cc088 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -86,7 +86,7 @@ const TODO_TICKTICK_URL = 'https://ticktick.com/signin';
 const TODO_MSTODO_URL = 'https://todo.microsoft.com/?app#';
 const TODO_HABITICA_URL = 'https://habitica.com/login';
 const TODO_NOZBE_URL = 'https://app.nozbe.com/#login';
-const TODO_RTM_URL = 'https://www.rememberthemilk.com/login/';
+const TODO_RTM_URL = 'https://www.rememberthemilk.com/';
 const TODO_ANYDO_URL = 'https://desktop.any.do/';
 const TODO_GOOGLETASKS_URL =
  'https://tasks.google.com/embed/?origin=https%3A%2F%2Fcalendar.google.com&fullWidth=1';
@@ -172,6 +172,9 @@ export const CUSTOM_WEBSITE_RECIPE_ID = 'franz-custom-website';
 export const DEFAULT_SERVICE_ORDER = 99; // something high enough that it gets added to the end of the already-added services on the left sidebar
+export const SPLIT_COLUMNS_MIN = 1;
+export const SPLIT_COLUMNS_MAX = 5;
 export const DEFAULT_APP_SETTINGS = {
  autoLaunchOnStart: false,
  autoLaunchInBackground: false,
@@ -193,6 +196,7 @@ export const DEFAULT_APP_SETTINGS = {
  spellcheckerLanguage: 'en-us',
  darkMode: false,
  splitMode: false,
+  splitColumns: 3,
  fallbackLocale: 'en-US',
  beta: false,
  isAppMuted: false,
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js
index aa36e3969..e6d6dcf8a 100644
--- a/src/containers/auth/AuthLayoutContainer.js
+++ b/src/containers/auth/AuthLayoutContainer.js
@@ -14,8 +14,6 @@ import AppLoader from '../../components/ui/AppLoader';
 import { oneOrManyChildElements } from '../../prop-types';
 import FeaturesStore from '../../stores/FeaturesStore';
-@inject('stores', 'actions')
-@observer
 class AuthLayoutContainer extends Component {
  static propTypes = {
    children: oneOrManyChildElements.isRequired,
@@ -71,7 +69,7 @@ class AuthLayoutContainer extends Component {
  }
 }
-AuthLayoutContainer.wrappedComponent.propTypes = {
+AuthLayoutContainer.propTypes = {
  stores: PropTypes.shape({
    app: PropTypes.instanceOf(AppStore).isRequired,
    features: PropTypes.instanceOf(FeaturesStore).isRequired,
@@ -85,4 +83,4 @@ AuthLayoutContainer.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default AuthLayoutContainer;
+export default inject('stores', 'actions')(observer(AuthLayoutContainer));
diff --git a/src/containers/auth/ChangeServerScreen.js b/src/containers/auth/ChangeServerScreen.js
index dcc913c39..60bfde088 100644
--- a/src/containers/auth/ChangeServerScreen.js
+++ b/src/containers/auth/ChangeServerScreen.js
@@ -5,8 +5,6 @@ import { RouterStore } from 'mobx-react-router';
 import ChangeServer from '../../components/auth/ChangeServer';
 import SettingsStore from '../../stores/SettingsStore';
-@inject('stores', 'actions')
-@observer
 class ChangeServerScreen extends Component {
  constructor(props) {
    super(props);
@@ -34,7 +32,7 @@ class ChangeServerScreen extends Component {
  }
 }
-ChangeServerScreen.wrappedComponent.propTypes = {
+ChangeServerScreen.propTypes = {
  actions: PropTypes.shape({
    settings: PropTypes.instanceOf(SettingsStore).isRequired,
  }).isRequired,
@@ -44,4 +42,4 @@ ChangeServerScreen.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default ChangeServerScreen;
+export default inject('stores', 'actions')(observer(ChangeServerScreen));
diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js
index 46e2d41f0..c01c3d355 100644
--- a/src/containers/auth/ImportScreen.js
+++ b/src/containers/auth/ImportScreen.js
@@ -5,8 +5,6 @@ import { RouterStore } from 'mobx-react-router';
 import Import from '../../components/auth/Import';
 import UserStore from '../../stores/UserStore';
-@inject('stores', 'actions')
-@observer
 class ImportScreen extends Component {
  render() {
    const { actions, stores } = this.props;
@@ -26,7 +24,7 @@ class ImportScreen extends Component {
  }
 }
-ImportScreen.wrappedComponent.propTypes = {
+ImportScreen.propTypes = {
  actions: PropTypes.shape({
    user: PropTypes.instanceOf(UserStore).isRequired,
  }).isRequired,
@@ -36,4 +34,4 @@ ImportScreen.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default ImportScreen;
+export default inject('stores', 'actions')(observer(ImportScreen));
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js
index e252242ae..fc66227cc 100644
--- a/src/containers/auth/InviteScreen.js
+++ b/src/containers/auth/InviteScreen.js
@@ -3,8 +3,6 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import Invite from '../../components/auth/Invite';
-@inject('stores', 'actions')
-@observer
 class InviteScreen extends Component {
  render() {
    const { actions } = this.props;
@@ -13,7 +11,7 @@ class InviteScreen extends Component {
  }
 }
-InviteScreen.wrappedComponent.propTypes = {
+InviteScreen.propTypes = {
  actions: PropTypes.shape({
    user: PropTypes.shape({
      invite: PropTypes.func.isRequired,
@@ -21,4 +19,4 @@ InviteScreen.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default InviteScreen;
+export default inject('stores', 'actions')(observer(InviteScreen));
diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js
index 945e41284..d99a4051b 100644
--- a/src/containers/auth/LockedScreen.js
+++ b/src/containers/auth/LockedScreen.js
@@ -7,8 +7,6 @@ import SettingsStore from '../../stores/SettingsStore';
 import { hash } from '../../helpers/password-helpers';
 import UserStore from '../../stores/UserStore';
-@inject('stores', 'actions')
-@observer
 class LockedScreen extends Component {
  state = {
    error: false,
@@ -61,22 +59,20 @@ class LockedScreen extends Component {
    return (
      <div className="auth">
        <div className="auth__layout">
-          <div className="auth__container">
+          <Locked
-            <Locked
+            onSubmit={this.onSubmit}
-              onSubmit={this.onSubmit}
+            unlock={this.unlock}
-              unlock={this.unlock}
+            useTouchIdToUnlock={useTouchIdToUnlock}
-              useTouchIdToUnlock={useTouchIdToUnlock}
+            isSubmitting={stores.user.loginRequest.isExecuting}
-              isSubmitting={stores.user.loginRequest.isExecuting}
+            error={this.state.error || {}}
-              error={this.state.error || {}}
+          />
-            />
-          </div>
        </div>
      </div>
    );
  }
 }
-LockedScreen.wrappedComponent.propTypes = {
+LockedScreen.propTypes = {
  actions: PropTypes.shape({
    settings: PropTypes.instanceOf(SettingsStore).isRequired,
  }).isRequired,
@@ -86,4 +82,4 @@ LockedScreen.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default LockedScreen;
+export default inject('stores', 'actions')(observer(LockedScreen));
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js
index 3f8c67fa8..f8351f458 100644
--- a/src/containers/auth/LoginScreen.js
+++ b/src/containers/auth/LoginScreen.js
@@ -6,8 +6,6 @@ import UserStore from '../../stores/UserStore';
 import { globalError as globalErrorPropType } from '../../prop-types';
-@inject('stores', 'actions')
-@observer
 class LoginScreen extends Component {
  static propTypes = {
    error: globalErrorPropType.isRequired,
@@ -25,14 +23,13 @@ class LoginScreen extends Component {
        }
        signupRoute={stores.user.signupRoute}
        passwordRoute={stores.user.passwordRoute}
-        changeServerRoute={stores.user.changeServerRoute}
        error={error}
      />
    );
  }
 }
-LoginScreen.wrappedComponent.propTypes = {
+LoginScreen.propTypes = {
  actions: PropTypes.shape({
    user: PropTypes.instanceOf(UserStore).isRequired,
  }).isRequired,
@@ -41,4 +38,4 @@ LoginScreen.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default LoginScreen;
+export default inject('stores', 'actions')(observer(LoginScreen));
diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js
index 836d4cc88..4b2c1b4a2 100644
--- a/src/containers/auth/PasswordScreen.js
+++ b/src/containers/auth/PasswordScreen.js
@@ -4,8 +4,6 @@ import { inject, observer } from 'mobx-react';
 import Password from '../../components/auth/Password';
 import UserStore from '../../stores/UserStore';
-@inject('stores', 'actions')
-@observer
 class PasswordScreen extends Component {
  render() {
    const { actions, stores } = this.props;
@@ -22,7 +20,7 @@ class PasswordScreen extends Component {
  }
 }
-PasswordScreen.wrappedComponent.propTypes = {
+PasswordScreen.propTypes = {
  actions: PropTypes.shape({
    user: PropTypes.instanceOf(UserStore).isRequired,
  }).isRequired,
@@ -31,4 +29,4 @@ PasswordScreen.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default PasswordScreen;
+export default inject('stores', 'actions')(observer(PasswordScreen));
diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.js
index 8cdd95a88..42c3d6019 100644
--- a/src/containers/auth/SetupAssistantScreen.js
+++ b/src/containers/auth/SetupAssistantScreen.js
@@ -4,18 +4,12 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import { RouterStore } from 'mobx-react-router';
-import {
-  DEFAULT_TODO_RECIPE_ID,
-  DEFAULT_TODO_SERVICE_NAME,
-} from '../../config';
 import { sleep } from '../../helpers/async-helpers';
 import SetupAssistant from '../../components/auth/SetupAssistant';
 import ServicesStore from '../../stores/ServicesStore';
 import RecipesStore from '../../stores/RecipesStore';
 import UserStore from '../../stores/UserStore';
-@inject('stores', 'actions')
-@observer
 class SetupAssistantScreen extends Component {
  constructor(props) {
    super(props);
@@ -65,9 +59,7 @@ class SetupAssistantScreen extends Component {
  };
  async setupServices(serviceConfig) {
-    const {
+    const { stores: { services, router } } = this.props;
-      stores: { services },
-    } = this.props;
    this.setState({
      isSettingUpServices: true,
@@ -93,19 +85,13 @@ class SetupAssistantScreen extends Component {
      await sleep(100);
    }
-    // Add todo service
-    await services._createService({
-      recipeId: DEFAULT_TODO_RECIPE_ID,
-      serviceData: {
-        name: DEFAULT_TODO_SERVICE_NAME,
-      },
-      redirect: false,
-      skipCleanup: true,
-    });
    this.setState({
      isSettingUpServices: false,
    });
+    await sleep(100);
+    router.push("/");
  }
  render() {
@@ -120,7 +106,7 @@ class SetupAssistantScreen extends Component {
  }
 }
-SetupAssistantScreen.wrappedComponent.propTypes = {
+SetupAssistantScreen.propTypes = {
  stores: PropTypes.shape({
    services: PropTypes.instanceOf(ServicesStore),
    router: PropTypes.instanceOf(RouterStore).isRequired,
@@ -134,4 +120,4 @@ SetupAssistantScreen.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default SetupAssistantScreen;
+export default inject('stores', 'actions')(observer(SetupAssistantScreen));
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js
index 3b19f3c50..3824e47d5 100644
--- a/src/containers/auth/SignupScreen.js
+++ b/src/containers/auth/SignupScreen.js
@@ -8,8 +8,6 @@ import FeaturesStore from '../../stores/FeaturesStore';
 import { globalError as globalErrorPropType } from '../../prop-types';
-@inject('stores', 'actions')
-@observer
 class SignupScreen extends Component {
  static propTypes = {
    error: globalErrorPropType.isRequired,
@@ -29,14 +27,13 @@ class SignupScreen extends Component {
        onSubmit={values => this.onSignup(values)}
        isSubmitting={stores.user.signupRequest.isExecuting}
        loginRoute={stores.user.loginRoute}
-        changeServerRoute={stores.user.changeServerRoute}
        error={error}
      />
    );
  }
 }
-SignupScreen.wrappedComponent.propTypes = {
+SignupScreen.propTypes = {
  actions: PropTypes.shape({
    user: PropTypes.instanceOf(UserStore).isRequired,
  }).isRequired,
@@ -46,4 +43,4 @@ SignupScreen.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default SignupScreen;
+export default inject('stores', 'actions')(observer(SignupScreen));
diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js
index 7a23d9ba9..18b6b2eda 100644
--- a/src/containers/auth/WelcomeScreen.js
+++ b/src/containers/auth/WelcomeScreen.js
@@ -6,8 +6,6 @@ import Welcome from '../../components/auth/Welcome';
 import UserStore from '../../stores/UserStore';
 import RecipePreviewsStore from '../../stores/RecipePreviewsStore';
-@inject('stores', 'actions')
-@observer
 class LoginScreen extends Component {
  render() {
    const { user, recipePreviews } = this.props.stores;
@@ -23,11 +21,11 @@ class LoginScreen extends Component {
  }
 }
-LoginScreen.wrappedComponent.propTypes = {
+LoginScreen.propTypes = {
  stores: PropTypes.shape({
    user: PropTypes.instanceOf(UserStore).isRequired,
    recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired,
  }).isRequired,
 };
-export default LoginScreen;
+export default inject('stores', 'actions')(observer(LoginScreen));
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 50a28803f..9b0edc85e 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -24,8 +24,6 @@ import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawe
 import { workspaceStore } from '../../features/workspaces';
 import WorkspacesStore from '../../features/workspaces/store';
-@inject('stores', 'actions')
-@observer
 class AppLayoutContainer extends Component {
  static defaultProps = {
    children: null,
@@ -171,7 +169,7 @@ class AppLayoutContainer extends Component {
  }
 }
-AppLayoutContainer.wrappedComponent.propTypes = {
+AppLayoutContainer.propTypes = {
  stores: PropTypes.shape({
    services: PropTypes.instanceOf(ServicesStore).isRequired,
    features: PropTypes.instanceOf(FeaturesStore).isRequired,
@@ -194,4 +192,4 @@ AppLayoutContainer.wrappedComponent.propTypes = {
  children: oneOrManyChildElements,
 };
-export default AppLayoutContainer;
+export default inject('stores', 'actions')(observer(AppLayoutContainer));
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index f7c9b8164..aae230577 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -12,8 +12,6 @@ import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { LIVE_FRANZ_API } from '../../config';
 import { WEBSITE } from '../../environment-remote';
-@inject('stores', 'actions')
-@observer
 class AccountScreen extends Component {
  onCloseWindow() {
    const { user, features } = this.props.stores;
@@ -74,7 +72,7 @@ class AccountScreen extends Component {
  }
 }
-AccountScreen.wrappedComponent.propTypes = {
+AccountScreen.propTypes = {
  stores: PropTypes.shape({
    user: PropTypes.instanceOf(UserStore).isRequired,
    features: PropTypes.instanceOf(FeaturesStore).isRequired,
@@ -87,4 +85,4 @@ AccountScreen.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default AccountScreen;
+export default inject('stores', 'actions')(observer(AccountScreen));
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index ddf7fab36..24b827993 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -111,8 +111,6 @@ const messages = defineMessages({
  },
 });
-@inject('stores', 'actions')
-@observer
 class EditServiceScreen extends Component {
  onSubmit(data) {
    const { action } = this.props.router.params;
@@ -438,7 +436,7 @@ class EditServiceScreen extends Component {
  }
 }
-EditServiceScreen.wrappedComponent.propTypes = {
+EditServiceScreen.propTypes = {
  stores: PropTypes.shape({
    user: PropTypes.instanceOf(UserStore).isRequired,
    recipes: PropTypes.instanceOf(RecipesStore).isRequired,
@@ -451,4 +449,6 @@ EditServiceScreen.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default injectIntl(EditServiceScreen);
+export default injectIntl(
+  inject('stores', 'actions')(observer(EditServiceScreen)),
+);
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 64f5b2e01..ddf6876b9 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -20,6 +20,8 @@ import {
  DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED,
  DEFAULT_IS_FEATURE_ENABLED_BY_USER,
  WAKE_UP_STRATEGIES,
+  SPLIT_COLUMNS_MIN,
+  SPLIT_COLUMNS_MAX,
 } from '../../config';
 import { isMac } from '../../environment';
@@ -169,6 +171,10 @@ const messages = defineMessages({
    id: 'settings.app.form.splitMode',
    defaultMessage: 'Enable Split View Mode',
  },
+  splitColumns: {
+    id: 'settings.app.form.splitColumns',
+    defaultMessage: 'Number of columns',
+  },
  serviceRibbonWidth: {
    id: 'settings.app.form.serviceRibbonWidth',
    defaultMessage: 'Sidebar width',
@@ -239,8 +245,6 @@ const messages = defineMessages({
  },
 });
-@inject('stores', 'actions')
-@observer
 class EditSettingsScreen extends Component {
  constructor(props) {
    super(props);
@@ -310,6 +314,7 @@ class EditSettingsScreen extends Component {
        adaptableDarkMode: Boolean(settingsData.adaptableDarkMode),
        universalDarkMode: Boolean(settingsData.universalDarkMode),
        splitMode: Boolean(settingsData.splitMode),
+        splitColumns: Number(settingsData.splitColumns),
        serviceRibbonWidth: Number(settingsData.serviceRibbonWidth),
        iconSize: Number(settingsData.iconSize),
        enableLongPressServiceHint: Boolean(
@@ -613,6 +618,13 @@ class EditSettingsScreen extends Component {
          value: settings.all.app.splitMode,
          default: DEFAULT_APP_SETTINGS.splitMode,
        },
+        splitColumns: {
+          label: `${intl.formatMessage(
+            messages.splitColumns,
+          )} (${SPLIT_COLUMNS_MIN}-${SPLIT_COLUMNS_MAX})`,
+          value: settings.all.app.splitColumns,
+          default: DEFAULT_APP_SETTINGS.splitColumns,
+        },
        serviceRibbonWidth: {
          label: intl.formatMessage(messages.serviceRibbonWidth),
          value: settings.all.app.serviceRibbonWidth,
@@ -725,6 +737,7 @@ class EditSettingsScreen extends Component {
          isAdaptableDarkModeEnabled={
            this.props.stores.settings.app.adaptableDarkMode
          }
+          isSplitModeEnabled={this.props.stores.settings.app.splitMode}
          isTodosActivated={this.props.stores.todos.isFeatureEnabledByUser}
          isUsingCustomTodoService={
            this.props.stores.todos.isUsingCustomTodoService
@@ -738,7 +751,7 @@ class EditSettingsScreen extends Component {
  }
 }
-EditSettingsScreen.wrappedComponent.propTypes = {
+EditSettingsScreen.propTypes = {
  stores: PropTypes.shape({
    app: PropTypes.instanceOf(AppStore).isRequired,
    user: PropTypes.instanceOf(UserStore).isRequired,
@@ -756,4 +769,6 @@ EditSettingsScreen.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default injectIntl(EditSettingsScreen);
+export default injectIntl(
+  inject('stores', 'actions')(observer(EditSettingsScreen)),
+);
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index 1dc0aa8e6..baa2d7b71 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -49,8 +49,6 @@ const messages = defineMessages({
  },
 });
-@inject('stores', 'actions')
-@observer
 class EditUserScreen extends Component {
  componentWillUnmount() {
    this.props.actions.user.resetStatus();
@@ -150,7 +148,7 @@ class EditUserScreen extends Component {
  }
 }
-EditUserScreen.wrappedComponent.propTypes = {
+EditUserScreen.propTypes = {
  stores: PropTypes.shape({
    user: PropTypes.instanceOf(UserStore).isRequired,
  }).isRequired,
@@ -159,4 +157,6 @@ EditUserScreen.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default injectIntl(EditUserScreen);
+export default injectIntl(
+  inject('stores', 'actions')(observer(EditUserScreen)),
+);
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js
index 592b4b11c..86723554c 100644
--- a/src/containers/settings/InviteScreen.js
+++ b/src/containers/settings/InviteScreen.js
@@ -6,8 +6,6 @@ import Invite from '../../components/auth/Invite';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import UserStore from '../../stores/UserStore';
-@inject('stores', 'actions')
-@observer
 class InviteScreen extends Component {
  componentWillUnmount() {
    this.props.stores.user.inviteRequest.reset();
@@ -32,7 +30,7 @@ class InviteScreen extends Component {
  }
 }
-InviteScreen.wrappedComponent.propTypes = {
+InviteScreen.propTypes = {
  actions: PropTypes.shape({
    user: PropTypes.instanceOf(UserStore).isRequired,
  }).isRequired,
@@ -41,4 +39,4 @@ InviteScreen.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default InviteScreen;
+export default inject('stores', 'actions')(observer(InviteScreen));
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index 7f55e54c5..6b629d3d8 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -19,8 +19,6 @@ import RecipePreview from '../../models/RecipePreview';
 import AppStore from '../../stores/AppStore';
 import { openPath } from '../../helpers/url-helpers';
-@inject('stores', 'actions')
-@observer
 class RecipesScreen extends Component {
  static propTypes = {
    params: PropTypes.shape({
@@ -182,7 +180,7 @@ class RecipesScreen extends Component {
  }
 }
-RecipesScreen.wrappedComponent.propTypes = {
+RecipesScreen.propTypes = {
  stores: PropTypes.shape({
    recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired,
    recipes: PropTypes.instanceOf(RecipeStore).isRequired,
@@ -198,4 +196,4 @@ RecipesScreen.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default RecipesScreen;
+export default inject('stores', 'actions')(observer(RecipesScreen));
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js
index a657b6e6c..2970b2a54 100644
--- a/src/containers/settings/ServicesScreen.js
+++ b/src/containers/settings/ServicesScreen.js
@@ -10,8 +10,6 @@ import ServiceStore from '../../stores/ServicesStore';
 import ServicesDashboard from '../../components/settings/services/ServicesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
-@inject('stores', 'actions')
-@observer
 class ServicesScreen extends Component {
  componentWillUnmount() {
    this.props.actions.service.resetFilter();
@@ -57,7 +55,7 @@ class ServicesScreen extends Component {
  }
 }
-ServicesScreen.wrappedComponent.propTypes = {
+ServicesScreen.propTypes = {
  stores: PropTypes.shape({
    user: PropTypes.instanceOf(UserStore).isRequired,
    services: PropTypes.instanceOf(ServiceStore).isRequired,
@@ -68,4 +66,4 @@ ServicesScreen.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default ServicesScreen;
+export default inject('stores', 'actions')(observer(ServicesScreen));
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js
index 35db3a434..0e6ce4df3 100644
--- a/src/containers/settings/SettingsWindow.js
+++ b/src/containers/settings/SettingsWindow.js
@@ -11,8 +11,6 @@ import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { workspaceStore } from '../../features/workspaces';
 import UIStore from '../../stores/UIStore';
-@inject('stores', 'actions')
-@observer
 class SettingsContainer extends Component {
  portalRoot = document.querySelector('#portalContainer');
@@ -48,7 +46,7 @@ class SettingsContainer extends Component {
  }
 }
-SettingsContainer.wrappedComponent.propTypes = {
+SettingsContainer.propTypes = {
  children: PropTypes.element.isRequired,
  stores: PropTypes.shape({
    services: PropTypes.instanceOf(ServicesStore).isRequired,
@@ -58,4 +56,4 @@ SettingsContainer.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default SettingsContainer;
+export default inject('stores', 'actions')(observer(SettingsContainer));
diff --git a/src/containers/settings/SupportScreen.js b/src/containers/settings/SupportScreen.js
index d3600f8ea..b4ad952b2 100644
--- a/src/containers/settings/SupportScreen.js
+++ b/src/containers/settings/SupportScreen.js
@@ -6,7 +6,6 @@ import SupportFerdi from '../../components/settings/supportFerdi/SupportFerdiDas
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import AppStore from '../../stores/AppStore';
-@inject('actions')
 class SupportScreen extends Component {
  constructor(props) {
    super(props);
@@ -27,10 +26,10 @@ class SupportScreen extends Component {
  }
 }
-SupportScreen.wrappedComponent.propTypes = {
+SupportScreen.propTypes = {
  actions: PropTypes.shape({
    app: PropTypes.instanceOf(AppStore).isRequired,
  }).isRequired,
 };
-export default SupportScreen;
+export default inject('actions')(SupportScreen);
diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js
index 928262a59..0a8b92b47 100644
--- a/src/containers/settings/TeamScreen.js
+++ b/src/containers/settings/TeamScreen.js
@@ -10,8 +10,6 @@ import TeamDashboard from '../../components/settings/team/TeamDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { DEV_API_FRANZ_WEBSITE } from '../../config';
-@inject('stores', 'actions')
-@observer
 class TeamScreen extends Component {
  handleWebsiteLink(route) {
    const { actions, stores } = this.props;
@@ -44,7 +42,7 @@ class TeamScreen extends Component {
  }
 }
-TeamScreen.wrappedComponent.propTypes = {
+TeamScreen.propTypes = {
  stores: PropTypes.shape({
    user: PropTypes.instanceOf(UserStore).isRequired,
    app: PropTypes.instanceOf(AppStore).isRequired,
@@ -56,4 +54,4 @@ TeamScreen.wrappedComponent.propTypes = {
  }).isRequired,
 };
-export default TeamScreen;
+export default inject('stores', 'actions')(observer(TeamScreen));
diff --git a/src/electron/ipc-api/download.ts b/src/electron/ipc-api/download.ts
index af15b157e..95f211e52 100644
--- a/src/electron/ipc-api/download.ts
+++ b/src/electron/ipc-api/download.ts
@@ -48,7 +48,7 @@ export default (params: { mainWindow: BrowserWindow }) => {
            debug('File blob saved to', saveDialog.filePath);
          } catch (error) {
-            console.log(error);
+            console.error(error);
          }
        }
      } catch (error) {
diff --git a/src/features/appearance/index.ts b/src/features/appearance/index.ts
index 21c9554ed..122fa2411 100644
--- a/src/features/appearance/index.ts
+++ b/src/features/appearance/index.ts
@@ -38,7 +38,6 @@ function generateAccentStyle(accentColorStr) {
    .theme__dark .app .sidebar .sidebar__button.is-active,
    .sidebar .sidebar__button.is-muted,
    .sidebar .sidebar__button.is-active,
-    .tab-item.is-active,
    .settings .account .invoices .invoices__action button,
    .settings-navigation .settings-navigation__link.is-active .badge,
    a.link,
@@ -56,12 +55,10 @@ function generateAccentStyle(accentColorStr) {
    .settings-navigation .settings-navigation__link.is-active,
    a.button,
    button.button,
-    .auth,
    .info-bar,
    .info-bar.info-bar--primary,
    .infobox.infobox--primary,
    .theme__dark .badge.badge--primary,
-    .theme__dark,
    .badge.badge--primary,
    .content-tabs .content-tabs__tabs .content-tabs__item.is-active,
    #electron-app-title-bar .toolbar-dropdown:not(.open) > .toolbar-button > button:hover,
@@ -80,7 +77,7 @@ function generateAccentStyle(accentColorStr) {
      border-right-color: ${accentColorStr};
    }
-    .franz-form .franz-form__radio.is-selected {
+    .franz-form .franz-form__radio.is-selected, .tab-item.is-active {
      border-color: ${accentColorStr};
    }
@@ -109,12 +106,17 @@ function generateAccentStyle(accentColorStr) {
    }
    .tab-item.is-active {
-      background: ${accentColor.lighten(0.35).hex()};
+      background: ${accentColor.lightness(90).hex()};
    }
  `;
 }
-function generateServiceRibbonWidthStyle(widthStr, iconSizeStr, vertical, isLabelEnabled) {
+function generateServiceRibbonWidthStyle(
+  widthStr,
+  iconSizeStr,
+  vertical,
+  isLabelEnabled,
+) {
  const width = Number(widthStr);
  const iconSize = Number(iconSizeStr) - iconSizeBias;
  let fontSize = 11;
@@ -122,33 +124,33 @@ function generateServiceRibbonWidthStyle(widthStr, iconSizeStr, vertical, isLabe
  let sidebarSizeBias = 22;
  const tabItemWidthBias = 2;
-  switch(width){
+  switch (width) {
-    case (35): 
+    case 35:
      fontSize = 9;
      tabItemHeightBias = 25;
      sidebarSizeBias = 48;
      break;
-    case (45):
+    case 45:
-        fontSize = 10;
+      fontSize = 10;
-        tabItemHeightBias = 21;
+      tabItemHeightBias = 21;
-        sidebarSizeBias = 44;
+      sidebarSizeBias = 44;
-        break;
+      break;
-    case (55):
+    case 55:
      fontSize = 11;
      tabItemHeightBias = 13;
      sidebarSizeBias = 37;
      break;
-    case (80):
+    case 80:
      fontSize = 11;
      tabItemHeightBias = 3;
      sidebarSizeBias = 27;
      break;
-    case (90):
+    case 90:
      fontSize = 12;
      tabItemHeightBias = 0;
      sidebarSizeBias = 25;
      break;
-    case (100):
+    case 100:
      fontSize = 13;
      tabItemHeightBias = 2;
      sidebarSizeBias = 25;
@@ -159,11 +161,14 @@ function generateServiceRibbonWidthStyle(widthStr, iconSizeStr, vertical, isLabe
      sidebarSizeBias = 37;
  }
-  if(!isLabelEnabled){
+  if (!isLabelEnabled) {
    sidebarSizeBias = 22;
    tabItemHeightBias = -5;
  }
+  // Due to the lowest values for SIDEBAR_WIDTH and ICON_SIZES, this can be computed to a negative value
+  const minimumAdjustedIconSize = Math.max(width / 2 + iconSize, 2);
  return vertical
    ? `
    .sidebar {
@@ -171,13 +176,13 @@ function generateServiceRibbonWidthStyle(widthStr, iconSizeStr, vertical, isLabe
      overflow: hidden !important;
    }
    .tab-item {
-      width: ${width - tabItemWidthBias}px !important;
+      height: ${width - tabItemWidthBias}px !important;
-      height: ${width + iconSize + tabItemHeightBias}px !important;
+      width: ${width + iconSize + tabItemHeightBias}px !important;
      min-height: unset;
      overflow: hidden !important;
    }
    .tab-item .tab-item__icon {
-      width: ${width / 2 + iconSize}px !important;
+      width: ${minimumAdjustedIconSize}px !important;
    }
    .sidebar__button {
      font-size: ${width / 3}px !important;
@@ -210,7 +215,7 @@ function generateServiceRibbonWidthStyle(widthStr, iconSizeStr, vertical, isLabe
      height: min-content !important;
    }
    .tab-item .tab-item__icon {
-      width: ${width / 2 + iconSize}px !important;
+      width: ${minimumAdjustedIconSize}px !important;
    }
    .sidebar__button {
      font-size: ${width / 3}px !important;
@@ -314,7 +319,7 @@ function generateStyle(settings) {
      serviceRibbonWidth,
      iconSize,
      useVerticalStyle,
-      showServiceName
+      showServiceName,
    );
  }
  if (showDragArea) {
diff --git a/src/features/basicAuth/Component.js b/src/features/basicAuth/Component.js
index 652233e55..89b0a4e72 100644
--- a/src/features/basicAuth/Component.js
+++ b/src/features/basicAuth/Component.js
@@ -22,8 +22,6 @@ const messages = defineMessages({
  },
 });
-@injectSheet(styles)
-@observer
 class BasicAuthModal extends Component {
  static propTypes = {
    classes: PropTypes.object.isRequired,
@@ -97,4 +95,6 @@ class BasicAuthModal extends Component {
    );
  }
 }
-export default injectIntl(BasicAuthModal);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(BasicAuthModal)),
+);
diff --git a/src/features/basicAuth/index.ts b/src/features/basicAuth/index.ts
index 149ab6c19..8e8fa186c 100644
--- a/src/features/basicAuth/index.ts
+++ b/src/features/basicAuth/index.ts
@@ -1,7 +1,5 @@
 import { AuthInfo, BrowserWindow, ipcRenderer } from 'electron';
-import BasicAuthComponent from './Component';
 import { state as ModalState } from './store';
 const debug = require('debug')('Ferdi:feature:basicAuth');
@@ -31,4 +29,4 @@ export function mainIpcHandler(mainWindow: BrowserWindow, authInfo: AuthInfo) {
  });
 }
-export const Component = BasicAuthComponent;
+export { default as Component } from './Component';
diff --git a/src/features/communityRecipes/store.ts b/src/features/communityRecipes/store.ts
index a8d358ba0..c7a51c311 100644
--- a/src/features/communityRecipes/store.ts
+++ b/src/features/communityRecipes/store.ts
@@ -26,7 +26,7 @@ export class CommunityRecipesStore extends FeatureStore {
      (recipePreview: { isDevRecipe: boolean; author: any[] }) => {
        // TODO: Need to figure out if this is even necessary/used
        recipePreview.isDevRecipe = !!recipePreview.author.some(
-          (author: { email: any }) =>
+          (author: { email: string }) =>
            author.email === this.stores.user.data.email,
        );
diff --git a/src/features/nightlyBuilds/Component.js b/src/features/nightlyBuilds/Component.js
index 64f782c8f..216e35f65 100644
--- a/src/features/nightlyBuilds/Component.js
+++ b/src/features/nightlyBuilds/Component.js
@@ -29,14 +29,20 @@ const messages = defineMessages({
  },
 });
-const styles = () => ({
+const styles = theme => ({
+  modal: {
+    width: '80%',
+    maxWidth: 600,
+    background: theme.styleTypes.primary.contrast,
+    paddingTop: 30,
+  },
  info: {
-    paddingTop: 20,
    paddingBottom: 20,
  },
  headline: {
    fontSize: 20,
    marginBottom: 20,
+    marginTop: -27,
  },
  buttonContainer: {
    display: 'flex',
@@ -53,9 +59,6 @@ const styles = () => ({
  },
 });
-@injectSheet(styles)
-@inject('stores', 'actions')
-@observer
 class NightlyBuildsModal extends Component {
  close() {
    ModalState.isModalVisible = false;
@@ -91,6 +94,7 @@ class NightlyBuildsModal extends Component {
    return (
      <Modal
        isOpen={isModalVisible}
+        className={`${classes.modal} nightly-builds`}
        shouldCloseOnOverlayClick
        close={this.close.bind(this)}
      >
@@ -119,7 +123,7 @@ class NightlyBuildsModal extends Component {
  }
 }
-NightlyBuildsModal.wrappedComponent.propTypes = {
+NightlyBuildsModal.propTypes = {
  stores: PropTypes.shape({
    settings: PropTypes.instanceOf(SettingsStore).isRequired,
  }).isRequired,
@@ -131,4 +135,8 @@ NightlyBuildsModal.wrappedComponent.propTypes = {
  classes: PropTypes.object.isRequired,
 };
-export default injectIntl(NightlyBuildsModal);
+export default injectIntl(
+  injectSheet(styles)(
+    inject('stores', 'actions')(observer(NightlyBuildsModal)),
+  ),
+);
diff --git a/src/features/publishDebugInfo/Component.js b/src/features/publishDebugInfo/Component.js
index 30bdc13b6..2b9af01a7 100644
--- a/src/features/publishDebugInfo/Component.js
+++ b/src/features/publishDebugInfo/Component.js
@@ -8,7 +8,7 @@ import { state as ModalState } from './store';
 import { H1 } from '../../components/ui/headline';
 import { sendAuthRequest } from '../../api/utils/auth';
 import Button from '../../components/ui/Button';
-import Input from '../../components/ui/Input';
+import { Input } from '../../components/ui/input/index';
 import Modal from '../../components/ui/Modal';
 import { DEBUG_API } from '../../config';
 import AppStore from '../../stores/AppStore';
@@ -50,11 +50,18 @@ const messages = defineMessages({
 });
 const styles = theme => ({
-  container: {
+  modal: {
-    minWidth: '70vw',
+    width: '80%',
+    maxWidth: 600,
+    background: theme.styleTypes.primary.contrast,
+    paddingTop: 30,
+  },
+  headline: {
+    fontSize: 20,
+    marginBottom: 20,
+    marginTop: -27,
  },
  info: {
-    paddingTop: 20,
    paddingBottom: 20,
  },
  link: {
@@ -67,32 +74,9 @@ const styles = theme => ({
    marginTop: 10,
    cursor: 'pointer',
  },
-  url: {
-    marginTop: 20,
-    width: '100%',
-    '& div': {
-      fontFamily:
-        'SFMono-Regular,Consolas,Liberation Mono,Menlo,Courier,monospace',
-    },
-    '& input': {
-      width: '100%',
-      padding: 15,
-      borderRadius: 6,
-      border: `solid 1px ${theme.styleTypes.primary.accent}`,
-    },
-  },
 });
-@injectSheet(styles)
-@inject('stores', 'actions')
-@observer
 class PublishDebugLogModal extends Component {
-  static propTypes = {
-    classes: PropTypes.object.isRequired,
-  };
  state = {
    log: null,
    error: false,
@@ -102,6 +86,11 @@ class PublishDebugLogModal extends Component {
  // Close this modal
  close() {
    ModalState.isModalVisible = false;
+    this.setState({
+      log: null,
+      error: false,
+      isSendingLog: false
+    });
  }
  async publishDebugInfo() {
@@ -157,77 +146,76 @@ class PublishDebugLogModal extends Component {
      <Modal
        isOpen={isModalVisible}
        shouldCloseOnOverlayClick
+        className={`${classes.modal} publish-debug`}
        close={() => this.close()}
      >
-        <div className={classes.container}>
+        <H1 className={classes.headline}>{intl.formatMessage(messages.title)}</H1>
-          <H1>{intl.formatMessage(messages.title)}</H1>
+        {log && (
-          {log && (
+          <>
-            <>
+            <p className={classes.info}>
-              <p className={classes.info}>
+              {intl.formatMessage(messages.published)}
-                {intl.formatMessage(messages.published)}
+            </p>
-              </p>
+            <Input
-              <Input
+              showLabel={false}
-                className={classes.url}
+              value={`${DEBUG_API}/${log}`}
-                showLabel={false}
+              readonly
-                field={{
+            />
-                  type: 'url',
+          </>
-                  value: `${DEBUG_API}/${log}`,
+        )}
-                  disabled: true,
-                }}
+        {error && (
-                readonly
+          <p className={classes.info}>{intl.formatMessage(messages.error)}</p>
-              />
+        )}
-            </>
-          )}
+        {!log && !error && (
+          <>
-          {error && (
+            <p className={classes.info}>
-            <p className={classes.info}>{intl.formatMessage(messages.error)}</p>
+              {intl.formatMessage(messages.info)}
-          )}
+            </p>
-          {!log && !error && (
+            <a
-            <>
+              href={`${DEBUG_API}/privacy.html`}
-              <p className={classes.info}>
+              target="_blank"
-                {intl.formatMessage(messages.info)}
+              className={classes.link}
-              </p>
+              rel="noreferrer"
+            >
-              <a
+              {intl.formatMessage(messages.privacy)}
-                href={`${DEBUG_API}/privacy.html`}
+            </a>
-                target="_blank"
+            <a
-                className={classes.link}
+              href={`${DEBUG_API}/terms.html`}
-                rel="noreferrer"
+              target="_blank"
-              >
+              className={classes.link}
-                {intl.formatMessage(messages.privacy)}
+              rel="noreferrer"
-              </a>
+            >
-              <a
+              {intl.formatMessage(messages.terms)}
-                href={`${DEBUG_API}/terms.html`}
+            </a>
-                target="_blank"
-                className={classes.link}
+            <Button
-                rel="noreferrer"
+              type="button"
-              >
+              label={intl.formatMessage(messages.publish)}
-                {intl.formatMessage(messages.terms)}
+              className={classes.button}
-              </a>
+              onClick={() => this.publishDebugInfo()}
+              disabled={isSendingLog}
-              <Button
+            />
-                type="button"
+          </>
-                label={intl.formatMessage(messages.publish)}
+        )}
-                className={classes.button}
-                onClick={() => this.publishDebugInfo()}
-                disabled={isSendingLog}
-              />
-            </>
-          )}
-        </div>
      </Modal>
    );
  }
 }
-PublishDebugLogModal.wrappedComponent.propTypes = {
+PublishDebugLogModal.propTypes = {
  stores: PropTypes.shape({
    app: PropTypes.instanceOf(AppStore).isRequired,
  }).isRequired,
  actions: PropTypes.shape({
    service: PropTypes.instanceOf(ServicesStore).isRequired,
  }).isRequired,
+  classes: PropTypes.object.isRequired,
 };
-export default injectIntl(PublishDebugLogModal);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(
+    inject('stores', 'actions')(observer(PublishDebugLogModal)),
+  ),
+);
diff --git a/src/features/publishDebugInfo/index.js b/src/features/publishDebugInfo/index.ts
index 43841b530..43841b530 100644
--- a/src/features/publishDebugInfo/index.js
+++ b/src/features/publishDebugInfo/index.ts
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
index d5cb9179f..9e66c444d 100644
--- a/src/features/quickSwitch/Component.js
+++ b/src/features/quickSwitch/Component.js
@@ -34,7 +34,6 @@ const styles = theme => ({
    width: '80%',
    maxWidth: 600,
    background: theme.styleTypes.primary.contrast,
-    color: theme.styleTypes.primary.accent,
    paddingTop: 30,
  },
  headline: {
@@ -51,9 +50,6 @@ const styles = theme => ({
  service: {
    background: theme.styleTypes.primary.contrast,
    color: theme.colorText,
-    borderColor: theme.styleTypes.primary.accent,
-    borderStyle: 'solid',
-    borderWidth: 1,
    borderRadius: 6,
    padding: '3px 25px',
    marginBottom: 10,
@@ -63,13 +59,11 @@ const styles = theme => ({
      marginBottom: 0,
    },
    '&:hover': {
-      background: theme.styleTypes.primary.accent,
-      color: theme.styleTypes.primary.contrast,
      cursor: 'pointer',
    },
  },
  activeService: {
-    background: theme.styleTypes.primary.accent,
+    background: `${theme.styleTypes.primary.accent} !important`,
    color: theme.styleTypes.primary.contrast,
    cursor: 'pointer',
  },
@@ -81,9 +75,6 @@ const styles = theme => ({
  },
 });
-@injectSheet(styles)
-@inject('stores', 'actions')
-@observer
 class QuickSwitchModal extends Component {
  static propTypes = {
    classes: PropTypes.object.isRequired,
@@ -99,8 +90,6 @@ class QuickSwitchModal extends Component {
  ARROW_UP = 38;
-  SHIFT = 16;
  ENTER = 13;
  TAB = 9;
@@ -149,7 +138,7 @@ class QuickSwitchModal extends Component {
          service.name.toLowerCase().search(this.state.search.toLowerCase()) !==
          -1,
      );
-    } else {
+    } else if (this.props.stores.services.allDisplayed.length > 0) {
      // Add the currently active service first
      const currentService = this.props.stores.services.active;
      if (currentService) {
@@ -351,13 +340,18 @@ class QuickSwitchModal extends Component {
  }
 }
-QuickSwitchModal.wrappedComponent.propTypes = {
+QuickSwitchModal.propTypes = {
  stores: PropTypes.shape({
    services: PropTypes.instanceOf(ServicesStore).isRequired,
  }).isRequired,
  actions: PropTypes.shape({
    service: PropTypes.instanceOf(ServicesStore).isRequired,
  }).isRequired,
+  classes: PropTypes.object.isRequired,
 };
-export default injectIntl(QuickSwitchModal);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(
+    inject('stores', 'actions')(observer(QuickSwitchModal)),
+  ),
+);
diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js
index 1d423544b..780864b91 100644
--- a/src/features/todos/components/TodosWebview.js
+++ b/src/features/todos/components/TodosWebview.js
@@ -48,8 +48,6 @@ const styles = theme => ({
  },
 });
-@injectSheet(styles)
-@observer
 class TodosWebview extends Component {
  static propTypes = {
    classes: PropTypes.object.isRequired,
@@ -128,7 +126,6 @@ class TodosWebview extends Component {
    const { handleClientMessage } = this.props;
    if (!this.webview) return;
    this.webview.addEventListener('ipc-message', e => {
-      // console.log(e);
      handleClientMessage({ channel: e.channel, message: e.args[0] });
    });
  }
@@ -201,4 +198,6 @@ class TodosWebview extends Component {
  }
 }
-export default TodosWebview;
+export default injectSheet(styles, { injectTheme: true })(
+  observer(TodosWebview),
+);
diff --git a/src/features/todos/containers/TodosScreen.js b/src/features/todos/containers/TodosScreen.js
index 536810d2d..b97506767 100644
--- a/src/features/todos/containers/TodosScreen.js
+++ b/src/features/todos/containers/TodosScreen.js
@@ -10,8 +10,6 @@ import { TODOS_MIN_WIDTH } from '../../../config';
 import { todoActions } from '../actions';
 import ServicesStore from '../../../stores/ServicesStore';
-@inject('stores', 'actions')
-@observer
 class TodosScreen extends Component {
  render() {
    if (
@@ -44,9 +42,9 @@ class TodosScreen extends Component {
  }
 }
-export default TodosScreen;
+export default inject('stores', 'actions')(observer(TodosScreen));
-TodosScreen.wrappedComponent.propTypes = {
+TodosScreen.propTypes = {
  stores: PropTypes.shape({
    features: PropTypes.instanceOf(FeaturesStore).isRequired,
    services: PropTypes.instanceOf(ServicesStore).isRequired,
diff --git a/src/features/todos/store.js b/src/features/todos/store.js
index d158ed480..2bf4e8fab 100644
--- a/src/features/todos/store.js
+++ b/src/features/todos/store.js
@@ -187,10 +187,6 @@ export default class TodoStore extends FeatureStore {
        break;
      default:
        debug('Other message received', channel, message);
-        console.log(
-          'this.stores.services.isTodosServiceAdded',
-          this.stores.services.isTodosServiceAdded,
-        );
        if (this.stores.services.isTodosServiceAdded) {
          this.actions.service.handleIPCMessage({
            serviceId: this.stores.services.isTodosServiceAdded.id,
diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js
index 5650d4cd1..99d78eda0 100644
--- a/src/features/webControls/components/WebControls.js
+++ b/src/features/webControls/components/WebControls.js
@@ -94,8 +94,6 @@ const styles = theme => ({
  },
 });
-@injectSheet(styles)
-@observer
 class WebControls extends Component {
  static propTypes = {
    classes: PropTypes.object.isRequired,
@@ -238,4 +236,6 @@ class WebControls extends Component {
  }
 }
-export default injectIntl(WebControls);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(WebControls)),
+);
diff --git a/src/features/webControls/containers/WebControlsScreen.js b/src/features/webControls/containers/WebControlsScreen.js
index 6fba5db86..3dac6997c 100644
--- a/src/features/webControls/containers/WebControlsScreen.js
+++ b/src/features/webControls/containers/WebControlsScreen.js
@@ -16,8 +16,6 @@ const URL_EVENTS = [
  'did-navigate-in-page',
 ];
-@inject('stores', 'actions')
-@observer
 class WebControlsScreen extends Component {
  @observable url = '';
@@ -125,9 +123,9 @@ class WebControlsScreen extends Component {
  }
 }
-export default WebControlsScreen;
+export default inject('stores', 'actions')(observer(WebControlsScreen));
-WebControlsScreen.wrappedComponent.propTypes = {
+WebControlsScreen.propTypes = {
  service: PropTypes.instanceOf(Service).isRequired,
  stores: PropTypes.shape({
    services: PropTypes.instanceOf(ServicesStore).isRequired,
diff --git a/src/features/workspaces/components/CreateWorkspaceForm.js b/src/features/workspaces/components/CreateWorkspaceForm.js
index 75f6d9f4a..898afb22e 100644
--- a/src/features/workspaces/components/CreateWorkspaceForm.js
+++ b/src/features/workspaces/components/CreateWorkspaceForm.js
@@ -21,7 +21,7 @@ const messages = defineMessages({
  },
 });
-const styles = () => ({
+const styles = {
  form: {
    display: 'flex',
  },
@@ -32,10 +32,8 @@ const styles = () => ({
  submitButton: {
    height: 'inherit',
  },
-});
+};
-@injectSheet(styles)
-@observer
 class CreateWorkspaceForm extends Component {
  static propTypes = {
    classes: PropTypes.object.isRequired,
@@ -82,7 +80,7 @@ class CreateWorkspaceForm extends Component {
          focus={workspaceStore.isUserAllowedToUseFeature}
        />
        <Button
-          className={classes.submitButton}
+          className={`${classes.submitButton} franz-form__button`}
          type="submit"
          label={intl.formatMessage(messages.submitButton)}
          onClick={this.submitForm.bind(this, form)}
@@ -94,4 +92,6 @@ class CreateWorkspaceForm extends Component {
  }
 }
-export default injectIntl(CreateWorkspaceForm);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(CreateWorkspaceForm)),
+);
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js
index fa3ea4289..26b3f83af 100644
--- a/src/features/workspaces/components/EditWorkspaceForm.js
+++ b/src/features/workspaces/components/EditWorkspaceForm.js
@@ -5,6 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router';
 import injectSheet from 'react-jss';
+import { Infobox } from '../../../components/ui/infobox/index';
 import { Input } from '../../../components/ui/input/index';
 import { Button } from '../../../components/ui/button/index';
 import Workspace from '../models/Workspace';
@@ -58,7 +59,7 @@ const messages = defineMessages({
  },
 });
-const styles = () => ({
+const styles = {
  nameInput: {
    height: 'auto',
  },
@@ -68,10 +69,8 @@ const styles = () => ({
  keepLoadedInfo: {
    marginBottom: '2rem !important',
  },
-});
+};
-@injectSheet(styles)
-@observer
 class EditWorkspaceForm extends Component {
  static propTypes = {
    classes: PropTypes.object.isRequired,
@@ -94,7 +93,8 @@ class EditWorkspaceForm extends Component {
  }
  prepareWorkspaceForm(workspace) {
-    const { intl } = this.props;
+    const { intl, updateWorkspaceRequest } = this.props;
+    updateWorkspaceRequest.reset();
    return new Form({
      fields: {
        name: {
@@ -116,6 +116,7 @@ class EditWorkspaceForm extends Component {
  }
  save(form) {
+    this.props.updateWorkspaceRequest.reset();
    form.submit({
      onSuccess: async f => {
        const { onSave } = this.props;
@@ -167,6 +168,14 @@ class EditWorkspaceForm extends Component {
          <span className="settings__header-item">{workspace.name}</span>
        </div>
        <div className="settings__body">
+          {updateWorkspaceRequest.error && (
+            <Infobox
+              icon="alert"
+              type="danger"
+            >
+              Error while saving workspace
+            </Infobox>
+          )}
          <div className={classes.nameInput}>
            <Input {...form.$('name').bind()} />
            <Toggle field={form.$('keepLoaded')} />
@@ -230,4 +239,6 @@ class EditWorkspaceForm extends Component {
  }
 }
-export default injectIntl(EditWorkspaceForm);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(EditWorkspaceForm)),
+);
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js
index d66e0f10d..4fd2b1153 100644
--- a/src/features/workspaces/components/WorkspaceDrawer.js
+++ b/src/features/workspaces/components/WorkspaceDrawer.js
@@ -88,8 +88,6 @@ const styles = theme => ({
  },
 });
-@injectSheet(styles)
-@observer
 class WorkspaceDrawer extends Component {
  static propTypes = {
    classes: PropTypes.object.isRequired,
@@ -175,4 +173,6 @@ class WorkspaceDrawer extends Component {
  }
 }
-export default injectIntl(WorkspaceDrawer);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(WorkspaceDrawer)),
+);
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.js b/src/features/workspaces/components/WorkspaceDrawerItem.js
index d3c9fa767..22c0a39d9 100644
--- a/src/features/workspaces/components/WorkspaceDrawerItem.js
+++ b/src/features/workspaces/components/WorkspaceDrawerItem.js
@@ -65,8 +65,6 @@ const styles = theme => ({
  },
 });
-@injectSheet(styles)
-@observer
 class WorkspaceDrawerItem extends Component {
  static propTypes = {
    classes: PropTypes.object.isRequired,
@@ -150,4 +148,6 @@ class WorkspaceDrawerItem extends Component {
  }
 }
-export default injectIntl(WorkspaceDrawerItem);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(WorkspaceDrawerItem)),
+);
diff --git a/src/features/workspaces/components/WorkspaceItem.tsx b/src/features/workspaces/components/WorkspaceItem.tsx
index 6fb02d2f5..f46375c7a 100644
--- a/src/features/workspaces/components/WorkspaceItem.tsx
+++ b/src/features/workspaces/components/WorkspaceItem.tsx
@@ -22,8 +22,6 @@ type Props = {
  onItemClick: (workspace) => void;
 };
-@injectSheet(styles)
-@observer
 class WorkspaceItem extends Component<Props> {
  static propTypes = {
    classes: PropTypes.object.isRequired,
@@ -42,4 +40,6 @@ class WorkspaceItem extends Component<Props> {
  }
 }
-export default WorkspaceItem;
+export default injectSheet(styles, { injectTheme: true })(
+  observer(WorkspaceItem),
+);
diff --git a/src/features/workspaces/components/WorkspaceServiceListItem.tsx b/src/features/workspaces/components/WorkspaceServiceListItem.tsx
index 6e012eb1e..46fda0103 100644
--- a/src/features/workspaces/components/WorkspaceServiceListItem.tsx
+++ b/src/features/workspaces/components/WorkspaceServiceListItem.tsx
@@ -36,8 +36,6 @@ type Props = {
  service: any;
 };
-@injectSheet(styles)
-@observer
 class WorkspaceServiceListItem extends Component<Props> {
  render() {
    const { classes, isInWorkspace, onToggle, service } = this.props;
@@ -63,4 +61,6 @@ class WorkspaceServiceListItem extends Component<Props> {
  }
 }
-export default WorkspaceServiceListItem;
+export default injectSheet(styles, { injectTheme: true })(
+  observer(WorkspaceServiceListItem),
+);
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
index ff4e9475a..b2e0adfe7 100644
--- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
+++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
@@ -53,8 +53,6 @@ const styles = theme => ({
  },
 });
-@injectSheet(styles)
-@observer
 class WorkspaceSwitchingIndicator extends Component {
  static propTypes = {
    classes: PropTypes.object.isRequired,
@@ -85,4 +83,8 @@ class WorkspaceSwitchingIndicator extends Component {
  }
 }
-export default injectIntl(WorkspaceSwitchingIndicator);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(
+    observer(WorkspaceSwitchingIndicator),
+  ),
+);
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index d41536f31..9c2f65731 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -1,3 +1,4 @@
+/* eslint-disable react/jsx-no-useless-fragment */
 import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react';
@@ -48,7 +49,7 @@ const messages = defineMessages({
  },
 });
-const styles = () => ({
+const styles = {
  table: {
    width: '100%',
    '& td': {
@@ -66,11 +67,8 @@ const styles = () => ({
    margin: [-8, 0, 0, 20],
    alignSelf: 'center',
  },
-});
+};
-@inject('stores')
-@injectSheet(styles)
-@observer
 class WorkspacesDashboard extends Component {
  static propTypes = {
    classes: PropTypes.object.isRequired,
@@ -189,9 +187,13 @@ class WorkspacesDashboard extends Component {
  }
 }
-export default injectIntl(WorkspacesDashboard);
+export default injectIntl(
+  inject('stores')(
+    injectSheet(styles, { injectTheme: true })(observer(WorkspacesDashboard)),
+  ),
+);
-WorkspacesDashboard.wrappedComponent.propTypes = {
+WorkspacesDashboard.propTypes = {
  stores: PropTypes.shape({
    ui: PropTypes.instanceOf(UIStore).isRequired,
  }).isRequired,
diff --git a/src/features/workspaces/containers/EditWorkspaceScreen.tsx b/src/features/workspaces/containers/EditWorkspaceScreen.tsx
index 8e8f8179d..0351ddafb 100644
--- a/src/features/workspaces/containers/EditWorkspaceScreen.tsx
+++ b/src/features/workspaces/containers/EditWorkspaceScreen.tsx
@@ -17,8 +17,6 @@ type Props = {
  };
 };
-@inject('stores', 'actions')
-@observer
 class EditWorkspaceScreen extends Component<Props> {
  // @ts-expect-error Not all code paths return a value.
  onDelete = () => {
@@ -58,4 +56,4 @@ class EditWorkspaceScreen extends Component<Props> {
  }
 }
-export default EditWorkspaceScreen;
+export default inject('stores', 'actions')(observer(EditWorkspaceScreen));
diff --git a/src/features/workspaces/containers/WorkspacesScreen.tsx b/src/features/workspaces/containers/WorkspacesScreen.tsx
index a07e92439..33808b69d 100644
--- a/src/features/workspaces/containers/WorkspacesScreen.tsx
+++ b/src/features/workspaces/containers/WorkspacesScreen.tsx
@@ -17,8 +17,6 @@ type Props = {
  };
 };
-@inject('stores', 'actions')
-@observer
 class WorkspacesScreen extends Component<Props> {
  render() {
    const { actions } = this.props;
@@ -38,4 +36,4 @@ class WorkspacesScreen extends Component<Props> {
  }
 }
-export default WorkspacesScreen;
+export default inject('stores', 'actions')(observer(WorkspacesScreen));
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 17ec17b3a..d6b790bd3 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -199,7 +199,7 @@ export default class WorkspacesStore extends FeatureStore {
            : 'none';
        }
      }
-    }, 1000);
+    }, 500);
  };
  @action _deactivateActiveWorkspace = () => {
@@ -221,7 +221,7 @@ export default class WorkspacesStore extends FeatureStore {
          wrapper.style.display = '';
        }
      }
-    }, 1000);
+    }, 500);
  };
  @action _toggleWorkspaceDrawer = () => {
diff --git a/src/helpers/async-helpers.ts b/src/helpers/async-helpers.ts
index 6b1f24b5a..56051b065 100644
--- a/src/helpers/async-helpers.ts
+++ b/src/helpers/async-helpers.ts
@@ -1,3 +1,4 @@
 export function sleep(ms: number = 0) {
+  // eslint-disable-next-line no-promise-executor-return
  return new Promise(r => setTimeout(r, ms));
 }
diff --git a/src/helpers/recipe-helpers.ts b/src/helpers/recipe-helpers.ts
index d482dffab..93c107cc5 100644
--- a/src/helpers/recipe-helpers.ts
+++ b/src/helpers/recipe-helpers.ts
@@ -1,3 +1,4 @@
+/* eslint-disable import/no-import-module-exports */
 /* eslint-disable global-require */
 import { parse } from 'path';
 import { userDataRecipesPath } from '../environment-remote';
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index 4ec106205..213c78f31 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Send invites",
  "invite.successInfo": "Invitations sent successfully",
  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
@@ -168,7 +167,6 @@
  "services.login": "Please login to use Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Welcome to Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Account is unavailable",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Available services",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Discover services",
  "settings.services.headline": "Your services",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Service is disabled",
  "settings.services.tooltip.isMuted": "All sounds are muted",
  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
  "settings.services.updatedInfo": "Your changes have been saved",
  "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.headline": "About Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.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",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index 7cbb47907..56f8348b1 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "إرسال الدعوات",
  "invite.successInfo": "تم إرسال الدعوات بنجاح",
  "locked.headline": "مقفل",
-  "locked.info": "فردي مقفل حاليا. الرجاء فتح فردي بكلمة المرور الخاصة بك لرؤية رسائلك.",
  "locked.invalidCredentials": "كلمة المرور غير صالحة",
  "locked.password.label": "كلمة المرور",
  "locked.submit.label": "فتح القفل",
@@ -168,7 +167,6 @@
  "services.login": "الرجاء تسجيل الدخول لاستخدام فردي.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "استخدام فردي بدون حساب",
-  "services.welcome": "مرحبا بكم في فردي",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "الحساب غير متوفر",
  "settings.account.accountUnavailableInfo": "أنت تستخدم فردي بدون حساب. إذا كنت ترغب في استخدام فردي مع حساب والحفاظ على مزامنة خدماتك عبر مختلف الحواسيب، الرجاء تحديد خادم في علامة تبويب الإعدادات ثم سجل الدخول.",
@@ -242,6 +240,7 @@
  "settings.app.form.showDragArea": "إظهار المنطقة القابلة للسحب على النافذة",
  "settings.app.form.showMessagesBadgesWhenMuted": "إظهار شارة رسالة غير مقروءة عند تعطيل الإشعارات",
  "settings.app.form.showServiceName": "Display service name under the icon",
+  "settings.app.form.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "البدء بنافذة مصغرة",
  "settings.app.form.universalDarkMode": "تمكين الوضع المظلم الكامل",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "التحديثات",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "الترجمات الرسمية هي الإنكليزية والألمانية. وجميع اللغات الأخرى مبنية على ترجمات مساهمين.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "كلمة المرور",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
  "settings.recipes.customService.headline.customRecipes": "وصفات طرف ثالث مخصصة",
  "settings.recipes.customService.headline.devRecipes": "وصفات خدمة التطوير الخاصة بك",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "وثائق المطور",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "الخدمات المتاحة",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "اكتشف الخدمات",
  "settings.services.headline": "خدماتك",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "تعذرَ تحميل خدماتك",
  "settings.services.tooltip.isDisabled": "الخدمة معطّلة",
  "settings.services.tooltip.isMuted": "تم كتم جميع الأصوات",
  "settings.services.tooltip.notificationsDisabled": "الإشعارات مُعَطَّلة",
  "settings.services.updatedInfo": "تم حفظ التغييرات الخاصة بك",
  "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.headline": "حول فردي",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.team.contentHeadline": "فريق أدارة فرانز",
  "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": "فريق",
diff --git a/src/i18n/locales/be.json b/src/i18n/locales/be.json
index a3e1e83a7..cfc587ffd 100644
--- a/src/i18n/locales/be.json
+++ b/src/i18n/locales/be.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Send invites",
  "invite.successInfo": "Invitations sent successfully",
  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
@@ -168,7 +167,6 @@
  "services.login": "Please login to use Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Welcome to Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Account is unavailable",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Available services",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Discover services",
  "settings.services.headline": "Your services",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Service is disabled",
  "settings.services.tooltip.isMuted": "All sounds are muted",
  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
  "settings.services.updatedInfo": "Your changes have been saved",
  "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.headline": "About Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.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",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index 4ec106205..213c78f31 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Send invites",
  "invite.successInfo": "Invitations sent successfully",
  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
@@ -168,7 +167,6 @@
  "services.login": "Please login to use Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Welcome to Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Account is unavailable",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Available services",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Discover services",
  "settings.services.headline": "Your services",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Service is disabled",
  "settings.services.tooltip.isMuted": "All sounds are muted",
  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
  "settings.services.updatedInfo": "Your changes have been saved",
  "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.headline": "About Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.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",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 734289614..b8e7187b4 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Enviar invitacions",
  "invite.successInfo": "Invitacions enviades correctament",
  "locked.headline": "Bloquejat",
-  "locked.info": "Actualment, Ferdi està bloquejat. Desbloqueu Ferdi amb la vostra contrasenya per veure els vostres missatges.",
  "locked.invalidCredentials": "Contrasenya incorrecte",
  "locked.password.label": "Contrasenya",
  "locked.submit.label": "Desbloqueja",
@@ -168,7 +167,6 @@
  "services.login": "Please login to use Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Benvingut a Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Account is unavailable",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Actualitzacions",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Contrasenya",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Serveis disponibles",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Descobrir serveis",
  "settings.services.headline": "Els vostres serveis",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "El servei està desactivat",
  "settings.services.tooltip.isMuted": "Tots els sons estan desactivats",
  "settings.services.tooltip.notificationsDisabled": "Les notificacions estan desactivades",
  "settings.services.updatedInfo": "S'han desat els canvis",
  "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.headline": "Sobre Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.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": "Equip",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 8a5f7037e..a1d8c68b2 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Poslat pozvánky",
  "invite.successInfo": "Pozvánky byly úspěšně odeslány.",
  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
@@ -168,7 +167,6 @@
  "services.login": "Please login to use Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Vítejte v programu Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Account is unavailable",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Aktualizace",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Dostupné služby",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Objevte služby",
  "settings.services.headline": "Vaše služby",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Služba je zakázána",
  "settings.services.tooltip.isMuted": "Všechny zvuky jsou ztišeny",
  "settings.services.tooltip.notificationsDisabled": "Oznámení jsou zakázána",
  "settings.services.updatedInfo": "Vaše změny byly uloženy",
  "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.headline": "O aplikaci",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.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": "Tým",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index ef78a2269..0463d22e1 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Send invitationer",
  "invite.successInfo": "Invitationer sendt",
  "locked.headline": "Låst",
-  "locked.info": "Ferdi er i øjeblikket låst. Lås Ferdi op med din adgangskode for at se dine beskeder.",
  "locked.invalidCredentials": "Ugyldig adgangskode",
  "locked.password.label": "Adgangskode",
  "locked.submit.label": "Lås op",
@@ -168,7 +167,6 @@
  "services.login": "Log ind for at bruge Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Brug Ferdi uden en konto",
-  "services.welcome": "Velkommen til Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Konto utilgængelig",
  "settings.account.accountUnavailableInfo": "Du bruger Ferdi uden en konto. Hvis du ønsker at bruge Ferdi med en konto og holde dine tjenester synkroniseret på tværs af enheder, vælg en server under fanen Indstillinger, og log derefter ind.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimeret",
  "settings.app.form.universalDarkMode": "Aktiver universel mørk tilstand",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Opdateringer",
  "settings.app.hibernateInfo": "Som standard vil Ferdi holde alle dine tjenester åbne og indlæste i baggrunden, så de er klar, når du vil bruge dem. Du kan vælge at sætte dine tjenester i dvale efter en angivet mængde tid. Dette er nyttigt til at spare hukommelse eller forhindre tjenester i at bremse din computer.",
  "settings.app.inactivityLockInfo": "Minutter af inaktivitet, hvorefter Ferdi automatisk skal låse. Brug 0 for at deaktivere",
-  "settings.app.languageDisclaimer": "Officielle oversættelser er engelske og tyske. Alle andre sprog er fællesskabsstyrede oversættelser.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Adgangskode",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "settings.recipes.customService.headline.communityRecipes": "Fællesskabstyrede Tredjepartsopskrifter",
  "settings.recipes.customService.headline.customRecipes": "Brugerdefinerede Tredjepartsopskrifter",
  "settings.recipes.customService.headline.devRecipes": "Dine Udviklingsopskrifter",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Udvikler Dokumentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Tilgængelige tjenester",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Opdag tjenester",
  "settings.services.headline": "Dine tjenester",
  "settings.services.noServicesAdded": "Start med at tilføje en tjeneste.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Kunne ikke indlæse dine tjenester",
  "settings.services.tooltip.isDisabled": "Tjenesten er deaktiveret",
  "settings.services.tooltip.isMuted": "Alle lyde er slået fra",
  "settings.services.tooltip.notificationsDisabled": "Notifikationer er slået fra",
  "settings.services.updatedInfo": "Dine ændringer er blevet gemt",
  "settings.supportFerdi.aboutIntro": "<p>Ferdi er et \"open source\" og fællesskabsstyret program.</p><p>Tak til de personer, der gør dette muligt:</p>",
-  "settings.supportFerdi.bannerText": "Vil du hjælpe os med at forbedre Ferdi?",
  "settings.supportFerdi.headline": "Om Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "Hvis du har lyst til at støtte Ferdi's udviklere med en donation, kan du gøre det på både,",
  "settings.supportFerdi.textDonationAnd": "og",
  "settings.supportFerdi.textExpenses": "Omend frivillige gør det meste af arbejdet, er vi stadig nødt til at betale for servere og certifikater. Som et fællesskab er vi fuldt ud gennemsigtige med hensyn til de midler, vi indsamler og bruger - se vores",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Støtte er altid velkommen. Du kan finde en liste over den hjælp, vi har brug for",
  "settings.supportFerdi.textSupportWelcomeHere": "her",
  "settings.supportFerdi.textVolunteers": "Udviklingen af Ferdi sker af frivillige. Folk, der bruger Ferdi som dig. De vedligeholder, retter og forbedrer Ferdi i deres fritid.",
-  "settings.supportFerdi.title": "Kan du lide Ferdi?",
  "settings.team.contentHeadline": "Franz Teamstyring",
  "settings.team.copy": "Franz's teamstyring giver dig mulighed for at administrere Franz abonnementer for flere brugere. Husk på, at hvis du har et Franz Premium-abonnement, får du ingen fordele ved at bruge Ferdi: Den eneste grund til, at du stadig har adgang til teamstyring er, at du kan administrere dine gamle Franz Teams, og så du ikke mister nogen funktionalitet i forvaltningen af din konto.",
  "settings.team.headline": "Team",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 30acbcb29..bdbcac154 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Einladungen schicken",
  "invite.successInfo": "Die Einladungen wurden erfolgreich versendet",
  "locked.headline": "Gesperrt",
-  "locked.info": "Ferdi ist zur Zeit gesperrt. Bitte entsperre Ferdi mit deinem Passwort, um deine Nachrichten zu sehen.",
  "locked.invalidCredentials": "Passwort ungültig",
  "locked.password.label": "Passwort",
  "locked.submit.label": "Entsperren",
@@ -168,7 +167,6 @@
  "services.login": "Bitte melde dich an, um Ferdi zu benutzen.",
  "services.serverInfo": "Optional können Sie Ihren Ferdi Server wechseln, indem Sie auf das Zahnrad in der unteren linken Ecke klicken. Wenn Sie von einem der gehosteten Server auf Ferdi ohne Konto umschalten beachten Sie bitte, dass Sie Ihre Daten von diesem Server exportieren und anschließend über das Hilfe-Menü importieren können, um alle Ihre Arbeitsbereiche und konfigurierten Dienste wiederzubeleben!",
  "services.serverless": "Ferdi ohne ein Konto verwenden",
-  "services.welcome": "Willkommen bei Ferdi!",
  "settings.account.account.editButton": "Konto bearbeiten",
  "settings.account.accountUnavailable": "Konto nicht verfügbar",
  "settings.account.accountUnavailableInfo": "Du verwendest Ferdi ohne ein Konto. Wenn du Ferdi mit einem Konto verwenden möchtest und deine Dienste über alle verschiedene Computer hinweg synchronisieren möchtest, wählen bitte einen Server in den Einstellungen und melde dich danach an.",
@@ -205,17 +203,17 @@
  "settings.app.form.automaticUpdates": "Updates aktivieren",
  "settings.app.form.beta": "Beta-Versionen einbeziehen",
  "settings.app.form.clipboardNotifications": "Keine Benachrichtigungen für Zwischenablagenereignisse anzeigen",
-  "settings.app.form.closeToSystemTray": "Ferdi in Infobereich minimieren",
+  "settings.app.form.closeToSystemTray": "Ferdi in den Infobereich schließen",
  "settings.app.form.confirmOnQuit": "Beim Beenden von Ferdi bestätigen",
  "settings.app.form.customTodoServer": "Eigener Todo Server",
  "settings.app.form.darkMode": "Dark Mode aktivieren",
  "settings.app.form.enableGPUAcceleration": "Hardwarebeschleunigung aktivieren",
-  "settings.app.form.enableGlobalHideShortcut": "Enable Global shortcut to hide Ferdi",
+  "settings.app.form.enableGlobalHideShortcut": "Globale Verknüpfung zum Verstecken von Ferdi aktivieren",
  "settings.app.form.enableLock": "Passwort-Sperre aktivieren",
-  "settings.app.form.enableLongPressServiceHint": "Enable service shortcut hint on long press",
+  "settings.app.form.enableLongPressServiceHint": "Aktivieren von Tastaturenkürzel Hinweisen bei langem Drücken",
  "settings.app.form.enableMenuBar": "Ferdi immer in der Menüleiste anzeigen",
  "settings.app.form.enableSpellchecking": "Rechtschreibprüfung aktivieren",
-  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
+  "settings.app.form.enableSystemTray": "Ferdi immer im Infobereich anzeigen",
  "settings.app.form.enableTodos": "Ferdi Todos aktivieren",
  "settings.app.form.hibernateOnStartup": "Behalte Dienste im Ruhezustand beim Start",
  "settings.app.form.hibernationStrategy": "\"Service Hibernation\"-Strategie",
@@ -241,13 +239,14 @@
  "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.showServiceName": "Dienstname unter dem Symbol anzeigen",
-  "settings.app.form.splitMode": "Enable Split View Mode",
+  "settings.app.form.splitColumns": "Anzahl der Spalten",
+  "settings.app.form.splitMode": "Split-Ansichtsmodus aktivieren",
  "settings.app.form.startMinimized": "Minimiert starten",
  "settings.app.form.universalDarkMode": "Universellen Dark Mode aktivieren",
-  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
+  "settings.app.form.useTouchIdToUnlock": "Verwenden von Touch ID zum Entsperren von Ferdi erlauben",
-  "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.useVerticalStyle": "Horizontaler Stil verwenden",
-  "settings.app.form.wakeUpStrategy": "Wake up strategy",
+  "settings.app.form.wakeUpStrategy": "Aufwachstrategie",
  "settings.app.headlineAdvanced": "Erweitert",
  "settings.app.headlineAppearance": "Darstellung",
  "settings.app.headlineGeneral": "Allgemeines",
@@ -256,18 +255,17 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "Standardmäßig öffnet Ferdi alle deine Dienste im Hintergrund, sodass diese bereit sind, wenn du sie verwenden möchtest. \"Service Hibernation\" wird deine Dienste nach einer bestimmten Zeitspanne schließen. Dies ist nützlich, um RAM zu sparen oder Dienste davon abzuhalten, deinen Computer zu verlangsamen.",
  "settings.app.inactivityLockInfo": "Minuten der Inaktivität, nach denen Ferdi automatisch sperren soll. Verwenden Sie 0, um dies zu deaktivieren",
-  "settings.app.languageDisclaimer": "Offizielle Übersetzungen: Englisch & Deutsch. Alle anderen Sprachen sind Übersetzungen der Ferdi Community.",
+  "settings.app.lockInfo": "Die Passwort-Sperre erlaubt es dir, deine Nachrichten zu schützen.\nMit der Passwort-Sperre wirst du sowohl beim Starten von Ferdi als auch wenn du das Programm manuell sperrst darum gebeten, dein Passwort einzugeben.\nDu kannst Ferdi über das Sperrsymbol in der unteren linken Ecke oder mit dem Shortcut {lockShortcut} sperren.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Passwort",
-  "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.lockedPasswordInfo": "Bitte stelle sicher, dass du ein Passwort setzt, an welches du dich erinnern kannst.\nSolltest du dieses Passwort vergessen, musst du Ferdi neu installieren.",
  "settings.app.restartRequired": "Änderungen werden erst nach einem Neustart wirksam.",
  "settings.app.scheduledDNDInfo": "Die geplante \"Nicht-stören\"-Funktion erlaubt es dir eine Zeitspanne festzulegen, in der du keine Benachrichtigungen von Ferdi erhalten möchtest.",
  "settings.app.scheduledDNDTimeInfo": "Zeiten im 24-Stunden-Format (z.B. 18:00). Endzeit kann vor Beginn der Startzeit sein (z.B. 17:00 Uhr, Ende 09:00), um die Funktion über Nacht zu aktivieren.",
-  "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.sentryInfo": "Das Senden von Telemetrie-Daten ermöglicht es uns, Fehler in Ferdi zu finden - es werden keine persönlichen Informationen gesendet wie z.B. Nachrichten!",
  "settings.app.spellCheckerLanguageInfo": "Ferdi verwendet den eingebauten Rechtschreibprüfer deines Macs, um nach Tippfehlern zu suchen. Wenn du die zu überprüfenden Sprachen ändern möchtest, kannst du das in deinen Systemeinstellungen tun.",
  "settings.app.subheadlineCache": "Cache",
-  "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
+  "settings.app.subheadlineFerdiProfile": "Ferdi Profil",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
+  "settings.app.todoServerInfo": "Dieser Server wird für die \"Ferdi Todo\"-Funktion verwendet.",
  "settings.app.translationHelp": "Hilf uns, Ferdi in Deine Sprache zu übersetzen.",
  "settings.app.universalDarkModeInfo": "Universeller Dark Mode versucht dynamisch Dienste abzudunkeln, die vom normalen Dark Mode noch nicht unterstützt werden.",
  "settings.app.updateStatusAvailable": "Update verfügbar, lädt herunter ...",
@@ -286,12 +284,12 @@
  "settings.recipes.customService.headline.communityRecipes": "Community Recipes",
  "settings.recipes.customService.headline.customRecipes": "Benutzerdefinierte Recipes",
  "settings.recipes.customService.headline.devRecipes": "Eigene Recipes",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
+  "settings.recipes.customService.intro": "Um ein benutzerdefiniertes Service hinzuzufügen, kopiere das Dienst-Rezept nach:",
  "settings.recipes.customService.openDevDocs": "Entwicklerdokumentation",
-  "settings.recipes.customService.openFolder": "Open folder",
+  "settings.recipes.customService.openFolder": "Ordner öffnen",
  "settings.recipes.headline": "Verfügbare Dienste",
  "settings.recipes.missingService": "Fehlt ein Dienst?",
-  "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.nothingFound": "Leider hat kein Dienst zu deinem Suchbegriff gepasst - aber du kannst ihn wahrscheinlich trotzdem über die Option \"Eigene Website\" hinzufügen. Bitte beachte, dass die Website möglicherweise weitere Dienste anzeigt, die seit deiner aktuellen Version zu Ferdi hinzugefügt wurden. Um diese neuen Dienste zu erhalten, erwäge bitte ein Upgrade auf eine neuere Version von Ferdi.",
  "settings.recipes.servicesSuccessfulAddedInfo": "Dienst erfolgreich hinzugefügt",
  "settings.searchService": "Dienst suchen",
  "settings.service.error.goBack": "Zurück zu den Diensten",
@@ -304,7 +302,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Helligkeit",
  "settings.service.form.darkReaderContrast": "Dark Reader Kontrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.deleteButton": "Dienst löschen",
  "settings.service.form.editServiceHeadline": "{name} bearbeiten",
  "settings.service.form.enableAudio": "Audio aktivieren",
  "settings.service.form.enableBadge": "Nachrichten-Badge anzeigen",
@@ -312,7 +310,7 @@
  "settings.service.form.enableHibernation": "Ruhezustand aktivieren",
  "settings.service.form.enableNotification": "Benachrichtigungen aktivieren",
  "settings.service.form.enableService": "Dienst aktivieren",
-  "settings.service.form.enableWakeUp": "Enable wake up",
+  "settings.service.form.enableWakeUp": "Aufwecken aktivieren",
  "settings.service.form.headlineBadges": "Nachrichten-Badge",
  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Einstellungen",
  "settings.service.form.headlineGeneral": "Allgemeines",
@@ -325,18 +323,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "Wenn aktiviert, wird ein Dienst nach einer Zeitspanne heruntergefahren, um Systemressourcen zu sparen.",
  "settings.service.form.isMutedInfo": "Sämtliche Wiedergabe von Tönen wird deaktiviert",
  "settings.service.form.name": "Name",
-  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Nur Favoriten in ungelesener Anzahl anzeigen",
  "settings.service.form.openDarkmodeCss": "Öffne darkmode.css",
  "settings.service.form.openUserCss": "Öffne user.css",
  "settings.service.form.openUserJs": "Öffne user.js",
  "settings.service.form.proxy.headline": "HTTP-/HTTPS-Proxy-Einstellungen",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy-Einstellungen werden nicht mit den Ferdi Servern synchronisiert.",
  "settings.service.form.proxy.isEnabled": "Proxy-Server verwenden",
-  "settings.service.form.proxy.password": "Password (optional)",
+  "settings.service.form.proxy.password": "Passwort (optional)",
  "settings.service.form.proxy.port": "Port",
  "settings.service.form.proxy.restartInfo": "Bitte starte Ferdi nach dem Ändern der Proxy-Einstellungen neu.",
-  "settings.service.form.proxy.user": "User (optional)",
+  "settings.service.form.proxy.user": "Benutzer (optional)",
  "settings.service.form.recipeFileInfo": "Deine \"user\" Dateien werden in die Webseite eingefügt, so dass du die Dienste in beliebiger Weise anpassen können. \"user\" Dateien werden nur lokal gespeichert und nicht auf andere Computer, welche das gleiche Konto nutzen, übertragen.",
  "settings.service.form.saveButton": "Dienst speichern",
  "settings.service.form.tabHosted": "Gehostet",
@@ -348,31 +346,28 @@
  "settings.services.discoverServices": "Dienste entdecken",
  "settings.services.headline": "Deine Dienste",
  "settings.services.noServicesAdded": "Beginne indem du einen Dienst hinzufügst.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Dienste konnten nicht geladen werden",
  "settings.services.tooltip.isDisabled": "Dienst ist deaktiviert",
  "settings.services.tooltip.isMuted": "Alle Töne sind deaktiviert",
  "settings.services.tooltip.notificationsDisabled": "Benachrichtigungen deaktiviert",
  "settings.services.updatedInfo": "Deine Änderungen wurden gespeichert",
  "settings.supportFerdi.aboutIntro": "<p>Ferdi ist eine Open-Source und von der Community-geführte Anwendung.</p><p>Danke an die Personen, die das möglich machen:</p>",
-  "settings.supportFerdi.bannerText": "Willst du uns helfen, Ferdi zu verbessern?",
  "settings.supportFerdi.headline": "Über Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "Wenn du Lust hast, die Entwicklung von Ferdi mit einer Spende zu unterstützen, kannst du dies auf folgenden Seiten tun,",
  "settings.supportFerdi.textDonationAnd": "und",
  "settings.supportFerdi.textExpenses": "Während die meiste Arbeit von Freiwilligen geleistet wird, müssen wir dennoch für Server und Zertifikate bezahlen. Als Community sind wir völlig transparent über die Gelder, die wir sammeln und ausgeben - siehe unsere",
  "settings.supportFerdi.textGitHubSponsors": "GitHub Sponsoren",
-  "settings.supportFerdi.textListContributors": "Full list of contributors",
+  "settings.supportFerdi.textListContributors": "Vollständige Liste an Mitwirkenden Personen",
  "settings.supportFerdi.textListContributorsHere": "hier",
  "settings.supportFerdi.textOpenCollective": "Open Collective",
  "settings.supportFerdi.textSupportWelcome": "Unterstützung ist immer willkommen. Du findest eine Liste über Unterstützungen die wir benötigen",
  "settings.supportFerdi.textSupportWelcomeHere": "hier",
  "settings.supportFerdi.textVolunteers": "Die Entwicklung von Ferdi wird von Freiwilligen vorangetrieben. Menschen, die Ferdi benutzen, wie Du. Sie überprüfen, reparieren und verbessern Ferdi in ihrer Freizeit.",
-  "settings.supportFerdi.title": "Gefällt dir Ferdi?",
  "settings.team.contentHeadline": "Franz Team-Management",
  "settings.team.copy": "Mit Franz's Team Management kannst du Franz Abonnements für mehrere Benutzer verwalten. Bitte beachte, dass dir ein Franz Premium-Abonnement keine Vorteile bei der Nutzung von Ferdi bringt: Der einzige Grund, warum du noch Zugriff auf das Team Management hast, ist, damit du weiterhin Franz Teams verwalten kannst und damit du keine Funktionalität bei der Verwaltung deines Kontos verlierst.",
  "settings.team.headline": "Team",
-  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "Du nutzt derzeit den Franz Server und hast deshalb Zugriff auf das Team Management.",
  "settings.team.manageAction": "Verwalte dein Team auf meetfranz.com",
  "settings.team.teamsUnavailable": "Teams sind nicht verfügbar",
  "settings.team.teamsUnavailableInfo": "Teams sind derzeit nur bei der Verwendung des Franz Servers und nach der Zahlung für Franz Professional verfügbar.\nBitte ändern Sie Ihren Server auf https://api.franzinfra.com, um Teams zu verwenden.",
@@ -400,7 +395,7 @@
  "settings.workspaces.tryReloadWorkspaces": "Erneut versuchen",
  "settings.workspaces.updatedInfo": "Deine Änderungen wurden gespeichert",
  "settings.workspaces.workspaceFeatureHeadline": "Weniger ist mehr: Ferdi Workspaces",
-  "settings.workspaces.workspaceFeatureInfo": "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. 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.",
+  "settings.workspaces.workspaceFeatureInfo": "Mit Ferdi Workspaces hast du alles im Blick, was gerade wichtig ist - und nur das. Erstelle unterschiedliche Sets von Services, und wechsle jederzeit zwischen ihnen hin und her. Du entscheidest welche Services du wann und wo brauchst, um ungestört arbeiten zu können - oder zu Hause besser abzuschalten.",
  "settings.workspaces.workspacesRequestFailed": "Workspaces konnte nicht geladen werden",
  "setupAssistant.headline": "Los geht's",
  "setupAssistant.subheadline": "Wähle von unseren meistgenutzten Diensten und bekomm deine Nachrichten wieder in den Griff.",
@@ -425,7 +420,7 @@
  "signup.password.label": "Passwort",
  "signup.submit.label": "Konto erstellen",
  "tabs.item.confirmDeleteService": "Willst du den {serviceName} Dienst wirklich löschen?",
-  "tabs.item.deleteService": "Delete service",
+  "tabs.item.deleteService": "Dienst löschen",
  "tabs.item.disableAudio": "Audio deaktivieren",
  "tabs.item.disableDarkMode": "Dunkler Modus deaktivieren",
  "tabs.item.disableNotifications": "Benachrichtigungen deaktivieren",
@@ -434,14 +429,14 @@
  "tabs.item.enableDarkMode": "Dunkler Modus aktivieren",
  "tabs.item.enableNotification": "Benachrichtigungen aktivieren",
  "tabs.item.enableService": "Dienst aktivieren",
-  "tabs.item.hibernateService": "Hibernate service",
+  "tabs.item.hibernateService": "Ruhezustand",
  "tabs.item.reload": "Neu laden",
-  "tabs.item.wakeUpService": "Wake up service",
+  "tabs.item.wakeUpService": "Aufweckdienst",
-  "validation.email": "{field} is not valid",
+  "validation.email": "{field} ist ungültig",
-  "validation.minLength": "{field} should be at least {length} characters long",
+  "validation.minLength": "{field} muss mindestens {length} Zeichen lang sein",
  "validation.oneRequired": "Mindestens ein Wert wird benötigt",
-  "validation.required": "{field} is required",
+  "validation.required": "{field} ist erforderlich",
-  "validation.url": "{field} is not a valid URL",
+  "validation.url": "{field} ist keine gültige URL",
  "webControls.back": "Zurück",
  "webControls.forward": "Vorwärts",
  "webControls.goHome": "Startseite",
@@ -454,7 +449,7 @@
  "workspaceDrawer.headline": "Arbeitsbereiche",
  "workspaceDrawer.item.contextMenuEdit": "Bearbeiten",
  "workspaceDrawer.item.noServicesAddedYet": "Noch keine Services hinzugefügt",
-  "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.workspaceFeatureInfo": "<p>Mit Ferdi Workspaces hast du alles im Blick, was gerade wichtig ist - und nur das. Erstelle unterschiedliche Sets von Services, und wechsle jederzeit zwischen ihnen hin und her.</p><p>Du entscheidest welche Services du wann und wo brauchst, um ungestört arbeiten zu können - oder zu Hause besser abzuschalten.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
+  "workspaceDrawer.workspacesSettingsTooltip": "Workspace-Einstellungen bearbeiten",
  "workspaces.switchingIndicator.switchingTo": "Wechsle zu"
 }
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index b42188fbf..df98bbf22 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Αποστολή προσκλήσεων",
  "invite.successInfo": "Επιτυχής αποστολή προσκλήσεων",
  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
@@ -168,7 +167,6 @@
  "services.login": "Please login to use Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Καλώς ορίσατε στον Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Account is unavailable",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Ενημερώσεις",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Διαθέσιμες υπηρεσίες",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Ανακαλύψτε υπηρεσίες",
  "settings.services.headline": "Οι υπηρεσίες σας",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Η υπηρεσία είναι απενεργοποιημένη",
  "settings.services.tooltip.isMuted": "Όλοι οι ήχοι είναι απενεργοποιημένοι",
  "settings.services.tooltip.notificationsDisabled": "Οι ειδοποιήσεις είναι απενεργοποιημένες",
  "settings.services.updatedInfo": "Οι αλλαγές σας έχουν αποθηκευτεί",
  "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.headline": "Σχετικά με το Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.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": "Ομάδα",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 2544d2a00..db528ac47 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Send invites",
  "invite.successInfo": "Invitations sent successfully",
  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
@@ -168,7 +167,6 @@
  "services.login": "Please login to use Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Welcome to Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Account is unavailable",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Available services",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Discover services",
  "settings.services.headline": "Your services",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Service is disabled",
  "settings.services.tooltip.isMuted": "All sounds are muted",
  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
  "settings.services.updatedInfo": "Your changes have been saved",
  "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.headline": "About Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.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",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index e85ebf772..87f94cfd6 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Enviar invitaciones",
  "invite.successInfo": "Invitaciones enviadas correctamente",
  "locked.headline": "Bloqueado",
-  "locked.info": "Ferdi está actualmente bloqueado. Por favor, desbloquea Ferdi con tu contraseña para ver tus mensajes.",
  "locked.invalidCredentials": "Contraseña incorrecta",
  "locked.password.label": "Contraseña",
  "locked.submit.label": "Desbloquear",
@@ -168,7 +167,6 @@
  "services.login": "Iniciar sesión para usar Ferdi.",
  "services.serverInfo": "Opcionalmente, puede cambiar su servidor Ferdi haciendo clic en el engranaje en la esquina inferior izquierda. Si está cambiando (de uno de los servidores alojados) a usar Ferdi sin una cuenta, por favor tenga en cuenta que puede exportar sus datos desde ese servidor y posteriormente importarlos usando el menú Ayuda para restaurar todos sus espacios de trabajo y servicios configurados!",
  "services.serverless": "Usar Ferdi sin una cuenta",
-  "services.welcome": "Bienvenido a Ferdi",
  "settings.account.account.editButton": "Editar cuenta",
  "settings.account.accountUnavailable": "La cuenta no está disponible",
  "settings.account.accountUnavailableInfo": "Estás usando Ferdi sin una cuenta. Si desea utilizar Ferdi con una cuenta y así mantener sus servicios sincronizados entre instalaciones, debe seleccionar un servidor en la Configuración e iniciar sesión.",
@@ -241,7 +239,8 @@
  "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.showServiceName": "Mostrar el nombre del servicio debajo del icono",
+  "settings.app.form.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Activar el modo de vista separada",
  "settings.app.form.startMinimized": "Iniciar minimizado",
  "settings.app.form.universalDarkMode": "Activar modo oscuro universal",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Actualizaciones",
  "settings.app.hibernateInfo": "Por defecto, Ferdi mantendrá todos sus servicios abiertos y cargados en segundo plano para que estén listos cuando los necesite. La hibernación del servicio desactivará los mismos tras el tiempo especificado. Esto es útil para ahorrar RAM y evitar que los servicios ralentizen su sistema.",
  "settings.app.inactivityLockInfo": "Minutos de inactividad, tras los cuales Ferdi debe bloquear automáticamente. Utilice 0 para desactivar",
-  "settings.app.languageDisclaimer": "Las traducciones oficiales son en inglés y alemán. Todos los demás idiomas son traducciones basadas en la comunidad.",
  "settings.app.lockInfo": "El bloqueo de contraseña le permite mantener los mensajes protegidos.\nSi activa el bloqueo de contraseña, se le pedirá introducirla cada vez que inicie o bloquee Ferdi usando el símbolo de la esquina inferior izquierda o bien el acceso directo {lockShortcut}.",
  "settings.app.lockedPassword": "Contraseña",
  "settings.app.lockedPasswordInfo": "Por favor, asegúrese de establecer una contraseña que usted pueda recordar.\nSi pierde esta contraseña, tendrá que reinstalar Ferdi.",
@@ -286,7 +284,7 @@
  "settings.recipes.customService.headline.communityRecipes": "Recetas de terceros comunitarios",
  "settings.recipes.customService.headline.customRecipes": "Recetas de terceros comunitarios",
  "settings.recipes.customService.headline.devRecipes": "Sus recetas de Servicio de Desarrollo",
-  "settings.recipes.customService.intro": "Para añadir un servicio personalizado, copie la receta de servicio a:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Documentación para desarrolladores",
  "settings.recipes.customService.openFolder": "Abrir carpeta",
  "settings.recipes.headline": "Servicios disponibles",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Descubrir servicios",
  "settings.services.headline": "Tus servicios",
  "settings.services.noServicesAdded": "Empieze añadiendo un servicio.",
-  "settings.services.nothingFound": "Lo sentimos, pero no pudimos encontrar ningún servicio similar a tu búsqueda, sin embargo: puedes agregarlo utilizando la opción de \"Sitio web personalizado\". \nRecuerda que pueden aparecer más servicios de los que has agregado a Ferdi desde la versión que estás utilizando. Para poder utilizar los nuevos servicios disponibles, considera actualizar a la versión más reciente.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "No pudo cargar tus servicios",
  "settings.services.tooltip.isDisabled": "El servicio está desactivado",
  "settings.services.tooltip.isMuted": "Todos los sonidos están silenciados",
  "settings.services.tooltip.notificationsDisabled": "Las notificaciones están desactivadas",
  "settings.services.updatedInfo": "Tus cambios han sido guardados",
  "settings.supportFerdi.aboutIntro": "<p>Ferdi es una aplicación de código abierto y líder en la comunidad.</p><p>Gracias a la gente que lo hace possbile:</p>",
-  "settings.supportFerdi.bannerText": "¿Quieres ayudarnos a mejorar Ferdi?",
  "settings.supportFerdi.headline": "Acerca de Ferdi",
-  "settings.supportFerdi.openSurvey": "Abrir encuesta",
  "settings.supportFerdi.textDonation": "Si desea apoyar el desarrollo de Ferdi con una donación, puede hacerlo en ambos,",
  "settings.supportFerdi.textDonationAnd": "y",
  "settings.supportFerdi.textExpenses": "Si bien los voluntarios hacen la mayor parte del trabajo, todavía tenemos que pagar los servidores y los certificados. Como comunidad, somos completamente transparentes con los fondos que recaudamos y gastamos; consulte nuestra",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "El apoyo siempre es bienvenido. Puede encontrar una lista de la ayuda que necesitamos",
  "settings.supportFerdi.textSupportWelcomeHere": "aquí",
  "settings.supportFerdi.textVolunteers": "El desarrollo de Ferdi lo realizan voluntarios. La gente que usa Ferdi como tú. Mantienen, arreglan y mejoran a Ferdi en su tiempo libre.",
-  "settings.supportFerdi.title": "¿Te gusta Ferdi?",
  "settings.team.contentHeadline": "Administración de Equipo",
  "settings.team.copy": "La gestión de equipos de Franz's te permite administrar suscripciones de Franz para múltiples usuarios. Por favor, ten en cuenta que tener una suscripción a Franz Premium no te dará ninguna ventaja en el uso de Ferdi: la única razón por la que todavía tienes acceso a la Gestión de Equipos es para que puedas gestionar tus equipos de Franz y para que no pierdas ninguna funcionalidad en la gestión de tu cuenta.",
  "settings.team.headline": "Equipo",
diff --git a/src/i18n/locales/fa.json b/src/i18n/locales/fa.json
index be8b1be20..db528ac47 100644
--- a/src/i18n/locales/fa.json
+++ b/src/i18n/locales/fa.json
@@ -1,346 +1,455 @@
 {
-  "app.errorHandler.action": "بارگذاری مجدد",
+  "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "اشتباهی رخ داده",
+  "app.errorHandler.headline": "Something went wrong.",
-  "connectionLostBanner.cta": "بارگذاری مجدد سرور",
+  "changeserver.customServerLabel": "Custom server",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
+  "connectionLostBanner.cta": "Reload Service",
  "connectionLostBanner.informationLink": "What happened?",
  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
-  "feature.announcements.changelog.headline": "تغییرات فرَنز {version}",
+  "feature.basicAuth.signIn": "Sign In",
-  "feature.shareFranz.action.email": "ارسال به صورت ایمیل",
+  "feature.nightlyBuilds.activate": "Activate",
-  "feature.shareFranz.action.facebook": "اشتراک‌گذاری در فیس بوک",
+  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
-  "feature.shareFranz.action.twitter": "اشتراک‌گذاری در توییتر",
+  "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.shareFranz.headline": "Ferdi is better together!",
+  "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
-  "feature.shareFranz.shareText.email": "من {count} تا سرویس تو فرَنز اضافه کردم! برنامه رایگان برای واتسآپ، اسکایپ، مسنجر، اسلک رو از سایت www.getferdi.com دانلود کن.",
+  "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
-  "feature.shareFranz.shareText.twitter": "من {count} تا سرویس تو فرَنز اضافه کردم! برنامه رایگان برای واتسآپ، اسکایپ، مسنجر، اسلک رو از سایت www.getferdi.com دانلود کن /cc @FerdiMessenger",
+  "feature.publishDebugInfo.privacy": "Privacy policy",
-  "feature.shareFranz.text": "به دوستات بگو فرَنز چقدر باحاله و بهمون کمک کن گسترش پیدا کنیم.",
+  "feature.publishDebugInfo.publish": "Accept and publish",
-  "global.api.unhealthy": "به سرویس های آنلاین فرَنز متصل نشدی",
+  "feature.publishDebugInfo.published": "Your debug log was published and is now availible at",
-  "global.edit": "ویرایش",
+  "feature.publishDebugInfo.terms": "Terms of service",
-  "global.franzProRequired": "Ferdi Professional Required",
+  "feature.publishDebugInfo.title": "Publish debug information",
-  "global.notConnectedToTheInternet": "اینترنت وصل نیست",
+  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
-  "global.quit": "خروج ",
+  "feature.quickSwitch.search": "Search...",
-  "global.settings": "تنظیمات",
+  "feature.quickSwitch.title": "QuickSwitch",
-  "global.spellchecker.useDefault": "استفاده از پیشفرض سیستم ({default})",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.spellchecking.autodetect": "تشخیص خودکار زبان",
+  "global.cancel": "Cancel",
-  "global.spellchecking.autodetect.short": "خودکار",
+  "global.edit": "Edit",
-  "global.spellchecking.language": "زبان غلط یاب املایی",
+  "global.no": "No",
-  "global.submit": "ارسال ",
+  "global.notConnectedToTheInternet": "You are not connected to the internet.",
-  "import.headline": "جانشانی سرویس های فرانز 4",
+  "global.ok": "Ok",
-  "import.notSupportedHeadline": "این سرویس ها در Ferdi ۵ پشتیبانی نمیشوند.",
+  "global.quit": "Quit",
-  "import.skip.label": "میخواهم سرویس ها را به صورت دستی اضافه کنم.",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
-  "import.submit.label": "جانشانی سرویس ها",
+  "global.save": "Save",
-  "infobar.buttonChangelog": "چه خبر ؟",
+  "global.settings": "Settings",
-  "infobar.buttonInstallUpdate": "باز کردن مجدد و نصب به روز رسانی",
+  "global.spellchecker.useDefault": "Use System Default ({default})",
-  "infobar.buttonReloadServices": "بارگذاری مجدد سرویس ها",
+  "global.spellchecking.autodetect": "Detect language automatically",
-  "infobar.requiredRequestsFailed": "بارگذاری سرویس ها و اطلاعات کاربر ممکن نیست",
+  "global.spellchecking.autodetect.short": "Automatic",
-  "infobar.servicesUpdated": "سرویس های شما به روز رسانی شدند.",
+  "global.spellchecking.language": "Spell checking language",
-  "infobar.updateAvailable": "یک به روز رسانی جدید برای Ferdi آماده است.",
+  "global.submit": "Submit",
-  "invite.email.label": "نشانی ایمیل",
+  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
-  "invite.headline.friends": "دعوت ۳ نفر از دوستان یا همکارانتان.",
+  "global.userAgentPref": "User Agent",
-  "invite.name.label": "نام ",
+  "global.yes": "Yes",
-  "invite.skip.label": "بعدا انجام میدم ",
+  "import.headline": "Import your Ferdi 4 services",
-  "invite.submit.label": "فرستادن دعوت نامه ها ",
+  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
-  "invite.successInfo": "دعوتنامه ها با موفقیت ارسال شدند .",
+  "import.skip.label": "I want to add services manually",
-  "login.email.label": "نشانی ایمیل",
+  "import.submit.label": "Import {count} services",
-  "login.headline": "ورود ",
+  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "login.invalidCredentials": "ایمیل یا رمز عبور معتبر نیست ",
+  "infobar.buttonChangelog": "What is new?",
-  "login.link.password": "تنظیم مجدد رمز عبور ",
+  "infobar.buttonInstallUpdate": "Restart & install update",
-  "login.link.signup": "ساختن یک حساب رایگان ",
+  "infobar.buttonReloadServices": "Reload services",
-  "login.password.label": "رمز عبور ",
+  "infobar.hide": "Hide",
-  "login.serverLogout": "این ارتباط منقضی شده است، لطفا دوباره وارد شوید.",
+  "infobar.requiredRequestsFailed": "Could not load services and user information",
-  "login.submit.label": "ورود ",
+  "infobar.servicesUpdated": "Your services have been updated.",
-  "login.tokenExpired": "ارتباط شما منقضی شده، لطفا دوباره وارد شوید.",
+  "infobar.updateAvailable": "A new update for Ferdi is available.",
+  "infobox.dismiss": "Dismiss",
+  "invite.email.label": "Email address",
+  "invite.headline.friends": "Invite 3 of your friends or colleagues",
+  "invite.name.label": "Name",
+  "invite.skip.label": "I want to do this later",
+  "invite.submit.label": "Send invites",
+  "invite.successInfo": "Invitations sent successfully",
+  "locked.headline": "Locked",
+  "locked.invalidCredentials": "Password invalid",
+  "locked.password.label": "Password",
+  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
+  "login.changeServer": "Change server",
+  "login.customServerQuestion": "Using a Franz account to log in?",
+  "login.customServerSuggestion": "Try importing your Franz account into Ferdi",
+  "login.email.label": "Email address",
+  "login.headline": "Sign in",
+  "login.invalidCredentials": "Email or password not valid",
+  "login.link.password": "Reset password",
+  "login.link.signup": "Create a free account",
+  "login.password.label": "Password",
+  "login.serverLogout": "Your session expired, please login again.",
+  "login.submit.label": "Sign in",
+  "login.tokenExpired": "Your session expired, please login again.",
  "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
  "menu.Todoss.openTodosDrawer": "Open Todos drawer",
-  "menu.app.about": "درباره فرانز",
+  "menu.app.about": "About Ferdi",
-  "menu.app.announcement": "چه خبر؟",
+  "menu.app.autohideMenuBar": "Auto-hide menu bar",
-  "menu.app.checkForUpdates": "بررسی وجود نسخه جدید ",
+  "menu.app.checkForUpdates": "Check for updates",
-  "menu.app.hide": "مخفی‌کردن ",
+  "menu.app.hide": "Hide",
-  "menu.app.hideOthers": "مخفی کردن بقیه ",
+  "menu.app.hideOthers": "Hide Others",
-  "menu.app.unhide": "آشکارسازی",
+  "menu.app.unhide": "Unhide",
-  "menu.edit": "ویرایش ",
+  "menu.edit": "Edit",
-  "menu.edit.copy": "کپی",
+  "menu.edit.copy": "Copy",
-  "menu.edit.cut": "برش ",
+  "menu.edit.cut": "Cut",
-  "menu.edit.delete": "حذف ",
+  "menu.edit.delete": "Delete",
-  "menu.edit.emojiSymbols": "شکلک و نماد ها",
+  "menu.edit.emojiSymbols": "Emoji & Symbols",
-  "menu.edit.paste": "چسباندن ",
+  "menu.edit.findInPage": "Find in Page",
-  "menu.edit.pasteAndMatchStyle": "بچسبان و با استایل هماهنگ کن.",
+  "menu.edit.paste": "Paste",
-  "menu.edit.redo": "انجام دوباره ",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
-  "menu.edit.selectAll": "انتخاب همه ",
+  "menu.edit.redo": "Redo",
-  "menu.edit.speech": "سخنرانی",
+  "menu.edit.selectAll": "Select All",
-  "menu.edit.startDictation": "شروع به دیکته کردن",
+  "menu.edit.speech": "Speech",
-  "menu.edit.startSpeaking": "شروع به حرف زدن",
+  "menu.edit.startDictation": "Start Dictation",
-  "menu.edit.stopSpeaking": "متوقف سازی حرف زدن",
+  "menu.edit.startSpeaking": "Start Speaking",
-  "menu.edit.undo": "برگشت",
+  "menu.edit.stopSpeaking": "Stop Speaking",
-  "menu.file": "فایل",
+  "menu.edit.undo": "Undo",
-  "menu.help": "راهنما",
+  "menu.file": "File",
-  "menu.help.changelog": "تغییرات",
+  "menu.help": "Help",
+  "menu.help.changelog": "Changelog",
  "menu.help.debugInfo": "Copy Debug Information",
  "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
  "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
-  "menu.help.learnMore": "بیشتر بدانید ",
+  "menu.help.importExportData": "Import/Export Configuration Data",
-  "menu.help.privacy": "قوانین شخصی سازی",
+  "menu.help.learnMore": "Learn More",
-  "menu.help.support": "پشتیبانی",
+  "menu.help.privacy": "Privacy Statement",
-  "menu.help.tos": "شرایط ارائهٔ خدمات ",
+  "menu.help.publishDebugInfo": "Publish Debug Information",
-  "menu.services": "سرویس‌ها ",
+  "menu.help.support": "Support",
-  "menu.services.activatePreviousService": "فعالسازی سرویس قبلی",
+  "menu.help.tos": "Terms of Service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services": "Services",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Home",
-  "menu.services.setNextServiceActive": "فعالسازی سرویس بعدی",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
  "menu.todos.enableTodos": "Enable Todos",
-  "menu.view": "نمایش",
+  "menu.view": "View",
-  "menu.view.reloadFerdi": "بارگذاری مجدد فرَنز",
+  "menu.view.back": "Back",
-  "menu.view.reloadService": "بارگذاری مجدد سرور",
+  "menu.view.forward": "Forward",
+  "menu.view.lockFerdi": "Lock Ferdi",
+  "menu.view.openQuickSwitch": "Open Quick Switch",
+  "menu.view.reloadFerdi": "Reload Ferdi",
+  "menu.view.reloadService": "Reload Service",
  "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "اندازه واقعی‌ ",
+  "menu.view.resetZoom": "Actual Size",
-  "menu.view.toggleDevTools": "ابزارهای گسترش دهنده",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
-  "menu.view.toggleFullScreen": "تغییر وضعیت تمام صفحه",
+  "menu.view.toggleDevTools": "Toggle Developer Tools",
-  "menu.view.toggleServiceDevTools": "تغییر سرویس ابزارهای توسعه",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
  "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
-  "menu.view.zoomIn": "بزرگنمایی",
+  "menu.view.zoomIn": "Zoom In",
-  "menu.view.zoomOut": "کوچک‌نمایی",
+  "menu.view.zoomOut": "Zoom Out",
-  "menu.window": "پنجره ",
+  "menu.window": "Window",
-  "menu.window.close": "بستن ",
+  "menu.window.close": "Close",
-  "menu.window.minimize": "به زیر بردن",
+  "menu.window.minimize": "Minimize",
-  "menu.workspaces": "فضای کاری",
+  "menu.workspaces": "Workspaces",
-  "menu.workspaces.addNewWorkspace": "افزودن فضای کاری جدید...",
+  "menu.workspaces.addNewWorkspace": "Add New Workspace...",
-  "menu.workspaces.closeWorkspaceDrawer": "بستن کشوی فضای کاری",
+  "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
-  "menu.workspaces.defaultWorkspace": "تمامی سرویس ها",
+  "menu.workspaces.defaultWorkspace": "All services",
-  "menu.workspaces.openWorkspaceDrawer": "بازکردن کشوی فضای کاری",
+  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
-  "password.email.label": "نشانی ایمیل",
+  "password.email.label": "Email address",
-  "password.headline": "تنظیم مجدد رمز عبور ",
+  "password.headline": "Reset password",
-  "password.link.login": "وارد شدن به اکانت خود",
+  "password.link.login": "Sign in to your account",
-  "password.link.signup": "ساخت یک حساب کاربری",
+  "password.link.signup": "Create a free account",
-  "password.noUser": "هیچ کاربری با این نشانی ایمیل یافت نشد ",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "لطفا ایمیل خود را چک کنید",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
+  "service.crashHandler.action": "Reload {name}",
-  "pricing.features.adFree": "Forever ad-free",
+  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
-  "pricing.features.appDelays": "No Waiting Screens",
+  "service.crashHandler.headline": "Oh no!",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
+  "service.crashHandler.text": "{name} has caused an error.",
-  "pricing.features.customWebsites": "Add Custom Websites",
+  "service.disabledHandler.action": "Enable {name}",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
+  "service.disabledHandler.headline": "{name} is disabled",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
+  "service.errorHandler.action": "Reload {name}",
-  "pricing.features.recipes": "Choose from more than 70 Services",
+  "service.errorHandler.editAction": "Edit {name}",
-  "pricing.features.serviceProxies": "Service Proxies",
+  "service.errorHandler.headline": "Oh no!",
-  "pricing.features.spellchecker": "Spellchecker support",
+  "service.errorHandler.message": "Error",
-  "pricing.features.teamManagement": "Team Management",
+  "service.errorHandler.text": "{name} has failed to load.",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
+  "service.webviewLoader.loading": "Loading {service}",
-  "pricing.features.unlimitedServices": "Add unlimited services",
+  "services.getStarted": "Get started",
-  "pricing.features.upToSixServices": "Add up to 6 services",
+  "services.login": "Please login to use Ferdi.",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
-  "pricing.features.workspaces": "Workspaces",
+  "services.serverless": "Use Ferdi without an Account",
-  "service.crashHandler.action": "بارگذاری مجدد {name}",
+  "settings.account.account.editButton": "Edit account",
-  "service.crashHandler.autoReload": "در حال بازیابی{نام} در{ثانیه} ثانیه به طور خودکار",
+  "settings.account.accountUnavailable": "Account is unavailable",
-  "service.crashHandler.headline": "وای نه! ",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
-  "service.crashHandler.text": "{نام} با مشکل مواجه شد",
+  "settings.account.buttonSave": "Update profile",
-  "service.disabledHandler.action": "{نام} فعال کن",
+  "settings.account.deleteAccount": "Delete account",
-  "service.disabledHandler.headline": "{نام} غیرفعال است",
+  "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-  "service.errorHandler.action": "بارگذاری مجدد {name}",
+  "settings.account.deleteInfo": "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
-  "service.errorHandler.editAction": "ویرایش {نام}",
+  "settings.account.headline": "Account",
-  "service.errorHandler.headline": "وای نه! ",
+  "settings.account.headlineAccount": "Account information",
-  "service.errorHandler.message": "خطا ",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "service.errorHandler.text": "{name} بارگذاری نشد.",
+  "settings.account.headlineInvoices": "Invoices",
-  "service.webviewLoader.loading": "در حال بارگذاری",
+  "settings.account.headlinePassword": "Change password",
-  "services.getStarted": "شروع ",
+  "settings.account.headlineProfile": "Update profile",
-  "services.welcome": "به فرانز خوش آمدید",
+  "settings.account.successInfo": "Your changes have been saved",
-  "settings.account.account.editButton": "ویرایش حساب کاربری",
+  "settings.account.tryReloadServices": "Try again",
-  "settings.account.accountType.basic": "اکانت ساده",
+  "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.accountType.premium": "پشتیبانی پیشرفته اکانت",
+  "settings.account.userInfoRequestFailed": "Could not load user information",
-  "settings.account.buttonSave": "بروز رسانی پروفایل",
+  "settings.account.yourLicense": "Your Ferdi License:",
-  "settings.account.deleteAccount": "حذف حساب",
+  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
-  "settings.account.deleteEmailSent": "شما یک ایمیل حاوی لینک غیر فعال سازی اکانت خود را دریافت کرده اید. اکانت شما به هیچ وجه بازیابی نخواهد شد !",
+  "settings.app.buttonClearAllCache": "Clear cache",
-  "settings.account.deleteInfo": "چنانچه دیگر به به اکانت فرانز خود نیاز ندارید ، میتوانید اکانت خود و تمامی اطلاعات خود در اینجا را حذف کنید.",
+  "settings.app.buttonInstallUpdate": "Restart & install update",
-  "settings.account.headline": "حساب ",
+  "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder",
-  "settings.account.headlineAccount": "اطلاعات حساب ",
+  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
-  "settings.account.headlineDangerZone": "منطقه خطرناک",
+  "settings.app.buttonSearchForUpdate": "Check for updates",
-  "settings.account.headlineInvoices": "فاکتورها",
+  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
-  "settings.account.headlinePassword": "تغییر کلمه عبور",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
-  "settings.account.headlineProfile": "بروزرسانی پروفایل",
+  "settings.app.closeSettings": "Close settings",
-  "settings.account.successInfo": "تغییرات شما ذخیره شد!",
+  "settings.app.currentVersion": "Current version:",
-  "settings.account.tryReloadServices": "تلاش مجدد ",
+  "settings.app.form.accentColor": "Accent color",
-  "settings.account.tryReloadUserInfoRequest": "تلاش مجدد ",
+  "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
-  "settings.account.userInfoRequestFailed": "نمی‌توان اطلاعات کاربر را بارگذاری کرد.",
+  "settings.app.form.alwaysShowWorkspaces": "Always show workspace drawer",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.app.form.autoLaunchInBackground": "Open in background",
-  "settings.app.buttonClearAllCache": "پاک کردن حافظه پنهان",
+  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
-  "settings.app.buttonInstallUpdate": "باز کردن مجدد و نصب به روز رسانی ",
+  "settings.app.form.automaticUpdates": "Enable updates",
-  "settings.app.buttonSearchForUpdate": "بررسی بروزرسانی",
+  "settings.app.form.beta": "Include beta versions",
-  "settings.app.cacheInfo": "حافظه ی پنهانی فرانز هم اکنون {سایز} از فضای شما استفاده میکند .",
+  "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
-  "settings.app.currentVersion": "نسخهٔ فعلی",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
-  "settings.app.form.autoLaunchInBackground": "باز کردن در پس زمینه",
+  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
-  "settings.app.form.autoLaunchOnStart": "باز شدن فرانز در استارت ",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.beta": "شامل نسخه های بتا ",
+  "settings.app.form.darkMode": "Enable Dark Mode",
-  "settings.app.form.darkMode": "فعالسازی حالت شب",
+  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableGPUAcceleration": "فعال سازی شتاب GPU",
+  "settings.app.form.enableGlobalHideShortcut": "Enable Global shortcut to hide Ferdi",
-  "settings.app.form.enableSpellchecking": "فعال‌سازی غلط‌یابی املایی",
+  "settings.app.form.enableLock": "Enable Password Lock",
-  "settings.app.form.enableSystemTray": "فرانز را در system tray نشان بده",
+  "settings.app.form.enableLongPressServiceHint": "Enable service shortcut hint on long press",
+  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
+  "settings.app.form.enableSpellchecking": "Enable spell checking",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
+  "settings.app.form.hibernationStrategy": "Hibernation strategy",
+  "settings.app.form.iconSize": "Service icon size",
+  "settings.app.form.inactivityLock": "Lock after inactivity",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
-  "settings.app.form.language": "زبان",
+  "settings.app.form.language": "Language",
-  "settings.app.form.minimizeToSystemTray": "فرانز را در system tray بخوابان",
+  "settings.app.form.lockPassword": "Password",
-  "settings.app.form.runInBackground": "فرانز را در پشت زمینه نگه دار زمانی که پنجره آن بسته میشود",
+  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
-  "settings.app.form.showDisabledServices": "سرویس های غیرفعال را نشان بده ",
+  "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.showMessagesBadgesWhenMuted": "نماد پیام خوانده نشده را زمانی که نوتیفیکیشن ها غیرفعالند نشان بده",
+  "settings.app.form.notifyTaskBarOnMessage": "Notify TaskBar/Dock on new message",
-  "settings.app.headlineAdvanced": "پیشرفته ",
+  "settings.app.form.passwordToggle": "Password toggle",
-  "settings.app.headlineAppearance": "ظاهر ",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
-  "settings.app.headlineGeneral": "عمومی ",
+  "settings.app.form.privateNotifications": "Don't show message content in notifications",
-  "settings.app.headlineLanguage": "زبان ",
+  "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
-  "settings.app.headlineUpdates": "به‌روزرسانی‌ها ",
+  "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
-  "settings.app.languageDisclaimer": "ترجمه های رسمی به زبان انگلیسی و آلمانی هستند. ترجمه های بقیه زبانها مردم پایه هستند.",
+  "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
-  "settings.app.restartRequired": "تغییر ملزومات ریستارت",
+  "settings.app.form.scheduledDNDEnd": "To",
-  "settings.app.subheadlineCache": "حافظه‌ی نهان",
+  "settings.app.form.scheduledDNDStart": "From",
-  "settings.app.translationHelp": "به ما کمک کنید فرانز را به زبان شما ترجمه کنیم.",
+  "settings.app.form.searchEngine": "Search engine",
-  "settings.app.updateStatusAvailable": "بروزرسانی موجود است ، در حال دانلود...",
+  "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.updateStatusSearching": "در حال جستجو برای بروزرسانی",
+  "settings.app.form.serviceRibbonWidth": "Sidebar width",
-  "settings.app.updateStatusUpToDate": "شما از آخرین نسخه فرانز استفاده میکنید",
+  "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.invite.headline": "دعوت دوستان",
+  "settings.app.form.showDragArea": "Show draggable area on window",
-  "settings.navigation.account": "حساب ",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.navigation.availableServices": "سرویس های موجود",
+  "settings.app.form.showServiceName": "Display service name under the icon",
-  "settings.navigation.inviteFriends": "دعوت دوستان",
+  "settings.app.form.splitColumns": "Number of columns",
-  "settings.navigation.logout": "خروج از سیستم ",
+  "settings.app.form.splitMode": "Enable Split View Mode",
-  "settings.navigation.team": "مدیریت گروه",
+  "settings.app.form.startMinimized": "Start minimized",
-  "settings.navigation.yourServices": "سرویس های شما",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
-  "settings.navigation.yourWorkspaces": "فضای کاری شما",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
-  "settings.recipes.all": "همه سرویس ها",
+  "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
+  "settings.app.headlineAdvanced": "Advanced",
+  "settings.app.headlineAppearance": "Appearance",
+  "settings.app.headlineGeneral": "General",
+  "settings.app.headlineLanguage": "Language",
+  "settings.app.headlinePrivacy": "Privacy",
+  "settings.app.headlineUpdates": "Updates",
+  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
+  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
+  "settings.app.lockedPassword": "Password",
+  "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": "Changes require restart",
+  "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.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.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
+  "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "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 available, downloading...",
+  "settings.app.updateStatusSearching": "Is searching for update",
+  "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
+  "settings.invite.headline": "Invite Friends",
+  "settings.navigation.account": "Account",
+  "settings.navigation.availableServices": "Available services",
+  "settings.navigation.logout": "Logout",
+  "settings.navigation.supportFerdi": "About Ferdi",
+  "settings.navigation.team": "Manage Team",
+  "settings.navigation.yourServices": "Your services",
+  "settings.navigation.yourWorkspaces": "Your workspaces",
+  "settings.recipes.all": "All services",
  "settings.recipes.custom": "Custom 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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
-  "settings.recipes.headline": "سرویس های موجود",
+  "settings.recipes.headline": "Available services",
-  "settings.recipes.missingService": "سرویسی را نیاز دارید ؟",
+  "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.nothingFound": "متاسفیم ، اما هیچ سرویسی با آنچه که جستجو کردید مطابقت نداشت .",
+  "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": "سرویس با موفقیت اضافه شد",
+  "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
-  "settings.searchService": "جستجوی سرویس ها",
+  "settings.searchService": "Search service",
-  "settings.service.error.goBack": "بازگشت به سرویس ها",
+  "settings.service.error.goBack": "Back to services",
-  "settings.service.error.headline": "خطا ",
+  "settings.service.error.headline": "Error",
-  "settings.service.error.message": "دستورالعمل سرویس بارگذاری نشد.",
+  "settings.service.error.message": "Could not load service recipe.",
-  "settings.service.form.addServiceHeadline": "اضافه کردن {نام}",
+  "settings.service.form.addServiceHeadline": "Add {name}",
-  "settings.service.form.availableServices": "سرویس های موجود",
+  "settings.service.form.availableServices": "Available services",
-  "settings.service.form.customUrl": "سرور سفارشی",
+  "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.customUrlPremiumInfo": "برای اضافه کردن سرویس هایی که خود دارید ، نیاز به پشتیبانی پیشرفته فرانز را دارید",
+  "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
-  "settings.service.form.customUrlValidationError": "نتوانستیم سرور {نام} را تایید اعتبار کنیم",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
-  "settings.service.form.deleteButton": "حذف سرویس",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
-  "settings.service.form.editServiceHeadline": "ویرایش {name}",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.enableAudio": "فعال‌سازی صدا",
+  "settings.service.form.deleteButton": "Delete service",
-  "settings.service.form.enableBadge": "نماد پیام خوانده نشده را نشان بده ",
+  "settings.service.form.editServiceHeadline": "Edit {name}",
-  "settings.service.form.enableDarkMode": "فعالسازی حالت شب",
+  "settings.service.form.enableAudio": "Enable audio",
+  "settings.service.form.enableBadge": "Show unread message badges",
+  "settings.service.form.enableDarkMode": "Enable Dark Mode",
  "settings.service.form.enableHibernation": "Enable hibernation",
-  "settings.service.form.enableNotification": "فعال سازی اعلان‌ها",
+  "settings.service.form.enableNotification": "Enable notifications",
-  "settings.service.form.enableService": "فعال سازی سرویس ها",
+  "settings.service.form.enableService": "Enable service",
-  "settings.service.form.headlineBadges": "نماد پیام های خوانده نشده ",
+  "settings.service.form.enableWakeUp": "Enable wake up",
-  "settings.service.form.headlineGeneral": "عمومی",
+  "settings.service.form.headlineBadges": "Unread message badges",
-  "settings.service.form.headlineNotifications": "اعلان‌ها",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
-  "settings.service.form.icon": "آیکون پیشفرض",
+  "settings.service.form.headlineGeneral": "General",
-  "settings.service.form.iconDelete": "حذف",
+  "settings.service.form.headlineNotifications": "Notifications",
-  "settings.service.form.iconUpload": "عکس خود را به اینجا بکشید و یا اینجا را کیلیک کنید",
+  "settings.service.form.icon": "Custom icon",
-  "settings.service.form.indirectMessageInfo": "شما از تمامی پیام های جدید در کانال ها با خبر خواهید شد نه تنها در @usernam , @channel , @here , ...",
+  "settings.service.form.iconDelete": "Delete",
-  "settings.service.form.indirectMessages": "نماد پیام را برای تمامی پیام های جدید نشان بده",
+  "settings.service.form.iconUpload": "Drop your image, or click here",
+  "settings.service.form.indirectMessageInfo": "You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
+  "settings.service.form.indirectMessages": "Show message badge for all new messages",
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
-  "settings.service.form.isMutedInfo": "زمان غیرفعالی ، تمامی اعلان ها ،صداها و صداهای پشت زمینه را ببند.",
+  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
-  "settings.service.form.name": "نام",
+  "settings.service.form.name": "Name",
-  "settings.service.form.proxy.headline": "تنظیمات پروکسی HTTP/HTTPS",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
-  "settings.service.form.proxy.host": "آی پی پروکسی",
+  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
-  "settings.service.form.proxy.info": "تنظیمات پروکسی در سرورهای فرَنز ذخیره نخواهد شد.",
+  "settings.service.form.openUserCss": "Open user.css",
-  "settings.service.form.proxy.isEnabled": "استفاده از پروکسی",
+  "settings.service.form.openUserJs": "Open user.js",
-  "settings.service.form.proxy.password": "رمزعبور (اختیاری)",
+  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
-  "settings.service.form.proxy.port": "درگاه",
+  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.restartInfo": "لطفا پس از تغییر تنظیمات پروکسی، فرَنز رو ریستارت کن.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
-  "settings.service.form.proxy.user": "کاربر (اختیاری)",
+  "settings.service.form.proxy.isEnabled": "Use Proxy",
-  "settings.service.form.saveButton": "ذخیره سرویس",
+  "settings.service.form.proxy.password": "Password (optional)",
-  "settings.service.form.tabHosted": "میزبان شده",
+  "settings.service.form.proxy.port": "Port",
-  "settings.service.form.tabOnPremise": "خود میزبانی",
+  "settings.service.form.proxy.restartInfo": "Please restart Ferdi after changing proxy Settings.",
-  "settings.service.form.team": "گروه",
+  "settings.service.form.proxy.user": "User (optional)",
-  "settings.service.form.useHostedService": "از هاست سرویس {نام} استفاده شود.",
+  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
-  "settings.service.form.yourServices": "سرویس های شما",
+  "settings.service.form.saveButton": "Save service",
-  "settings.services.deletedInfo": "سرویس حذف شده است",
+  "settings.service.form.tabHosted": "Hosted",
-  "settings.services.discoverServices": "آشکار سازی سرویس ها ",
+  "settings.service.form.tabOnPremise": "Self hosted ⭐️",
-  "settings.services.headline": "سرویس های شما",
+  "settings.service.form.team": "Team",
-  "settings.services.noServicesAdded": "شما هیچ سرویسی هنوز اضافه نکرده اید ",
+  "settings.service.form.useHostedService": "Use the hosted {name} service.",
-  "settings.services.servicesRequestFailed": "سرویس های شما بارگیری نشدن",
+  "settings.service.form.yourServices": "Your services",
-  "settings.services.tooltip.isDisabled": "سرویس غیرفعال است",
+  "settings.services.deletedInfo": "Service has been deleted",
-  "settings.services.tooltip.isMuted": "تمامی صدا ها قطع هستند .",
+  "settings.services.discoverServices": "Discover services",
-  "settings.services.tooltip.notificationsDisabled": "اعلان ها غیرفعالند.",
+  "settings.services.headline": "Your services",
-  "settings.services.updatedInfo": "تغییرات شما ذخیره شد .",
+  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.team.contentHeadline": "فرَنز برای گروه ها",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term.",
-  "settings.team.copy": "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.services.servicesRequestFailed": "Could not load your services",
-  "settings.team.headline": "گروه",
+  "settings.services.tooltip.isDisabled": "Service is disabled",
-  "settings.team.intro": "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+  "settings.services.tooltip.isMuted": "All sounds are muted",
-  "settings.team.manageAction": "گروهتو تو meetfranz.com مدیریت کن",
+  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
-  "settings.team.upgradeAction": "حسابت رو ارتقا بده",
+  "settings.services.updatedInfo": "Your changes have been saved",
-  "settings.user.form.accountType.company": "شرکت",
+  "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.user.form.accountType.individual": "شخص",
+  "settings.supportFerdi.headline": "About Ferdi",
-  "settings.user.form.accountType.label": "نوع حساب",
+  "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,",
-  "settings.user.form.accountType.non-profit": "شرکت خصوصی",
+  "settings.supportFerdi.textDonationAnd": "and",
-  "settings.user.form.currentPassword": "گذرواژهٔ فعلی",
+  "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.user.form.email": "ایمیل",
+  "settings.supportFerdi.textGitHubSponsors": "GitHub Sponsors",
-  "settings.user.form.firstname": "نام",
+  "settings.supportFerdi.textListContributors": "Full list of contributors",
-  "settings.user.form.lastname": "نام خانوادگی",
+  "settings.supportFerdi.textListContributorsHere": "here",
-  "settings.user.form.newPassword": "گذرواژهٔ جدید",
+  "settings.supportFerdi.textOpenCollective": "Open Collective",
-  "settings.workspace.add.form.name": "نام",
+  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
-  "settings.workspace.add.form.submitButton": "ایجاد فضای کاری",
+  "settings.supportFerdi.textSupportWelcomeHere": "here",
-  "settings.workspace.form.buttonDelete": "حذف فضای کاری",
+  "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.workspace.form.buttonSave": "ذخیره فضای کاری",
+  "settings.team.contentHeadline": "Franz Team Management",
-  "settings.workspace.form.name": "نام",
+  "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.workspace.form.servicesInWorkspaceHeadline": "سرویس های این فضای کاری",
+  "settings.team.headline": "Team",
-  "settings.workspace.form.yourWorkspaces": "فضاهای کاری شما",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
-  "settings.workspaces.deletedInfo": "فضای کاری حذف شد",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
-  "settings.workspaces.headline": "فضاهای کاری شما",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
-  "settings.workspaces.noWorkspacesAdded": "هنوز فضای کاری اضافه نکردی.",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.workspaces.tryReloadWorkspaces": "تلاش مجدد ",
+  "settings.user.form.accountType.company": "Company",
-  "settings.workspaces.updatedInfo": "تغییرات ذخیره شدن",
+  "settings.user.form.accountType.individual": "Individual",
+  "settings.user.form.accountType.label": "Account type",
+  "settings.user.form.accountType.non-profit": "Non-Profit",
+  "settings.user.form.currentPassword": "Current password",
+  "settings.user.form.email": "Email",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
+  "settings.user.form.newPassword": "New password",
+  "settings.workspace.add.form.name": "Name",
+  "settings.workspace.add.form.submitButton": "Create workspace",
+  "settings.workspace.form.buttonDelete": "Delete workspace",
+  "settings.workspace.form.buttonSave": "Save workspace",
+  "settings.workspace.form.keepLoaded": "Keep this workspace loaded*",
+  "settings.workspace.form.keepLoadedInfo": "*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
+  "settings.workspace.form.name": "Name",
+  "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace",
+  "settings.workspace.form.yourWorkspaces": "Your workspaces",
+  "settings.workspaces.deletedInfo": "Workspace has been deleted",
+  "settings.workspaces.headline": "Your workspaces",
+  "settings.workspaces.noWorkspacesAdded": "You haven't created any workspaces yet.",
+  "settings.workspaces.tryReloadWorkspaces": "Try again",
+  "settings.workspaces.updatedInfo": "Your changes have been saved",
  "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces",
  "settings.workspaces.workspaceFeatureInfo": "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. 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.",
-  "settings.workspaces.workspacesRequestFailed": "فضاهای کاری بارگذاری نشدند",
+  "settings.workspaces.workspacesRequestFailed": "Could not load your workspaces",
  "setupAssistant.headline": "Let's get started",
  "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
  "setupAssistant.submit.label": "Let's go",
-  "sidebar.addNewService": "اضافه کردن سرویس جدید",
+  "sidebar.addNewService": "Add new service",
  "sidebar.closeTodosDrawer": "Close Ferdi Todos",
-  "sidebar.closeWorkspaceDrawer": "بستن کشوی فضای کاری",
+  "sidebar.closeWorkspaceDrawer": "Close workspace drawer",
-  "sidebar.muteApp": "غیرفعال کردن اعلان ها و صدا",
+  "sidebar.lockFerdi": "Lock Ferdi",
+  "sidebar.muteApp": "Disable notifications & audio",
  "sidebar.openTodosDrawer": "Open Ferdi Todos",
-  "sidebar.openWorkspaceDrawer": "بازکردن کشوی فضای کاری",
+  "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.unmuteApp": "فعال سازی اعلان ها  و صدا",
+  "sidebar.unmuteApp": "Enable notifications & audio",
-  "signup.email.label": "نشانی ایمیل",
+  "signup.email.label": "Email address",
-  "signup.emailDuplicate": "یک کاربر با این ایمیل هم اکنون موجود است.",
+  "signup.emailDuplicate": "A user with that email address already exists",
-  "signup.firstname.label": "نام",
+  "signup.firstname.label": "First Name",
-  "signup.headline": "ثبت نام",
+  "signup.headline": "Sign up",
-  "signup.lastname.label": "نام خانوادگی",
+  "signup.lastname.label": "Last Name",
-  "signup.legal.info": "با ایجاد حساب فرانز شما قبول کرده اید که ",
+  "signup.legal.info": "By creating a Ferdi account you accept the",
-  "signup.legal.privacy": "قوانین خصوصی سازی",
+  "signup.legal.privacy": "Privacy Statement",
-  "signup.legal.terms": "شرایط ارائهٔ خدمات",
+  "signup.legal.terms": "Terms of service",
-  "signup.link.login": "صاحب اکانت هستید ؟ وارد شوید",
+  "signup.link.login": "Already have an account, sign in?",
-  "signup.password.label": "رمز عبور",
+  "signup.password.label": "Password",
-  "signup.submit.label": "ایجاد حساب جدید",
+  "signup.submit.label": "Create account",
-  "tabs.item.deleteService": "حذف سرویس",
+  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.disableAudio": "غیرفعال کردن صدا",
+  "tabs.item.deleteService": "Delete service",
-  "tabs.item.disableNotifications": "غیر فعال کردن اعلان ها",
+  "tabs.item.disableAudio": "Disable audio",
-  "tabs.item.disableService": "غیر فعال کردن سرویس",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
-  "tabs.item.enableAudio": "فعال‌سازی صدا",
+  "tabs.item.disableNotifications": "Disable notifications",
-  "tabs.item.enableNotification": "فعال سازی اعلان‌ها",
+  "tabs.item.disableService": "Disable service",
-  "tabs.item.enableService": "فعال سازی سرویس",
+  "tabs.item.enableAudio": "Enable audio",
-  "tabs.item.reload": "بارگذاری مجدد",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
-  "validation.email": "{فیلد} معتبر نیست",
+  "tabs.item.enableNotification": "Enable notifications",
-  "validation.minLength": "{فیلد} باید حداقل{طول} کاراکتر داشته باشد",
+  "tabs.item.enableService": "Enable service",
-  "validation.oneRequired": "حداقل یکی الزامی هست",
+  "tabs.item.hibernateService": "Hibernate service",
-  "validation.required": "{فیلد} نیاز است ",
+  "tabs.item.reload": "Reload",
-  "validation.url": "{فیلد} URL  معتبر نیست",
+  "tabs.item.wakeUpService": "Wake up service",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
+  "validation.oneRequired": "At least one is required",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Back",
  "webControls.forward": "Forward",
  "webControls.goHome": "Home",
  "webControls.openInBrowser": "Open in Browser",
-  "webControls.reload": "بارگذاری مجدد",
+  "webControls.reload": "Reload",
-  "welcome.loginButton": "وارد شدن به اکانت خود",
+  "welcome.loginButton": "Login to your account",
-  "welcome.signupButton": "ساخت یک حساب کاربری",
+  "welcome.signupButton": "Create a free account",
-  "workspaceDrawer.addNewWorkspaceLabel": "افزودن فضای کاری جدید",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
-  "workspaceDrawer.allServices": "همه سرویس ها",
+  "workspaceDrawer.allServices": "All services",
-  "workspaceDrawer.headline": "فضاهای کاری",
+  "workspaceDrawer.headline": "Workspaces",
-  "workspaceDrawer.item.contextMenuEdit": "ویرایش",
+  "workspaceDrawer.item.contextMenuEdit": "edit",
-  "workspaceDrawer.item.noServicesAddedYet": "هنوز هیچ سرویسی اضافه نشده",
+  "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "اولین فضای کاریتو درست کن",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "فعالسازی مجدد حساب ویژه",
  "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": "ویرایش تنظیمات فضاهای کاری",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
-  "workspaces.switchingIndicator.switchingTo": "سویچ به"
+  "workspaces.switchingIndicator.switchingTo": "Switching to"
 }
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index 0238a262e..ea87f56e3 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Lähetä kutsuja",
  "invite.successInfo": "Kutsut lähetetty onnistuneesti",
  "locked.headline": "Lukittu",
-  "locked.info": "Ferdi on tällä hetkellä lukittu. Nähdäksesi viestit avaa Ferdi salasanallasi.",
  "locked.invalidCredentials": "Virheellinen salasana",
  "locked.password.label": "Salasana",
  "locked.submit.label": "Avaa lukitus",
@@ -168,7 +167,6 @@
  "services.login": "Kirjaudu sisään käyttääksesi Ferdiä.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Käytä Ferdia ilman tiliä",
-  "services.welcome": "Tervetuloa Ferdiin",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Tili ei ole käytettävissä",
  "settings.account.accountUnavailableInfo": "Käytät Ferdia ilman tiliä. Jos haluat käyttää Ferdia tilin kanssa ja pitää palvelusi synkronoituna kaikissa asennuksissa, valitse Asetukset-välilehdessä palvelin ja kirjaudu sisään.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "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",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Päivitykset",
  "settings.app.hibernateInfo": "Oletuksena Ferdi pitää kaikki palvelut auki ja ladattuna taustalla, joten ne ovat valmiina, kun haluat käyttää niitä. Horrostila sammuttaa palveluita tietyn jakson jälkeen. Tämä kätevä toimino säästää RAM-muistia tai estää palveluita hidastamasta tietokonetta.",
  "settings.app.inactivityLockInfo": "Minuutin käyttämättömyyden jälkeen Ferdi lukkiutuu automaattisesti. Käytä arvoa 0 poistaaksesi toiminnon käytöstä",
-  "settings.app.languageDisclaimer": "Viralliset käännökset ovat englanti ja saksa. Kaikki muut kielet ovat yhteisön kääntämiä.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Salasana",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "settings.recipes.customService.headline.communityRecipes": "Yhteisön Kolmannen osapuolen Ohjeet",
  "settings.recipes.customService.headline.customRecipes": "Kolmannen osapuolen ohjeet",
  "settings.recipes.customService.headline.devRecipes": "Ohjeet palvelun kehittämiseen",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Ohjelmoijan dokumentaatio",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Käytettävissä olevat palvelut",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Selaa palveluita",
  "settings.services.headline": "Sinun palvelusi",
  "settings.services.noServicesAdded": "Aloita lisäämällä palvelu.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Palveluita ei voitu ladata",
  "settings.services.tooltip.isDisabled": "Palvelu poistettu käytöstä",
  "settings.services.tooltip.isMuted": "Kaikki äänet on mykistetty",
  "settings.services.tooltip.notificationsDisabled": "Ilmoitukset on poistettu käytöstä",
  "settings.services.updatedInfo": "Tekemäsi muutokset on tallennettu",
  "settings.supportFerdi.aboutIntro": "<p>Ferdi on yhteisöjohtoinen ja avoimen lähdekoodin sovellus.</p><p>Kiitos henkilöille, jotka tekevät tämän mahdolliseksi:</p>",
-  "settings.supportFerdi.bannerText": "Haluatko auttaa meitä kehittämään Ferdiä?",
  "settings.supportFerdi.headline": "Tietoja Ferdistä",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "Jos haluat tukea Ferdin kehitystä lahjoituksella, voit tehdä niin molemmilla tavoilla,",
  "settings.supportFerdi.textDonationAnd": "ja",
  "settings.supportFerdi.textExpenses": "Vaikka vapaaehtoiset tekevät suurimman osan työstä, meidän on silti maksettava palvelemista ja sertifikaateista. Olemme yhteisönä täysin läpinäkyviä keräämiämme ja käyttämiemme varojen suhteen",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Tuki on aina tervetullutta. Voit saada listan tarvitsemastamme avusta",
  "settings.supportFerdi.textSupportWelcomeHere": "tästä",
  "settings.supportFerdi.textVolunteers": "Ferdin kehittäminen tehdään vapaaehtoisten avulla. Ihmisillä, jotka käyttävät Ferdiä kuten sinä. He ylläpitävät, korjaavat ja parantavat Ferdia vapaa-aikanaan.",
-  "settings.supportFerdi.title": "Pidätkö Ferdistä?",
  "settings.team.contentHeadline": "Franz-tiimin hallinta",
  "settings.team.copy": "Franzin Tiimihallinnan avulla voit hallita usean käyttäjän Franz-tilauksia. Huomioithan, että Franz Premium -tilaus ei anna sinulle etuja Ferdin käytössä: Ainoa syy siihen, että sinulla on vielä pääsy Tiimihallintaan, on se, että voit hallita perinteisiä Franz-tiimejä ja että et menetä mitään toimintoja tilisi hallinnassa.",
  "settings.team.headline": "Tiimi",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index ba5af2f86..16d806321 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Envoyer des invitations",
  "invite.successInfo": "Invitations envoyées avec succès",
  "locked.headline": "Verrouiller",
-  "locked.info": "Ferdi est actuellement verrouillé. Veuillez déverrouiller Ferdi avec votre mot de passe pour voir vos messages.",
  "locked.invalidCredentials": "Mot de passe invalide",
  "locked.password.label": "Mot de passe",
  "locked.submit.label": "Déverrouiller",
@@ -168,7 +167,6 @@
  "services.login": "Veuillez vous connecter pour utiliser Ferdi.",
  "services.serverInfo": "Optionnellement, vous pouvez changer de serveur Ferdi en cliquant sur le contrôle dans le coin inférieur gauche. Si vous basculez d'un serveur hébergé à une utilisation de Ferdi sans compte, vous pouvez exporter vos données depuis ce serveur et ensuite l'importer en utilisant le menu Aide pour ressusciter tous vos espaces de travail et services configurés !",
  "services.serverless": "Utiliser Ferdi sans compte",
-  "services.welcome": "Bienvenue dans Ferdi",
  "settings.account.account.editButton": "Modifier le compte",
  "settings.account.accountUnavailable": "Compte indisponible",
  "settings.account.accountUnavailableInfo": "Vous utilisez Ferdi sans compte. Si vous souhaitez utiliser Ferdi avec un compte et garder vos services synchronisés entre les installations, sélectionnez un serveur dans l'onglet Paramètres, puis connectez-vous.",
@@ -242,6 +240,7 @@
  "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": "Afficher le nom du service sous l'icône",
+  "settings.app.form.splitColumns": "Nombre de colonnes",
  "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",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Mises à jour",
  "settings.app.hibernateInfo": "Par défaut, Ferdi gardera tous vos services ouverts et chargés en arrière-plan afin qu'ils soient prêts lorsque vous voulez les utiliser. Le service d'hibernation déchargera vos services après un montant spécifié. Ceci est utile pour sauver de la RAM ou garder les services de ralentir votre ordinateur.",
  "settings.app.inactivityLockInfo": "Minutes d'inactivité, après lesquelles Ferdi devrait se verrouiller automatiquement. Utilisez 0 pour désactiver",
-  "settings.app.languageDisclaimer": "Les traductions officielles sont l'anglais et l'allemand. Toutes les autres langues sont des traductions faites par la communauté.",
  "settings.app.lockInfo": "Le verrouillage par mot de passe vous permet de garder vos messages protégés.\nPour l'utilisation du verrouillage par mot de passe, vous serez invité à entrer votre mot de passe chaque fois que vous démarrez Ferdi ou que vous verrouillerez Ferdi vous-même en utilisant le symbole de verrouillage en bas à gauche ou le raccourci {lockShortcut}.",
  "settings.app.lockedPassword": "Mot de passe",
  "settings.app.lockedPasswordInfo": "Veuillez vous assurer de définir un mot de passe dont vous vous souviendrez.\nSi vous perdez ce mot de passe, vous devrez réinstaller Ferdi.",
@@ -286,7 +284,7 @@
  "settings.recipes.customService.headline.communityRecipes": "Recettes tiers communautaire",
  "settings.recipes.customService.headline.customRecipes": "Recettes tiers modifiées",
  "settings.recipes.customService.headline.devRecipes": "Vos recettes de service de développement",
-  "settings.recipes.customService.intro": "Pour ajouter un service personnalisé, copiez la recette du service à:",
+  "settings.recipes.customService.intro": "Pour ajouter un service personnalisé, copiez le dossier de recettes du service ici:",
  "settings.recipes.customService.openDevDocs": "Documentation de Développeur",
  "settings.recipes.customService.openFolder": "Ouvrir le dossier",
  "settings.recipes.headline": "Services disponibles",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Découvrir les services",
  "settings.services.headline": "Vos services",
  "settings.services.noServicesAdded": "Commencez par ajouter un service.",
-  "settings.services.nothingFound": "Désolé, mais aucun service ne correspond à votre recherche - mais vous pouvez toujours l'ajouter en utilisant l'option \"Custom Website\". Veuillez noter que le site Web pourrait afficher plus de services qui ont été ajoutés à Ferdi depuis la version sur laquelle vous êtes actuellement. Pour obtenir ces nouveaux services, veuillez envisager la mise à niveau vers une version plus récente de Ferdi.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Impossible de charger vos services",
  "settings.services.tooltip.isDisabled": "Ce service est désactivé",
  "settings.services.tooltip.isMuted": "Tous les sons sont coupés",
  "settings.services.tooltip.notificationsDisabled": "Notifications désactivées",
  "settings.services.updatedInfo": "Vos modifications ont été enregistrées",
  "settings.supportFerdi.aboutIntro": "<p>Ferdi est une application open-source et dirigée par la communauté.</p><p>Merci à toutes les personnes qui rendent cela possible :</p>",
-  "settings.supportFerdi.bannerText": "Voulez-vous nous aider à améliorer Ferdi ?",
  "settings.supportFerdi.headline": "À propos de Ferdi",
-  "settings.supportFerdi.openSurvey": "Ouvrir l'enquête",
  "settings.supportFerdi.textDonation": "Si vous avez envie de soutenir le développement de Ferdi par un don, vous pouvez le faire via",
  "settings.supportFerdi.textDonationAnd": "et",
  "settings.supportFerdi.textExpenses": "Bien que les bénévoles fassent la majeure partie du travail, nous avons besoin de payer pour les serveurs et les certificats. En tant que communauté, nous sommes totalement transparents sur les fonds que nous collectons et dépensons - voir nos",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Toute aide est toujours la bienvenue. Vous pouvez trouver une liste de l'aide dont nous avons besoin",
  "settings.supportFerdi.textSupportWelcomeHere": "ici",
  "settings.supportFerdi.textVolunteers": "Le développement de Ferdi est fait par des bénévoles. Des gens qui utilisent Ferdi comme vous. Ils maintiennent, réparent et améliorent Ferdi pendant leur temps libre.",
-  "settings.supportFerdi.title": "Vous aimez Ferdi ?",
  "settings.team.contentHeadline": "Gestion d'équipe Franz",
  "settings.team.copy": "La gestion d'équipe de Franz vous permet de gérer les abonnements Franz pour plusieurs utilisateurs. N’oubliez pas que le fait d’avoir un abonnement Franz Premium ne vous donnera aucun avantage dans l'utilisation de Ferdi : la seule raison pour laquelle vous avez encore accès à la gestion d’équipe est que vous pouvez gérer vos équipes Franz héritées et que vous ne perdez donc aucune fonctionnalité dans la gestion de votre compte.",
  "settings.team.headline": "Équipe",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 1d9596a79..ade9c3fbf 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Seol cuirí",
  "invite.successInfo": "Cuirí seolta go rathúil",
  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
@@ -168,7 +167,6 @@
  "services.login": "Please login to use Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Fáilte go Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Account is unavailable",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Nuashonruithe",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Seirbhísí le fáil",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Aimsigh seirbhísí",
  "settings.services.headline": "Do sheirbhísí",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Seirbhís díchumasaithe",
  "settings.services.tooltip.isMuted": "Tachtar gach fuaim",
  "settings.services.tooltip.notificationsDisabled": "Fógraí dhíchumasaithe",
  "settings.services.updatedInfo": "Sábháladh do chuid athruithe",
  "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.headline": "Faoi Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.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": "Foireann",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 226c66943..b25aaa67b 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "שלח הזמנות",
  "invite.successInfo": "ההזמנות נשלחו בהצלחה",
  "locked.headline": "נעול",
-  "locked.info": "Ferdi נעול כרגע. אנא בטל את נעילת Ferdi באמצעות הסיסמה כדי לראות את ההודעות שלך.",
  "locked.invalidCredentials": "הסיסמא אינה תקינה",
  "locked.password.label": "סיסמא",
  "locked.submit.label": "בטל נעילה",
@@ -168,7 +167,6 @@
  "services.login": "אנא התחבר כדי להשתמש בפרדי.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "השתמש בפרדי ללא חשבון",
-  "services.welcome": "ברוך הבא לפרדי",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "החשבון אינו זמין",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "התחלה במצב ממוזער",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "עדכונים",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "סיסמא",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "תיעוד למפתחים",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "שירותים זמינים",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "גלה שירותים חדשים",
  "settings.services.headline": "השירותים שלך",
  "settings.services.noServicesAdded": "התחל להוסיף שירותים.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "לא נית לטעון את השירותים שלך",
  "settings.services.tooltip.isDisabled": "השירות מושבת",
  "settings.services.tooltip.isMuted": "כל הצלילים מושתקים",
  "settings.services.tooltip.notificationsDisabled": "ההתראות מושבתות",
  "settings.services.updatedInfo": "השינויים שלך נשמרו",
  "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": "האם תרצה לעזור לנו לשפר את פרדי?",
  "settings.supportFerdi.headline": "אודות פרדי",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "אם תרצה לתמוך בפרדי באמצעות תרומה, אתה יכול לעשות זאת גם,",
  "settings.supportFerdi.textDonationAnd": "וגם",
  "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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "כאן",
  "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": "האם אתה אוהב את פרדי?",
  "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": "צוות",
diff --git a/src/i18n/locales/hi.json b/src/i18n/locales/hi.json
index 2544d2a00..db528ac47 100644
--- a/src/i18n/locales/hi.json
+++ b/src/i18n/locales/hi.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Send invites",
  "invite.successInfo": "Invitations sent successfully",
  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
@@ -168,7 +167,6 @@
  "services.login": "Please login to use Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Welcome to Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Account is unavailable",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Available services",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Discover services",
  "settings.services.headline": "Your services",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Service is disabled",
  "settings.services.tooltip.isMuted": "All sounds are muted",
  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
  "settings.services.updatedInfo": "Your changes have been saved",
  "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.headline": "About Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.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",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 81e76fc9f..83611ff1b 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Pošalji pozivnice",
  "invite.successInfo": "Pozivnice uspješno poslane",
  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
@@ -168,7 +167,6 @@
  "services.login": "Please login to use Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Dobrodošli u Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Account is unavailable",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Nadogradnje",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Dostupne usluge",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Pronađite usluge",
  "settings.services.headline": "Vaše usluge",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Usluga je onemogućena. ",
  "settings.services.tooltip.isMuted": "Svi zvukovi su onemogućeni. ",
  "settings.services.tooltip.notificationsDisabled": "Obavijesti su onemogućene.",
  "settings.services.updatedInfo": "Vaše promjene su spremljene",
  "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.headline": "O aplikaciji",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.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": "Tim",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 05546e271..a8fa40c99 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Meghívók küldése",
  "invite.successInfo": "Meghívás sikeresen elküldve",
  "locked.headline": "Zárolva",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "Érvénytelen jelszó",
  "locked.password.label": "Jelszó",
  "locked.submit.label": "Feloldás",
@@ -168,7 +167,6 @@
  "services.login": "Kérlek, lépj be a Ferdi használatához.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Üdvözöl a Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "A Fiók nem érhető el",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "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",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Frissítések",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "A hivatalos fordítások angol és német nyelven elérhetőek. Minden más nyelv közösségi fordításon alapul.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Jelszó",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
  "settings.recipes.customService.headline.customRecipes": "Egyéni, harmadik féltől származó receptek",
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Fejlesztői dokumentáció",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Elérhető szolgáltatások",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Szolgáltatások felfedezése",
  "settings.services.headline": "Szolgáltatásaid",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Szolgáltatásaid betöltése sikertelen",
  "settings.services.tooltip.isDisabled": "A szolgáltatás le van tiltva",
  "settings.services.tooltip.isMuted": "Minden hang lenémítva",
  "settings.services.tooltip.notificationsDisabled": "Értesítések letiltva",
  "settings.services.updatedInfo": "A módosításokat elmentettük",
  "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.headline": "Névjegy",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,",
  "settings.supportFerdi.textDonationAnd": "és",
  "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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "itt",
  "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": "Tetszik a Ferdi?",
  "settings.team.contentHeadline": "Franz Csapatkezelés",
  "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": "Csapat",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index d0a3dd482..60e80a27e 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Kirim undangan",
  "invite.successInfo": "Undangan berhasil dikirim",
  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
@@ -168,7 +167,6 @@
  "services.login": "Please login to use Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Selamat datang di Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Account is unavailable",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Versi Baru",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Penerjemahan resmi dilakukan untuk Bahasa Inggris dan Jerman. Bahasa lainnya merupakan penerjemahan oleh komunitas.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Layanan tersedia",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Temukan layanan",
  "settings.services.headline": "Layanan Anda",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Tidak dapat memuat layanan Anda",
  "settings.services.tooltip.isDisabled": "Layanan dinonaktifkan",
  "settings.services.tooltip.isMuted": "Semua suara dibisukan",
  "settings.services.tooltip.notificationsDisabled": "Pemberitahuan dinonaktifkan",
  "settings.services.updatedInfo": "Perubahan Anda telah disimpan",
  "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.headline": "Tentang Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.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": "Tim",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index dd3e1287a..f1d55e471 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Manda inviti",
  "invite.successInfo": "Inviti inviati con successo",
  "locked.headline": "Bloccato",
-  "locked.info": "Ferdi è attualmente bloccato. Per favore sblocca Ferdi con la tua password per vedere i tuoi messaggi.",
  "locked.invalidCredentials": "Password non valida",
  "locked.password.label": "Password",
  "locked.submit.label": "Sblocca",
@@ -168,7 +167,6 @@
  "services.login": "Effettua il login per utlizzare Ferdi.",
  "services.serverInfo": "Facoltativamente, puoi cambiare il tuo server Ferdi cliccando l'ingranaggio nell'angolo in basso a sinistra. Se stai passando (da uno dei server ospitati) ad usare Ferdi senza un account, sappi che puoi esportare i tuoi dati da quel server e successivamente importarli usando il menu Aiuto per ripristinare tutti i tuoi spazi di lavoro e servizi configurati!",
  "services.serverless": "Usa Ferdi senza account",
-  "services.welcome": "Benvenuto su Ferdi",
  "settings.account.account.editButton": "Modifica account",
  "settings.account.accountUnavailable": "Account non disponibile",
  "settings.account.accountUnavailableInfo": "Stai usando Ferdi senza un account. Se si desidera aggiungere un account, e tenere sincronizzati i servizi tra le installazioni, selezionare un server nel tab delle Impostazioni e quindi login.",
@@ -242,6 +240,7 @@
  "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.showServiceName": "Mostra il nome del servizio sotto all'icona",
+  "settings.app.form.splitColumns": "Number of columns",
  "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",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Aggiornamenti",
  "settings.app.hibernateInfo": "Per impostazione predefinita, Ferdi manterrà tutti i servizi aperti e caricati in background in modo che siano pronti quando si desidera utilizzarli. Il servizio Hibernation sospenderà i servizi dopo un tempo specificato. Questo è utile per risparmiare RAM o per evitare che i servizi rallentino il computer.",
  "settings.app.inactivityLockInfo": "Minuti di inattività oltre i quali Ferdi si bloccherà automaticamente, 0 per disabilitare",
-  "settings.app.languageDisclaimer": "Le traduzioni ufficiali sono in Inglese e Tedesco. Tutte le altre lingue sono tradotte dalla community.",
  "settings.app.lockInfo": "Password Lock ti permette di mantenere i tuoi messaggi protetti. Usando Password Lock, ti verrà richiesto di inserire la tua password ogni volta che avvii Ferdi o di bloccare Ferdi stesso usando il simbolo del lucchetto nell'angolo in basso a sinistra o la scorciatoia {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Assicurati di impostare una password che ricordi.\nSe perdi questa password, dovrai reinstallare Ferdi.",
@@ -286,7 +284,7 @@
  "settings.recipes.customService.headline.communityRecipes": "'Recipe' (istruzioni) per applicazioni di terze parti della community",
  "settings.recipes.customService.headline.customRecipes": "'Recipe' (istruzioni) per applicazioni di terze parti personalizzate",
  "settings.recipes.customService.headline.devRecipes": "Le tue 'Recipe' (istruzioni) per applicazioni",
-  "settings.recipes.customService.intro": "Per aggiungere un servizio personalizzato copia la sua 'recipe' in:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Documentazione per sviluppatori",
  "settings.recipes.customService.openFolder": "Apri cartella",
  "settings.recipes.headline": "Servizi disponibili",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Scopri servizi",
  "settings.services.headline": "I tuoi servizi",
  "settings.services.noServicesAdded": "Inizia aggiungendo un servizio.",
-  "settings.services.nothingFound": "Non è stato trovato alcun servizio corrispondente alla ricerca impostata. Ricorda che anche se non esiste un servizio specifico, potrebbe essere possibile usare la funzionalità \"Sito Custom\". Inoltre potrebbe essere che sul sito web di Ferdi siano mostrati più servizi di quanti disponibili nella applicazione correntemente in uso. Nel caso, per accedere a questi servizi, è possibile aggiornare Ferdi.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Impossibile caricare il servizio",
  "settings.services.tooltip.isDisabled": "Il servizio è disattivato",
  "settings.services.tooltip.isMuted": "Tutti i suoni sono disattivati",
  "settings.services.tooltip.notificationsDisabled": "Le notifiche sono disattivate",
  "settings.services.updatedInfo": "Le tue modifiche sono state salvate",
  "settings.supportFerdi.aboutIntro": "<p>Ferdi è un'applicazione open source sviluppata dalla community.</p><p>Un ringraziamento a tutti coloro che hanno reso questo possibile:</p>",
-  "settings.supportFerdi.bannerText": "Vuoi aiutarci a migliorare Ferdi?",
  "settings.supportFerdi.headline": "Info su Ferdi",
-  "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. Maggiori informazioni su",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Il tuo supporto è il benvenuto. Puoi trovare un elenco degli aiuti che ci servono",
  "settings.supportFerdi.textSupportWelcomeHere": "qui",
  "settings.supportFerdi.textVolunteers": "Lo sviluppo dell'applicazione Ferdi è gestita interamente da volontari, persone che come te usano Ferdi. Queste persone mantengono e migliorano Ferdi nel loro tempo libero.",
-  "settings.supportFerdi.title": "Ti piace Ferdi?",
  "settings.team.contentHeadline": "Franz Team Management",
  "settings.team.copy": "Il gestore di Team di Franz (Franz's Team Management) ti consente di gestire gli abbonamenti Franz (Franz Subscriptions) per più utenti. È importante ricordare che possedere un abbonamento Premium Franz non dà alcun beneficio nell'usare Ferdi. L'unico motivo per cui hai accesso al gestore di Team è perchè tu posa gestire i tuoi Team di Franz creati in precedenza così da non perdere alcuna funzionalità nella gestione del tuo account.",
  "settings.team.headline": "Gruppo",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 26e1f3606..af0664075 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "招待を送る",
  "invite.successInfo": "招待は無事に送信されました",
  "locked.headline": "ロック中",
-  "locked.info": "Ferdiは現在ロックされています。メッセージを表示するには、パスワードを入力してロックを解除してください。",
  "locked.invalidCredentials": "無効なパスワードです",
  "locked.password.label": "パスワード",
  "locked.submit.label": "ロック解除",
@@ -168,7 +167,6 @@
  "services.login": "Ferdiを使用するにはログインしてください。",
  "services.serverInfo": "オプションとして、左下の歯車をクリックしてFerdiサーバーを変更することができます。他のホストされたサーバからアカウントなしでFerdiを使うように変更する場合は、そのサーバからデータをエクスポートし、その後ヘルプメニューを使ってインポートすることですべてのワークスペースと設定したサービスを復元させることができます。",
  "services.serverless": "アカウントなしでFerdiを使用する",
-  "services.welcome": "Ferdiにようこそ",
  "settings.account.account.editButton": "アカウントを編集",
  "settings.account.accountUnavailable": "アカウントが利用できません",
  "settings.account.accountUnavailableInfo": "アカウントなしでFerdiを使用しています。 Ferdiのアカウントを使用してコンピューター間でサービスを同期させる場合、 設定タブでサーバーを選択してログインしてください。",
@@ -242,6 +240,7 @@
  "settings.app.form.showDragArea": "ドラッグ可能な領域をウィンドウに表示",
  "settings.app.form.showMessagesBadgesWhenMuted": "通知の無効時に未読メッセージ件数を表示する",
  "settings.app.form.showServiceName": "Display service name under the icon",
+  "settings.app.form.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "分割表示モードを有効にする",
  "settings.app.form.startMinimized": "最小化して起動",
  "settings.app.form.universalDarkMode": "ユニバーサルダークモードを有効にする",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "更新",
  "settings.app.hibernateInfo": "デフォルトでは、Ferdiはすべてのサービスをバックグラウンドで開いて読み込んでおくので、使いたいときにすぐに使えます。 サービス休止機能は設定した時間が経過したら読み込んだサービスを解放します。これはRAMを節約したり、サービスでコンピューターの動作が重くなるのを防ぐのに役立ちます。",
  "settings.app.inactivityLockInfo": "休止状態までの時間(分)、この時間が経過後Ferdiは自動でロックします。0で無効化",
-  "settings.app.languageDisclaimer": "公式の言語は英語とドイツ語です。他の言語はコミュニティによる翻訳です。",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "パスワード",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "settings.recipes.customService.headline.communityRecipes": "コミュニティのサードパーティレシピ",
  "settings.recipes.customService.headline.customRecipes": "カスタムサードパーティレシピ",
  "settings.recipes.customService.headline.devRecipes": "開発サービスのレシピ",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "開発者ドキュメント",
  "settings.recipes.customService.openFolder": "フォルダーを開く",
  "settings.recipes.headline": "利用可能なサービス",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "サービスを探す",
  "settings.services.headline": "利用中のサービス",
  "settings.services.noServicesAdded": "まずはサービスを追加します。",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "サービスを読み込むことができませんでした",
  "settings.services.tooltip.isDisabled": "サービスが無効です",
  "settings.services.tooltip.isMuted": "無音となっています",
  "settings.services.tooltip.notificationsDisabled": "通知は無効です",
  "settings.services.updatedInfo": "変更内容が保存されました",
  "settings.supportFerdi.aboutIntro": "<p>Ferdiはオープンソースでコミュニティ主導開発のアプリケーションです。</p><p>これを可能にしてくださった皆様に感謝します:</p>",
-  "settings.supportFerdi.bannerText": "Ferdiの改良の手助けをしたいですか？",
  "settings.supportFerdi.headline": "バージョン情報",
-  "settings.supportFerdi.openSurvey": "アンケートを開く",
  "settings.supportFerdi.textDonation": "Ferdiの開発を寄付で応援したい場合、以下の方法でお願いします。",
  "settings.supportFerdi.textDonationAnd": "と",
  "settings.supportFerdi.textExpenses": "ボランティアがかなりの部分の作業を行っていますが、私たちもサーバー代と証明書を支払わなくてはなりません。コミュニティと同様に、私たちの収支は全て公開されています。以下を参照してください。",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "支援はいつでも歓迎です。私たちが必要としている支援のリストがあります",
  "settings.supportFerdi.textSupportWelcomeHere": "ここ",
  "settings.supportFerdi.textVolunteers": "Ferdiの開発はボランティアにより行われています。Ferdiを気に入った同士の皆さんです。この方々は自分の自由時間を利用してFerdiのメンテナンス、バグ修正、改良を行っています。",
-  "settings.supportFerdi.title": "Ferdiを気に入ってくださいましたか？",
  "settings.team.contentHeadline": "Franzのチーム管理",
  "settings.team.copy": "Franzチーム管理では、複数のユーザーのFranzサブスクリプションを管理できます。Franzプレミアムのサブスクリプションは、Ferdiを使用する上で何の利点もないことに留意してください。レガシーなFranzのチームを管理し、アカウント管理機能を維持するためだけに、チーム管理にアクセスできるようになっています。",
  "settings.team.headline": "チーム",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index a5e9bab9c..df7d69c4f 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "მოწვევის გაგზავნა",
  "invite.successInfo": "Invitations sent successfully",
  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
@@ -168,7 +167,6 @@
  "services.login": "Please login to use Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "მოგესალმებით Ferdi-ზე",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Account is unavailable",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "განახლებები",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "ხელმისაწვდომი სერვისები",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "აღმოაჩინეთ სერვისები",
  "settings.services.headline": "თქვენი სერვისები",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "სერვისი გათიშულია",
  "settings.services.tooltip.isMuted": "All sounds are muted",
  "settings.services.tooltip.notificationsDisabled": "შეტყობინებები გათიშულია",
  "settings.services.updatedInfo": "თქვენი ცვლილებები შენახულია",
  "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.headline": "Ferdi-ის შესახებ",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.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": "გუნდი",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index 12307159a..9f7268afe 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "새로고침",
-  "app.errorHandler.headline": "Something went wrong.",
+  "app.errorHandler.headline": "문제가 발생했습니다.",
  "changeserver.customServerLabel": "사용자 정의 서버",
  "changeserver.headline": "서버 번경",
  "changeserver.label": "서버",
@@ -9,7 +9,7 @@
  "connectionLostBanner.cta": "서비스 재시작",
  "connectionLostBanner.informationLink": "무슨 일인가요?",
  "connectionLostBanner.message": "오 저런! Ferdi가 {name} 과 연결이 끊겼습니다.",
-  "feature.basicAuth.signIn": "Sign In",
+  "feature.basicAuth.signIn": "로그인",
  "feature.nightlyBuilds.activate": "활성화",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "나이틀리 빌드",
@@ -24,29 +24,29 @@
  "feature.quickSwitch.search": "검색...",
  "feature.quickSwitch.title": "빠른 검색",
  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Cancel",
+  "global.cancel": "취소",
  "global.edit": "편집",
-  "global.no": "No",
+  "global.no": "아니오",
  "global.notConnectedToTheInternet": "인터넷에 연결할 수 없습니다.",
-  "global.ok": "Ok",
+  "global.ok": "확인",
-  "global.quit": "Quit",
+  "global.quit": "종료",
-  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.quitConfirmation": "정말로 Ferdi를 종료 하시겠습니까?",
-  "global.save": "Save",
+  "global.save": "저장",
-  "global.settings": "Settings",
+  "global.settings": "설정",
  "global.spellchecker.useDefault": "시스템 기본 사용 ({default})",
  "global.spellchecking.autodetect": "언어 자동 탐색",
  "global.spellchecking.autodetect.short": "자동",
  "global.spellchecking.language": "철자 검사",
-  "global.submit": "Submit",
+  "global.submit": "제출",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
-  "global.userAgentPref": "User Agent",
+  "global.userAgentPref": "유저 에이전트",
-  "global.yes": "Yes",
+  "global.yes": "네",
-  "import.headline": "Import your Ferdi 4 services",
+  "import.headline": "Ferdi 4 서비스를 가져오기",
  "import.notSupportedHeadline": "Ferdi 5에서 아직 지원되지 않는 서비스입니다.",
  "import.skip.label": "수동으로 서비스 추가",
-  "import.submit.label": "Import {count} services",
+  "import.submit.label": "{count} 개의 서비스를 가져오기",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "What is new?",
+  "infobar.buttonChangelog": "변경 사항",
  "infobar.buttonInstallUpdate": "재시작 후 업데이트 설치",
  "infobar.buttonReloadServices": "서비스 재시작",
  "infobar.hide": "숨기기",
@@ -61,7 +61,6 @@
  "invite.submit.label": "초대 보내기",
  "invite.successInfo": "초대가 성공적으로 보내졌습니다.",
  "locked.headline": "잠김",
-  "locked.info": "Ferdi 는 현재 잠겨있습니다. 패스워드로 열어 메세지를 확인하세요.",
  "locked.invalidCredentials": "유효하지 않은 비밀번호",
  "locked.password.label": "비밀번호",
  "locked.submit.label": "잠금 해제",
@@ -74,7 +73,7 @@
  "login.email.label": "이메일 주소",
  "login.headline": "로그인",
  "login.invalidCredentials": "이메일 또는 비밀번호가 일치하지 않습니다",
-  "login.link.password": "Reset password",
+  "login.link.password": "비밀번호 초기화",
  "login.link.signup": "무료 계정 생성",
  "login.password.label": "비밀번호",
  "login.serverLogout": "세션이 만료되었습니다. 다시 로그인 하세요.",
@@ -86,40 +85,40 @@
  "menu.app.autohideMenuBar": "메뉴바 자동 감춤",
  "menu.app.checkForUpdates": "업데이트 확인",
  "menu.app.hide": "숨기기",
-  "menu.app.hideOthers": "Hide Others",
+  "menu.app.hideOthers": "다른 항목 숨기기",
-  "menu.app.unhide": "Unhide",
+  "menu.app.unhide": "보이기",
  "menu.edit": "편집",
-  "menu.edit.copy": "Copy",
+  "menu.edit.copy": "복사",
-  "menu.edit.cut": "Cut",
+  "menu.edit.cut": "잘라내기",
  "menu.edit.delete": "삭제",
  "menu.edit.emojiSymbols": "이모지 및 기호",
  "menu.edit.findInPage": "현재 페이지에서 찾기",
-  "menu.edit.paste": "Paste",
+  "menu.edit.paste": "붙여넣기",
-  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.pasteAndMatchStyle": "붙여넣어 스타일 맞춤",
-  "menu.edit.redo": "Redo",
+  "menu.edit.redo": "재실행",
-  "menu.edit.selectAll": "Select All",
+  "menu.edit.selectAll": "전체 선택",
  "menu.edit.speech": "말하기",
  "menu.edit.startDictation": "받아쓰기 시작",
  "menu.edit.startSpeaking": "말하기 시작",
  "menu.edit.stopSpeaking": "말하기 중지",
-  "menu.edit.undo": "Undo",
+  "menu.edit.undo": "되돌리기",
  "menu.file": "파일",
-  "menu.help": "Help",
+  "menu.help": "도움말",
  "menu.help.changelog": "변경 내역",
  "menu.help.debugInfo": "디버그 정보 복사",
  "menu.help.debugInfoCopiedBody": "디버그 정보가 클립보드에 복사되었습니다.",
  "menu.help.debugInfoCopiedHeadline": "Ferdi 디버그 정보",
-  "menu.help.importExportData": "Import/Export Configuration Data",
+  "menu.help.importExportData": "설정 가져오기/내보내기",
  "menu.help.learnMore": "자세히 보기",
  "menu.help.privacy": "개인정보보호정책",
  "menu.help.publishDebugInfo": "디버깅 정보 공개",
  "menu.help.support": "지원",
  "menu.help.tos": "이용 약관",
  "menu.services": "서비스",
-  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.activatePreviousService": "이전 서비스 활성화",
-  "menu.services.addNewService": "Add New Service...",
+  "menu.services.addNewService": "새로운 서비스 추가...",
  "menu.services.goHome": "홈",
-  "menu.services.setNextServiceActive": "Activate next service",
+  "menu.services.setNextServiceActive": "다음 서비스 활성화",
  "menu.todos": "Todos",
  "menu.todos.enableTodos": "Todos 허용",
  "menu.view": "View",
@@ -127,31 +126,31 @@
  "menu.view.forward": "앞으로 가기",
  "menu.view.lockFerdi": "Ferdi 잠금",
  "menu.view.openQuickSwitch": "Quick Switch 열기",
-  "menu.view.reloadFerdi": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Ferdi 재시작",
  "menu.view.reloadService": "서비스 재시작",
-  "menu.view.reloadTodos": "Reload ToDos",
+  "menu.view.reloadTodos": "ToDos 새로고침",
-  "menu.view.resetZoom": "Actual Size",
+  "menu.view.resetZoom": "실제 크기",
  "menu.view.toggleDarkMode": "다크 모드 켜기/끄기",
  "menu.view.toggleDevTools": "개발자 모드 켜기/끄기",
-  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleFullScreen": "전체 화면 전환/복귀",
-  "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
+  "menu.view.toggleServiceDevTools": "서비스 개발자 모드 켜기/끄기",
-  "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
+  "menu.view.toggleTodosDevTools": "Todos 개발자 모드 켜기/끄기",
-  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomIn": "확대",
-  "menu.view.zoomOut": "Zoom Out",
+  "menu.view.zoomOut": "축소",
-  "menu.window": "Window",
+  "menu.window": "창",
-  "menu.window.close": "Close",
+  "menu.window.close": "닫기",
-  "menu.window.minimize": "Minimize",
+  "menu.window.minimize": "최소화",
  "menu.workspaces": "작업 공간",
  "menu.workspaces.addNewWorkspace": "새 작업영역을 추가",
  "menu.workspaces.closeWorkspaceDrawer": "작업영역 서랍 닫기",
  "menu.workspaces.defaultWorkspace": "모든 서비스",
  "menu.workspaces.openWorkspaceDrawer": "작업영역 서랍 열기",
  "password.email.label": "이메일 주소",
-  "password.headline": "Reset password",
+  "password.headline": "비밀번호 초기화",
  "password.link.login": "계정에 로그인하세요.",
  "password.link.signup": "무료 계정 생성",
-  "password.noUser": "No user with that email address was found",
+  "password.noUser": "해당 이메일을 사용하는 유저를 찾을 수 없습니다.",
-  "password.successInfo": "Your new password was sent to your email address",
+  "password.successInfo": "새로운 비밀번호가 이메일 주소로 발송되었습니다.",
  "service.crashHandler.action": "재시작 {name}",
  "service.crashHandler.autoReload": "{seconds} 초내에 자동으로 {name} 을 복원합니다.",
  "service.crashHandler.headline": "이런!",
@@ -168,8 +167,7 @@
  "services.login": "Ferdi를 사용해 로그인하세요.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "계정없이 Ferdi 사용하기",
-  "services.welcome": "Ferdi에 오신 것을 환영합니다.",
+  "settings.account.account.editButton": "계정 설정",
-  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "계정을 사용할 수 없습니다.",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
  "settings.account.buttonSave": "프로필 수정",
@@ -177,21 +175,21 @@
  "settings.account.deleteEmailSent": "받은 이메일에 있는 링크를 통해 계정 삭제를 확인했다면 계정과 데이터는 복구되지 않습니다.",
  "settings.account.deleteInfo": "더 이상 Ferdi 계정이 필요하지 않다면 여기서 모든 관련한 데이터와 계정을 삭제할 수 있습니다.",
  "settings.account.headline": "계정",
-  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineAccount": "계정 정보",
-  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineDangerZone": "위험한 설정",
-  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlineInvoices": "청구서",
-  "settings.account.headlinePassword": "Change password",
+  "settings.account.headlinePassword": "비밀번호 변경",
  "settings.account.headlineProfile": "프로필 수정",
  "settings.account.successInfo": "변경사항이 저장되었습니다.",
  "settings.account.tryReloadServices": "다시 시도하세요.",
  "settings.account.tryReloadUserInfoRequest": "다시 시도하세요.",
  "settings.account.userInfoRequestFailed": "사용자 정보를 불러올 수 없습니다.",
-  "settings.account.yourLicense": "Your Ferdi License:",
+  "settings.account.yourLicense": "Ferdi 라이센스:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "캐시 지우기",
  "settings.app.buttonInstallUpdate": "재시작 후 업데이트 설치",
-  "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder",
+  "settings.app.buttonOpenFerdiProfileFolder": "프로파일 폴더 열기",
-  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
+  "settings.app.buttonOpenFerdiServiceRecipesFolder": "서비스 레시피 폴더 열기",
  "settings.app.buttonSearchForUpdate": "업데이트 확인",
  "settings.app.cacheInfo": "현재 Ferdi 캐시가 디스크 공간의 {size} 만큼 사용하고 있습니다.",
  "settings.app.cacheNotCleared": "모든 캐시를 지우지 못했습니다.",
@@ -199,42 +197,42 @@
  "settings.app.currentVersion": "현재 버전:",
  "settings.app.form.accentColor": "강조 색상",
  "settings.app.form.adaptableDarkMode": "사용하고 있는 OS의 다크 모드 설정과 동기화합니다.",
-  "settings.app.form.alwaysShowWorkspaces": "Always show workspace drawer",
+  "settings.app.form.alwaysShowWorkspaces": "작업공간 영역을 항상 표시하기",
  "settings.app.form.autoLaunchInBackground": "백그라운드로 열기",
  "settings.app.form.autoLaunchOnStart": "부팅 시 Ferdi 실행",
  "settings.app.form.automaticUpdates": "업데이트 활성화",
  "settings.app.form.beta": "베타 버전 포함",
-  "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
+  "settings.app.form.clipboardNotifications": "클립보드 이벤트 관련 알림을 보지 않기",
  "settings.app.form.closeToSystemTray": "Ferdi 시스템 트레이로 닫기",
-  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
+  "settings.app.form.confirmOnQuit": "Ferdi 종료시 확인",
-  "settings.app.form.customTodoServer": "Custom Todo Server",
+  "settings.app.form.customTodoServer": "커스텀 Todo 서버",
  "settings.app.form.darkMode": "다크 모드 활성화",
  "settings.app.form.enableGPUAcceleration": "GPU 가속 사용",
  "settings.app.form.enableGlobalHideShortcut": "Enable Global shortcut to hide Ferdi",
  "settings.app.form.enableLock": "암호 잠금 활성화",
  "settings.app.form.enableLongPressServiceHint": "Enable service shortcut hint on long press",
-  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
+  "settings.app.form.enableMenuBar": "메뉴 바에서 Ferdi 항상 표시하기",
  "settings.app.form.enableSpellchecking": "맞춤법 검사 활성화",
-  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
+  "settings.app.form.enableSystemTray": "시스템 트레이에서 Ferdi 항상 표시하기",
-  "settings.app.form.enableTodos": "Enable Ferdi Todos",
+  "settings.app.form.enableTodos": "Ferdi Todos 활성화",
-  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
+  "settings.app.form.hibernateOnStartup": "시작시 서비스를 잠자기 상태로 유지하기",
  "settings.app.form.hibernationStrategy": "하이버네이션 전략",
-  "settings.app.form.iconSize": "Service icon size",
+  "settings.app.form.iconSize": "서비스 아이콘 크기",
  "settings.app.form.inactivityLock": "비활성화일 때 잠금",
-  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
+  "settings.app.form.keepAllWorkspacesLoaded": "모든 작업영역을 항상 로드하기",
  "settings.app.form.language": "언어",
  "settings.app.form.lockPassword": "비밀번호",
  "settings.app.form.minimizeToSystemTray": "시스템 트레이에 Ferdi 최소화",
-  "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
+  "settings.app.form.navigationBarBehaviour": "네비게이션 바 설정",
-  "settings.app.form.notifyTaskBarOnMessage": "Notify TaskBar/Dock on new message",
+  "settings.app.form.notifyTaskBarOnMessage": "태스크바/독에서 새로운 메시지 알림",
-  "settings.app.form.passwordToggle": "Password toggle",
+  "settings.app.form.passwordToggle": "패스워드 전환",
  "settings.app.form.predefinedTodoServer": "Todo 서버",
  "settings.app.form.privateNotifications": "알림에 메세지 내용 보이지 않기",
  "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
  "settings.app.form.runInBackground": "윈도우를 닫을 때 Ferdi 백그라운드에서 계속 실행하기",
  "settings.app.form.scheduledDNDEnabled": "방해 금지 모드 시간 설정",
-  "settings.app.form.scheduledDNDEnd": "To",
+  "settings.app.form.scheduledDNDEnd": "종료",
-  "settings.app.form.scheduledDNDStart": "From",
+  "settings.app.form.scheduledDNDStart": "시작",
  "settings.app.form.searchEngine": "검색 엔진",
  "settings.app.form.sentry": "Send telemetry data",
  "settings.app.form.serviceRibbonWidth": "사이드바 너비",
@@ -242,11 +240,12 @@
  "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.splitColumns": "Number of columns",
+  "settings.app.form.splitMode": "분할보기 모드 활성화",
  "settings.app.form.startMinimized": "최소화 된 상태로 시작",
  "settings.app.form.universalDarkMode": "전체 다크 모드 활성화",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
-  "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.useVerticalStyle": "가로 스타일 사용",
  "settings.app.form.wakeUpStrategy": "Wake up strategy",
  "settings.app.headlineAdvanced": "고급",
  "settings.app.headlineAppearance": "모양",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "업데이트",
  "settings.app.hibernateInfo": "기본적으로 Ferdi 는 모든 서비스를 열고 백그라운드에서 불러옵니다. 그래서 사용할 때 이미 준비되어 있습니다. Service Hibernation은 일정 개수 이후에 서비스를 불러오지 않습니다. 이로인해 RAM을 절약하고 컴퓨터에서 서비스가 느려지는 것을 방지해주기에 유용합니다.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "공식 지우너 언어는 영어와 독일어이며 이외 언어들은 커뮤니티에 의해 번역되고 있습니다.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "비밀번호",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -266,8 +264,8 @@
  "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": "캐시",
-  "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
+  "settings.app.subheadlineFerdiProfile": "Ferdi 프로파일",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
+  "settings.app.todoServerInfo": "\"Ferdi Todo\" 기능에 이 서버가 사용됩니다.",
  "settings.app.translationHelp": "Ferdi 번역을 도와주세요.",
  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
  "settings.app.updateStatusAvailable": "사용가능 한 업데이트 다운로드 중",
@@ -286,9 +284,9 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "개발 문서",
-  "settings.recipes.customService.openFolder": "Open folder",
+  "settings.recipes.customService.openFolder": "폴더 열기",
  "settings.recipes.headline": "사용가능 한 서비스",
  "settings.recipes.missingService": "서비스가 보이지 않습니까?",
  "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.",
@@ -296,7 +294,7 @@
  "settings.searchService": "서비스 찾기",
  "settings.service.error.goBack": "서비스로 돌아가기",
  "settings.service.error.headline": "에러",
-  "settings.service.error.message": "Could not load service recipe.",
+  "settings.service.error.message": "서비스 레시피를 불러올 수 없습니다.",
  "settings.service.form.addServiceHeadline": "{name} 추가",
  "settings.service.form.availableServices": "사용가능 한 서비스",
  "settings.service.form.customUrl": "사용자 정의 서버",
@@ -304,7 +302,7 @@
  "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.deleteButton": "서비스 삭제",
  "settings.service.form.editServiceHeadline": "편집 {name}",
  "settings.service.form.enableAudio": "오디오 활성화",
  "settings.service.form.enableBadge": "읽지 않은 메세지 배지 표시",
@@ -312,7 +310,7 @@
  "settings.service.form.enableHibernation": "절전모드 활성화",
  "settings.service.form.enableNotification": "알림 허용",
  "settings.service.form.enableService": "서비스 활성화",
-  "settings.service.form.enableWakeUp": "Enable wake up",
+  "settings.service.form.enableWakeUp": "깨우기 활성화",
  "settings.service.form.headlineBadges": "읽지 않은 메세지 배지 표시",
  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
  "settings.service.form.headlineGeneral": "일반",
@@ -330,13 +328,13 @@
  "settings.service.form.openUserCss": "user.css 열기",
  "settings.service.form.openUserJs": "user.js 열기",
  "settings.service.form.proxy.headline": "HTTP/HTTPS 프록시 설정",
-  "settings.service.form.proxy.host": "Proxy Host/IP",
+  "settings.service.form.proxy.host": "프록시 호스트/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
+  "settings.service.form.proxy.info": "프록시 설정은 Ferdi 서버에 저장되지 않습니다.",
  "settings.service.form.proxy.isEnabled": "프록시 사용하기",
-  "settings.service.form.proxy.password": "Password (optional)",
+  "settings.service.form.proxy.password": "비밀번호 (선택사항)",
  "settings.service.form.proxy.port": "포트",
  "settings.service.form.proxy.restartInfo": "프록시 설정 변경 후 Ferdi를 재시작 해주세요.",
-  "settings.service.form.proxy.user": "User (optional)",
+  "settings.service.form.proxy.user": "사용자명 (선택사항)",
  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
  "settings.service.form.saveButton": "서비스 저장",
  "settings.service.form.tabHosted": "Hosted",
@@ -347,28 +345,25 @@
  "settings.services.deletedInfo": "서비스가 삭제되었습니다.",
  "settings.services.discoverServices": "서비스 발견",
  "settings.services.headline": "서비스",
-  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.noServicesAdded": "서비스를 추가하여 시작하기",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "서비스를 불러올 수 없습니다.",
  "settings.services.tooltip.isDisabled": "서비스를 사용할 수 없습니다.",
  "settings.services.tooltip.isMuted": "모든 소리가 꺼져있습니다.",
  "settings.services.tooltip.notificationsDisabled": "알림이 비활성화 되어 있습니다.",
  "settings.services.updatedInfo": "변경사항이 저장되었습니다.",
-  "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.aboutIntro": "<p>Ferdi는 오픈소스이며 커뮤니티가 주도하는 애플리케이션입니다.</p><p>이것을 가능하게 해주신 분들께 감사드립니다:</p>",
-  "settings.supportFerdi.bannerText": "Ferdi 서비스 향상에 도움을 주기를 원하십니까?",
  "settings.supportFerdi.headline": "Ferdi에 대해",
-  "settings.supportFerdi.openSurvey": "Open survey",
+  "settings.supportFerdi.textDonation": "기부를 통해 Ferdi의 개발을 지원하\b시려면 아래 방법을 선택하실 수 있습니다.",
-  "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,",
  "settings.supportFerdi.textDonationAnd": "그리고",
-  "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.textExpenses": "대부분의 작업이 자원봉사자들에 의해 이루어지지만 서버비용과 인증서 비용이 발생됩니다. 우리 커뮤니티는 자금의 모금과 사용에 대해 완전한 투명성을 유지합니다. 자세한 내용을 다음을 참조하세요.",
  "settings.supportFerdi.textGitHubSponsors": "깃허브 후원자",
-  "settings.supportFerdi.textListContributors": "Full list of contributors",
+  "settings.supportFerdi.textListContributors": "기여자 전체 목록",
-  "settings.supportFerdi.textListContributorsHere": "here",
+  "settings.supportFerdi.textListContributorsHere": "여기",
  "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": "여기",
  "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": "Ferdi가 맘에 드시나요?",
  "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": "팀",
@@ -382,8 +377,8 @@
  "settings.user.form.accountType.non-profit": "비영리",
  "settings.user.form.currentPassword": "현재 비밀번호",
  "settings.user.form.email": "이메일",
-  "settings.user.form.firstname": "First Name",
+  "settings.user.form.firstname": "이름",
-  "settings.user.form.lastname": "Last Name",
+  "settings.user.form.lastname": "성",
  "settings.user.form.newPassword": "새로운 비밀번호",
  "settings.workspace.add.form.name": "이름",
  "settings.workspace.add.form.submitButton": "새로운 작업영역 생성하기",
@@ -415,9 +410,9 @@
  "sidebar.unmuteApp": "알림과 오디오 활성화",
  "signup.email.label": "이메일 주소",
  "signup.emailDuplicate": "해당 이메일을 가진 사용자가 이미 존재합니다",
-  "signup.firstname.label": "First Name",
+  "signup.firstname.label": "이름",
  "signup.headline": "회원 가입",
-  "signup.lastname.label": "Last Name",
+  "signup.lastname.label": "성",
  "signup.legal.info": "By creating a Ferdi account you accept the",
  "signup.legal.privacy": "개인정보보호정책",
  "signup.legal.terms": "이용 약관",
@@ -425,11 +420,11 @@
  "signup.password.label": "비밀번호",
  "signup.submit.label": "계정 만들기",
  "tabs.item.confirmDeleteService": "{serviceName} 서비스를 정말로 삭제하시겠습니까?",
-  "tabs.item.deleteService": "Delete service",
+  "tabs.item.deleteService": "서비스 삭제",
  "tabs.item.disableAudio": "오디오 비활성화",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "알림 비활성화",
-  "tabs.item.disableService": "Disable service",
+  "tabs.item.disableService": "서비스 비활성화",
  "tabs.item.enableAudio": "오디오 활성화",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "알림 허용",
@@ -449,12 +444,12 @@
  "webControls.reload": "새로고침",
  "welcome.loginButton": "계정에 로그인하세요.",
  "welcome.signupButton": "무료 계정 생성",
-  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
+  "workspaceDrawer.addNewWorkspaceLabel": "새 작업영역을 추가",
  "workspaceDrawer.allServices": "모든 서비스",
  "workspaceDrawer.headline": "작업 공간",
  "workspaceDrawer.item.contextMenuEdit": "편집",
  "workspaceDrawer.item.noServicesAddedYet": "추가된 서비스가 없습니다.",
  "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": "작업 영역 설정",
-  "workspaces.switchingIndicator.switchingTo": "Switching to"
+  "workspaces.switchingIndicator.switchingTo": "다음으로 전환"
 }
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 44f48ee9b..4ec87e66b 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Uitnodigingen verzenden",
  "invite.successInfo": "Uitnodiging met succes verzonden",
  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
@@ -168,7 +167,6 @@
  "services.login": "Please login to use Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Welkom bij Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Account is unavailable",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Officiële vertalingen zijn in het Engels en Duits. Alle andere tallen zijn op de gemeenschap gebaseerde vertalingen.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Beschikbare services",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Services ontdekken",
  "settings.services.headline": "Jouw services",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Kan je diensten niet laden",
  "settings.services.tooltip.isDisabled": "Service is uitgeschakeld",
  "settings.services.tooltip.isMuted": "Alle geluiden zijn uitgeschakeld",
  "settings.services.tooltip.notificationsDisabled": "Notificaties staan uit",
  "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.headline": "Over Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.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",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 97542828f..be302db8d 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Uitnodigingen verzenden",
  "invite.successInfo": "Uitnodigingen verzonden",
  "locked.headline": "Vergrendeld",
-  "locked.info": "Ferdi is momenteel vergrendeld. Ontgrendel Ferdi met je wachtwoord om je berichten te bekijken.",
  "locked.invalidCredentials": "Verkeerd wachtwoord",
  "locked.password.label": "Wachtwoord",
  "locked.submit.label": "Ontgrendelen",
@@ -168,7 +167,6 @@
  "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.",
@@ -242,6 +240,7 @@
  "settings.app.form.showDragArea": "Sleepbaar gebied in venster tonen",
  "settings.app.form.showMessagesBadgesWhenMuted": "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
  "settings.app.form.showServiceName": "Servicenaam onder pictogram weergeven",
+  "settings.app.form.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Gesplitste weergave inschakelen",
  "settings.app.form.startMinimized": "Geminimaliseerd starten",
  "settings.app.form.universalDarkMode": "Universele donkere modus inschakelen",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "Ferdi houdt je services standaard open op de achtergrond, zodat ze klaarstaan wanneer je ze wilt gebruiken. Als je de slaapstand inschakelt, worden services na een bepaalde tijd gesloten. Zo kun je RAM besparen en voorkomen dat services je computer vertragen.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Ferdi spreekt officieel Engels en Duits. Alle andere talen worden beheerd door de community.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "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.",
@@ -286,7 +284,7 @@
  "settings.recipes.customService.headline.communityRecipes": "Communityrecepten",
  "settings.recipes.customService.headline.customRecipes": "Aangepaste recepten",
  "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
-  "settings.recipes.customService.intro": "Kopieer het servicerecept hierheen om een aangepaste service toe te voegen:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Documentatie voor ontwikkelaars",
  "settings.recipes.customService.openFolder": "Map openen",
  "settings.recipes.headline": "Beschikbare services",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Ontdek services",
  "settings.services.headline": "Jouw services",
  "settings.services.noServicesAdded": "Start met een service toe te voegen.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Kan jouw services niet laden",
  "settings.services.tooltip.isDisabled": "Service is uitgeschakeld",
  "settings.services.tooltip.isMuted": "Geluid is uitgeschakeld",
  "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": "Wil je ons helpen Ferdi te verbeteren?",
  "settings.supportFerdi.headline": "Over Ferdi",
-  "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": "en",
  "settings.supportFerdi.textExpenses": "Hoewel het meeste werk door vrijwilligers wordt gedaan, moeten we nog steeds voor servers en certificaten betalen. Als community zijn we volledig transparant over het geld dat we inzamelen en uitgeven. Meer informatie vind je op",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "hier",
  "settings.supportFerdi.textVolunteers": "De ontwikkeling van Ferdi is in handen van vrijwilligers. Mensen die Ferdi gebruiken, net als jij. Ze onderhouden, repareren en verbeteren Ferdi in hun vrije tijd.",
-  "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",
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index 0e9dec5ee..5010614e6 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Send invitasjoner",
  "invite.successInfo": "Invitasjonene ble vellykket sendt",
  "locked.headline": "Låst",
-  "locked.info": "Ferdi er for øyeblikket låst. Vennligst lås opp Ferdi med passordet ditt for å se meldingene dine.",
  "locked.invalidCredentials": "Ugyldig passord",
  "locked.password.label": "Passord",
  "locked.submit.label": "Lås opp",
@@ -168,7 +167,6 @@
  "services.login": "Vennligst logg inn for å bruke Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Bruk Ferdi uten en konto",
-  "services.welcome": "Velkommen til Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Kontoen er ikke tilgjengelig",
  "settings.account.accountUnavailableInfo": "Du bruker Ferdi uten en konto. Hvis du ønsker å bruke Ferdi med en konto og hold tjenestene dine synkronisert på tvers av installasjoner, velg en tjener i fanen innstillinger og logg inn.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimert",
  "settings.app.form.universalDarkMode": "Aktiver universelt mørkt tema",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Oppdateringer",
  "settings.app.hibernateInfo": "Som standard vil Ferdi beholde alle tjenestene dine åpne og lastet i bakgrunnen slik at de er klare når du vil bruke dem. Dvalemodus for tjenester vil sette tjenestene dine i dvale etter et angitt tidsrom. Dette er nyttig for å spare minne eller sørge for at tjenestene ikke gjør datamaskinen din treg.",
  "settings.app.inactivityLockInfo": "Minutter med inaktivitet, hvorpå Ferdi burde låses automatisk. Bruk 0 for å deaktivere",
-  "settings.app.languageDisclaimer": "Offisielle oversettelser er engelsk & tysk. Alle andre språk er samfunnsbaserte oversettelser.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Passord",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "settings.recipes.customService.headline.communityRecipes": "Fellesskap 3. parts oppskrifter",
  "settings.recipes.customService.headline.customRecipes": "Tilpassede 3. parts oppskrifter",
  "settings.recipes.customService.headline.devRecipes": "Dine utviklingstjeneste oppskrifter",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Utviklerdokumentasjon",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Tilgjengelige tjenester",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Oppdag tjenester",
  "settings.services.headline": "Dine tjenester",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Kunne ikke laste dine tjenester",
  "settings.services.tooltip.isDisabled": "Tjenesten er deaktivert",
  "settings.services.tooltip.isMuted": "Alle lyder er dempet",
  "settings.services.tooltip.notificationsDisabled": "Varsler er deaktivert",
  "settings.services.updatedInfo": "Dine endringer har blitt lagret",
  "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.headline": "Om Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.team.contentHeadline": "Ferdi team-administrasjon",
  "settings.team.copy": "Med Franz's Team-administrasjon kan du administrere Franz abonnementer for flere brukere. Vennligst husk at du som har et Franz Premium-abonnement vil ikke ha noen fordeler med deg når du bruker Ferdi: Den eneste grunnen til at du fortsatt har tilgang til teamhåndtering er slik at du kan administrere din eldre Franz team, og for at du ikke skal miste noen funksjoner ved administrasjon av kontoen din.",
  "settings.team.headline": "Team",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 0accdac07..20511d92f 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Wyślij zaproszenia",
  "invite.successInfo": "Zaproszenia zostały wysłane",
  "locked.headline": "Zablokowane",
-  "locked.info": "Ferdi jest obecnie zablokowany. Odblokuj go przy użyciu hasła, aby zobaczyć swoje wiadomości.",
  "locked.invalidCredentials": "Nieprawidłowe hasło",
  "locked.password.label": "Hasło",
  "locked.submit.label": "Odblokuj",
@@ -168,7 +167,6 @@
  "services.login": "Zaloguj się, aby używać Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Używaj Ferdi bez konta",
-  "services.welcome": "Witaj w programie Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Konto jest niedostępne",
  "settings.account.accountUnavailableInfo": "Używasz Ferdi bez konta. Jeśli chcesz używać Ferdi z kontem i synchronizować swoje usługi pomiędzy klientami, wybierz serwer w zakładce Ustawienia i zaloguj się.",
@@ -179,7 +177,7 @@
  "settings.account.headline": "Konto",
  "settings.account.headlineAccount": "Account information",
  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlineInvoices": "Faktury",
  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Uaktualnij profil",
  "settings.account.successInfo": "Twoje zmiany zostały zapisane",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Uruchom zminimalizowany",
  "settings.app.form.universalDarkMode": "Włącz uniwersalny tryb ciemny",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Aktualizacje",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Oficjalnymi językami są Angielski i Niemiecki. Inne języki są tłumaczone przez społeczność Ferdi.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Hasło",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Dokumentacja deweloperska",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Dostępne usługi",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Przeglądaj usługi",
  "settings.services.headline": "Twoje usługi",
  "settings.services.noServicesAdded": "Rozpocznij od dodania usługi.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Nie udało się załadować twoich usług",
  "settings.services.tooltip.isDisabled": "Usługa jest nieaktywna",
  "settings.services.tooltip.isMuted": "Wszystkie dźwięki są wyciszone",
  "settings.services.tooltip.notificationsDisabled": "Powiadomienia są nieaktywne",
  "settings.services.updatedInfo": "Twoje zmiany zostały zapisane",
  "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.headline": "O Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,",
  "settings.supportFerdi.textDonationAnd": "i",
  "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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Doceniamy każde wsparcie. Listę rzeczy, z którymi potrzebujemy pomocy znajdziesz",
  "settings.supportFerdi.textSupportWelcomeHere": "tutaj",
  "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": "Lubisz Ferdi?",
  "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": "Zespół",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index ef3bb0561..09eb92e1e 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Enviar convites",
  "invite.successInfo": "Convites enviados com sucesso",
  "locked.headline": "Bloqueado",
-  "locked.info": "Ferdi está bloqueado no momento. Por favor, desbloqueie Ferdi com sua senha para ver suas mensagens.",
  "locked.invalidCredentials": "Senha inválida",
  "locked.password.label": "Senha",
  "locked.submit.label": "Desbloquear",
@@ -168,7 +167,6 @@
  "services.login": "Por favor, inicie sua sessão para usar Ferdi.",
  "services.serverInfo": "Opcionalmente, você pode alterar seu servidor Ferdi clicando na engrenagem no canto inferior esquerdo. Se você está mudando (de um dos servidores hospedados) para usar Ferdi sem uma conta, por favor, saiba que você pode exportar seus dados desse servidor e posteriormente, importá-lo usando o menu Ajuda para restaurar todas as suas áreas de trabalho e serviços configurados!",
  "services.serverless": "Use Ferdi sem uma conta",
-  "services.welcome": "Bem-vindo ao Ferdi",
  "settings.account.account.editButton": "Editar conta",
  "settings.account.accountUnavailable": "Conta indisponível",
  "settings.account.accountUnavailableInfo": "Você está utilizando Ferdis sem uma conta. Se você deseja usar o Ferdi com uma conta e manter seus serviços atualizados, Por favor selecione um servidor em Configurações seção Servidor.",
@@ -242,6 +240,7 @@
  "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": "Exibir o nome do serviço abaixo do ícone",
+  "settings.app.form.splitColumns": "Número de colunas",
  "settings.app.form.splitMode": "Ativar modo de visualização dividida",
  "settings.app.form.startMinimized": "Iniciar minimizado",
  "settings.app.form.universalDarkMode": "Habilitar modo noturno universal",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Atualizações",
  "settings.app.hibernateInfo": "Por padrão, Ferdi manterá todos seus serviços abertos e carregados, assim eles estarão disponíveis quando você for usá-los. O Serviço de Hibernação irá finalizar seus serviços após um período específico. Isso é útil para evitar consumo excessivo de memória RAM evitando também que seu computador fique lento.",
  "settings.app.inactivityLockInfo": "Minutos de inatividade, após este tempo Ferdi irá automaticamente bloquear. Utilize 0 para desabilitar",
-  "settings.app.languageDisclaimer": "As traduções oficiais são em inglês e alemão. As demais traduções são baseadas na ajuda da comunidade.",
  "settings.app.lockInfo": "O bloqueio por senha permite a você proteger suas mensagens.\nUsando o bloqueio por senha, será necessário informar sua senha toda vez que o Ferdi for iniciado ou você solicite o bloqueio {lockShortcut}.",
  "settings.app.lockedPassword": "Senha",
  "settings.app.lockedPasswordInfo": "Por favor certifique-se de definir uma senha que você se lembrará.\nSe você perder esta senha, você terá que reinstalar o Ferdi.",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Descobrir serviços",
  "settings.services.headline": "Seus serviços",
  "settings.services.noServicesAdded": "Comece adicionando um serviço.",
-  "settings.services.nothingFound": "Desculpe, mas nenhum serviço corresponde ao seu termo de pesquisa - mas você provavelmente pode adicioná-lo usando a opção \"Site personalizado\". Por favor, note que o site pode mostrar mais serviços que foram adicionados ao Ferdi desde a versão em que você está atualmente. Para obter esses novos serviços, por favor, considere atualizar para uma versão mais recente do Ferdi.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Não foi possível ler os seus serviços",
  "settings.services.tooltip.isDisabled": "O serviço está desativado",
  "settings.services.tooltip.isMuted": "Todos os sons estão silenciados",
  "settings.services.tooltip.notificationsDisabled": "As notificações estão desativadas",
  "settings.services.updatedInfo": "As suas alterações foram efetuadas com sucesso",
  "settings.supportFerdi.aboutIntro": "<p>Ferdi é um aplicativo de código aberto e uma aplicação de líder de comunidade.</p><p>Obrigado às pessoas que tornam isso possível:</p>",
-  "settings.supportFerdi.bannerText": "Deseja nos ajudar a melhorar o Ferdi?",
  "settings.supportFerdi.headline": "Sobre o Ferdi",
-  "settings.supportFerdi.openSurvey": "Abrir pesquisa",
  "settings.supportFerdi.textDonation": "Se você quiser apoiar o desenvolvimento de Ferdi com uma doação, você pode fazê-lo em ambos,",
  "settings.supportFerdi.textDonationAnd": "e",
  "settings.supportFerdi.textExpenses": "Enquanto os voluntários fazem a maior parte do trabalho, ainda precisamos pagar por servidores e certificados. Como uma comunidade, somos totalmente transparentes com os fundos que coletamos e gastamos - veja",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "O suporte é sempre bem-vindo. Você pode encontrar uma lista da ajuda de que precisamos",
  "settings.supportFerdi.textSupportWelcomeHere": "aqui",
  "settings.supportFerdi.textVolunteers": "O desenvolvimento de Ferdi é feito por voluntários. Pessoas que usam Ferdi como você. Eles mantêm, consertam e melhoram Ferdi em seu tempo livre.",
-  "settings.supportFerdi.title": "Você gosta do Ferdi?",
  "settings.team.contentHeadline": "Gerenciamento de Equipe Franz",
  "settings.team.copy": "O Gerenciamento de Equipes de Franz permite gerenciar assinaturas do Franz para múltiplos usuários. Por favor, entenda que ter uma assinatura Franz Premium não lhe dará nenhuma vantagem em usar o Ferdi. A única razão em manter o acesso ao Gerenciamento de Equipes é permitir o gerenciamento de suas equipes legadas e não perder nenhuma funcionalidade no gerenciamento da sua conta.",
  "settings.team.headline": "Equipa",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index cd113996d..519a97363 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Enviar convites",
  "invite.successInfo": "Convites enviados com sucesso",
  "locked.headline": "Bloqueado",
-  "locked.info": "Ferdi está bloqueado de momento. Por favor, desbloqueie Ferdi com sua palavra-passe para ver as suas mensagens.",
  "locked.invalidCredentials": "Palavra-passe inválida",
  "locked.password.label": "Palavra-passe",
  "locked.submit.label": "Desbloquear",
@@ -168,7 +167,6 @@
  "services.login": "Por favor, inicie sua sessão para usar Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi sem conta",
-  "services.welcome": "Bem-vindo ao Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Conta indisponível",
  "settings.account.accountUnavailableInfo": "Está a usar o Ferdi sem uma conta. Se deseja usar o Ferdi com uma conta e manter os seus serviços sincronizados entre instalações, por favor, selecione um servidor no separador Configurações e faça a autenticação.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Iniciar minimizado",
  "settings.app.form.universalDarkMode": "Ativar o Modo Noturno Universal",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Atualizações",
  "settings.app.hibernateInfo": "Por princípio, Ferdi manterá todos os serviços abertos e carregados em segundo plano para que estejam prontos sempre que os quiser utilizar. A hibernação do serviço suspende os serviços após um determinado tempo. Isto é útil para conservar memória RAM ou impedir que os serviços afetem o desempenho do computador.",
  "settings.app.inactivityLockInfo": "Minutos de inatividade, após os quais Ferdi bloqueará automaticamente. Use 0 para desativar",
-  "settings.app.languageDisclaimer": "As traduções oficiais são Inglês e Alemão. Todas as outras traduções são feitas pela comunidade.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Palavra-passe",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "settings.recipes.customService.headline.communityRecipes": "Receitas da comunidade de terceiros",
  "settings.recipes.customService.headline.customRecipes": "Receitas personalizadas de terceiros",
  "settings.recipes.customService.headline.devRecipes": "As suas Receitas de Serviço de Desenvolvimento",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Documentação para programadores",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Serviços disponíveis",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Descobrir serviços",
  "settings.services.headline": "Os seus serviços",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Não foi possível carregar os seus serviços",
  "settings.services.tooltip.isDisabled": "O serviço está desativado",
  "settings.services.tooltip.isMuted": "Sem som",
  "settings.services.tooltip.notificationsDisabled": "Notificações desativadas",
  "settings.services.updatedInfo": "As suas alterações foram gravadas",
  "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.headline": "Acerca de Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.team.contentHeadline": "Gestão de Equipas Franz",
  "settings.team.copy": "A Gestão de Equipas Franz permite gerir as assinaturas Franz para múltiplos utilizadores. Por favor, lembre-se que ter uma assinatura Franz Premium não lhe dará nenhuma vantagem ao usar Ferdi: a única razão pela qual ainda tem acesso à Gestão de Equipas é para que possa gerir as suas equipas antigas e para que não perca nenhuma funcionalidade na gestão da sua conta.",
  "settings.team.headline": "Equipa",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index d858313ac..5d05bc52d 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -1,8 +1,8 @@
 {
  "app.errorHandler.action": "Reîncărcare",
-  "app.errorHandler.headline": "Something went wrong.",
+  "app.errorHandler.headline": "Ceva nu a funcționat corect.",
-  "changeserver.customServerLabel": "Custom server",
+  "changeserver.customServerLabel": "Server personalizat",
-  "changeserver.headline": "Change server",
+  "changeserver.headline": "Schimbă serverul",
  "changeserver.label": "Server",
  "changeserver.urlError": "Introduceți un URL valid",
  "changeserver.warning": "Setările suplimentare oferite de Ferdi nu vor fi salvate",
@@ -31,16 +31,16 @@
  "global.ok": "Ok",
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
-  "global.save": "Save",
+  "global.save": "Salvare",
-  "global.settings": "Settings",
+  "global.settings": "Configurări",
  "global.spellchecker.useDefault": "Folosește sistemul implicit ({default})",
  "global.spellchecking.autodetect": "Detectează limba automat",
  "global.spellchecking.autodetect.short": "Automat",
  "global.spellchecking.language": "Limba de verificare a ortografiei",
-  "global.submit": "Submit",
+  "global.submit": "Trimite",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
-  "global.userAgentPref": "User Agent",
+  "global.userAgentPref": "Agent utilizator",
-  "global.yes": "Yes",
+  "global.yes": "Da",
  "import.headline": "Importă serviciile tale Ferdi 4",
  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
  "import.skip.label": "I want to add services manually",
@@ -49,26 +49,25 @@
  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Restart & install update",
  "infobar.buttonReloadServices": "Reload services",
-  "infobar.hide": "Hide",
+  "infobar.hide": "Ascunde",
  "infobar.requiredRequestsFailed": "Could not load services and user information",
-  "infobar.servicesUpdated": "Your services have been updated.",
+  "infobar.servicesUpdated": "Serviciile dvs. au fost actualizate.",
  "infobar.updateAvailable": "A new update for Ferdi is available.",
  "infobox.dismiss": "Dismiss",
  "invite.email.label": "Email address",
  "invite.headline.friends": "Invite 3 of your friends or colleagues",
-  "invite.name.label": "Name",
+  "invite.name.label": "Nume",
  "invite.skip.label": "I want to do this later",
-  "invite.submit.label": "Send invites",
+  "invite.submit.label": "Trimite invitații",
  "invite.successInfo": "Invitations sent successfully",
-  "locked.headline": "Locked",
+  "locked.headline": "Blocat",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
  "locked.touchId": "Unlock with Touch ID",
  "locked.touchIdPrompt": "unlock via Touch ID",
  "locked.unlockWithPassword": "Unlock with Password",
-  "login.changeServer": "Change server",
+  "login.changeServer": "Schimbă serverul",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
  "login.email.label": "Email address",
@@ -85,7 +84,7 @@
  "menu.app.about": "About Ferdi",
  "menu.app.autohideMenuBar": "Auto-hide menu bar",
  "menu.app.checkForUpdates": "Check for updates",
-  "menu.app.hide": "Hide",
+  "menu.app.hide": "Ascunde",
  "menu.app.hideOthers": "Hide Others",
  "menu.app.unhide": "Unhide",
  "menu.edit": "Edit",
@@ -103,17 +102,17 @@
  "menu.edit.startSpeaking": "Start Speaking",
  "menu.edit.stopSpeaking": "Stop Speaking",
  "menu.edit.undo": "Undo",
-  "menu.file": "File",
+  "menu.file": "Fișier",
-  "menu.help": "Help",
+  "menu.help": "Ajutor",
-  "menu.help.changelog": "Changelog",
+  "menu.help.changelog": "Istoric modificări",
  "menu.help.debugInfo": "Copy Debug Information",
  "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
  "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
  "menu.help.importExportData": "Import/Export Configuration Data",
-  "menu.help.learnMore": "Learn More",
+  "menu.help.learnMore": "Aflați mai multe",
  "menu.help.privacy": "Privacy Statement",
  "menu.help.publishDebugInfo": "Publish Debug Information",
-  "menu.help.support": "Support",
+  "menu.help.support": "Suport",
  "menu.help.tos": "Terms of Service",
  "menu.services": "Services",
  "menu.services.activatePreviousService": "Activate previous service",
@@ -122,9 +121,9 @@
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
  "menu.todos.enableTodos": "Enable Todos",
-  "menu.view": "View",
+  "menu.view": "Vizualizare",
-  "menu.view.back": "Back",
+  "menu.view.back": "Înapoi",
-  "menu.view.forward": "Forward",
+  "menu.view.forward": "Înainte",
  "menu.view.lockFerdi": "Lock Ferdi",
  "menu.view.openQuickSwitch": "Open Quick Switch",
  "menu.view.reloadFerdi": "Reload Ferdi",
@@ -138,9 +137,9 @@
  "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
  "menu.view.zoomIn": "Zoom In",
  "menu.view.zoomOut": "Zoom Out",
-  "menu.window": "Window",
+  "menu.window": "Fereastră",
-  "menu.window.close": "Close",
+  "menu.window.close": "Închideți",
-  "menu.window.minimize": "Minimize",
+  "menu.window.minimize": "Minimizare",
  "menu.workspaces": "Workspaces",
  "menu.workspaces.addNewWorkspace": "Add New Workspace...",
  "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
@@ -168,7 +167,6 @@
  "services.login": "Please login to use Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Welcome to Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Account is unavailable",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Available services",
@@ -299,7 +297,7 @@
  "settings.service.error.message": "Could not load service recipe.",
  "settings.service.form.addServiceHeadline": "Add {name}",
  "settings.service.form.availableServices": "Available services",
-  "settings.service.form.customUrl": "Custom server",
+  "settings.service.form.customUrl": "Server personalizat",
  "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -310,7 +308,7 @@
  "settings.service.form.enableBadge": "Show unread message badges",
  "settings.service.form.enableDarkMode": "Enable Dark Mode",
  "settings.service.form.enableHibernation": "Enable hibernation",
-  "settings.service.form.enableNotification": "Enable notifications",
+  "settings.service.form.enableNotification": "Activare notificări",
  "settings.service.form.enableService": "Enable service",
  "settings.service.form.enableWakeUp": "Enable wake up",
  "settings.service.form.headlineBadges": "Unread message badges",
@@ -324,7 +322,7 @@
  "settings.service.form.indirectMessages": "Show message badge for all new messages",
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
-  "settings.service.form.name": "Name",
+  "settings.service.form.name": "Nume",
  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
@@ -332,32 +330,30 @@
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
-  "settings.service.form.proxy.isEnabled": "Use Proxy",
+  "settings.service.form.proxy.isEnabled": "Utilizare proxy",
-  "settings.service.form.proxy.password": "Password (optional)",
+  "settings.service.form.proxy.password": "Parolă (opțional)",
  "settings.service.form.proxy.port": "Port",
  "settings.service.form.proxy.restartInfo": "Please restart Ferdi after changing proxy Settings.",
  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
  "settings.service.form.saveButton": "Save service",
  "settings.service.form.tabHosted": "Hosted",
-  "settings.service.form.tabOnPremise": "Self hosted ⭐️",
+  "settings.service.form.tabOnPremise": "Auto-găzduit ⭐",
-  "settings.service.form.team": "Team",
+  "settings.service.form.team": "Echipă",
  "settings.service.form.useHostedService": "Use the hosted {name} service.",
  "settings.service.form.yourServices": "Your services",
  "settings.services.deletedInfo": "Service has been deleted",
  "settings.services.discoverServices": "Discover services",
  "settings.services.headline": "Your services",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Service is disabled",
  "settings.services.tooltip.isMuted": "All sounds are muted",
  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
  "settings.services.updatedInfo": "Your changes have been saved",
  "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.headline": "About Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,30 +364,29 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.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",
+  "settings.team.headline": "Echipă",
  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
  "settings.team.manageAction": "Manage your Team on meetfranz.com",
  "settings.team.teamsUnavailable": "Teams are unavailable",
  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.user.form.accountType.company": "Company",
+  "settings.user.form.accountType.company": "Companie",
  "settings.user.form.accountType.individual": "Individual",
-  "settings.user.form.accountType.label": "Account type",
+  "settings.user.form.accountType.label": "Tip cont",
-  "settings.user.form.accountType.non-profit": "Non-Profit",
+  "settings.user.form.accountType.non-profit": "Non-profit",
-  "settings.user.form.currentPassword": "Current password",
+  "settings.user.form.currentPassword": "Parola curentă",
  "settings.user.form.email": "Email",
  "settings.user.form.firstname": "First Name",
  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "New password",
-  "settings.workspace.add.form.name": "Name",
+  "settings.workspace.add.form.name": "Nume",
  "settings.workspace.add.form.submitButton": "Create workspace",
  "settings.workspace.form.buttonDelete": "Delete workspace",
  "settings.workspace.form.buttonSave": "Save workspace",
  "settings.workspace.form.keepLoaded": "Keep this workspace loaded*",
  "settings.workspace.form.keepLoadedInfo": "*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
-  "settings.workspace.form.name": "Name",
+  "settings.workspace.form.name": "Nume",
  "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace",
  "settings.workspace.form.yourWorkspaces": "Your workspaces",
  "settings.workspaces.deletedInfo": "Workspace has been deleted",
@@ -402,10 +397,10 @@
  "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces",
  "settings.workspaces.workspaceFeatureInfo": "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. 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.",
  "settings.workspaces.workspacesRequestFailed": "Could not load your workspaces",
-  "setupAssistant.headline": "Let's get started",
+  "setupAssistant.headline": "Să începem",
  "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
-  "setupAssistant.submit.label": "Let's go",
+  "setupAssistant.submit.label": "Să începem",
-  "sidebar.addNewService": "Add new service",
+  "sidebar.addNewService": "Adaugă un serviciu nou",
  "sidebar.closeTodosDrawer": "Close Ferdi Todos",
  "sidebar.closeWorkspaceDrawer": "Close workspace drawer",
  "sidebar.lockFerdi": "Lock Ferdi",
@@ -426,13 +421,13 @@
  "signup.submit.label": "Create account",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
  "tabs.item.deleteService": "Delete service",
-  "tabs.item.disableAudio": "Disable audio",
+  "tabs.item.disableAudio": "Dezactivare audio",
-  "tabs.item.disableDarkMode": "Disable Dark mode",
+  "tabs.item.disableDarkMode": "Dezactivare mod întunecat",
-  "tabs.item.disableNotifications": "Disable notifications",
+  "tabs.item.disableNotifications": "Dezactivare notificări",
-  "tabs.item.disableService": "Disable service",
+  "tabs.item.disableService": "Dezactivare serviciu",
  "tabs.item.enableAudio": "Enable audio",
  "tabs.item.enableDarkMode": "Enable Dark mode",
-  "tabs.item.enableNotification": "Enable notifications",
+  "tabs.item.enableNotification": "Activare notificări",
  "tabs.item.enableService": "Enable service",
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Reîncărcare",
@@ -442,8 +437,8 @@
  "validation.oneRequired": "At least one is required",
  "validation.required": "{field} is required",
  "validation.url": "{field} is not a valid URL",
-  "webControls.back": "Back",
+  "webControls.back": "Înapoi",
-  "webControls.forward": "Forward",
+  "webControls.forward": "Înainte",
  "webControls.goHome": "Home",
  "webControls.openInBrowser": "Open in Browser",
  "webControls.reload": "Reîncărcare",
@@ -452,7 +447,7 @@
  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "All services",
  "workspaceDrawer.headline": "Workspaces",
-  "workspaceDrawer.item.contextMenuEdit": "edit",
+  "workspaceDrawer.item.contextMenuEdit": "editează",
  "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
  "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",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 91020fa81..994e68a86 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -14,7 +14,7 @@
  "feature.nightlyBuilds.info": "Ночные сборки - это экспериментальные версии Ferdi, которые могут содержать недоработанные или незавершенные функции. Эти ночные сборки в основном используются разработчиками для тестирования недавно разработанных функций и того, как они будут работать в финальной сборке. Если вы не знаете, что делаете, мы рекомендуем не активировать ночные сборки.",
  "feature.nightlyBuilds.title": "Ночные сборки",
  "feature.publishDebugInfo.error": "При попытке опубликовать отладочную информацию произошла ошибка. Пожалуйста, повторите попытку позже или просмотрите консоль для получения дополнительной информации.",
-  "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
+  "feature.publishDebugInfo.info": "Публикация вашей отладочной информации помогает нам найти проблемы и ошибки в Ferdi. Публикуя вашу отладочную информацию, вы принимаете политику конфиденциальности Ferdi Debugger'ов и условия предоставления услуг",
  "feature.publishDebugInfo.privacy": "Политика конфиденциальности",
  "feature.publishDebugInfo.publish": "Принять и опубликовать",
  "feature.publishDebugInfo.published": "Ваш журнал отладки был опубликован и теперь доступен по адресу",
@@ -58,10 +58,9 @@
  "invite.headline.friends": "Пригласите 3-х друзей или коллег",
  "invite.name.label": "Имя",
  "invite.skip.label": "Я сделаю это позже",
-  "invite.submit.label": "����с��ать приглашения",
+  "invite.submit.label": "������равить приглашения",
  "invite.successInfo": "Приглашения успешно отправлены",
  "locked.headline": "Заблокировано",
-  "locked.info": "Ferdi сейчас заблокирован. Пожалуйста, разблокируйте Ferdi своим паролем, чтобы увидеть ваши сообщения.",
  "locked.invalidCredentials": "Неверный пароль",
  "locked.password.label": "Пароль",
  "locked.submit.label": "Разблокировать",
@@ -166,12 +165,11 @@
  "service.webviewLoader.loading": "Загрузка {service}",
  "services.getStarted": "Начать работу",
  "services.login": "Пожалуйста, войдите, чтобы использовать Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
+  "services.serverInfo": "При необходимости вы можете изменить ваш сервер Ferdi, нажав на иконку в левом нижнем углу. Если вы переключаетесь (с одного из серверов хостинга) на использование Ferdi без учетной записи, примите к сведению, что вы можете экспортировать ваши данные с этого сервера и затем импортировать их с помощью меню справки, чтобы восстановить все ваши рабочие окружения и подключенные сервисы!",
  "services.serverless": "Использовать Ferdi без учетной записи",
-  "services.welcome": "Добро пожаловать во Ferdi",
  "settings.account.account.editButton": "Редактировать аккаунт",
  "settings.account.accountUnavailable": "Учетная запись недоступна",
-  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
+  "settings.account.accountUnavailableInfo": "Вы используете Ferdi без учетной записи. Если вы желаете использовать Ferdi с учетной записью и сохранить ваши сервисы синхронизированными между установками, пожалуйста, выберите сервер на вкладке Настройки и войдите в систему.",
  "settings.account.buttonSave": "Обновить профиль",
  "settings.account.deleteAccount": "Удалить аккаунт",
  "settings.account.deleteEmailSent": "Вам выслано письмо с ссылкой для подтверждения удаления аккаунта. После этого ваш аккаунт и данные не смогут быть восстановлены!",
@@ -187,52 +185,52 @@
  "settings.account.tryReloadUserInfoRequest": "Попробовать снова",
  "settings.account.userInfoRequestFailed": "Невозможно загрузить информацию пользователя",
  "settings.account.yourLicense": "Ваша лицензия Ферди:",
-  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
+  "settings.app.accentColorInfo": "Напишите свой акцентный цвет в совместимом с CSS-формате. (По умолчанию: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Очистить кэш",
  "settings.app.buttonInstallUpdate": "Перезапустить и установить обновления",
  "settings.app.buttonOpenFerdiProfileFolder": "Открыть папку профиля",
-  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
+  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Открыть папку сервисных протоколов",
  "settings.app.buttonSearchForUpdate": "Проверить обновления",
  "settings.app.cacheInfo": "Кэш занимает {size} на диске.",
  "settings.app.cacheNotCleared": "Не удалось очистить весь кэш",
  "settings.app.closeSettings": "Закрыть настройки",
  "settings.app.currentVersion": "Текущая версия:",
-  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.accentColor": "Цвет акцента",
-  "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
+  "settings.app.form.adaptableDarkMode": "Синхронизировать темный режим с настройками темных режимов моей ОС",
-  "settings.app.form.alwaysShowWorkspaces": "Always show workspace drawer",
+  "settings.app.form.alwaysShowWorkspaces": "Всегда показывать меню рабочего окружения",
  "settings.app.form.autoLaunchInBackground": "Открывать в фоне",
  "settings.app.form.autoLaunchOnStart": "Запускать Ferdi при старте",
  "settings.app.form.automaticUpdates": "Включить обновления",
  "settings.app.form.beta": "Включая бета версии",
-  "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
+  "settings.app.form.clipboardNotifications": "Не показывать уведомления о событиях в буфере обмена",
-  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
+  "settings.app.form.closeToSystemTray": "При закрытии сворачивать Ferdi в системном трее",
-  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
+  "settings.app.form.confirmOnQuit": "Запросить подтверждение при выходе из Ferdi",
-  "settings.app.form.customTodoServer": "Custom Todo Server",
+  "settings.app.form.customTodoServer": "Пользовательсикй сервер (задач)",
  "settings.app.form.darkMode": "Включить Тёмный режим",
  "settings.app.form.enableGPUAcceleration": "Включить ускорение GPU",
-  "settings.app.form.enableGlobalHideShortcut": "Enable Global shortcut to hide Ferdi",
+  "settings.app.form.enableGlobalHideShortcut": "Включить глобальную комбинацию клавиш для скрытия Ferdi",
-  "settings.app.form.enableLock": "Enable Password Lock",
+  "settings.app.form.enableLock": "Включить блокировку паролем",
-  "settings.app.form.enableLongPressServiceHint": "Enable service shortcut hint on long press",
+  "settings.app.form.enableLongPressServiceHint": "Включить подсказку горячих клавиш сервиса при длительном нажатии",
-  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
+  "settings.app.form.enableMenuBar": "Всегда показывать Ferdi в меню",
  "settings.app.form.enableSpellchecking": "Включить проверку правописания",
-  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
+  "settings.app.form.enableSystemTray": "Всегда показывать значок Ferdi в системном трее",
-  "settings.app.form.enableTodos": "Enable Ferdi Todos",
+  "settings.app.form.enableTodos": "Включить задания Ferdi",
-  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
+  "settings.app.form.hibernateOnStartup": "Оставлять сервисы в состоянии глубокого сна во время запуска",
  "settings.app.form.hibernationStrategy": "Стратегия гибернации",
-  "settings.app.form.iconSize": "Service icon size",
+  "settings.app.form.iconSize": "Размер иконки сервиса",
  "settings.app.form.inactivityLock": "Заблокировать после бездействия",
-  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
+  "settings.app.form.keepAllWorkspacesLoaded": "Сохранить все рабочие окружения загруженными",
  "settings.app.form.language": "Язык",
  "settings.app.form.lockPassword": "Пароль",
  "settings.app.form.minimizeToSystemTray": "Сворачивать Ferdi в системный трей",
-  "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
+  "settings.app.form.navigationBarBehaviour": "Визуализация панели навигации",
-  "settings.app.form.notifyTaskBarOnMessage": "Notify TaskBar/Dock on new message",
+  "settings.app.form.notifyTaskBarOnMessage": "Уведомления в панели задач о новых сообщениях",
-  "settings.app.form.passwordToggle": "Password toggle",
+  "settings.app.form.passwordToggle": "Изменить пароль",
-  "settings.app.form.predefinedTodoServer": "Todo Server",
+  "settings.app.form.predefinedTodoServer": "Сервер задач",
-  "settings.app.form.privateNotifications": "Don't show message content in notifications",
+  "settings.app.form.privateNotifications": "Не показывать содержимое сообщений в уведомлениях",
-  "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
+  "settings.app.form.reloadAfterResume": "Перезагрузить Ферди после возобновления системы",
  "settings.app.form.runInBackground": "Оставлять Ferdi в фоне при закрытии окна",
-  "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
+  "settings.app.form.scheduledDNDEnabled": "Включить запланированный режим \"не беспокоить\"",
  "settings.app.form.scheduledDNDEnd": "До",
  "settings.app.form.scheduledDNDStart": "От",
  "settings.app.form.searchEngine": "Поисковая система",
@@ -241,11 +239,12 @@
  "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.showServiceName": "Отображать имя сервиса под иконкой",
-  "settings.app.form.splitMode": "Enable Split View Mode",
+  "settings.app.form.splitColumns": "Количество столбцов",
+  "settings.app.form.splitMode": "Включить раздельный режим просмотра",
  "settings.app.form.startMinimized": "Запускать свернутым",
-  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.universalDarkMode": "Включить универсальный темный режим",
-  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
+  "settings.app.form.useTouchIdToUnlock": "Разрешить разблокировку Ferdi по TouchID",
  "settings.app.form.useVerticalStyle": "Использовать горизонтальный стиль",
  "settings.app.form.wakeUpStrategy": "Стратегия пробуждения",
  "settings.app.headlineAdvanced": "Дополнительно",
@@ -254,22 +253,21 @@
  "settings.app.headlineLanguage": "Язык",
  "settings.app.headlinePrivacy": "Конфиденциальность",
  "settings.app.headlineUpdates": "Обновления",
-  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
+  "settings.app.hibernateInfo": "По умолчанию, Ферди будет держать все ваши сервисы открытыми и загружеными в фоновом режиме, чтобы они были готовы к использованию. Спящий режим выгрузит ваши сервисы после заданного количества минут. Это полезно для экономии памяти и/или оптимальной работы компьютера.",
-  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
+  "settings.app.inactivityLockInfo": "Минут бездействия, после чего Ferdi будет автоматически блокироваться. Используйте 0, чтобы отключить",
-  "settings.app.languageDisclaimer": "Официальная поддержка только для английского и немецкого языков. Остальные языки переведены сообществом.",
+  "settings.app.lockInfo": "Блокировка паролем позволяет защитить ваши сообщения.\nПри использовании блокировки паролем вам будет предложено вводить пароль каждый раз, когда вы запускаете Ferdi или блокируете Ферди с помощью символа блокировки в левом нижнем углу или ярлыка {lockShortcut}.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Пароль",
-  "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.lockedPasswordInfo": "Пожалуйста, убедитесь, что установлен пароль, который вы запомните.\nЕсли вы потеряете этот пароль, вам придется переустановить Ferdi.",
  "settings.app.restartRequired": "Изменения требуют перезагрузки приложения",
-  "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.scheduledDNDInfo": "Запланированный режим \"не беспокоить\" позволяет вам определить период времени, в течение которого вы не желаете получать уведомления от 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.scheduledDNDTimeInfo": "Время в 24-часовом формате. Время окончания может быть раньше времени начала (например, начало 17:00, конец 09:00), чтобы включить ночной режим \"не беспокоить\".",
-  "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.sentryInfo": "Отправка телеметрии позволяет нам находить ошибки в Ferdi - мы не будем отправлять никакой личной информации, включая ваши сообщения!",
-  "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.spellCheckerLanguageInfo": "Ferdi использует встроенную проверку орфографии вашего устройства. Если вы желаете изменить язык проверки орфографии, вы можете произвести это в системных настройках вашего устройства.",
  "settings.app.subheadlineCache": "Кэш",
  "settings.app.subheadlineFerdiProfile": "Ferdi профиль",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
+  "settings.app.todoServerInfo": "Этот сервер будет использоваться для функции задач \"Ferdi Todo\".",
  "settings.app.translationHelp": "Помогите нам перевести Ferdi на ваш язык.",
-  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
+  "settings.app.universalDarkModeInfo": "Универсальный темный режим старается динамически генерировать стили темных режимов для сервисов, которые в настоящее время не поддерживают этот режим.",
  "settings.app.updateStatusAvailable": "Доступно обновление, идёт загрузка...",
  "settings.app.updateStatusSearching": "Поиск обновлений",
  "settings.app.updateStatusUpToDate": "Вы используете актуальную версию Ferdi",
@@ -283,15 +281,15 @@
  "settings.navigation.yourWorkspaces": "Ваши окружения",
  "settings.recipes.all": "Все сервисы",
  "settings.recipes.custom": "Пользовательский сервисы",
-  "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
+  "settings.recipes.customService.headline.communityRecipes": "Протоколы сторонних сообществ",
-  "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes",
+  "settings.recipes.customService.headline.customRecipes": "Пользовательские сторонние протоколы",
-  "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
+  "settings.recipes.customService.headline.devRecipes": "Сервисные протоколы, разработанные вами",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
+  "settings.recipes.customService.intro": "Для добавления пользовательского сервиса, скопируйте сервисный протокол в папку:",
  "settings.recipes.customService.openDevDocs": "Документация для разработчиков",
  "settings.recipes.customService.openFolder": "Открыть папку",
  "settings.recipes.headline": "Доступные сервисы",
  "settings.recipes.missingService": "Не можете найти сервис?",
-  "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.nothingFound": "Извините, но сервис не соответствует вашему поисковому запросу - но вы все еще можете добавить его, используя опцию \"Пользовательский сайт\". Пожалуйста, обратите внимание, что на сайте может отображаться больше служб, которые могли быть добавлены в новых версиях Ferdi. Для получения новых сервисов, пожалуйста, обновите Ferdi до актуальной версии.",
  "settings.recipes.servicesSuccessfulAddedInfo": "Сервис успешно добавлен",
  "settings.searchService": "Найти сервис",
  "settings.service.error.goBack": "Вернуться к сервисам",
@@ -301,9 +299,9 @@
  "settings.service.form.availableServices": "Доступные сервисы",
  "settings.service.form.customUrl": "Пользовательский сервер",
  "settings.service.form.customUrlValidationError": "Невозможно проверить сервер {name}.",
-  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderBrightness": "Яркий темный режим",
-  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderContrast": "Контрастный темный режим",
-  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
+  "settings.service.form.darkReaderSepia": "Темный режим сепия",
  "settings.service.form.deleteButton": "Удалить сервис",
  "settings.service.form.editServiceHeadline": "Редактирование {name}",
  "settings.service.form.enableAudio": "Включить звук",
@@ -325,13 +323,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "Когда включено, служба будет отключена по истечении времени, чтобы сохранить системные ресурсы.",
  "settings.service.form.isMutedInfo": "Когда выключено, все звуковые уведомления будут отключены",
  "settings.service.form.name": "Имя",
-  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Отображение только \"Избранного\" в количестве непрочитанного",
  "settings.service.form.openDarkmodeCss": "Открыть darkmode.css",
  "settings.service.form.openUserCss": "Открыть user.css",
  "settings.service.form.openUserJs": "Открыть user.js",
  "settings.service.form.proxy.headline": "Настройки Прокси HTTP/HTTPS",
  "settings.service.form.proxy.host": "Прокси Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Настройки прокси не будут синхронизироваться с серверами Ferdi.",
  "settings.service.form.proxy.isEnabled": "Использовать прокси",
  "settings.service.form.proxy.password": "Пароль (опционально)",
  "settings.service.form.proxy.port": "Порт",
@@ -340,7 +338,7 @@
  "settings.service.form.recipeFileInfo": "Ваши пользовательские файлы будут вставлены на веб-страницу, чтобы вы могли настроить сервисы в любом удобном вам виде. Файлы пользователей хранятся только локально и не передаются на другие компьютеры, использующие ту же учетную запись.",
  "settings.service.form.saveButton": "Сохранить сервис",
  "settings.service.form.tabHosted": "Размещено",
-  "settings.service.form.tabOnPremise": "Св��й хостинг ⭐️",
+  "settings.service.form.tabOnPremise": "С��бст������ны�� хостинг ⭐",
  "settings.service.form.team": "Команда",
  "settings.service.form.useHostedService": "Использовать собственный сервис {name}",
  "settings.service.form.yourServices": "Ваши сервисы",
@@ -348,34 +346,31 @@
  "settings.services.discoverServices": "Найти сервисы",
  "settings.services.headline": "Ваши сервисы",
  "settings.services.noServicesAdded": "Начните с добавления сервиса.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Ошибка загрузки сервисов",
  "settings.services.tooltip.isDisabled": "Сервис отключен",
  "settings.services.tooltip.isMuted": "Все звуки отключены",
  "settings.services.tooltip.notificationsDisabled": "Уведомления отключены",
  "settings.services.updatedInfo": "Ваши изменения были сохранены",
  "settings.supportFerdi.aboutIntro": "<p>Ферди является приложением с открытым исходным кодом и разрабатывается сообществом.</p><p>Спасибо людям, которые делают это возможным:</p>",
-  "settings.supportFerdi.bannerText": "Вы хотите помочь нам улучшить Ферди?",
  "settings.supportFerdi.headline": "О Ferdi",
-  "settings.supportFerdi.openSurvey": "Открыть опрос",
  "settings.supportFerdi.textDonation": "Если вы хотите поддержать развитие Ферди с пожертвованием, вы можете сделать это двумя способами,",
  "settings.supportFerdi.textDonationAnd": "и",
-  "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.textExpenses": "Хотя большую часть работы выполняют волонтёры, а нам к тому же необходимо оплачивать серверы и сертификаты. Как сообщество, мы полностью прозрачны к средствам, которые собираем и расходуем - смотрите наш",
  "settings.supportFerdi.textGitHubSponsors": "Спонсоры на Github",
-  "settings.supportFerdi.textListContributors": "Full list of contributors",
+  "settings.supportFerdi.textListContributors": "Полный список участников",
  "settings.supportFerdi.textListContributorsHere": "здесь",
  "settings.supportFerdi.textOpenCollective": "Open Collective",
-  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
+  "settings.supportFerdi.textSupportWelcome": "Поддержка всегда приветствуется. Вы можете найти список необходимой нам помощи",
  "settings.supportFerdi.textSupportWelcomeHere": "здесь",
-  "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.textVolunteers": "Поддержкой Ferdi занимаются волонтёры. Люди, который использую Ferdi, как и Вы. Они поддерживают, исправляют и улучшают Ferdi в свободное время.",
-  "settings.supportFerdi.title": "Вам нравится Ферди?",
  "settings.team.contentHeadline": "Команда управления Franz ",
-  "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.copy": "Сервис управления командой Franz позволяет управлять подпиской Franz для нескольких пользователей. Пожалуйста, имейте в виду, что подписка Franz Premium не даст Вам никаких преимуществ в использовании Ferdi. Единственной причиной, почему Вы еще имеете доступ к управлению командой, состоит в том, чтобы Вы могли управлять своими прежними командами Franz Teams и чтобы Вы не потеряли никаких функций управления своей учетной записью.",
  "settings.team.headline": "Команда",
-  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "Сейчас вы используете серверы Franz, поэтому у Вас есть доступ к управлению командой.",
  "settings.team.manageAction": "Управляйте вашей командой на meetfranz.com",
  "settings.team.teamsUnavailable": "Команды недоступны",
-  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailableInfo": "Команды на текущий момент доступны только при использовании сервера Franz и после приобретения Franz Professional. Пожалуйста, измените Ваш сервер на https://api.franzinfra.com для использования Teams.",
  "settings.user.form.accountType.company": "Компания",
  "settings.user.form.accountType.individual": "Индивидуальный",
  "settings.user.form.accountType.label": "Тип аккаунта",
@@ -389,28 +384,28 @@
  "settings.workspace.add.form.submitButton": "Создать окружение",
  "settings.workspace.form.buttonDelete": "Удалить окружение",
  "settings.workspace.form.buttonSave": "Сохранить окружение",
-  "settings.workspace.form.keepLoaded": "Keep this workspace loaded*",
+  "settings.workspace.form.keepLoaded": "Оставить это рабочее окружение загруженным*",
-  "settings.workspace.form.keepLoadedInfo": "*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
+  "settings.workspace.form.keepLoadedInfo": "*Этот параметр будет перезаписан глобальным параметром \"Сохранять все рабочие окружения загруженными\".",
  "settings.workspace.form.name": "Имя",
-  "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace",
+  "settings.workspace.form.servicesInWorkspaceHeadline": "Сервисы в этом Рабочем пространстве",
  "settings.workspace.form.yourWorkspaces": "Ваши окружения",
  "settings.workspaces.deletedInfo": "Рабочая область удалена",
  "settings.workspaces.headline": "Ваши окружения",
  "settings.workspaces.noWorkspacesAdded": "Вы еще не создали ни одной рабочей области.",
  "settings.workspaces.tryReloadWorkspaces": "Попробовать снова",
  "settings.workspaces.updatedInfo": "Ваши изменения были сохранены",
-  "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces",
+  "settings.workspaces.workspaceFeatureHeadline": "Меньше - больше: знакомство с рабочими окружениями Ferdi",
-  "settings.workspaces.workspaceFeatureInfo": "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. 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.",
+  "settings.workspaces.workspaceFeatureInfo": "Рабочие окружения Ferdi позволяют вам фокусироваться на том, что важно на текущий момент. Установите разные наборы сервисов и легко переключайтесь между ними в любое время. Только вы решаете, какие сервисы вам необходимы здесь и сейчас, а мы можем помочь вам достичь совершенства или отключиться от работы, по своему усмотрению.",
  "settings.workspaces.workspacesRequestFailed": "Ошибка загрузки ваших рабочих областей",
  "setupAssistant.headline": "Давайте начнем",
-  "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
+  "setupAssistant.subheadline": "Сделайте свой выбор среди наиболее популярных сервисов и возвращайтесь к своим сообщениям прямо сейчас.",
  "setupAssistant.submit.label": "Начнем",
  "sidebar.addNewService": "Добавить новый сервис",
-  "sidebar.closeTodosDrawer": "Close Ferdi Todos",
+  "sidebar.closeTodosDrawer": "Закрыть невыполненные заданий Ferdi",
  "sidebar.closeWorkspaceDrawer": "Закрыть меню окружений",
  "sidebar.lockFerdi": "Заблокировать Ferdi",
  "sidebar.muteApp": "Отключить уведомления и звук",
-  "sidebar.openTodosDrawer": "Open Ferdi Todos",
+  "sidebar.openTodosDrawer": "Открыть задания Ferdi",
  "sidebar.openWorkspaceDrawer": "Открыть меню окружений",
  "sidebar.unmuteApp": "Включить уведомления и звук",
  "signup.email.label": "Адрес электронной почты",
@@ -424,7 +419,7 @@
  "signup.link.login": "Уже есть аккаунт, войти?",
  "signup.password.label": "Пароль",
  "signup.submit.label": "Создать аккаунт",
-  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
+  "tabs.item.confirmDeleteService": "Вы точно желаете удалить сервис {serviceName}?",
  "tabs.item.deleteService": "Удалить сервис",
  "tabs.item.disableAudio": "Отключить звук",
  "tabs.item.disableDarkMode": "Отключить темный режим",
@@ -434,14 +429,14 @@
  "tabs.item.enableDarkMode": "Включить темный режим",
  "tabs.item.enableNotification": "Включить уведомления",
  "tabs.item.enableService": "Включить сервис",
-  "tabs.item.hibernateService": "Hibernate service",
+  "tabs.item.hibernateService": "Переход сервиса в спящий режим",
  "tabs.item.reload": "Перезагрузить",
  "tabs.item.wakeUpService": "Разбудить службу",
-  "validation.email": "{field} is not valid",
+  "validation.email": "{field} не действительно",
-  "validation.minLength": "{field} should be at least {length} characters long",
+  "validation.minLength": "Кількість символів в {field} повина бути не меньше {length}",
-  "validation.oneRequired": "At least one is required",
+  "validation.oneRequired": "Необходим как минимум один",
-  "validation.required": "{field} is required",
+  "validation.required": "{field} необходимо",
-  "validation.url": "{field} is not a valid URL",
+  "validation.url": "{field} не является правильным URL (ссылкой)",
  "webControls.back": "Назад",
  "webControls.forward": "Переслать",
  "webControls.goHome": "Домой",
@@ -449,12 +444,12 @@
  "webControls.reload": "Перезагрузить",
  "welcome.loginButton": "Вход",
  "welcome.signupButton": "Создать бесплатный аккаунт",
-  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
+  "workspaceDrawer.addNewWorkspaceLabel": "Добавить новое рабочее окружение",
  "workspaceDrawer.allServices": "Все сервисы",
  "workspaceDrawer.headline": "Окружение",
  "workspaceDrawer.item.contextMenuEdit": "редактировать",
-  "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
+  "workspaceDrawer.item.noServicesAddedYet": "Нет добавленных сервисов",
-  "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.workspaceFeatureInfo": "<p>Рабочие окружения Ferdi позволяют вма сфокусироваться на том, что важно на текущий момент. Установите разные наборы сервисов и легко переключайтесь между ними в любое время.</p><p>Только вы решаете, какие сервисы вам необходимы здесь и сейчас, а мы можем вам помочь достичь совершенства или отключиться от работы, по своему усмотрению.</p>",
  "workspaceDrawer.workspacesSettingsTooltip": "Изменить настройки рабочих областей",
  "workspaces.switchingIndicator.switchingTo": "Переключение на"
 }
diff --git a/src/i18n/locales/si.json b/src/i18n/locales/si.json
index 9ebf7f9e5..43295c582 100644
--- a/src/i18n/locales/si.json
+++ b/src/i18n/locales/si.json
@@ -1,97 +1,136 @@
 {
-  "app.errorHandler.action": "Reload",
+  "app.errorHandler.action": "නැවත පූරණය",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
-  "connectionLostBanner.cta": "Reload Service",
+  "changeserver.customServerLabel": "අභිරුචි සේවාදායකය",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "සේවාදායකය",
+  "changeserver.urlError": "වලංගු ඒ.ස.නි. යොදන්න",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
+  "connectionLostBanner.cta": "සේවාව යළි පූරණය",
  "connectionLostBanner.informationLink": "What happened?",
  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
-  "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
-  "feature.shareFranz.action.email": "Send as email",
+  "feature.nightlyBuilds.activate": "Activate",
-  "feature.shareFranz.action.facebook": "Share on Facebook",
+  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
-  "feature.shareFranz.action.twitter": "Share on Twitter",
+  "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.shareFranz.headline": "Ferdi is better together!",
+  "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
-  "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
+  "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
-  "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
+  "feature.publishDebugInfo.privacy": "රහස්‍යතා ප්‍රතිපත්තිය",
-  "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
+  "feature.publishDebugInfo.publish": "Accept and publish",
-  "global.api.unhealthy": "ෆ්රාන්ස් මාර්ගගත සේවාවන් වෙත සම්බන්ධ වීමට නොහැක.",
+  "feature.publishDebugInfo.published": "Your debug log was published and is now availible at",
-  "global.edit": "Edit",
+  "feature.publishDebugInfo.terms": "Terms of service",
-  "global.franzProRequired": "Ferdi Professional Required",
+  "feature.publishDebugInfo.title": "Publish debug information",
+  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
+  "feature.quickSwitch.search": "සොයන්න...",
+  "feature.quickSwitch.title": "QuickSwitch",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "අවලංගු",
+  "global.edit": "සංස්කරණය",
+  "global.no": "නැහැ",
  "global.notConnectedToTheInternet": "ඔබ අන්තර්ජාලයට සම්බන්ධ වී නැත.",
-  "global.quit": "Quit",
+  "global.ok": "හරි",
-  "global.settings": "Settings",
+  "global.quit": "ඉවත් වන්න",
+  "global.quitConfirmation": "ඔබට ෆර්ඩි වෙතින් ඉවත් වීමට ඇවැසිද?",
+  "global.save": "සුරකින්න",
+  "global.settings": "සැකසුම්",
  "global.spellchecker.useDefault": "Use System Default ({default})",
  "global.spellchecking.autodetect": "Detect language automatically",
-  "global.spellchecking.autodetect.short": "Automatic",
+  "global.spellchecking.autodetect.short": "ස්වයංක්‍රීය",
  "global.spellchecking.language": "Spell checking language",
-  "global.submit": "යවන්න",
+  "global.submit": "යොමන්න",
-  "import.headline": "ඔබගේ ෆ්රාන්ස් සේවාවන් නැවත ඇතුලත් කරගන්න.",
+  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
-  "import.notSupportedHeadline": "සේවාවන් සඳහා ෆ්රාන්ස් 5 හි තවමත් පහසුකම් සලසා නැත.",
+  "global.userAgentPref": "පරිශීලක නියෝතය",
-  "import.skip.label": "සේවාවන් මවිසින් ඇතුලත් කල යුතුය. ",
+  "global.yes": "ඔව්",
-  "import.submit.label": "සේවාවන් ස්වයං ඇතුලත් කරගැනීම ",
+  "import.headline": "ෆර්ඩි 4 සේවා අයාත කරන්න",
-  "infobar.buttonChangelog": "අලුත් දෑ",
+  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
-  "infobar.buttonInstallUpdate": "නැවත අරඹා යාවත්කාල කරන්න.",
+  "import.skip.label": "I want to add services manually",
-  "infobar.buttonReloadServices": "සේවාවන් නැවත ඇරඹීම",
+  "import.submit.label": "Import {count} services",
-  "infobar.requiredRequestsFailed": "සේවාවන් සහ පරිශීලක තොරතුරු ලබාගත නොහැක.",
+  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.servicesUpdated": "ඔබගේ සේවාවන් යාවත්කාල කර ඇත.",
+  "infobar.buttonChangelog": "What is new?",
-  "infobar.updateAvailable": "ෆ්රාන්ස් හි නව සංස්කරණයක් දැන් ලබා ගත හැක.",
+  "infobar.buttonInstallUpdate": "Restart & install update",
-  "invite.email.label": "විද්‍යුත් තැපැල් ලිපිනය ",
+  "infobar.buttonReloadServices": "සේවා නැවත පූරණය",
-  "invite.headline.friends": "මිතුරන් 3කට ආරාධනා කරන්න.",
+  "infobar.hide": "සඟවන්න",
-  "invite.name.label": "නම",
+  "infobar.requiredRequestsFailed": "Could not load services and user information",
-  "invite.skip.label": "මා මෙය පසුව කරන්නම්",
+  "infobar.servicesUpdated": "Your services have been updated.",
-  "invite.submit.label": "ඇරයුම් යවන්න ",
+  "infobar.updateAvailable": "A new update for Ferdi is available.",
+  "infobox.dismiss": "Dismiss",
+  "invite.email.label": "Email address",
+  "invite.headline.friends": "Invite 3 of your friends or colleagues",
+  "invite.name.label": "Name",
+  "invite.skip.label": "I want to do this later",
+  "invite.submit.label": "Send invites",
  "invite.successInfo": "Invitations sent successfully",
-  "login.email.label": "විද්‍යුත් තැපැල් ලිපිනය",
+  "locked.headline": "Locked",
-  "login.headline": "ඇතුළු වන්න",
+  "locked.invalidCredentials": "Password invalid",
-  "login.invalidCredentials": "විද්‍යුත් තැපැල් ලිපිනය හෝ මුර පදය වැරදියි",
+  "locked.password.label": "Password",
-  "login.link.password": "මුර පදය අලුත් කරන්න",
+  "locked.submit.label": "Unlock",
-  "login.link.signup": "නොමිළ ගිණුමක් සකසන්න",
+  "locked.touchId": "Unlock with Touch ID",
-  "login.password.label": "මුරපදය",
+  "locked.touchIdPrompt": "unlock via Touch ID",
-  "login.serverLogout": "ඔබේ ඇතුළු වීම් කාලය අවසන්, නැවත ඇතුල් වන්න.",
+  "locked.unlockWithPassword": "Unlock with Password",
-  "login.submit.label": "ඇතුල් වන්න",
+  "login.changeServer": "Change server",
-  "login.tokenExpired": "ඔබේ ඇතුළු වීම් කාලය අවසන්, නැවත ඇතුල් වන්න.",
+  "login.customServerQuestion": "Using a Franz account to log in?",
+  "login.customServerSuggestion": "Try importing your Franz account into Ferdi",
+  "login.email.label": "Email address",
+  "login.headline": "Sign in",
+  "login.invalidCredentials": "Email or password not valid",
+  "login.link.password": "Reset password",
+  "login.link.signup": "නොමිලේ ගිණුමක් සාදන්න",
+  "login.password.label": "Password",
+  "login.serverLogout": "Your session expired, please login again.",
+  "login.submit.label": "Sign in",
+  "login.tokenExpired": "Your session expired, please login again.",
  "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
  "menu.Todoss.openTodosDrawer": "Open Todos drawer",
-  "menu.app.about": "About Ferdi",
+  "menu.app.about": "ෆර්ඩි පිළිබඳව",
-  "menu.app.announcement": "What's new?",
+  "menu.app.autohideMenuBar": "Auto-hide menu bar",
  "menu.app.checkForUpdates": "Check for updates",
-  "menu.app.hide": "Hide",
+  "menu.app.hide": "සඟවන්න",
  "menu.app.hideOthers": "Hide Others",
-  "menu.app.unhide": "Unhide",
+  "menu.app.unhide": "නොසඟවන්න",
-  "menu.edit": "Edit",
+  "menu.edit": "සංස්කරණය",
-  "menu.edit.copy": "Copy",
+  "menu.edit.copy": "පිටපත්",
-  "menu.edit.cut": "Cut",
+  "menu.edit.cut": "කපන්න",
  "menu.edit.delete": "Delete",
  "menu.edit.emojiSymbols": "Emoji & Symbols",
-  "menu.edit.paste": "Paste",
+  "menu.edit.findInPage": "Find in Page",
+  "menu.edit.paste": "අලවන්න",
  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
-  "menu.edit.redo": "Redo",
+  "menu.edit.redo": "පසුසේ",
  "menu.edit.selectAll": "Select All",
  "menu.edit.speech": "Speech",
  "menu.edit.startDictation": "Start Dictation",
  "menu.edit.startSpeaking": "Start Speaking",
  "menu.edit.stopSpeaking": "Stop Speaking",
-  "menu.edit.undo": "Undo",
+  "menu.edit.undo": "පෙරසේ",
-  "menu.file": "File",
+  "menu.file": "ගොනුව",
-  "menu.help": "Help",
+  "menu.help": "උදව්",
  "menu.help.changelog": "Changelog",
  "menu.help.debugInfo": "Copy Debug Information",
  "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
  "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
  "menu.help.learnMore": "Learn More",
  "menu.help.privacy": "Privacy Statement",
-  "menu.help.support": "Support",
+  "menu.help.publishDebugInfo": "Publish Debug Information",
-  "menu.help.tos": "Terms of Service",
+  "menu.help.support": "සහාය",
-  "menu.services": "Services",
+  "menu.help.tos": "සේවාවේ නියම",
+  "menu.services": "සේවා",
  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
-  "menu.services.goHome": "Home",
+  "menu.services.goHome": "මුල",
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
  "menu.todos.enableTodos": "Enable Todos",
-  "menu.view": "View",
+  "menu.view": "දකින්න",
-  "menu.view.reloadFerdi": "Reload Ferdi",
+  "menu.view.back": "ආපසු",
-  "menu.view.reloadService": "Reload Service",
+  "menu.view.forward": "Forward",
+  "menu.view.lockFerdi": "ෆර්ඩි අගුළුලන්න",
+  "menu.view.openQuickSwitch": "Open Quick Switch",
+  "menu.view.reloadFerdi": "ෆර්ඩි යළි පූරණය",
+  "menu.view.reloadService": "සේවාව යළි පූරණය",
  "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Actual Size",
+  "menu.view.resetZoom": "සැබෑ ප්‍රමාණය",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
  "menu.view.toggleDevTools": "Toggle Developer Tools",
  "menu.view.toggleFullScreen": "Toggle Full Screen",
  "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
@@ -104,192 +143,256 @@
  "menu.workspaces": "Workspaces",
  "menu.workspaces.addNewWorkspace": "Add New Workspace...",
  "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
-  "menu.workspaces.defaultWorkspace": "All services",
+  "menu.workspaces.defaultWorkspace": "සියළුම සේවා",
  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
-  "password.email.label": "විද්‍යුත් තැපැල් ලිපිනය",
+  "password.email.label": "Email address",
-  "password.headline": "මුරපදය නැවත සකසන්න ",
+  "password.headline": "Reset password",
-  "password.link.login": "ඔබේ ගිණුමට ඇතුල් වන්න ",
+  "password.link.login": "Sign in to your account",
-  "password.link.signup": "නව නොමිල ගිණුමක් අරඹන්න ",
+  "password.link.signup": "නොමිලේ ගිණුමක් සාදන්න",
-  "password.noUser": "එම විද්‍යුත් තැපැල් ලිපිනය යටතේ කිසිදු පරිශීලකයෙක් නොමැත ",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "කරුණාකර ඔබේ විද්‍යුත් තැපෑල පිරික්සන්න",
+  "password.successInfo": "Your new password was sent to your email address",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
+  "service.crashHandler.action": "Reload {name}",
-  "pricing.features.accountSync": "Account Synchronisation",
+  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
-  "pricing.features.adFree": "Forever ad-free",
+  "service.crashHandler.headline": "Oh no!",
-  "pricing.features.appDelays": "No Waiting Screens",
+  "service.crashHandler.text": "{name} has caused an error.",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
+  "service.disabledHandler.action": "{name} සබල කරන්න",
-  "pricing.features.customWebsites": "Add Custom Websites",
+  "service.disabledHandler.headline": "{name} සබල කර ඇත",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
+  "service.errorHandler.action": "Reload {name}",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
+  "service.errorHandler.editAction": "{name} සංස්කරණය",
-  "pricing.features.recipes": "Choose from more than 70 Services",
+  "service.errorHandler.headline": "Oh no!",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
-  "pricing.features.workspaces": "Workspaces",
-  "service.crashHandler.action": "{name} නැවත ලබාගන්න",
-  "service.crashHandler.autoReload": "{name} ස්වයංක්‍රීය ප්‍රතිෂ්ඨාපනය තවත් තත්පර {seconds}කින් ",
-  "service.crashHandler.headline": "අපොයි!",
-  "service.crashHandler.text": "{name} හි දෝෂයකි. ",
-  "service.disabledHandler.action": "{name} සක්‍රීය කරන්න",
-  "service.disabledHandler.headline": "{name} අක්‍රීයයි.",
-  "service.errorHandler.action": "{name} නැවත ලබාගන්න",
-  "service.errorHandler.editAction": "Edit {name}",
-  "service.errorHandler.headline": "අපොයි!",
  "service.errorHandler.message": "Error",
  "service.errorHandler.text": "{name} has failed to load.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "{service} පූරණය වෙමින්",
-  "services.getStarted": "ආරම්භ කරන්න",
+  "services.getStarted": "පටන් ගන්න",
-  "services.welcome": "ෆ්‍රාන්ස් වෙත සාදරයෙන් පිළිගනිමු",
+  "services.login": "Please login to use Ferdi.",
-  "settings.account.account.editButton": "ගිණුම සකසන්න",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
-  "settings.account.accountType.basic": "මුලික ගිණුම ",
+  "services.serverless": "Use Ferdi without an Account",
-  "settings.account.accountType.premium": "විශේෂ ආධාරකාර ගිණුම ",
+  "settings.account.account.editButton": "ගිණුම සංස්කරණය",
-  "settings.account.buttonSave": "පැතිකඩ යාවත්කාල කිරීම ",
+  "settings.account.accountUnavailable": "Account is unavailable",
-  "settings.account.deleteAccount": "ගිණුම මකා දමන්න ",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
-  "settings.account.deleteEmailSent": "ගිණුම මකා දැමීම තහවුරු කිරීම සඳහා විද්‍යුත් තැපැල් පණිවුඩයක් ඔබ වෙත යවා ඇත. මකා දැමීමෙන් පසුව ඔබගේ ගිණුම සහ අනෙකුත් දත්ත නැවත ලබාගත නොහැකි බව කරුණාවෙන් සලකන්න.",
+  "settings.account.buttonSave": "පැතිකඩ යාවත්කාලය",
-  "settings.account.deleteInfo": "ඔබට ෆ්‍රාන්ස් ගිණුම තවදුරටත් අනවශ්‍ය නම්, ගිණුම සහ ඒ සම්බන්ධ සියලු තොරතුරු මෙහිදී මකා දැමිය හැක.",
+  "settings.account.deleteAccount": "Delete account",
-  "settings.account.headline": "ගිණුම ",
+  "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
+  "settings.account.deleteInfo": "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
+  "settings.account.headline": "ගිණුම",
  "settings.account.headlineAccount": "ගිණුමේ තොරතුරු",
-  "settings.account.headlineDangerZone": "භයානක කලාපය ",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "��������������� ",
+  "settings.account.headlineInvoices": "���������������",
  "settings.account.headlinePassword": "මුරපදය වෙනස් කරන්න",
-  "settings.account.headlineProfile": "පැතිකඩ යාවත්කාල ��රන්න ",
+  "settings.account.headlineProfile": "පැතිකඩ යාවත්කාල��",
  "settings.account.successInfo": "Your changes have been saved",
-  "settings.account.tryReloadServices": "Try again",
+  "settings.account.tryReloadServices": "යළි උත්සාහය",
-  "settings.account.tryReloadUserInfoRequest": "Try again",
+  "settings.account.tryReloadUserInfoRequest": "යළි උත්සාහය",
  "settings.account.userInfoRequestFailed": "Could not load user information",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "ඔබගේ ෆර්ඩි බලපත්‍රය:",
+  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Clear cache",
-  "settings.app.buttonInstallUpdate": "නැවත අරඹා යාවත්කාල කරන්න.",
+  "settings.app.buttonInstallUpdate": "Restart & install update",
+  "settings.app.buttonOpenFerdiProfileFolder": "පැතිකඩ බහාලුම විවෘත",
+  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
  "settings.app.buttonSearchForUpdate": "Check for updates",
  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
-  "settings.app.currentVersion": "Current version:",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
-  "settings.app.form.autoLaunchInBackground": "Open in background",
+  "settings.app.closeSettings": "සැකසුම් වසන්න",
-  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
+  "settings.app.currentVersion": "වත්මන් අනුවාදය:",
+  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
+  "settings.app.form.alwaysShowWorkspaces": "Always show workspace drawer",
+  "settings.app.form.autoLaunchInBackground": "පසුබිමෙහි විවෘත කරන්න",
+  "settings.app.form.autoLaunchOnStart": "ආරම්භයේදී ෆර්ඩි දියත්කරන්න",
+  "settings.app.form.automaticUpdates": "යාවත්කාල සබල කරන්න",
  "settings.app.form.beta": "Include beta versions",
-  "settings.app.form.darkMode": "Join the Dark Side",
+  "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
+  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
+  "settings.app.form.darkMode": "Enable Dark Mode",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
+  "settings.app.form.enableGlobalHideShortcut": "Enable Global shortcut to hide Ferdi",
+  "settings.app.form.enableLock": "Enable Password Lock",
+  "settings.app.form.enableLongPressServiceHint": "Enable service shortcut hint on long press",
+  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
+  "settings.app.form.hibernationStrategy": "Hibernation strategy",
+  "settings.app.form.iconSize": "Service icon size",
+  "settings.app.form.inactivityLock": "Lock after inactivity",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Language",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
+  "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
+  "settings.app.form.notifyTaskBarOnMessage": "Notify TaskBar/Dock on new message",
+  "settings.app.form.passwordToggle": "Password toggle",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
+  "settings.app.form.privateNotifications": "Don't show message content in notifications",
+  "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
  "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
+  "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
+  "settings.app.form.scheduledDNDEnd": "To",
+  "settings.app.form.scheduledDNDStart": "වෙතින්",
+  "settings.app.form.searchEngine": "Search engine",
+  "settings.app.form.sentry": "Send telemetry data",
+  "settings.app.form.serviceRibbonWidth": "Sidebar width",
  "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.headlineAdvanced": "Advanced",
+  "settings.app.form.showServiceName": "Display service name under the icon",
+  "settings.app.form.splitColumns": "තීරු ගණන",
+  "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.wakeUpStrategy": "Wake up strategy",
+  "settings.app.headlineAdvanced": "වැඩිදුර",
  "settings.app.headlineAppearance": "Appearance",
  "settings.app.headlineGeneral": "General",
  "settings.app.headlineLanguage": "Language",
-  "settings.app.headlineUpdates": "Updates",
+  "settings.app.headlinePrivacy": "රහස්‍යතාව",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
+  "settings.app.headlineUpdates": "යාවත්කාල",
+  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
+  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
+  "settings.app.lockedPassword": "Password",
+  "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": "Changes require restart",
-  "settings.app.subheadlineCache": "Cache",
+  "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.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": "නිහිතය",
+  "settings.app.subheadlineFerdiProfile": "ෆර්ඩි පැතිකඩ",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
  "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "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 available, downloading...",
  "settings.app.updateStatusSearching": "Is searching for update",
  "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
  "settings.invite.headline": "Invite Friends",
-  "settings.navigation.account": "ගිණුම ",
+  "settings.navigation.account": "ගිණුම",
-  "settings.navigation.availableServices": "Available services",
+  "settings.navigation.availableServices": "තිබෙන සේවා",
-  "settings.navigation.inviteFriends": "Invite Friends",
  "settings.navigation.logout": "Logout",
-  "settings.navigation.team": "Manage Team",
+  "settings.navigation.supportFerdi": "ෆර්ඩි පිළිබඳව",
-  "settings.navigation.yourServices": "Your services",
+  "settings.navigation.team": "කණ්ඩායම කළමනාකරණය",
-  "settings.navigation.yourWorkspaces": "Your workspaces",
+  "settings.navigation.yourServices": "ඔබගේ සේවා",
-  "settings.recipes.all": "All services",
+  "settings.navigation.yourWorkspaces": "ඔබගේ වැඩබිම්",
-  "settings.recipes.custom": "Custom Services",
+  "settings.recipes.all": "සියළුම සේවා",
+  "settings.recipes.custom": "අභිරුචි සේවා",
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
-  "settings.recipes.headline": "Available services",
+  "settings.recipes.headline": "තිබෙන සේවා",
  "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.nothingFound": "Sorry, but no service matched your search term. 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.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 successfully added",
  "settings.searchService": "Search service",
  "settings.service.error.goBack": "Back to services",
  "settings.service.error.headline": "Error",
  "settings.service.error.message": "Could not load service recipe.",
  "settings.service.form.addServiceHeadline": "Add {name}",
-  "settings.service.form.availableServices": "Available services",
+  "settings.service.form.availableServices": "තිබෙන සේවා",
-  "settings.service.form.customUrl": "Custom server",
+  "settings.service.form.customUrl": "අභිරුචි සේවාදායකය",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
  "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "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": "Edit {name}",
+  "settings.service.form.editServiceHeadline": "{name} සංස්කරණය",
-  "settings.service.form.enableAudio": "Enable audio",
+  "settings.service.form.enableAudio": "ශ්‍රව්‍ය සබල කරන්න",
  "settings.service.form.enableBadge": "Show unread message badges",
  "settings.service.form.enableDarkMode": "Enable Dark Mode",
  "settings.service.form.enableHibernation": "Enable hibernation",
  "settings.service.form.enableNotification": "Enable notifications",
-  "settings.service.form.enableService": "Enable service",
+  "settings.service.form.enableService": "සේවාව සබල කරන්න",
+  "settings.service.form.enableWakeUp": "Enable wake up",
  "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
  "settings.service.form.headlineGeneral": "General",
-  "settings.service.form.headlineNotifications": "Notifications",
+  "settings.service.form.headlineNotifications": "දැනුම්දීම්",
-  "settings.service.form.icon": "Custom icon",
+  "settings.service.form.icon": "අභිරුචි නිරූපකය",
  "settings.service.form.iconDelete": "Delete",
  "settings.service.form.iconUpload": "Drop your image, or click here",
  "settings.service.form.indirectMessageInfo": "You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
  "settings.service.form.indirectMessages": "Show message badge for all new messages",
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
-  "settings.service.form.name": "නම",
+  "settings.service.form.name": "Name",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
+  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
+  "settings.service.form.openUserCss": "user.css විවෘත කරන්න",
+  "settings.service.form.openUserJs": "user.js විවෘත කරන්න",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
  "settings.service.form.proxy.restartInfo": "Please restart Ferdi after changing proxy Settings.",
  "settings.service.form.proxy.user": "User (optional)",
+  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
  "settings.service.form.saveButton": "Save service",
  "settings.service.form.tabHosted": "Hosted",
  "settings.service.form.tabOnPremise": "Self hosted ⭐️",
-  "settings.service.form.team": "Team",
+  "settings.service.form.team": "කණ්ඩායම",
  "settings.service.form.useHostedService": "Use the hosted {name} service.",
-  "settings.service.form.yourServices": "Your services",
+  "settings.service.form.yourServices": "ඔබගේ සේවා",
  "settings.services.deletedInfo": "Service has been deleted",
-  "settings.services.discoverServices": "Discover services",
+  "settings.services.discoverServices": "සේවා ගවේෂණය",
-  "settings.services.headline": "Your services",
+  "settings.services.headline": "ඔබගේ සේවා",
-  "settings.services.noServicesAdded": "You haven't added any services yet.",
+  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Could not load your services",
-  "settings.services.tooltip.isDisabled": "Service is disabled",
+  "settings.services.tooltip.isDisabled": "සේවාව අබල කර ඇත",
-  "settings.services.tooltip.isMuted": "All sounds are muted",
+  "settings.services.tooltip.isMuted": "සියළුම ශබ්ද නිහඬයි",
  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
  "settings.services.updatedInfo": "Your changes have been saved",
-  "settings.team.contentHeadline": "Franz for Teams",
+  "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.team.copy": "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.supportFerdi.headline": "ෆර්ඩි පිළිබඳව",
-  "settings.team.headline": "Team",
+  "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,",
-  "settings.team.intro": "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+  "settings.supportFerdi.textDonationAnd": "සහ",
+  "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.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.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.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": "කණ්ඩායම",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
  "settings.team.manageAction": "Manage your Team on meetfranz.com",
-  "settings.team.upgradeAction": "Upgrade your Account",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
-  "settings.user.form.accountType.company": "Company",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.user.form.accountType.company": "සමාගම",
  "settings.user.form.accountType.individual": "Individual",
-  "settings.user.form.accountType.label": "Account type",
+  "settings.user.form.accountType.label": "ගිණුමේ වර්ගය",
  "settings.user.form.accountType.non-profit": "Non-Profit",
-  "settings.user.form.currentPassword": "Current password",
+  "settings.user.form.currentPassword": "වත්මන් මුරපදය",
-  "settings.user.form.email": "Email",
+  "settings.user.form.email": "වි-තැපෑල",
-  "settings.user.form.firstname": "First Name",
+  "settings.user.form.firstname": "පළමු නම",
-  "settings.user.form.lastname": "Last Name",
+  "settings.user.form.lastname": "අවසාන නම",
-  "settings.user.form.newPassword": "New password",
+  "settings.user.form.newPassword": "නව මුරපදය",
-  "settings.workspace.add.form.name": "නම",
+  "settings.workspace.add.form.name": "Name",
-  "settings.workspace.add.form.submitButton": "Create workspace",
+  "settings.workspace.add.form.submitButton": "වැඩබිම සාදන්න",
  "settings.workspace.form.buttonDelete": "Delete workspace",
-  "settings.workspace.form.buttonSave": "Save workspace",
+  "settings.workspace.form.buttonSave": "වැඩබිම සුරකින්න",
-  "settings.workspace.form.name": "නම",
+  "settings.workspace.form.keepLoaded": "Keep this workspace loaded*",
+  "settings.workspace.form.keepLoadedInfo": "*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
+  "settings.workspace.form.name": "Name",
  "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace",
-  "settings.workspace.form.yourWorkspaces": "Your workspaces",
+  "settings.workspace.form.yourWorkspaces": "ඔබගේ වැඩබිම්",
  "settings.workspaces.deletedInfo": "Workspace has been deleted",
-  "settings.workspaces.headline": "Your workspaces",
+  "settings.workspaces.headline": "ඔබගේ වැඩබිම්",
-  "settings.workspaces.noWorkspacesAdded": "You haven't added any workspaces yet.",
+  "settings.workspaces.noWorkspacesAdded": "You haven't created any workspaces yet.",
-  "settings.workspaces.tryReloadWorkspaces": "Try again",
+  "settings.workspaces.tryReloadWorkspaces": "යළි උත්සාහය",
  "settings.workspaces.updatedInfo": "Your changes have been saved",
  "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces",
  "settings.workspaces.workspaceFeatureInfo": "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. 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.",
@@ -300,48 +403,52 @@
  "sidebar.addNewService": "Add new service",
  "sidebar.closeTodosDrawer": "Close Ferdi Todos",
  "sidebar.closeWorkspaceDrawer": "Close workspace drawer",
+  "sidebar.lockFerdi": "ෆර්ඩි අගුළුලන්න",
  "sidebar.muteApp": "Disable notifications & audio",
  "sidebar.openTodosDrawer": "Open Ferdi Todos",
  "sidebar.openWorkspaceDrawer": "Open workspace drawer",
  "sidebar.unmuteApp": "Enable notifications & audio",
  "signup.email.label": "Email address",
  "signup.emailDuplicate": "A user with that email address already exists",
-  "signup.firstname.label": "First Name",
+  "signup.firstname.label": "පළමු නම",
  "signup.headline": "Sign up",
-  "signup.lastname.label": "Last Name",
+  "signup.lastname.label": "අවසාන නම",
  "signup.legal.info": "By creating a Ferdi account you accept the",
  "signup.legal.privacy": "Privacy Statement",
  "signup.legal.terms": "Terms of service",
  "signup.link.login": "Already have an account, sign in?",
-  "signup.password.label": "මුරපදය",
+  "signup.password.label": "Password",
  "signup.submit.label": "Create account",
+  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
  "tabs.item.deleteService": "Delete service",
-  "tabs.item.disableAudio": "Disable audio",
+  "tabs.item.disableAudio": "ශ්‍රව්‍ය අබල කරන්න",
-  "tabs.item.disableNotifications": "Disable notifications",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
-  "tabs.item.disableService": "Disable service",
+  "tabs.item.disableNotifications": "දැනුම්දීම් අබල කරන්න",
-  "tabs.item.enableAudio": "Enable audio",
+  "tabs.item.disableService": "සේවාව අබල කරන්න",
+  "tabs.item.enableAudio": "ශ්‍රව්‍ය සබල කරන්න",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Enable notifications",
-  "tabs.item.enableService": "Enable service",
+  "tabs.item.enableService": "සේවාව සබල කරන්න",
-  "tabs.item.reload": "Reload",
+  "tabs.item.hibernateService": "Hibernate service",
+  "tabs.item.reload": "නැවත පූරණය",
+  "tabs.item.wakeUpService": "Wake up service",
  "validation.email": "{field} is not valid",
  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "At least one is required",
  "validation.required": "{field} is required",
  "validation.url": "{field} is not a valid URL",
-  "webControls.back": "Back",
+  "webControls.back": "ආපසු",
  "webControls.forward": "Forward",
-  "webControls.goHome": "Home",
+  "webControls.goHome": "මුල",
  "webControls.openInBrowser": "Open in Browser",
-  "webControls.reload": "Reload",
+  "webControls.reload": "නැවත පූරණය",
  "welcome.loginButton": "Login to your account",
-  "welcome.signupButton": "Create a free account",
+  "welcome.signupButton": "නොමිලේ ගිණුමක් සාදන්න",
  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
-  "workspaceDrawer.allServices": "All services",
+  "workspaceDrawer.allServices": "සියළුම සේවා",
  "workspaceDrawer.headline": "Workspaces",
  "workspaceDrawer.item.contextMenuEdit": "edit",
  "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
  "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",
  "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 80bd1c69d..c7cd1929b 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -1,59 +1,59 @@
 {
  "app.errorHandler.action": "Obnoviť",
-  "app.errorHandler.headline": "Something went wrong.",
+  "app.errorHandler.headline": "Niečo sa pokazilo.",
  "changeserver.customServerLabel": "Vlastný server",
  "changeserver.headline": "Zmeniť server",
  "changeserver.label": "Server",
  "changeserver.urlError": "Zadajte platnú adresu URL",
-  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
+  "changeserver.warning": "Extra nastavenia z Ferdi nebudú uložené",
  "connectionLostBanner.cta": "Obnoviť službu",
  "connectionLostBanner.informationLink": "Čo sa stalo?",
-  "connectionLostBanner.message": "Oh nie! Ferdi stratil pripojenie k {name}.",
+  "connectionLostBanner.message": "Och nie! Ferdi stratil pripojenie k {name}.",
-  "feature.basicAuth.signIn": "Sign In",
+  "feature.basicAuth.signIn": "Prihlásiť sa",
  "feature.nightlyBuilds.activate": "Aktivovať",
  "feature.nightlyBuilds.info": "Tzv. \"nočné verzie\" sú vysoko experimentálne verzie Ferdi, ktoré môžu obsahovať nedoladená alebo nedokončené funkcie. Tieto verzie sú používané predovšetkým vývojármi, aby otestovali novo-vyvíjané funkcie a spôsob, akým sa budú správať vo finálnej verzii. Ak neviete čo robíte, navrhujeme neaktivovať tieto experimentálne verzie.",
  "feature.nightlyBuilds.title": "Vývojárske verzie",
-  "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
+  "feature.publishDebugInfo.error": "Pri zverejňovaní debug informácií nastala chyba. Skúste to neskôr alebo si zobrazte konzolu pre viac informácií.",
-  "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
+  "feature.publishDebugInfo.info": "Zverejnenie debug informácií nám pomáha identifikovať problémy a chyby vo Ferdi. Zverejnením týchto informácií akceptujete zásady ochrany osobných údajov a podmienky služby Ferdi",
  "feature.publishDebugInfo.privacy": "Ochrana osobných údajov",
-  "feature.publishDebugInfo.publish": "Prijať a publikovať",
+  "feature.publishDebugInfo.publish": "Prijať a zverejniť",
-  "feature.publishDebugInfo.published": "Your debug log was published and is now availible at",
+  "feature.publishDebugInfo.published": "Vaše debug informácie boli zverejnené a teraz sú dostupné na",
  "feature.publishDebugInfo.terms": "Podmienky služby",
-  "feature.publishDebugInfo.title": "Publish debug information",
+  "feature.publishDebugInfo.title": "Zverejniť debug informácie",
-  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
+  "feature.quickSwitch.info": "Vyberte službu s TAB, ↑ a ↓. Otvorte službu s ENTER.",
  "feature.quickSwitch.search": "Hľadať...",
-  "feature.quickSwitch.title": "QuickSwitch",
+  "feature.quickSwitch.title": "Rýchle prepnutie",
-  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.api.unhealthy": "Nedá sa pripojiť k online službám Ferdi",
-  "global.cancel": "Cancel",
+  "global.cancel": "Zrušiť",
  "global.edit": "Upraviť",
-  "global.no": "No",
+  "global.no": "Nie",
  "global.notConnectedToTheInternet": "Nie ste pripojení k internetu.",
-  "global.ok": "Ok",
+  "global.ok": "OK",
-  "global.quit": "Quit",
+  "global.quit": "Ukončiť",
-  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.quitConfirmation": "Naozaj chceš ukončiť Ferdi?",
-  "global.save": "Save",
+  "global.save": "Uložiť",
-  "global.settings": "Settings",
+  "global.settings": "Nastavenia",
  "global.spellchecker.useDefault": "Použiť predvolené nastavenie systému ({default})",
  "global.spellchecking.autodetect": "Automaticky rozpoznať jazyk",
  "global.spellchecking.autodetect.short": "Automatický",
  "global.spellchecking.language": "Jazyk kontroly pravopisu",
-  "global.submit": "Submit",
+  "global.submit": "Potvrdiť",
-  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
+  "global.userAgentHelp": "Použite 'https://whatmyuseragent.com/' (na zobrazenie) alebo 'https://developers.whatismybrowser.com/useragents/explore/' (na výber) používateľského agenta a vložte ho sem.",
  "global.userAgentPref": "User Agent",
-  "global.yes": "Yes",
+  "global.yes": "Áno",
  "import.headline": "Importovať vaše služby z Ferdi 4",
  "import.notSupportedHeadline": "Služby zatiaľ nie sú podporované vo verzii Ferdi 5",
  "import.skip.label": "Chcem pridať služby ručne",
-  "import.submit.label": "Import {count} services",
+  "import.submit.label": "Importuj {count} služieb",
-  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
+  "infobar.authRequestFailed": "Pri pokuse o vykonanie overenej požiadavky došlo k chybám. Ak táto chyba pretrváva, skúste sa odhlásiť a znova prihlásiť.",
-  "infobar.buttonChangelog": "What is new?",
+  "infobar.buttonChangelog": "Čo je nové?",
  "infobar.buttonInstallUpdate": "Reštartovať a nainštalovať aktualizáciu",
  "infobar.buttonReloadServices": "Obnoviť služby",
  "infobar.hide": "Skryť",
  "infobar.requiredRequestsFailed": "Nie je možné načítať služby a informácie o používateľovi",
  "infobar.servicesUpdated": "Vaše služby boli aktualizované.",
  "infobar.updateAvailable": "Je k dispozícii nová aktualizácia Ferdi.",
-  "infobox.dismiss": "Dismiss",
+  "infobox.dismiss": "Zrušiť",
  "invite.email.label": "E-mailová adresa",
  "invite.headline.friends": "Pozvite troch vašich priateľov alebo kolegov",
  "invite.name.label": "Meno",
@@ -61,97 +61,96 @@
  "invite.submit.label": "Poslať pozvánky",
  "invite.successInfo": "Pozvánky boli úspešne odoslané",
  "locked.headline": "Zamknuté",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
+  "locked.invalidCredentials": "Heslo je nesprávne",
-  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Heslo",
  "locked.submit.label": "Odomknúť",
-  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchId": "Odomknúť s Touch ID",
-  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.touchIdPrompt": "odomknúť s Touch ID",
-  "locked.unlockWithPassword": "Unlock with Password",
+  "locked.unlockWithPassword": "Odomknúť heslom",
  "login.changeServer": "Zmeniť server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
  "login.email.label": "E-mailová adresa",
  "login.headline": "Prihlásiť sa",
  "login.invalidCredentials": "E-mail alebo heslo nesúhlasia",
-  "login.link.password": "Reset password",
+  "login.link.password": "Obnoviť heslo",
  "login.link.signup": "Vytvoriť používateľský účet zdarma",
  "login.password.label": "Heslo",
  "login.serverLogout": "Vaša relácia vypršala, prihláste sa prosím znovu.",
  "login.submit.label": "Prihlásiť sa",
  "login.tokenExpired": "Vaša relácia vypršala, prihláste sa prosím znovu.",
-  "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
+  "menu.Todoss.closeTodosDrawer": "Zatvoriť zásuvku Todos",
-  "menu.Todoss.openTodosDrawer": "Open Todos drawer",
+  "menu.Todoss.openTodosDrawer": "Otvoriť zásuvku Todos",
  "menu.app.about": "O aplikácii",
-  "menu.app.autohideMenuBar": "Auto-hide menu bar",
+  "menu.app.autohideMenuBar": "Automaticky skrývať panel s ponukami",
  "menu.app.checkForUpdates": "Skontrolovať aktualizácie",
  "menu.app.hide": "Skryť",
-  "menu.app.hideOthers": "Hide Others",
+  "menu.app.hideOthers": "Skryť ostatné",
-  "menu.app.unhide": "Unhide",
+  "menu.app.unhide": "Odkryť",
  "menu.edit": "Upraviť",
-  "menu.edit.copy": "Copy",
+  "menu.edit.copy": "Kopírovať",
-  "menu.edit.cut": "Cut",
+  "menu.edit.cut": "Vystrihnúť",
  "menu.edit.delete": "Zmazať",
  "menu.edit.emojiSymbols": "Emoji a symboly",
-  "menu.edit.findInPage": "Find in Page",
+  "menu.edit.findInPage": "Nájsť na stránke",
-  "menu.edit.paste": "Paste",
+  "menu.edit.paste": "Vložiť",
-  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.pasteAndMatchStyle": "Vložiť s prevzatím jestvujúceho štýlu",
-  "menu.edit.redo": "Redo",
+  "menu.edit.redo": "Znovu",
-  "menu.edit.selectAll": "Select All",
+  "menu.edit.selectAll": "Vybrať všetko",
  "menu.edit.speech": "Rozprávanie",
  "menu.edit.startDictation": "Začať diktovanie",
  "menu.edit.startSpeaking": "Začať rozprávanie",
  "menu.edit.stopSpeaking": "Zastaviť rozprávanie",
-  "menu.edit.undo": "Undo",
+  "menu.edit.undo": "Vrátiť späť",
  "menu.file": "Súbor",
-  "menu.help": "Help",
+  "menu.help": "Pomocník",
  "menu.help.changelog": "Záznam zmien",
-  "menu.help.debugInfo": "Copy Debug Information",
+  "menu.help.debugInfo": "Kopírovať debug informácie",
-  "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
+  "menu.help.debugInfoCopiedBody": "Vaše debug informácie boli uložené do schránky.",
-  "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.debugInfoCopiedHeadline": "Debug informácie Ferdi",
-  "menu.help.importExportData": "Import/Export Configuration Data",
+  "menu.help.importExportData": "Import/Export konfigurácie",
  "menu.help.learnMore": "Zistiť viac",
  "menu.help.privacy": "Vyhlásenie o ochrane súkromia",
-  "menu.help.publishDebugInfo": "Publish Debug Information",
+  "menu.help.publishDebugInfo": "Zverejniť debug informácie",
  "menu.help.support": "Podpora",
  "menu.help.tos": "Podmienky použitia",
  "menu.services": "Služby",
-  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.activatePreviousService": "Aktivovať predchádzajúcu službu",
-  "menu.services.addNewService": "Add New Service...",
+  "menu.services.addNewService": "Pridať novú službu...",
  "menu.services.goHome": "Úvod",
-  "menu.services.setNextServiceActive": "Activate next service",
+  "menu.services.setNextServiceActive": "Aktivovať ďalšiu službu",
  "menu.todos": "Todos",
-  "menu.todos.enableTodos": "Enable Todos",
+  "menu.todos.enableTodos": "Povoliť Todos",
  "menu.view": "Zobraziť",
  "menu.view.back": "Naspäť",
-  "menu.view.forward": "Forward",
+  "menu.view.forward": "Dopredu",
  "menu.view.lockFerdi": "Uzamknúť Ferdi",
  "menu.view.openQuickSwitch": "Otvoriť prepínač služieb",
-  "menu.view.reloadFerdi": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Obnoviť Ferdi",
  "menu.view.reloadService": "Obnoviť službu",
-  "menu.view.reloadTodos": "Reload ToDos",
+  "menu.view.reloadTodos": "Obnoviť Todos",
-  "menu.view.resetZoom": "Actual Size",
+  "menu.view.resetZoom": "Skutočná veľkosť",
  "menu.view.toggleDarkMode": "Zapnúť Tmavý Mód",
  "menu.view.toggleDevTools": "Prepnúť vývojárske nástroje",
-  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleFullScreen": "Prepnúť na celú obrazovku",
  "menu.view.toggleServiceDevTools": "Prepnúť vývojárske nástroje služby",
  "menu.view.toggleTodosDevTools": "Prepnúť vývojárske nástroje",
-  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomIn": "Priblížiť",
-  "menu.view.zoomOut": "Zoom Out",
+  "menu.view.zoomOut": "Oddialiť",
-  "menu.window": "Window",
+  "menu.window": "Okno",
-  "menu.window.close": "Close",
+  "menu.window.close": "Zatvoriť",
-  "menu.window.minimize": "Minimize",
+  "menu.window.minimize": "Minimalizovať",
-  "menu.workspaces": "Pracovn�� priestor",
+  "menu.workspaces": "Pracovn�� priestory",
-  "menu.workspaces.addNewWorkspace": "Pridať nový pracovný priestor ...",
+  "menu.workspaces.addNewWorkspace": "Pridať nový pracovný priestor...",
-  "menu.workspaces.closeWorkspaceDrawer": "Zavrieť workspace z��ložku",
+  "menu.workspaces.closeWorkspaceDrawer": "Zavrieť zásuvku pracovn��ho priestoru",
  "menu.workspaces.defaultWorkspace": "Všetky služby",
-  "menu.workspaces.openWorkspaceDrawer": "Otvoriť workspace z��ložku",
+  "menu.workspaces.openWorkspaceDrawer": "Otvoriť zásuvku pracovn��ho priestoru",
  "password.email.label": "E-mailová adresa",
-  "password.headline": "Reset password",
+  "password.headline": "Obnoviť heslo",
  "password.link.login": "Prihlásiť sa do vášho účtu",
  "password.link.signup": "Vytvoriť používateľský účet zdarma",
-  "password.noUser": "No user with that email address was found",
+  "password.noUser": "Používateľ s touto e-mailovou adresou nebol nájdený",
-  "password.successInfo": "Your new password was sent to your email address",
+  "password.successInfo": "Nové heslo bolo odoslané na vašu e-mailovú adresu",
  "service.crashHandler.action": "Znovu načítať {name}",
  "service.crashHandler.autoReload": "Najbližší pokus o automatické obnovenie {name} o {seconds} sekúnd",
  "service.crashHandler.headline": "Ale nie!",
@@ -165,111 +164,110 @@
  "service.errorHandler.text": "{name} sa nepodarilo načítať.",
  "service.webviewLoader.loading": "Načítavam {service}",
  "services.getStarted": "Začíname",
-  "services.login": "Please login to use Ferdi.",
+  "services.login": "Prosím prihláste sa do Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
+  "services.serverInfo": "Server Ferdi môžete zmeniť kliknutím na ozubené koliesko v ľavom dolnom rohu. Ak prechádzate (z jedného z hostovaných serverov) na používanie Ferdi bez účtu, upozorňujeme vás, že môžete exportovať svoje údaje z tohto servera a následne ich importovať pomocou ponuky Pomocník, aby ste obnovili všetky svoje pracovné priestory a nakonfigurované služby!",
-  "services.serverless": "Use Ferdi without an Account",
+  "services.serverless": "Používať Ferdi bez účtu",
-  "services.welcome": "Vítajte v aplikácii Ferdi",
+  "settings.account.account.editButton": "Upraviť účet",
-  "settings.account.account.editButton": "Edit account",
+  "settings.account.accountUnavailable": "Účet je nedostupný",
-  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "Používate Ferdi bez účtu. Ak chcete používať Ferdi s účtom a udržiavať tak vaše služby synchronizované medzi zariadeniami, zvoľte prosím server na záložke Nastavenia > Prihlásiť sa.",
-  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
  "settings.account.buttonSave": "Aktualizovať profil",
  "settings.account.deleteAccount": "Odstrániť účet",
  "settings.account.deleteEmailSent": "Bol vám odoslaný e-mail s odkazom pre potvrdenie odstránenia vášho účtu. Váš účet a údaje sa nebudú dať obnoviť!",
  "settings.account.deleteInfo": "Ak už nepotrebujete váš Ferdi účet, tu ho môžete zmazať spolu so všetkými prislúchajúcimi údajmi.",
  "settings.account.headline": "Účet",
-  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineAccount": "Informácie o účte",
-  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineDangerZone": "Nebezpečná zóna",
-  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlineInvoices": "Faktúry",
-  "settings.account.headlinePassword": "Change password",
+  "settings.account.headlinePassword": "Zmeniť heslo",
  "settings.account.headlineProfile": "Aktualizovať profil",
  "settings.account.successInfo": "Vaše zmeny boli uložené",
  "settings.account.tryReloadServices": "Skúsiť znova",
  "settings.account.tryReloadUserInfoRequest": "Skúsiť znova",
  "settings.account.userInfoRequestFailed": "Nebolo možné načítať informácie o používateľovi",
-  "settings.account.yourLicense": "Your Ferdi License:",
+  "settings.account.yourLicense": "Vaša Ferdi licencia:",
-  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
+  "settings.app.accentColorInfo": "Zvoľte farbu akcentu vo formáte kompatibilnom s CSS. (Predvolené: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Vyčistiť vyrovnávaciu pamäť",
  "settings.app.buttonInstallUpdate": "Reštartovať a nainštalovať aktualizáciu",
-  "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder",
+  "settings.app.buttonOpenFerdiProfileFolder": "Otvoriť priečinok s profilom",
-  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
+  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Otvoriť priečinok s receptami",
  "settings.app.buttonSearchForUpdate": "Skontrolovať aktualizácie",
  "settings.app.cacheInfo": "Vyrovnávacia pamäť Ferdi momentálne používa {size} miesta na disku.",
-  "settings.app.cacheNotCleared": "Couldn't clear all cache",
+  "settings.app.cacheNotCleared": "Nepodarilo sa vyčistiť cache",
-  "settings.app.closeSettings": "Close settings",
+  "settings.app.closeSettings": "Zavrieť nastavenia",
  "settings.app.currentVersion": "Súčasná verzia:",
  "settings.app.form.accentColor": "Odtieň farby",
-  "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
+  "settings.app.form.adaptableDarkMode": "Synchronizácia tmavého režimu s nastavením operačného systému",
-  "settings.app.form.alwaysShowWorkspaces": "Always show workspace drawer",
+  "settings.app.form.alwaysShowWorkspaces": "Vždy zobraziť zásuvku pracovného priestoru",
  "settings.app.form.autoLaunchInBackground": "Otvoriť na pozadí",
  "settings.app.form.autoLaunchOnStart": "Spustiť Ferdi pri štarte",
-  "settings.app.form.automaticUpdates": "Enable updates",
+  "settings.app.form.automaticUpdates": "Povoliť aktualizácie",
  "settings.app.form.beta": "Vrátane beta verzií",
-  "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
+  "settings.app.form.clipboardNotifications": "Nezobrazovať notifikácie pre udalosti schránky",
-  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
+  "settings.app.form.closeToSystemTray": "Minimalizovať Ferdi do systémovej lišty",
-  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
+  "settings.app.form.confirmOnQuit": "Potvrdiť ukončenie Ferdi",
-  "settings.app.form.customTodoServer": "Custom Todo Server",
+  "settings.app.form.customTodoServer": "Vlastný server Todo",
  "settings.app.form.darkMode": "Zapnúť Dark Mode",
  "settings.app.form.enableGPUAcceleration": "Zapnúť GPU zrýchlenie",
-  "settings.app.form.enableGlobalHideShortcut": "Enable Global shortcut to hide Ferdi",
+  "settings.app.form.enableGlobalHideShortcut": "Povolenie globálnej skratky na skrytie Ferdi",
-  "settings.app.form.enableLock": "Enable Password Lock",
+  "settings.app.form.enableLock": "Povoliť uzamknutie heslom",
-  "settings.app.form.enableLongPressServiceHint": "Enable service shortcut hint on long press",
+  "settings.app.form.enableLongPressServiceHint": "Povoliť nápovedu skratky služby pri dlhom stlačení",
-  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
+  "settings.app.form.enableMenuBar": "Zobrazovať Ferdi v Menu",
  "settings.app.form.enableSpellchecking": "Zapnúť kontrolu pravopisu",
-  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
+  "settings.app.form.enableSystemTray": "Zobrazovať Ferdi na paneli úloh",
-  "settings.app.form.enableTodos": "Enable Ferdi Todos",
+  "settings.app.form.enableTodos": "Povoliť Ferdi Todos",
-  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
+  "settings.app.form.hibernateOnStartup": "Pri štarte ponechať služby uspané",
-  "settings.app.form.hibernationStrategy": "Hibernation strategy",
+  "settings.app.form.hibernationStrategy": "Stratégia uspania",
-  "settings.app.form.iconSize": "Service icon size",
+  "settings.app.form.iconSize": "Veľkosť ikony služieb",
-  "settings.app.form.inactivityLock": "Lock after inactivity",
+  "settings.app.form.inactivityLock": "Uzamknúť po nečinnosti",
-  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
+  "settings.app.form.keepAllWorkspacesLoaded": "Ponechať všetky pracovné priestory načítané",
  "settings.app.form.language": "Jazyk",
  "settings.app.form.lockPassword": "Heslo",
  "settings.app.form.minimizeToSystemTray": "Minimalizovať Ferdi do systémovej lišty",
-  "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
+  "settings.app.form.navigationBarBehaviour": "Správanie navigačnej lišty",
-  "settings.app.form.notifyTaskBarOnMessage": "Notify TaskBar/Dock on new message",
+  "settings.app.form.notifyTaskBarOnMessage": "Upozornenie na novú správu v paneli úloh/doku",
-  "settings.app.form.passwordToggle": "Password toggle",
+  "settings.app.form.passwordToggle": "Prepínanie hesla",
-  "settings.app.form.predefinedTodoServer": "Todo Server",
+  "settings.app.form.predefinedTodoServer": "Server Todo",
-  "settings.app.form.privateNotifications": "Don't show message content in notifications",
+  "settings.app.form.privateNotifications": "Nezobrazovať obsah správy v notifikáciách",
-  "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
+  "settings.app.form.reloadAfterResume": "Obnoviť Ferdi po obnovení systému",
  "settings.app.form.runInBackground": "Po zatvorení okna ponechať Ferdi spustený na pozadí",
-  "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
+  "settings.app.form.scheduledDNDEnabled": "Naplánovať režim nerušiť",
  "settings.app.form.scheduledDNDEnd": "Do",
  "settings.app.form.scheduledDNDStart": "Od",
-  "settings.app.form.searchEngine": "Search engine",
+  "settings.app.form.searchEngine": "Vyhľadávač",
-  "settings.app.form.sentry": "Send telemetry data",
+  "settings.app.form.sentry": "Odosielať telemetriu",
-  "settings.app.form.serviceRibbonWidth": "Sidebar width",
+  "settings.app.form.serviceRibbonWidth": "Šírka bočného panela",
  "settings.app.form.showDisabledServices": "Zobraziť záložky vypnutých služieb",
-  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showDragArea": "Zobraziť oblasť, za ktorú možno ťahať v okne",
  "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.showServiceName": "Zobraziť názov služby pod ikonou",
-  "settings.app.form.splitMode": "Enable Split View Mode",
+  "settings.app.form.splitColumns": "Počet stĺpcov",
-  "settings.app.form.startMinimized": "Start minimized",
+  "settings.app.form.splitMode": "Povoliť režim Split View",
-  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.startMinimized": "Spúšťať minimalizované",
-  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
+  "settings.app.form.universalDarkMode": "Použiť univerzálny tmavý režim",
-  "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.useTouchIdToUnlock": "Povoliť TouchID na odomknutie Ferdi",
-  "settings.app.form.wakeUpStrategy": "Wake up strategy",
+  "settings.app.form.useVerticalStyle": "Vodorovný štýl",
+  "settings.app.form.wakeUpStrategy": "Stratégia prebudenia",
  "settings.app.headlineAdvanced": "Pokročilé",
  "settings.app.headlineAppearance": "Vzhľad",
  "settings.app.headlineGeneral": "Všeobecné",
  "settings.app.headlineLanguage": "Jazyk",
-  "settings.app.headlinePrivacy": "Privacy",
+  "settings.app.headlinePrivacy": "Súkromie",
  "settings.app.headlineUpdates": "Aktualizácie",
-  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
+  "settings.app.hibernateInfo": "V predvolenom nastavení bude Ferdi udržiavať všetky vaše služby otvorené a načítané na pozadí, aby boli pripravené, keď ich budete chcieť použiť. Funkcia uspania služieb vaše služby po určitom čase odpojí. Je to užitočné na šetrenie pamäte RAM alebo na to, aby služby nespomaľovali počítač.",
-  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
+  "settings.app.inactivityLockInfo": "Minúty nečinnosti, po ktorých by sa mal Ferdi automaticky uzamknúť. Ak si neželáte automatické uzamknutie, použite hodnotu 0",
-  "settings.app.languageDisclaimer": "Oficiálne preklady sú angličtina a nemčina. Všetky ostatné jazyky sú preklady založené na komunite.",
+  "settings.app.lockInfo": "Funkcia uzamknutie heslom umožňuje chrániť správy.\nPri použití funkcie uzamknutie heslom budete pri každom spustení Ferdi vyzvaní na zadanie hesla alebo si Ferdi zamknete sami pomocou symbolu zámku v ľavom dolnom rohu alebo skratky {lockShortcut}.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Heslo",
-  "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.lockedPasswordInfo": "Uistite sa, že nastavíte heslo, ktoré si zapamätáte.\nAk toto heslo stratíte, budete musieť Ferdi nainštalovať znova.",
  "settings.app.restartRequired": "Zmeny vyžadujú reštart",
-  "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.scheduledDNDInfo": "Naplánované nevyrušovanie vám umožňuje definovať časové obdobie, počas ktorého nechcete dostávať oznámenia od 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.scheduledDNDTimeInfo": "Časy v 24-hodinovom formáte. Čas ukončenia môže byť pred časom začiatku (napr. začiatok 17:00, koniec 09:00), aby bolo možné nerušiť počas noci.",
-  "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.sentryInfo": "Odosielanie telemetrických údajov nám umožňuje nájsť chyby v systéme Ferdi - nebudeme odosielať žiadne osobné údaje, ako napríklad vaše správy!",
-  "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.spellCheckerLanguageInfo": "Ferdi používa na kontrolu preklepov zabudovanú kontrolu pravopisu v počítači Mac. Ak chcete zmeniť jazyky, ktoré kontroluje, môžete to urobiť v systémových nastaveniach Macu.",
  "settings.app.subheadlineCache": "Vyrovnávacia pamäť",
-  "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
+  "settings.app.subheadlineFerdiProfile": "Profil Ferdi",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
+  "settings.app.todoServerInfo": "Tento server sa bude používať pre funkciu \"Ferdi Todo\".",
  "settings.app.translationHelp": "Pomôžte nám preložiť Ferdi do svojho jazyka.",
-  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
+  "settings.app.universalDarkModeInfo": "Univerzálny tmavý režim sa snaží dynamicky generovať štýly tmavého režimu pre služby, ktoré v súčasnosti nie sú podporované.",
  "settings.app.updateStatusAvailable": "Je dostupná aktualizácia, sťahuje sa...",
  "settings.app.updateStatusSearching": "Vyhľadáva aktualizácie",
  "settings.app.updateStatusUpToDate": "Používate najnovšiu verziu Ferdi",
@@ -280,18 +278,18 @@
  "settings.navigation.supportFerdi": "O aplikácii",
  "settings.navigation.team": "Spravovať tím",
  "settings.navigation.yourServices": "Vaše služby",
-  "settings.navigation.yourWorkspaces": "Tvoje pracovné priestory",
+  "settings.navigation.yourWorkspaces": "Vaše pracovné priestory",
  "settings.recipes.all": "Všetky služby",
-  "settings.recipes.custom": "Custom Services",
+  "settings.recipes.custom": "Vlastné služby",
-  "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
+  "settings.recipes.customService.headline.communityRecipes": "Komunitné 3rd Party recepty",
-  "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes",
+  "settings.recipes.customService.headline.customRecipes": "Vlastné 3rd party recepty",
-  "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
+  "settings.recipes.customService.headline.devRecipes": "Vaše recepty služieb",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe folder inside:",
-  "settings.recipes.customService.openDevDocs": "Developer Documentation",
+  "settings.recipes.customService.openDevDocs": "Dokumentácia pre vývojára",
-  "settings.recipes.customService.openFolder": "Open folder",
+  "settings.recipes.customService.openFolder": "Otvoriť priečinok",
  "settings.recipes.headline": "Dostupné služby",
  "settings.recipes.missingService": "Chýba vám služba?",
-  "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.nothingFound": "Je nám ľúto, vášmu hľadanému výrazu nezodpovedá žiadna služba, ale pravdepodobne ju môžete pridať pomocou možnosti \"Custom Website\". Upozorňujeme, že na webovej lokalite sa môžu zobraziť ďalšie služby, ktoré boli do Ferdi pridané od verzie, na ktorej sa práve nachádzate. Ak chcete získať tieto nové služby, zvážte aktualizáciu na novšiu verziu Ferdi.",
  "settings.recipes.servicesSuccessfulAddedInfo": "Služba bola úspešne pridaná",
  "settings.searchService": "Vyhľadať službu",
  "settings.service.error.goBack": "Späť na služby",
@@ -304,40 +302,40 @@
  "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.deleteButton": "Odstrániť službu",
  "settings.service.form.editServiceHeadline": "Upraviť {name}",
  "settings.service.form.enableAudio": "Zapnúť zvuk",
  "settings.service.form.enableBadge": "Zobraziť symboly neprečítaných správ",
  "settings.service.form.enableDarkMode": "Zapnúť Dark Mode",
-  "settings.service.form.enableHibernation": "Enable hibernation",
+  "settings.service.form.enableHibernation": "Povoliť uspanie",
  "settings.service.form.enableNotification": "Povoliť oznámenia",
  "settings.service.form.enableService": "Povoliť službu",
-  "settings.service.form.enableWakeUp": "Enable wake up",
+  "settings.service.form.enableWakeUp": "Povoliť zobudenie",
  "settings.service.form.headlineBadges": "Symboly neprečítaných správ",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
+  "settings.service.form.headlineDarkReaderSettings": "Nastavenia Dark Reader",
  "settings.service.form.headlineGeneral": "Všeobecné",
  "settings.service.form.headlineNotifications": "Oznámenia",
  "settings.service.form.icon": "Vlastná ikona",
  "settings.service.form.iconDelete": "Zmazať",
  "settings.service.form.iconUpload": "Presuňte váš obrázok, alebo kliknite sem",
-  "settings.service.form.indirectMessageInfo": "Budete dostávať upozornenia na všetky nové správy v kanáli, nielen na @username, @channel, @here, ......",
+  "settings.service.form.indirectMessageInfo": "Budete dostávať upozornenia na všetky nové správy v kanáli, nielen na @username, @channel, @here, ...",
  "settings.service.form.indirectMessages": "Zobraziť symbol správy pre všetky nové správy",
-  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
+  "settings.service.form.isHibernatedEnabledInfo": "Ak je táto možnosť povolená, služba sa po určitom čase vypne, aby sa šetrili systémové zdroje.",
-  "settings.service.form.isMutedInfo": "Ak je vypnuté, všetky zvuky oznámení a iné prehrávania budú stíšené",
+  "settings.service.form.isMutedInfo": "Ak je vypnuté, budú stíšené všetky zvuky oznámení aj prehrávanie audia",
  "settings.service.form.name": "Meno",
-  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "V počte neprečítaných zobrazovať iba obľúbené položky",
-  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
+  "settings.service.form.openDarkmodeCss": "Otvoriť darkmode.css",
-  "settings.service.form.openUserCss": "Open user.css",
+  "settings.service.form.openUserCss": "Otvoriť user.css",
-  "settings.service.form.openUserJs": "Open user.js",
+  "settings.service.form.openUserJs": "Otvoriť user.js",
-  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
+  "settings.service.form.proxy.headline": "Nastavenia HTTP/HTTPS proxy",
-  "settings.service.form.proxy.host": "Proxy Host/IP",
+  "settings.service.form.proxy.host": "Hostiteľ Proxy/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Nastavenia proxy servera nebudú synchronizované so servermi Ferdi.",
  "settings.service.form.proxy.isEnabled": "Použiť Proxy",
-  "settings.service.form.proxy.password": "Password (optional)",
+  "settings.service.form.proxy.password": "Heslo (voliteľné)",
  "settings.service.form.proxy.port": "Port",
  "settings.service.form.proxy.restartInfo": "Po zmene nastavení servera proxy reštartujte Ferdi.",
-  "settings.service.form.proxy.user": "User (optional)",
+  "settings.service.form.proxy.user": "Používateľ (voliteľné)",
-  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
+  "settings.service.form.recipeFileInfo": "Vaše používateľské súbory budú vložené do webovej stránky, takže si môžete služby prispôsobiť ľubovoľným spôsobom. Používateľské súbory sa ukladajú len lokálne a neprenášajú sa do iných počítačov používajúcich rovnaké konto.",
  "settings.service.form.saveButton": "Uložiť službu",
  "settings.service.form.tabHosted": "Hostované",
  "settings.service.form.tabOnPremise": "Vlastné hostovanie ⭐️",
@@ -347,114 +345,111 @@
  "settings.services.deletedInfo": "Služba bola odstránená",
  "settings.services.discoverServices": "Preskúmať služby",
  "settings.services.headline": "Vaše služby",
-  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.noServicesAdded": "Začnite pridaním služby.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Nepodarilo sa načítať vaše služby",
  "settings.services.tooltip.isDisabled": "Služba je vypnutá",
  "settings.services.tooltip.isMuted": "Všetky zvuky sú stíšené",
  "settings.services.tooltip.notificationsDisabled": "Oznámenia sú vypnuté",
  "settings.services.updatedInfo": "Vaše zmeny boli uložené",
-  "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.aboutIntro": "<p>Ferdi je aplikácia s otvoreným zdrojovým kódom a je spravovaná komunitou.</p><p>Ďakujeme ľuďom, ktorí to umožňujú:</p>",
-  "settings.supportFerdi.bannerText": "Do you want to help us improve Ferdi?",
  "settings.supportFerdi.headline": "O aplikácii",
-  "settings.supportFerdi.openSurvey": "Open survey",
+  "settings.supportFerdi.textDonation": "Ak máte chuť podporiť vývoj Ferdi darom, môžete tak urobiť na stránkach",
-  "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,",
+  "settings.supportFerdi.textDonationAnd": "a",
-  "settings.supportFerdi.textDonationAnd": "and",
+  "settings.supportFerdi.textExpenses": "Hoci väčšinu práce vykonávajú dobrovoľníci, stále musíme platiť za servery a certifikáty. Ako komunita sme plne transparentní, pokiaľ ide o finančné prostriedky, ktoré získavame a míňame - pozrite si náš",
-  "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.textListContributors": "Úplný zoznam prispievateľov",
-  "settings.supportFerdi.textListContributorsHere": "here",
+  "settings.supportFerdi.textListContributorsHere": "tu",
  "settings.supportFerdi.textOpenCollective": "Open Collective",
-  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
+  "settings.supportFerdi.textSupportWelcome": "Podpora je vždy vítaná. Zoznam pomoci, ktorú potrebujeme, nájdete",
-  "settings.supportFerdi.textSupportWelcomeHere": "here",
+  "settings.supportFerdi.textSupportWelcomeHere": "tu",
-  "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.textVolunteers": "Na vývoji Ferdi sa podieľajú dobrovoľníci. Ľudia, ktorí Ferdi používajú ako vy. Vo svojom voľnom čase udržiavajú, opravujú a vylepšujú Ferdi.",
-  "settings.supportFerdi.title": "Do you like Ferdi?",
+  "settings.team.contentHeadline": "Manažment tímu Franz",
-  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Manažment tímu Franz vám umožňuje spravovať predplatné spoločnosti Franz pre viacerých používateľov. Majte na pamäti, že predplatné Franz Premium vám neposkytuje žiadne výhody pri používaní Ferdi: Jediný dôvod, prečo máte stále prístup k správe tímov, je, aby ste mohli spravovať svoje staršie tímy Franz a aby ste nestratili žiadne funkcie pri správe svojho účtu.",
-  "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": "Tím",
-  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "V súčasnosti používate servery Franz, preto máte prístup k správe tímu.",
-  "settings.team.manageAction": "Manage your Team on meetfranz.com",
+  "settings.team.manageAction": "Spravujte svoj tím na meetfranz.com",
-  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailable": "Tímy sú nedostupné",
-  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailableInfo": "Tímy sú v súčasnosti k dispozícii len pri používaní servera Franz Server a po zaplatení služby Franz Professional. Ak chcete používať tímy, zmeňte svoj server na https://api.franzinfra.com.",
  "settings.user.form.accountType.company": "Spoločnosť",
  "settings.user.form.accountType.individual": "Osoba",
  "settings.user.form.accountType.label": "Typ účtu",
  "settings.user.form.accountType.non-profit": "Nezisková organizácia",
  "settings.user.form.currentPassword": "Súčasné heslo",
  "settings.user.form.email": "E-mail",
-  "settings.user.form.firstname": "First Name",
+  "settings.user.form.firstname": "Meno",
-  "settings.user.form.lastname": "Last Name",
+  "settings.user.form.lastname": "Priezvisko",
  "settings.user.form.newPassword": "Nové heslo",
  "settings.workspace.add.form.name": "Meno",
  "settings.workspace.add.form.submitButton": "Vytvoriť pracovný priestor",
  "settings.workspace.form.buttonDelete": "Vymazať pracovný priestor",
  "settings.workspace.form.buttonSave": "Uložiť pracovný priestor",
-  "settings.workspace.form.keepLoaded": "Keep this workspace loaded*",
+  "settings.workspace.form.keepLoaded": "Ponechať tento pracovný priestor načítaný*",
-  "settings.workspace.form.keepLoadedInfo": "*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
+  "settings.workspace.form.keepLoadedInfo": "*Táto možnosť bude prepísaná globálnym nastavením \"Ponechať všetky pracovné priestory načítané\".",
  "settings.workspace.form.name": "Meno",
  "settings.workspace.form.servicesInWorkspaceHeadline": "Služby v tomto pracovnom priestore",
-  "settings.workspace.form.yourWorkspaces": "Tvoje pracovné priestory",
+  "settings.workspace.form.yourWorkspaces": "Vaše pracovné priestory",
  "settings.workspaces.deletedInfo": "Pracovný priestor bol odstránený",
-  "settings.workspaces.headline": "Tvoje pracovné priestory",
+  "settings.workspaces.headline": "Vaše pracovné priestory",
-  "settings.workspaces.noWorkspacesAdded": "You haven't created any workspaces yet.",
+  "settings.workspaces.noWorkspacesAdded": "Zatiaľ ste nepridali žiadne pracovné priestory.",
  "settings.workspaces.tryReloadWorkspaces": "Skúsiť znova",
  "settings.workspaces.updatedInfo": "Vaše zmeny boli uložené",
  "settings.workspaces.workspaceFeatureHeadline": "Menej je viac: Predstavenie Ferdi Pracovné priestory",
-  "settings.workspaces.workspaceFeatureInfo": "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. 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.",
+  "settings.workspaces.workspaceFeatureInfo": "Ferdi pracovné priestory vám umožňujú sústrediť sa na to, čo je práve dôležité. Nastavte si rozličné skupiny služieb a jednoducho medzi nimi kedykoľvek prepínajte. Vy rozhodujete ktoré služby, kedy a kde potrebujete, a my vám potom vieme pomôcť sústrediť sa na prácu - alebo jednoducho prepnúť z práce na čokoľvek iné.",
-  "settings.workspaces.workspacesRequestFailed": "Nebolo možné načítať vaše workspace",
+  "settings.workspaces.workspacesRequestFailed": "Nebolo možné načítať vaše pracovné priestory",
-  "setupAssistant.headline": "Let's get started",
+  "setupAssistant.headline": "Začíname",
-  "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
+  "setupAssistant.subheadline": "Vyberte si z našich najpoužívanejších služieb a vráťte sa k správam tam kde s ste prestali.",
-  "setupAssistant.submit.label": "Let's go",
+  "setupAssistant.submit.label": "Poďme na to",
  "sidebar.addNewService": "Pridať novú službu",
-  "sidebar.closeTodosDrawer": "Close Ferdi Todos",
+  "sidebar.closeTodosDrawer": "Zavrieť Ferdi Todos",
-  "sidebar.closeWorkspaceDrawer": "Zavrieť workspace z��ložku",
+  "sidebar.closeWorkspaceDrawer": "Zavrieť zásuvku pracovn��ho priestoru",
  "sidebar.lockFerdi": "Uzamknúť Ferdi",
  "sidebar.muteApp": "Vypnúť upozornenia a zvuky",
-  "sidebar.openTodosDrawer": "Open Ferdi Todos",
+  "sidebar.openTodosDrawer": "Otvoriť Ferdi Todos",
-  "sidebar.openWorkspaceDrawer": "Otvoriť workspace z��ložku",
+  "sidebar.openWorkspaceDrawer": "Otvoriť zásuvku pracovn��ho priestoru",
  "sidebar.unmuteApp": "Povoliť oznámenia a zvuky",
  "signup.email.label": "E-mailová adresa",
  "signup.emailDuplicate": "Používateľ s touto e-mailovou adresou už jestvuje",
-  "signup.firstname.label": "First Name",
+  "signup.firstname.label": "Meno",
  "signup.headline": "Prihlásiť sa",
-  "signup.lastname.label": "Last Name",
+  "signup.lastname.label": "Priezvisko",
  "signup.legal.info": "Vytvorením účtu Ferdi súhlasíte s",
  "signup.legal.privacy": "Vyhlásenie o ochrane súkromia",
  "signup.legal.terms": "Podmienky služby",
  "signup.link.login": "Už máte účet, chcete sa prihlásiť?",
  "signup.password.label": "Heslo",
  "signup.submit.label": "Vytvoriť účet",
-  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
+  "tabs.item.confirmDeleteService": "Naozaj chcete odstrániť službu {serviceName}?",
-  "tabs.item.deleteService": "Delete service",
+  "tabs.item.deleteService": "Odstrániť službu",
  "tabs.item.disableAudio": "Vypnúť zvuk",
-  "tabs.item.disableDarkMode": "Disable Dark mode",
+  "tabs.item.disableDarkMode": "Vypnúť tmavý režim",
  "tabs.item.disableNotifications": "Zakázať oznámenia",
-  "tabs.item.disableService": "Disable service",
+  "tabs.item.disableService": "Vypnúť službu",
  "tabs.item.enableAudio": "Zapnúť zvuk",
-  "tabs.item.enableDarkMode": "Enable Dark mode",
+  "tabs.item.enableDarkMode": "Zapnúť tmavý režim",
  "tabs.item.enableNotification": "Povoliť oznámenia",
  "tabs.item.enableService": "Povoliť službu",
-  "tabs.item.hibernateService": "Hibernate service",
+  "tabs.item.hibernateService": "Uspať službu",
  "tabs.item.reload": "Obnoviť",
-  "tabs.item.wakeUpService": "Wake up service",
+  "tabs.item.wakeUpService": "Prebudiť službu",
-  "validation.email": "{field} is not valid",
+  "validation.email": "{field} je neplatný",
-  "validation.minLength": "{field} should be at least {length} characters long",
+  "validation.minLength": "{field} by malo byť dlhé aspoň {length} znakov",
  "validation.oneRequired": "Je nutné zadať aspoň jeden",
-  "validation.required": "{field} is required",
+  "validation.required": "{field} je povinné",
-  "validation.url": "{field} is not a valid URL",
+  "validation.url": "{field} nie je platná URL",
  "webControls.back": "Naspäť",
-  "webControls.forward": "Forward",
+  "webControls.forward": "Dopredu",
  "webControls.goHome": "Úvod",
  "webControls.openInBrowser": "Otvoriť v prehliadači",
  "webControls.reload": "Obnoviť",
  "welcome.loginButton": "Prihlásiť sa do vášho účtu",
  "welcome.signupButton": "Vytvoriť používateľský účet zdarma",
-  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
+  "workspaceDrawer.addNewWorkspaceLabel": "Pridať nový pracovný priestor",
  "workspaceDrawer.allServices": "Všetky služby",
-  "workspaceDrawer.headline": "Pracovn�� priestor",
+  "workspaceDrawer.headline": "Pracovn�� priestory",
  "workspaceDrawer.item.contextMenuEdit": "Upraviť",
  "workspaceDrawer.item.noServicesAddedYet": "Zatiaľ žiadne služby",
-  "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.workspaceFeatureInfo": "<p>Ferdi pracovné priestory vám umožňujú sústrediť sa na to, čo je práve dôležité. Nastavte si rozličné skupiny služieb a jednoducho medzi nimi kedykoľvek prepínajte.</p><p>Vy rozhodujete ktoré služby, kedy a kde potrebujete, a my vám potom vieme pomôcť sústrediť sa na prácu - alebo jednoducho prepnúť z práce na čokoľvek iné. </p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
+  "workspaceDrawer.workspacesSettingsTooltip": "Upraviť nastavenia pracovných priestorov",
  "workspaces.switchingIndicator.switchingTo": "Prepínanie na"
 }
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index 4ec106205..213c78f31 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Send invites",
  "invite.successInfo": "Invitations sent successfully",
  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
@@ -168,7 +167,6 @@
  "services.login": "Please login to use Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Welcome to Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Account is unavailable",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Available services",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Discover services",
  "settings.services.headline": "Your services",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Service is disabled",
  "settings.services.tooltip.isMuted": "All sounds are muted",
  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
  "settings.services.updatedInfo": "Your changes have been saved",
  "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.headline": "About Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.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",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 8b26d6548..33a311d87 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Pošalji pozivnice",
  "invite.successInfo": "Poziv je uspešno poslat.",
  "locked.headline": "Закључано",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "Лозинка је неисправна",
  "locked.password.label": "Лозинка",
  "locked.submit.label": "Откључај",
@@ -168,7 +167,6 @@
  "services.login": "Please login to use Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Dobrodošli u Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Account is unavailable",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Nadogradnje",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Лозинка",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Dostupne usluge",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Pronađite usluge",
  "settings.services.headline": "Vaše usluge",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Usluga je onemogućena.",
  "settings.services.tooltip.isMuted": "Svi zvukovi su onemogućeni.",
  "settings.services.tooltip.notificationsDisabled": "Obavijesti su onemogućene.",
  "settings.services.updatedInfo": "Vaše promjene su spremljene",
  "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.headline": "O Francu",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.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": "Tim",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index ca21dc442..d3c9072f2 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Ladda om",
-  "app.errorHandler.headline": "Någonting gick fel.",
+  "app.errorHandler.headline": "Något gick fel.",
  "changeserver.customServerLabel": "Anpassad server",
  "changeserver.headline": "Byt server",
  "changeserver.label": "Server",
@@ -61,7 +61,6 @@
  "invite.submit.label": "Skicka inbjudningar",
  "invite.successInfo": "Inbjudningar har skickats",
  "locked.headline": "Låst",
-  "locked.info": "Ferdi är för närvarande låst. Lås upp Ferdi med ditt lösenord för att se dina meddelanden.",
  "locked.invalidCredentials": "Felaktigt lösenord",
  "locked.password.label": "Lösenord",
  "locked.submit.label": "Lås upp",
@@ -69,7 +68,7 @@
  "locked.touchIdPrompt": "lås upp med Touch ID",
  "locked.unlockWithPassword": "Lås upp med lösenord",
  "login.changeServer": "Byt server",
-  "login.customServerQuestion": "Using a custom Ferdi server?",
+  "login.customServerQuestion": "Använder du ett Franz-konto för att logga in?",
  "login.customServerSuggestion": "Try importing your Franz account",
  "login.email.label": "E-postadress",
  "login.headline": "Logga in",
@@ -168,7 +167,6 @@
  "services.login": "Logga in för att använda Ferdi.",
  "services.serverInfo": "Alternativt kan du ändra din Ferdi server genom att klicka på kuggen i det nedre vänstra hörnet. Om du byter över (från en av de hostade servrarna) till att använda Ferdi utan ett konto, informeras om att du kan exportera dina data från den servern och därefter importera den med hjälp av Hjälpmenyn för att återuppliva alla dina arbetsytor och konfigurerade tjänster!",
  "services.serverless": "Använd Ferdi utan ett konto",
-  "services.welcome": "Välkommen till Ferdi",
  "settings.account.account.editButton": "Redigera konto",
  "settings.account.accountUnavailable": "Kontot är inte tillgängligt",
  "settings.account.accountUnavailableInfo": "Du använder Ferdi utan ett konto. Om du vill använda Ferdi med ett konto och hålla dina tjänster synkroniserade mellan installationer, välj en server i fliken Inställningar och logga in.",
@@ -241,7 +239,8 @@
  "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.showServiceName": "Visa tjänstens namn under ikonen",
+  "settings.app.form.splitColumns": "Antal kolumner",
  "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",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Uppdateringar",
  "settings.app.hibernateInfo": "Som standard kommer Ferdi att hålla alla dina tjänster öppna och laddade i bakgrunden så att de är redo när du vill använda dem. Viloläget kommer att stänga dina tjänster efter ett angivet belopp. Detta är användbart för att spara på arbetsminne eller se till att tjänster inte saktar ner datorn.",
  "settings.app.inactivityLockInfo": "Antal minuter av inaktivitet, varefter Ferdi låses automatiskt. Ange 0 för att inaktivera",
-  "settings.app.languageDisclaimer": "Engelska och tyska är officella översättningar. Övriga språk har översatts av gemenskapen.",
  "settings.app.lockInfo": "Lösenordslås låter dig skydda dina meddelanden.\nAnvända lösenordsblock, du kommer att bli ombedd att ange ditt lösenord varje gång du startar Ferdi eller låsa Ferdi själv med hjälp av låssymbolen i det nedre vänstra hörnet eller genvägen {lockShortcut}.",
  "settings.app.lockedPassword": "Lösenord",
  "settings.app.lockedPasswordInfo": "Se till att du anger ett lösenord du kommer att komma ihåg.\nOm du tappar bort detta lösenord måste du installera om Ferdi.",
@@ -286,7 +284,7 @@
  "settings.recipes.customService.headline.communityRecipes": "Tredjepartsrecept från gemenskapen",
  "settings.recipes.customService.headline.customRecipes": "Egna tredjepartsrecept",
  "settings.recipes.customService.headline.devRecipes": "Dina recept för utvecklingsservice",
-  "settings.recipes.customService.intro": "För att lägga till en anpassad tjänst, kopiera receptet för tjänsten till:",
+  "settings.recipes.customService.intro": "För att lägga till en anpassad tjänst, kopiera tjänstens receptmapp inuti:",
  "settings.recipes.customService.openDevDocs": "Dokumentation för utvecklare",
  "settings.recipes.customService.openFolder": "Öppna mapp",
  "settings.recipes.headline": "Tillgängliga tjänster",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Upptäck tjänster",
  "settings.services.headline": "Dina tjänster",
  "settings.services.noServicesAdded": "Börja med att lägga till en tjänst.",
-  "settings.services.nothingFound": "Tyvärr, men ingen tjänst matchade ditt sökord - men du kan fortfarande förmodligen lägga till det med \"Anpassad webbplats\" alternativet. Observera att webbplatsen kan visa fler tjänster som har lagts till Ferdi sedan den version som du för närvarande är på. För att få dessa nya tjänster, överväg att uppgradera till en nyare version av Ferdi.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Kunde inte ladda dina tjänster",
  "settings.services.tooltip.isDisabled": "Tjänsten är inaktiverad",
  "settings.services.tooltip.isMuted": "Alla ljud är avstängda",
  "settings.services.tooltip.notificationsDisabled": "Aviseringar är inaktiverade",
  "settings.services.updatedInfo": "Dina ändringar har sparats",
  "settings.supportFerdi.aboutIntro": "<p>Ferdi är en öppen källkod och en community-ledd applikation.</p><p>Tack till de personer som gör detta besitter:</p>",
-  "settings.supportFerdi.bannerText": "Vill du hjälpa oss att förbättra Ferdi?",
  "settings.supportFerdi.headline": "Om Ferdi",
-  "settings.supportFerdi.openSurvey": "Öppna enkäten",
  "settings.supportFerdi.textDonation": "Om du känner för att stödja Ferdi utveckling med en donation, kan du göra det på båda,",
  "settings.supportFerdi.textDonationAnd": "och",
  "settings.supportFerdi.textExpenses": "Medan volontärer gör det mesta av arbetet, måste vi fortfarande betala för servrar och certifikat. Som ett samhälle är vi helt öppna för medel som vi samlar in och spenderar - se vår",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Stöd är alltid välkommet. Du hittar en lista över den hjälp vi behöver",
  "settings.supportFerdi.textSupportWelcomeHere": "här",
  "settings.supportFerdi.textVolunteers": "Utvecklingen av Ferdi görs av volontärer. Människor som använder Ferdi som du. De underhåller, fixar och förbättrar Ferdi på sin fritid.",
-  "settings.supportFerdi.title": "Tycker du om Ferdi?",
  "settings.team.contentHeadline": "Hantera Franz-grupp",
  "settings.team.copy": "Grupphanteringen i Franz låter dig hantera Franz-abonnemang för flera användare. Observera att ett Franz Premium-abonnemang inte ger dig några extra funktioner i Ferdi: Den enda anledningen till att du fortfarande har tillgång till grupphanteringen är att du kan hantera dina äldre Franz-grupper så att du inte förlorar någon funktionalitet i hanteringen av ditt konto.",
  "settings.team.headline": "Grupp",
diff --git a/src/i18n/locales/te.json b/src/i18n/locales/te.json
index 2544d2a00..db528ac47 100644
--- a/src/i18n/locales/te.json
+++ b/src/i18n/locales/te.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Send invites",
  "invite.successInfo": "Invitations sent successfully",
  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
@@ -168,7 +167,6 @@
  "services.login": "Please login to use Ferdi.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Welcome to Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Account is unavailable",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Available services",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Discover services",
  "settings.services.headline": "Your services",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Service is disabled",
  "settings.services.tooltip.isMuted": "All sounds are muted",
  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
  "settings.services.updatedInfo": "Your changes have been saved",
  "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.headline": "About Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "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.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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "here",
  "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.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",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index b697231e3..120efa39d 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -14,7 +14,7 @@
  "feature.nightlyBuilds.info": "Nightly yapılar Ferdi'nin deneysel sürümleri olup tamamlanmamış özellikler içerebilir. Bu nightly yapılar genellikle geliştiriciler tarafından yeni özellikleri deneyip geliştirmek için kullanılır. Ne yaptığınızı bilmiyorsanız nightly yapıları etkinleştirmeyin.",
  "feature.nightlyBuilds.title": "Nightly Yapılar",
  "feature.publishDebugInfo.error": "Hata ayıklama bilgisi oluşturulurken hata oluştu. Lütfen daha sonra tekrar deneyin veya daha fazla bilgi için konsolu görüntüleyin.",
-  "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
+  "feature.publishDebugInfo.info": "Hata ayıklama bilgilerinizi yayınlamak, Ferdi'deki sorunları ve hataları bulmamıza yardımcı olur. Hata ayıklama bilgilerinizi yayınlayarak Ferdi Hata Ayıklayıcı'nın gizlilik politikasını ve hizmet şartlarını kabul etmiş olursunuz.",
  "feature.publishDebugInfo.privacy": "Gizlilik ilkesi",
  "feature.publishDebugInfo.publish": "Onayla ve yayımla",
  "feature.publishDebugInfo.published": "Your debug log was published and is now availible at",
@@ -61,7 +61,6 @@
  "invite.submit.label": "Davetiye gönder",
  "invite.successInfo": "Davetiyeler başarıyla gönderildi",
  "locked.headline": "Kilitli",
-  "locked.info": "Ferdi şu anda kilitli. Lütfen mesajlarını görmek için Ferdi'nin kilidini şifrenle aç.",
  "locked.invalidCredentials": "Geçersiz şifre",
  "locked.password.label": "Şifre",
  "locked.submit.label": "Kilidi aç",
@@ -163,12 +162,11 @@
  "service.errorHandler.headline": "Olamaz!",
  "service.errorHandler.message": "Hata",
  "service.errorHandler.text": "{name} yüklenemedi.",
-  "service.webviewLoader.loading": "Loading {service}",
+  "service.webviewLoader.loading": "{service} yükleniyor",
  "services.getStarted": "Haydi başlayalım",
  "services.login": "Ferdi'yi kullanmak için lütfen oturum açın.",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Ferdi'yi bir hesap olmadan kullan",
-  "services.welcome": "Ferdi'ye Hoşgeldiniz",
  "settings.account.account.editButton": "Hesabı düzenle",
  "settings.account.accountUnavailable": "Hesap kullanılamıyor",
  "settings.account.accountUnavailableInfo": "Ferdi'yi hesap olmadan kullanıyorsunuz. Ferdi'yi bir hesap ile kullanmak isterseniz ve hizmetlerinizin senkronize kalmasını istiyorsanız, lütfen ayarlar kısmından giriş yapın.",
@@ -190,14 +188,14 @@
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Önbelleği temizle",
  "settings.app.buttonInstallUpdate": "Yeniden Başlat ve Güncelleştirmeleri Kur",
-  "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder",
+  "settings.app.buttonOpenFerdiProfileFolder": "Profil Dizinini aç",
  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
  "settings.app.buttonSearchForUpdate": "Güncellemeleri kontrol et",
  "settings.app.cacheInfo": "Ferdi önbelleği şu anda {size} disk alanı kullanıyor.",
  "settings.app.cacheNotCleared": "Önbellek tamamen temizlenemedi",
  "settings.app.closeSettings": "Ayarları kapat",
  "settings.app.currentVersion": "Geçerli sürüm:",
-  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.accentColor": "Vurgu Rengi",
  "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
  "settings.app.form.alwaysShowWorkspaces": "Always show workspace drawer",
  "settings.app.form.autoLaunchInBackground": "Arka planda aç",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Güncellemeler",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Resmi çeviriler İngilizce ve Almanca'dır. Diğer tüm diller topluluk tabanlı çevirilerdir.",
  "settings.app.lockInfo": "Parola Kilidi, mesajlarınızı koruma altına almanızı sağlar.\nParola Kilidi'ni kullanarak, Ferdi'yi her başlattığınızda veya sol alt köşedeki kilit simgesini veya {lockShortcut} kısayolunu kullanarak Ferdi'yi kendiniz kilitlediğinizde parolanızı girmeniz istenir.",
  "settings.app.lockedPassword": "Şifre",
  "settings.app.lockedPasswordInfo": "Lütfen hatırlayacağınız bir şifre belirlediğinizden emin olun.\nBu şifreyi kaybederseniz, Ferdi'yi yeniden kurmanız gerekecektir.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "Klasörü aç",
  "settings.recipes.headline": "Mevcut servisler",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Servisleri keşfet",
  "settings.services.headline": "Servislerin",
  "settings.services.noServicesAdded": "Bir hizmet ekleyerek başla.",
-  "settings.services.nothingFound": "Üzgünüz, ancak hiçbir hizmet arama teriminizle eşleşmedi - ancak \"Özel Web Sitesi\" seçeneğini kullanarak yeni bir tane ekleyebilirsiniz. Web sitesinde, şu anda bulunduğunuz sürümden bu yana Ferdi'ye eklenen daha fazla hizmet gösterilebileceğini lütfen unutmayın. Bu yeni hizmetleri almak için lütfen Ferdi'nin daha yeni bir sürümüne geçmeyi düşünün.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Hizmetiniz yüklenemedi",
  "settings.services.tooltip.isDisabled": "Servis devre dışı",
  "settings.services.tooltip.isMuted": "Tüm sesler kapalı",
  "settings.services.tooltip.notificationsDisabled": "Bildirimler devre dışı",
  "settings.services.updatedInfo": "Değişikliklerin kaydedildi",
  "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": "Ferdi'nin gelişmesi için yardımcı olmak ister misin?",
  "settings.supportFerdi.headline": "Ferdi Hakkında",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "Ferdi'nin gelişimini bağışla desteklemek istiyorsanız, her ikisinde de yapabilirsiniz",
  "settings.supportFerdi.textDonationAnd": "ve",
  "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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Desteğe her zaman açığız. İhtiyacımız olan yardımın bir listesini bulabilirsiniz",
  "settings.supportFerdi.textSupportWelcomeHere": "burası",
  "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": "Ferdi uygulamasını sevdiniz mi?",
  "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": "Takım",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 39cfeb604..fcea97c40 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Перезавантажити",
-  "app.errorHandler.headline": "Something went wrong.",
+  "app.errorHandler.headline": "Щось пішло не так.",
  "changeserver.customServerLabel": "Користувацький сервер",
  "changeserver.headline": "Змінити сервер",
  "changeserver.label": "Сервер",
@@ -9,7 +9,7 @@
  "connectionLostBanner.cta": "Перезавантажити сервіс",
  "connectionLostBanner.informationLink": "Що трапилось?",
  "connectionLostBanner.message": "О ні! Ферді втратив з'єднання з {name}.",
-  "feature.basicAuth.signIn": "Sign In",
+  "feature.basicAuth.signIn": "Увійти",
  "feature.nightlyBuilds.activate": "Активувати",
  "feature.nightlyBuilds.info": "Нічні збірки - це високоекспериментальні версії Ferdi, що можуть містити \"неполіровані\" або незавершені функції. Нічні збірки в основному використовуються розробниками, щоб перевірити свої нові функції та те, як вони будуть працювати в фінальній версії. Якщо ви не знаєте, що ви робите, то радимо не активувати нічні збірки.",
  "feature.nightlyBuilds.title": "Нічні збірки",
@@ -23,30 +23,30 @@
  "feature.quickSwitch.info": "Виберіть сервіс за допомогою TAB, стрілок ↑ та ↓. Натисніть ENTER, щоб відкрити.",
  "feature.quickSwitch.search": "Пошук...",
  "feature.quickSwitch.title": "Швидке перемикання",
-  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.api.unhealthy": "Не вдалося підключитися до онлайн-сервісів Ferdi",
-  "global.cancel": "Cancel",
+  "global.cancel": "Відмінити",
  "global.edit": "Редагувати",
-  "global.no": "No",
+  "global.no": "Ні",
  "global.notConnectedToTheInternet": "Ви не підключені до Інтернету.",
-  "global.ok": "Ok",
+  "global.ok": "Гаразд",
-  "global.quit": "Quit",
+  "global.quit": "Вийти",
-  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.quitConfirmation": "Ви дійсно бажаєте вийти з Ferdi?",
-  "global.save": "Save",
+  "global.save": "Зберегти",
-  "global.settings": "Settings",
+  "global.settings": "Налаштування",
  "global.spellchecker.useDefault": "Використовувати системні параметри за змовчуванням ({default})",
  "global.spellchecking.autodetect": "Автоматично визначати мову",
  "global.spellchecking.autodetect.short": "Автоматично",
  "global.spellchecking.language": "Мова перевірки правопису",
-  "global.submit": "Submit",
+  "global.submit": "Відправити",
-  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
+  "global.userAgentHelp": "Використовуйте 'https://whatmyuseragent.com/' (для визначення) або 'https://developers.whatismy.com/useragents/explore/' (для вибору) необхідного агента користувача і скопіюйте та вставте його тут.",
  "global.userAgentPref": "Ідентифікатор браузера",
-  "global.yes": "Yes",
+  "global.yes": "Так",
  "import.headline": "Імпортувати ваші сервіси з Ferdi 4",
  "import.notSupportedHeadline": "Наразі сервіси не підтримуються у Ferdi 5",
  "import.skip.label": "Я бажаю додати сервіс вручну",
-  "import.submit.label": "Import {count} services",
+  "import.submit.label": "Імпортувати {count} сервісів",
-  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
+  "infobar.authRequestFailed": "Сталися помилки при виконанні автентифікованого запиту. Будь ласка, спробуйте вийти і увійти знову, якщо помилка повториться.",
-  "infobar.buttonChangelog": "What is new?",
+  "infobar.buttonChangelog": "Що нового?",
  "infobar.buttonInstallUpdate": "Перезавантажити і встановити оновлення",
  "infobar.buttonReloadServices": "Перезавантажити сервіси",
  "infobar.hide": "Приховати",
@@ -61,7 +61,6 @@
  "invite.submit.label": "Надіслати запрошення",
  "invite.successInfo": "Запрошення успішно надіслані",
  "locked.headline": "Заблоковано",
-  "locked.info": "Fredi зараз заблокований. Розблокуйте Fredi з вашим паролем, щоб побачити повідомлення.",
  "locked.invalidCredentials": "Пароль не є дійсним",
  "locked.password.label": "Пароль",
  "locked.submit.label": "Розблокувати",
@@ -74,19 +73,19 @@
  "login.email.label": "Email адреса",
  "login.headline": "Увійти",
  "login.invalidCredentials": "Email або пароль некоректні",
-  "login.link.password": "Reset password",
+  "login.link.password": "Скинути пароль",
  "login.link.signup": "Створити безплатний акаунт",
  "login.password.label": "Пароль",
  "login.serverLogout": "Ваша сесія закінчилась, будь ласка, увійдіть знову.",
  "login.submit.label": "Увійти",
  "login.tokenExpired": "Ваша сесія закінчилась, будь ласка, увійдіть знову.",
-  "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
+  "menu.Todoss.closeTodosDrawer": "Закрити меню Завдань",
-  "menu.Todoss.openTodosDrawer": "Open Todos drawer",
+  "menu.Todoss.openTodosDrawer": "Відкрити меню Завдань",
  "menu.app.about": "Про Ferdi",
  "menu.app.autohideMenuBar": "Автоматично приховувати меню",
  "menu.app.checkForUpdates": "Перевірити наявність оновлень",
  "menu.app.hide": "Приховати",
-  "menu.app.hideOthers": "Hide Others",
+  "menu.app.hideOthers": "Приховати інші",
  "menu.app.unhide": "Показати",
  "menu.edit": "Редагувати",
  "menu.edit.copy": "Копіювати",
@@ -116,42 +115,42 @@
  "menu.help.support": "Підтримка",
  "menu.help.tos": "Умови використання",
  "menu.services": "Служби",
-  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.activatePreviousService": "Активувати попередній сервіс",
-  "menu.services.addNewService": "Add New Service...",
+  "menu.services.addNewService": "Додати новий сервіс...",
  "menu.services.goHome": "Головна",
-  "menu.services.setNextServiceActive": "Activate next service",
+  "menu.services.setNextServiceActive": "Активувати наступний сервіс",
  "menu.todos": "Завдання",
  "menu.todos.enableTodos": "Увімкнути Завдання",
  "menu.view": "Вигляд",
  "menu.view.back": "Назад",
  "menu.view.forward": "Вперед",
-  "menu.view.lockFerdi": "Lock Ferdi",
+  "menu.view.lockFerdi": "Заблокувати Ferdi",
-  "menu.view.openQuickSwitch": "Open Quick Switch",
+  "menu.view.openQuickSwitch": "Відкрити меню швидких дій",
-  "menu.view.reloadFerdi": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Перезавантажити Ferdi",
  "menu.view.reloadService": "Перезавантажити сервіс",
-  "menu.view.reloadTodos": "Reload ToDos",
+  "menu.view.reloadTodos": "Перезавантажити Завдання",
-  "menu.view.resetZoom": "Actual Size",
+  "menu.view.resetZoom": "Фактичний розмір",
-  "menu.view.toggleDarkMode": "Toggle Dark Mode",
+  "menu.view.toggleDarkMode": "Перемкнути темний режим",
-  "menu.view.toggleDevTools": "Перек������и��и інструмент розробника",
+  "menu.view.toggleDevTools": "Пере��������ти інструменти розробника",
-  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleFullScreen": "Перемкнути повноекранний режим",
-  "menu.view.toggleServiceDevTools": "Перек������и��и інструменти розробника сервісу",
+  "menu.view.toggleServiceDevTools": "Пере��������ти інструменти розробника сервісу",
-  "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
+  "menu.view.toggleTodosDevTools": "Перемкнути інструменти розробника Завдань",
-  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomIn": "Збільшити",
-  "menu.view.zoomOut": "Zoom Out",
+  "menu.view.zoomOut": "Зменшити",
-  "menu.window": "Window",
+  "menu.window": "Вікно",
-  "menu.window.close": "Close",
+  "menu.window.close": "Закрити",
-  "menu.window.minimize": "Minimize",
+  "menu.window.minimize": "Згорнути",
-  "menu.workspaces": "Workspaces",
+  "menu.workspaces": "Робочі простори",
-  "menu.workspaces.addNewWorkspace": "Add New Workspace...",
+  "menu.workspaces.addNewWorkspace": "Додати новий робочий простір...",
-  "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
+  "menu.workspaces.closeWorkspaceDrawer": "Закрити меню робочих просторів",
  "menu.workspaces.defaultWorkspace": "Усі сервіси",
-  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
+  "menu.workspaces.openWorkspaceDrawer": "Відкрити меню робочих просторів",
  "password.email.label": "Email адреса",
-  "password.headline": "Reset password",
+  "password.headline": "Скинути пароль",
  "password.link.login": "Увійти до вашого акаунту",
  "password.link.signup": "Створити безплатний акаунт",
-  "password.noUser": "No user with that email address was found",
+  "password.noUser": "Не знайдено жодного користувача з цією email адресою",
-  "password.successInfo": "Your new password was sent to your email address",
+  "password.successInfo": "Новий пароль надіслано на Вашу email адресу",
  "service.crashHandler.action": "Перезавантажити {name}",
  "service.crashHandler.autoReload": "Спробую автоматично відновити {name} через {seconds} с",
  "service.crashHandler.headline": "О, ні!",
@@ -165,111 +164,110 @@
  "service.errorHandler.text": "{name} не завантажено",
  "service.webviewLoader.loading": "Завантаження {service}",
  "services.getStarted": "Почати",
-  "services.login": "Please login to use Ferdi.",
+  "services.login": "Будь ласка, увійдіть, щоб користуватись Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
+  "services.serverInfo": "За бажанням, ви можете змінити свій сервер Ferdi, натиснувши на іконку шестерні у нижньому лівому куті. Якщо ви хочете перейти (з одного з розміщених серверів) на використання Ferdi без облікового запису, зверніть увагу, що ви можете експортувати свої дані з цього сервера, а потім імпортувати їх за допомогою меню «Довідка», щоб відновити всі свої робочі простори та налаштовані служби!",
-  "services.serverless": "Use Ferdi without an Account",
+  "services.serverless": "Використовувати Ferdi без облікового запису",
-  "services.welcome": "Ласкаво просимо в Ferdi",
+  "settings.account.account.editButton": "Редагувати акаунт",
-  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Обліковий запис недоступний",
-  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
+  "settings.account.accountUnavailableInfo": "Ви використовуєте Ferdi без облікового запису. Якщо ви хочете використовувати Ferdi з обліковим записом та зберегти свої сервісі синхронізованими між встановленнями, будь ласка, виберіть сервер на вкладці \"Параметри\" і увійдіть.",
  "settings.account.buttonSave": "Оновити профіль",
  "settings.account.deleteAccount": "Видалити обліковий запис",
  "settings.account.deleteEmailSent": "Ви отримали електронного листа з посиланням, щоб підтвердити видалення облікового запису. Ваш обліковий запис і дані не можна буде відновити!",
  "settings.account.deleteInfo": "Якщо Вам більше не потрібний обліковий запис Ferdi, Ви можете його видалити і всі суміжні дані.",
  "settings.account.headline": "Акаунт",
-  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineAccount": "Інформація про обліковий запис",
-  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineDangerZone": "Небезпечна зона",
-  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlineInvoices": "Рахунки",
-  "settings.account.headlinePassword": "Change password",
+  "settings.account.headlinePassword": "Змінити пароль",
  "settings.account.headlineProfile": "Оновити профіль",
  "settings.account.successInfo": "Ваші зміни були збережені",
  "settings.account.tryReloadServices": "Спробуйте ще раз",
  "settings.account.tryReloadUserInfoRequest": "Спробуйте ще раз",
  "settings.account.userInfoRequestFailed": "Не вдалося завантажити інформацію користувача",
-  "settings.account.yourLicense": "Your Ferdi License:",
+  "settings.account.yourLicense": "Ваша ліцензія Ferdi:",
-  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
+  "settings.app.accentColorInfo": "Напишіть ваш акцентний колір у CSS-сумісному форматі (За замовчуванням: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Очистити кеш",
  "settings.app.buttonInstallUpdate": "Перезавантажити і встановити оновлення",
-  "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder",
+  "settings.app.buttonOpenFerdiProfileFolder": "Відкрити папку профілю",
-  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
+  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Відкрити папку сервісних протоколів",
  "settings.app.buttonSearchForUpdate": "Перевірити наявність оновлень",
  "settings.app.cacheInfo": "Кеш, який використовує Ferdi, займає {size} дискового простору.",
-  "settings.app.cacheNotCleared": "Couldn't clear all cache",
+  "settings.app.cacheNotCleared": "Не вдалося очистити весь кеш",
-  "settings.app.closeSettings": "Close settings",
+  "settings.app.closeSettings": "Закрити налаштування",
  "settings.app.currentVersion": "Поточна версія:",
-  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.accentColor": "Акцентний колір",
-  "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
+  "settings.app.form.adaptableDarkMode": "Синхронизувати темний режим з наташтуванннями темного режиму моєї ОС",
-  "settings.app.form.alwaysShowWorkspaces": "Always show workspace drawer",
+  "settings.app.form.alwaysShowWorkspaces": "Завжди показувати меню робочого простору",
  "settings.app.form.autoLaunchInBackground": "Відкрити у фоновому режимі",
  "settings.app.form.autoLaunchOnStart": "Запускати Ferdi на початку",
-  "settings.app.form.automaticUpdates": "Enable updates",
+  "settings.app.form.automaticUpdates": "Увімкнути оновлення",
  "settings.app.form.beta": "Включити бета-версії",
-  "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
+  "settings.app.form.clipboardNotifications": "Не показувати сповіщення для подій буфера обміну",
-  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
+  "settings.app.form.closeToSystemTray": "При закритті згортати Ferdi до системного трею",
-  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
+  "settings.app.form.confirmOnQuit": "Підтверджувати вихід з Ferdi",
-  "settings.app.form.customTodoServer": "Custom Todo Server",
+  "settings.app.form.customTodoServer": "Користувацький сервер Завдань",
  "settings.app.form.darkMode": "Переходь на Темну Сторону",
  "settings.app.form.enableGPUAcceleration": "Ввімкнути прискорення GPU",
-  "settings.app.form.enableGlobalHideShortcut": "Enable Global shortcut to hide Ferdi",
+  "settings.app.form.enableGlobalHideShortcut": "Увімкнути глобальну комбінацію клавіш для приховання Ferdi",
-  "settings.app.form.enableLock": "Enable Password Lock",
+  "settings.app.form.enableLock": "Увімкнути блокування кодом допуску",
-  "settings.app.form.enableLongPressServiceHint": "Enable service shortcut hint on long press",
+  "settings.app.form.enableLongPressServiceHint": "Увімкнути підказку комбінації клавіш для сервісу при довгому натисканні",
-  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
+  "settings.app.form.enableMenuBar": "Завжди показувати Ferdi в меню",
  "settings.app.form.enableSpellchecking": "Увімкнути перевірку орфографії",
-  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
+  "settings.app.form.enableSystemTray": "Завжди показувати Ferdi в системному треї",
-  "settings.app.form.enableTodos": "Enable Ferdi Todos",
+  "settings.app.form.enableTodos": "Увімкнути Завдання Ferdi",
-  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
+  "settings.app.form.hibernateOnStartup": "Залишати сервіси в режимі глибокого сну при запуску",
-  "settings.app.form.hibernationStrategy": "Hibernation strategy",
+  "settings.app.form.hibernationStrategy": "Стратегія режиму глибокого сну",
-  "settings.app.form.iconSize": "Service icon size",
+  "settings.app.form.iconSize": "Розмір іконки сервіса",
-  "settings.app.form.inactivityLock": "Lock after inactivity",
+  "settings.app.form.inactivityLock": "Блокувати після бездіяльності",
-  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
+  "settings.app.form.keepAllWorkspacesLoaded": "Зберігати всі робочі простори завантаженими",
  "settings.app.form.language": "Мова",
  "settings.app.form.lockPassword": "Пароль",
  "settings.app.form.minimizeToSystemTray": "Мінімізувати Ferdi до системного лотка",
-  "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
+  "settings.app.form.navigationBarBehaviour": "Поведінка панелі навігації",
-  "settings.app.form.notifyTaskBarOnMessage": "Notify TaskBar/Dock on new message",
+  "settings.app.form.notifyTaskBarOnMessage": "Повідомити панель завдань/Dock про нове повідомлення",
-  "settings.app.form.passwordToggle": "Password toggle",
+  "settings.app.form.passwordToggle": "Перемкнути пароль",
-  "settings.app.form.predefinedTodoServer": "Todo Server",
+  "settings.app.form.predefinedTodoServer": "Сервер Завдань",
-  "settings.app.form.privateNotifications": "Don't show message content in notifications",
+  "settings.app.form.privateNotifications": "Не показувати вміст повідомлень в сповіщеннях",
-  "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
+  "settings.app.form.reloadAfterResume": "Перезавантажити Ferdi після відновлення системи",
  "settings.app.form.runInBackground": "Тримати Ferdi в фоні при закритті вікна",
-  "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
+  "settings.app.form.scheduledDNDEnabled": "Увімкнути запланований режим \"не турбувати\"",
  "settings.app.form.scheduledDNDEnd": "До",
  "settings.app.form.scheduledDNDStart": "Від",
-  "settings.app.form.searchEngine": "Search engine",
+  "settings.app.form.searchEngine": "Пошукова система",
-  "settings.app.form.sentry": "Send telemetry data",
+  "settings.app.form.sentry": "Надсилати дані телеметрії",
-  "settings.app.form.serviceRibbonWidth": "Sidebar width",
+  "settings.app.form.serviceRibbonWidth": "Ширина бічної панелі",
  "settings.app.form.showDisabledServices": "Показати вкладку вимкнених сервісів",
-  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showDragArea": "Показати у вікні область, яку можна перетягнути",
  "settings.app.form.showMessagesBadgesWhenMuted": "Показувати значок непрочитаних повідомлень коли сповіщення вимкнені",
-  "settings.app.form.showServiceName": "Display service name under the icon",
+  "settings.app.form.showServiceName": "Показувати назву сервісу під іконкою",
-  "settings.app.form.splitMode": "Enable Split View Mode",
+  "settings.app.form.splitColumns": "Кількість стовпчиків",
+  "settings.app.form.splitMode": "Увімкнути режим розділеного перегляду",
  "settings.app.form.startMinimized": "Запускати згорнутим",
  "settings.app.form.universalDarkMode": "Увімкнути універсальний темний режим",
-  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
+  "settings.app.form.useTouchIdToUnlock": "Дозволити використання TouchID для розблокування Ferdi",
-  "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.useVerticalStyle": "Використовувати горизонтальний стиль",
-  "settings.app.form.wakeUpStrategy": "Wake up strategy",
+  "settings.app.form.wakeUpStrategy": "Стратегія пробудження",
  "settings.app.headlineAdvanced": "Додаткові налаштування",
  "settings.app.headlineAppearance": "Вигляд",
  "settings.app.headlineGeneral": "Загальні",
  "settings.app.headlineLanguage": "Мова",
-  "settings.app.headlinePrivacy": "Privacy",
+  "settings.app.headlinePrivacy": "Конфіденційність",
  "settings.app.headlineUpdates": "Оновлення",
-  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
+  "settings.app.hibernateInfo": "За замовчуванням, Ferdi залишає всі ваші сервіси відкритими та завантажує їх у фоновому режимі, щоб вони були готові, коли ви захочете їх використати. Режим глибокого сну розвантажить ваші сервіси після зазначеної кількості хвилин. Це корисно для заощадження оперативної пам’яті або щоб послуги не сповільнювали роботу комп’ютера.",
-  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
+  "settings.app.inactivityLockInfo": "Кількість хвилин бездіяльності, після якої Ferdi буде автоматично блокуватись. Використайте 0, щоб не блокуватись",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
+  "settings.app.lockInfo": "Блокування паролем дозволяє зберігати ваші повідомлення в безпеці.\nВикористовуючи блокування паролем, вам буде запропоновано ввести пароль кожен раз, коли ви запускаєте Ferdi або блокуєте Ferdi власноруч за допомогою символу замочку в нижньому лівому куті або комбінації клавіш {lockShortcut}.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Пароль",
-  "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.lockedPasswordInfo": "Обов’язково встановіть пароль, який ви запам’ятаєте.\nЯкщо ви втратите цей пароль, вам доведеться перевстановити Ferdi.",
  "settings.app.restartRequired": "Зміни потребують перезапуску",
-  "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.scheduledDNDInfo": "Запланований режим \"не турбувати\" дозволяє визначити проміжок часу, в який ви не хочете отримувати сповіщення від 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.scheduledDNDTimeInfo": "Час в 24-годинному форматі. Час закінчення може бути меньшим за час початку (наприклад, старт - 17:00, кінець - 09:00) щоб увімкнути режим \"не турбувати\" вночі.",
-  "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.sentryInfo": "Надсилання даних телеметрії дозволяє знайти помилки у Ferdi - ми не надсилатимемо жодної особистої інформації, такої як ваше повідомлення!",
-  "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.spellCheckerLanguageInfo": "Ferdi використовує вбудований у ваш Mac засіб перевірки орфографії для пошуку помилок. Якщо ви хочете змінити мови для перевірки орфографії, ви можете зробити це в налаштуваннях системи вашого Mac.",
  "settings.app.subheadlineCache": "Кеш",
-  "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
+  "settings.app.subheadlineFerdiProfile": "Обліковий запис Ferdi",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
+  "settings.app.todoServerInfo": "Цей сервер буде використовуватися для функції Завдань Ferdi.",
  "settings.app.translationHelp": "Допоможіть перекласти Ferdi на Вашу мову.",
-  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
+  "settings.app.universalDarkModeInfo": "Універсальний темний режим намагається динамічно генерувати стилі темного режиму для сервісів, які поки не підтримують цей режим.",
  "settings.app.updateStatusAvailable": "Оновлення доступне, завантаження...",
  "settings.app.updateStatusSearching": "Шукає оновлення",
  "settings.app.updateStatusUpToDate": "Ви використовуєте останню версію Ferdi",
@@ -278,20 +276,20 @@
  "settings.navigation.availableServices": "Доступні сервіси",
  "settings.navigation.logout": "Вийти",
  "settings.navigation.supportFerdi": "Про Ferdi",
-  "settings.navigation.team": "Manage Team",
+  "settings.navigation.team": "Керувати командою",
  "settings.navigation.yourServices": "Ваші сервіси",
-  "settings.navigation.yourWorkspaces": "Your workspaces",
+  "settings.navigation.yourWorkspaces": "Ваші робочі простори",
  "settings.recipes.all": "Усі сервіси",
-  "settings.recipes.custom": "Custom Services",
+  "settings.recipes.custom": "Користувацькі сервіси",
-  "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
+  "settings.recipes.customService.headline.communityRecipes": "Сторонні протоколи за підтримки спільноти",
-  "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes",
+  "settings.recipes.customService.headline.customRecipes": "Користувацькі сторонні протоколи",
-  "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
+  "settings.recipes.customService.headline.devRecipes": "Ваші розроблені сервісні протоколи",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
+  "settings.recipes.customService.intro": "Щоб додати користувацький сервіс, скопіюйте сервісний протокол в папку:",
  "settings.recipes.customService.openDevDocs": "Документація розробника",
-  "settings.recipes.customService.openFolder": "Open folder",
+  "settings.recipes.customService.openFolder": "Відкрити папку",
  "settings.recipes.headline": "Доступні сервіси",
-  "settings.recipes.missingService": "Не знайшли сервісу?",
+  "settings.recipes.missingService": "Не знайшли сервіс?",
-  "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.nothingFound": "Вибачте, але жоден сервіс не відповідає вашому пошуковому запиту. Але, можливо, ви можете додати його за допомогою опції «Custom Website». Зауважте, що на веб-сайті може відображатися більше сервісів, які могли бути додані у нових версіях Ferdi. Щоб отримати ці нові сервіси, оновіть Ferdi до новішої версії.",
  "settings.recipes.servicesSuccessfulAddedInfo": "Сервіс успішно додано",
  "settings.searchService": "Знайти сервіс",
  "settings.service.error.goBack": "Повернутись до сервісів",
@@ -301,20 +299,20 @@
  "settings.service.form.availableServices": "Доступні сервіси",
  "settings.service.form.customUrl": "Користувацький сервер",
  "settings.service.form.customUrlValidationError": "Не вдалось підтвердити власний {name} сервер.",
-  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderBrightness": "Яскравість темного режиму",
-  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderContrast": "Контрастність темного режиму",
-  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
+  "settings.service.form.darkReaderSepia": "Сепія темного режиму",
-  "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.deleteButton": "Видалити сервіс",
  "settings.service.form.editServiceHeadline": "Редагувати {name}",
  "settings.service.form.enableAudio": "Увімкнути звук",
  "settings.service.form.enableBadge": "Показувати непрочитані повідомлення",
  "settings.service.form.enableDarkMode": "Переходь на Темну Сторону",
-  "settings.service.form.enableHibernation": "Enable hibernation",
+  "settings.service.form.enableHibernation": "Увімкнути режим глибокого сну",
  "settings.service.form.enableNotification": "Увімкнути сповіщення",
  "settings.service.form.enableService": "Увімкнути сервіс",
-  "settings.service.form.enableWakeUp": "Enable wake up",
+  "settings.service.form.enableWakeUp": "Увімкнути пробудження",
  "settings.service.form.headlineBadges": "Значки непрочитаних повідомлень",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
+  "settings.service.form.headlineDarkReaderSettings": "Налаштування темного режиму",
  "settings.service.form.headlineGeneral": "Загальні",
  "settings.service.form.headlineNotifications": "Сповіщення",
  "settings.service.form.icon": "Своя іконка",
@@ -322,22 +320,22 @@
  "settings.service.form.iconUpload": "Скиньте своє зображення або натисніть тут",
  "settings.service.form.indirectMessageInfo": "Ви отримаєте сповіщення про всі нові повідомлення в каналі, а не лише про @username, @channel, @here, ...",
  "settings.service.form.indirectMessages": "Показувати значок повідомлення для всіх нових повідомлень",
-  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
+  "settings.service.form.isHibernatedEnabledInfo": "Коли ввімкнено, сервіс буде вимикатись через деякий час для економії системних ресурсів.",
  "settings.service.form.isMutedInfo": "Коли вимкнено, всі сповищення та відтворення ігноруються",
  "settings.service.form.name": "Ім'я",
-  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Показувати лише \"обраних\" у кількості непрочитаних",
-  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
+  "settings.service.form.openDarkmodeCss": "Відкрити darkmode.css",
  "settings.service.form.openUserCss": "Відкрити user.css",
  "settings.service.form.openUserJs": "Відкрити user.js",
  "settings.service.form.proxy.headline": "Налаштування HTTP/HTTPS проксі ",
  "settings.service.form.proxy.host": "Проксі Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Налаштування проксі не будуть синхронізовуватись із серверами Ferdi.",
  "settings.service.form.proxy.isEnabled": "Використовувати проксі",
-  "settings.service.form.proxy.password": "Password (optional)",
+  "settings.service.form.proxy.password": "Пароль (опціонально)",
  "settings.service.form.proxy.port": "Порт",
  "settings.service.form.proxy.restartInfo": "Будь ласка, перезапустіть Ferdi після зміни налуштувань проксі",
-  "settings.service.form.proxy.user": "User (optional)",
+  "settings.service.form.proxy.user": "Користувач (опціонально)",
-  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
+  "settings.service.form.recipeFileInfo": "Ваші користувацькі файли будуть вставлені у веб-сторінку, тож ви маєте змогу персоналізувати сервіси так, як вам завгодно. Користувацькі файли зберігаються лише локально і не передаються на інші комп'ютери, які використовують той самий обліковий запис.",
  "settings.service.form.saveButton": "Зберегти сервіс",
  "settings.service.form.tabHosted": "Розміщений",
  "settings.service.form.tabOnPremise": "Самостійно розміщений ⭐️",
@@ -347,114 +345,111 @@
  "settings.services.deletedInfo": "Сервіс було видалено",
  "settings.services.discoverServices": "Відкрийте для себе сервіси",
  "settings.services.headline": "Ваші сервіси",
-  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.noServicesAdded": "Почніть з додавання сервісу.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
-  "settings.services.servicesRequestFailed": "Could not load your services",
+  "settings.services.servicesRequestFailed": "Не вдалося завантажити ваші сервіси",
  "settings.services.tooltip.isDisabled": "Сервіс відключений",
  "settings.services.tooltip.isMuted": "Всі звуки вимкнено",
  "settings.services.tooltip.notificationsDisabled": "Сповіщення відключені",
  "settings.services.updatedInfo": "Ваші зміни були збережені",
-  "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.aboutIntro": "<p>Ferdi є програмою з відкритим вихідним кодом, якою керує спільнота.</p><p>Дякуємо людям, які роблять це можливим:</p>",
-  "settings.supportFerdi.bannerText": "Do you want to help us improve Ferdi?",
  "settings.supportFerdi.headline": "Про Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
+  "settings.supportFerdi.textDonation": "Якщо ви хочете підтримать розвиток Ferdi за допомогою пожертви, ви можете зробити це на",
-  "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,",
+  "settings.supportFerdi.textDonationAnd": "та",
-  "settings.supportFerdi.textDonationAnd": "and",
+  "settings.supportFerdi.textExpenses": "Хоча більшу частину роботи виконують волонтери, нам все ще потрібно платити за сервери та сертифікати. Як спільнота, ми повністю прозорі щодо коштів, які збираємо та витрачаємо – дивись наш",
-  "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 Спонсори",
-  "settings.supportFerdi.textGitHubSponsors": "GitHub Sponsors",
+  "settings.supportFerdi.textListContributors": "Повний список учасників",
-  "settings.supportFerdi.textListContributors": "Full list of contributors",
+  "settings.supportFerdi.textListContributorsHere": "тут",
-  "settings.supportFerdi.textListContributorsHere": "here",
  "settings.supportFerdi.textOpenCollective": "Open Collective",
-  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
+  "settings.supportFerdi.textSupportWelcome": "Підтримка завжди вітається. Ви можете знайти список необхідної нам допомоги",
-  "settings.supportFerdi.textSupportWelcomeHere": "here",
+  "settings.supportFerdi.textSupportWelcomeHere": "тут",
-  "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.textVolunteers": "Розробкою Ferdi займаються волонтери. Люди, які використовують Ferdi, як і ви. Вони обслуговують, виправляють та покращують Ferdi у вільний час.",
-  "settings.supportFerdi.title": "Do you like Ferdi?",
+  "settings.team.contentHeadline": "Керування командою Franz",
-  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Сервіс керування командою Franz дозволяє керувати підпискою Franz для кількох користувачів. Будь ласка, майте на увазі, що підписка Franz Premium не надасть вам жодних переваг у використанні Ferdi. Єдина причина, чому ви все ще маєте доступ до керування командою, полягає в тому, щоб ви могли керувати своїми застарілими командами Franz Teams і щоб ви не втратили жодних функцій керування своїм обліковим записом.",
-  "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": "Команда",
-  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "Зараз ви використовуєте сервери Franz, тому ви маєте доступ до управління командою.",
-  "settings.team.manageAction": "Manage your Team on meetfranz.com",
+  "settings.team.manageAction": "Керуйте вашою командою на meetfranz.com",
-  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailable": "Команди недоступні",
-  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailableInfo": "Команди на даний момент доступні тільки при використанні серверу Franz і після оплати за Franz Professional. Будь ласка, змініть ваш сервер на https://api.franzinfra.com для використання команд.",
  "settings.user.form.accountType.company": "Компанія",
  "settings.user.form.accountType.individual": "Індивідуальний",
  "settings.user.form.accountType.label": "Тип акаунту",
  "settings.user.form.accountType.non-profit": "Некомерційний",
  "settings.user.form.currentPassword": "Поточний пароль",
  "settings.user.form.email": "Ел. пошта",
-  "settings.user.form.firstname": "First Name",
+  "settings.user.form.firstname": "Ім'я",
-  "settings.user.form.lastname": "Last Name",
+  "settings.user.form.lastname": "Прізвище",
  "settings.user.form.newPassword": "Новий пароль",
  "settings.workspace.add.form.name": "Ім'я",
-  "settings.workspace.add.form.submitButton": "Create workspace",
+  "settings.workspace.add.form.submitButton": "Створити робочий простір",
-  "settings.workspace.form.buttonDelete": "Delete workspace",
+  "settings.workspace.form.buttonDelete": "Видалити робочий простір",
-  "settings.workspace.form.buttonSave": "Save workspace",
+  "settings.workspace.form.buttonSave": "Зберегти робочій простір",
-  "settings.workspace.form.keepLoaded": "Keep this workspace loaded*",
+  "settings.workspace.form.keepLoaded": "Зберігати цей робочий простір завантаженим*",
-  "settings.workspace.form.keepLoadedInfo": "*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
+  "settings.workspace.form.keepLoadedInfo": "*Цей параметр буде перезаписано глобальним параметром \"Зберігати всі робочі простори завантаженими\".",
  "settings.workspace.form.name": "Ім'я",
-  "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace",
+  "settings.workspace.form.servicesInWorkspaceHeadline": "Сервіси в цьому робочому просторі",
-  "settings.workspace.form.yourWorkspaces": "Your workspaces",
+  "settings.workspace.form.yourWorkspaces": "Ваші робочі простори",
-  "settings.workspaces.deletedInfo": "Workspace has been deleted",
+  "settings.workspaces.deletedInfo": "Робочий простір було видалено",
-  "settings.workspaces.headline": "Your workspaces",
+  "settings.workspaces.headline": "Ваші робочі простори",
-  "settings.workspaces.noWorkspacesAdded": "You haven't created any workspaces yet.",
+  "settings.workspaces.noWorkspacesAdded": "Ви ще не створили жодного робочого простору.",
  "settings.workspaces.tryReloadWorkspaces": "Спробуйте ще раз",
  "settings.workspaces.updatedInfo": "Ваші зміни були збережені",
-  "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces",
+  "settings.workspaces.workspaceFeatureHeadline": "Менше – більше: знайомимось з робочими просторами Ferdi",
-  "settings.workspaces.workspaceFeatureInfo": "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. 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.",
+  "settings.workspaces.workspaceFeatureInfo": "Робочі простори Ferdi дозволяють вам сфокусуватися на тому, що важливо прямо зараз. Встановіть різні набори сервісів та легко перемикайтесь між ними в будь-який час. Тільки ви вирішуєте, які сервіси вам потрібні тут і зараз, так що ми можемо допомогти вам залишатись в найкращій формі або легко закінчувати роботу коли забажаєте.",
-  "settings.workspaces.workspacesRequestFailed": "Could not load your workspaces",
+  "settings.workspaces.workspacesRequestFailed": "Не вдалося завантажити робочий простір",
-  "setupAssistant.headline": "Let's get started",
+  "setupAssistant.headline": "Давайте почнем",
-  "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
+  "setupAssistant.subheadline": "Зробіть свій вибір серед наших найбільш популярних сервісів і зробіть свій обмін повідомленнями найкращим зараз.",
-  "setupAssistant.submit.label": "Let's go",
+  "setupAssistant.submit.label": "Поїхали",
  "sidebar.addNewService": "Додати новий сервіс",
-  "sidebar.closeTodosDrawer": "Close Ferdi Todos",
+  "sidebar.closeTodosDrawer": "Закрити Завдання Ferdi",
-  "sidebar.closeWorkspaceDrawer": "Close workspace drawer",
+  "sidebar.closeWorkspaceDrawer": "Закрити меню робочих просторів",
-  "sidebar.lockFerdi": "Lock Ferdi",
+  "sidebar.lockFerdi": "Заблокувати Ferdi",
  "sidebar.muteApp": "Вимкнути сповіщення та звуки",
-  "sidebar.openTodosDrawer": "Open Ferdi Todos",
+  "sidebar.openTodosDrawer": "Відкрити Завдання Ferdi",
-  "sidebar.openWorkspaceDrawer": "Open workspace drawer",
+  "sidebar.openWorkspaceDrawer": "Відкрити меню робочих просторів",
  "sidebar.unmuteApp": "Увімкнути сповіщення та звуки",
  "signup.email.label": "Email адреса",
  "signup.emailDuplicate": "Користувач із цією email адресою вже існує",
-  "signup.firstname.label": "First Name",
+  "signup.firstname.label": "Ім'я",
  "signup.headline": "Увійти",
-  "signup.lastname.label": "Last Name",
+  "signup.lastname.label": "Прізвище",
  "signup.legal.info": "Створенням акаунту Ferdi ви приймаєте",
  "signup.legal.privacy": "Заява про конфіденційність",
  "signup.legal.terms": "Умови використання",
  "signup.link.login": "У вас вже є обліковий запис, увійти?",
  "signup.password.label": "Пароль",
  "signup.submit.label": "Створити акаунт",
-  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
+  "tabs.item.confirmDeleteService": "Ви дійсно бажаєте видалити сервіс {serviceName}?",
-  "tabs.item.deleteService": "Delete service",
+  "tabs.item.deleteService": "Видалити сервіс",
  "tabs.item.disableAudio": "відключити звук",
-  "tabs.item.disableDarkMode": "Disable Dark mode",
+  "tabs.item.disableDarkMode": "Вимкнути темний режим",
  "tabs.item.disableNotifications": "Вимкнути сповіщення",
-  "tabs.item.disableService": "Disable service",
+  "tabs.item.disableService": "Вимкнути сервіс",
  "tabs.item.enableAudio": "Увімкнути звук",
-  "tabs.item.enableDarkMode": "Enable Dark mode",
+  "tabs.item.enableDarkMode": "Увімкнути темний режим",
  "tabs.item.enableNotification": "Увімкнути сповіщення",
  "tabs.item.enableService": "Увімкнути сервіс",
-  "tabs.item.hibernateService": "Hibernate service",
+  "tabs.item.hibernateService": "Приспати сервіс",
  "tabs.item.reload": "Перезавантажити",
-  "tabs.item.wakeUpService": "Wake up service",
+  "tabs.item.wakeUpService": "Пробудити сервіс",
-  "validation.email": "{field} is not valid",
+  "validation.email": "{field} не валідне",
-  "validation.minLength": "{field} should be at least {length} characters long",
+  "validation.minLength": "Кількість символів в {field} повина бути не меньше {length}",
-  "validation.oneRequired": "At least one is required",
+  "validation.oneRequired": "Потрібен принаймні один",
-  "validation.required": "{field} is required",
+  "validation.required": "{field} обов'язвоке",
-  "validation.url": "{field} is not a valid URL",
+  "validation.url": "{field} не є валідним URL",
  "webControls.back": "Назад",
  "webControls.forward": "Вперед",
  "webControls.goHome": "Головна",
-  "webControls.openInBrowser": "Open in Browser",
+  "webControls.openInBrowser": "Відкрити в браузері",
  "webControls.reload": "Перезавантажити",
  "welcome.loginButton": "Увійдіть до свого акаунту",
  "welcome.signupButton": "Створити безплатний акаунт",
-  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
+  "workspaceDrawer.addNewWorkspaceLabel": "Додати новий робочий простір",
  "workspaceDrawer.allServices": "Усі сервіси",
-  "workspaceDrawer.headline": "Workspaces",
+  "workspaceDrawer.headline": "Робочі простори",
-  "workspaceDrawer.item.contextMenuEdit": "edit",
+  "workspaceDrawer.item.contextMenuEdit": "редагувати",
  "workspaceDrawer.item.noServicesAddedYet": "Немає доданих сервісів",
-  "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.workspaceFeatureInfo": "<p>Робочі простори Ferdi дозволяють вам сфокусуватися на тому, що важливо прямо зараз. Встановіть різні набори сервісів та легко перемикайтесь між ними в будь-який час.</p><p>Тільки ви вирішуєте, які сервіси вам потрібні тут і зараз, так що ми можемо допомогти вам залишатись в найкращій формі або легко закінчувати роботу коли забажаєте.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
+  "workspaceDrawer.workspacesSettingsTooltip": "Змінити налаштування робочих просторів",
-  "workspaces.switchingIndicator.switchingTo": "Switching to"
+  "workspaces.switchingIndicator.switchingTo": "Перемикання на"
 }
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index e168c3cc3..4cebad219 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "Gửi lời mời",
  "invite.successInfo": "Lời mời đã được gửi thành công",
  "locked.headline": "Đã khóa",
-  "locked.info": "Ferdi hiện đang bị khóa. Vui lòng mở khóa Ferdi bằng mật khẩu của bạn để xem tin nhắn của bạn.",
  "locked.invalidCredentials": "Mật khẩu không hợp lệ",
  "locked.password.label": "Mật khẩu",
  "locked.submit.label": "Mở khoá",
@@ -168,7 +167,6 @@
  "services.login": "Vui lòng đăng nhập để sử dụng Ferdi.",
  "services.serverInfo": "Theo tùy chọn, bạn có thể thay đổi máy chủ Ferdi của mình bằng cách nhấp vào bánh răng ở góc dưới cùng bên trái. Nếu bạn đang chuyển qua (từ một trong các máy chủ được lưu trữ) sang sử dụng Ferdi mà không có tài khoản, vui lòng thông báo rằng bạn có thể xuất dữ liệu của mình từ máy chủ đó và sau đó nhập dữ liệu đó bằng menu Trợ giúp để phục hồi tất cả không gian làm việc và dịch vụ đã định cấu hình của bạn!",
  "services.serverless": "Sử dụng Ferdi không cần Đăng nhập Tài khoản",
-  "services.welcome": "Chào mừng bạn đến với Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Tài khoản không hợp lệ",
  "settings.account.accountUnavailableInfo": "Bạn đang sử dụng Ferdi mà không có tài khoản. Nếu bạn muốn sử dụng Ferdi với một tài khoản và giữ cho các dịch vụ của mình được đồng bộ hóa giữa các bản cài đặt, vui lòng chọn một máy chủ trong tab Cài đặt rồi đăng nhập.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "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",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "Cập nhật",
  "settings.app.hibernateInfo": "Theo mặc định, Ferdi sẽ giữ cho tất cả các dịch vụ của bạn luôn mở và được tải ở chế độ nền để chúng luôn sẵn sàng khi bạn muốn sử dụng. Service Hibernation sẽ dỡ bỏ các dịch vụ của bạn sau một khoảng thời gian cụ thể. Điều này rất hữu ích để tiết kiệm RAM hoặc giữ cho các dịch vụ không làm chậm máy tính của bạn.",
  "settings.app.inactivityLockInfo": "Vài phút không hoạt động, sau đó Ferdi sẽ tự động khóa. Sử dụng 0 để tắt",
-  "settings.app.languageDisclaimer": "Bản dịch chính thức là tiếng Anh và tiếng Đức. Tất cả các ngôn ngữ khác là bản dịch dựa trên cộng đồng.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Mật khẩu",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "settings.recipes.customService.headline.communityRecipes": "Công thức của cộng đồng bên thứ 3",
  "settings.recipes.customService.headline.customRecipes": "Công thức của tùy chỉnh bên thứ 3",
  "settings.recipes.customService.headline.devRecipes": "Công thức dịch vụ phát triển của bạn",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Tài liệu dành cho nhà phát triển",
  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Các dịch vụ có sẵn",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "Khám phá các dịch vụ",
  "settings.services.headline": "Dịch vụ của bạn",
  "settings.services.noServicesAdded": "Bắt đầu bằng cách thêm một dịch vụ.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Không thể tải các dịch vụ của bạn",
  "settings.services.tooltip.isDisabled": "Dịch vụ bị vô hiệu hóa",
  "settings.services.tooltip.isMuted": "Tất cả âm thanh đều bị tắt tiếng",
  "settings.services.tooltip.notificationsDisabled": "Thông báo bị vô hiệu hoá",
  "settings.services.updatedInfo": "Mọi thay đổi đã được lưu lại",
  "settings.supportFerdi.aboutIntro": "<p>Ferdi là một ứng dụng mã nguồn mở và dẫn dắt cộng đồng.</p><p>Cảm ơn những người tạo nên sự khả thi này:</p>",
-  "settings.supportFerdi.bannerText": "Bạn có muốn giúp chúng tôi cải thiện Ferdi không?",
  "settings.supportFerdi.headline": "Giới thiệu về phần mềm Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "Nếu bạn cảm thấy muốn hỗ trợ sự phát triển của Ferdi bằng một khoản đóng góp, bạn có thể làm như vậy trên cả hai,",
  "settings.supportFerdi.textDonationAnd": "và",
  "settings.supportFerdi.textExpenses": "Trong khi các tình nguyện viên thực hiện hầu hết công việc, chúng tôi vẫn cần trả tiền cho các máy chủ và chứng chỉ. Là một cộng đồng, chúng tôi hoàn toàn minh bạch về các khoản tiền mà chúng tôi thu thập và chi tiêu - hãy xem",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Hỗ trợ luôn được chào đón. Bạn có thể tìm thấy danh sách trợ giúp mà chúng tôi cần",
  "settings.supportFerdi.textSupportWelcomeHere": "tại đây",
  "settings.supportFerdi.textVolunteers": "Sự phát triển của Ferdi được thực hiện bởi các tình nguyện viên. Những người sử dụng Ferdi như bạn. Họ bảo trì, sửa chữa và cải tiến Ferdi trong thời gian rảnh rỗi.",
-  "settings.supportFerdi.title": "Bạn có thích Ferdi không?",
  "settings.team.contentHeadline": "Quản lý nhóm Franz",
  "settings.team.copy": "Quản lý nhóm của Franz cho phép bạn quản lý Đăng ký Franz cho nhiều người dùng. Xin lưu ý rằng việc đăng ký Franz Premium sẽ không mang lại lợi ích gì cho bạn khi sử dụng Ferdi: Lý do duy nhất bạn vẫn có quyền truy cập vào Quản lý nhóm là để bạn có thể quản lý Nhóm Franz cũ của mình và để bạn không mất bất kỳ chức năng nào trong việc quản lý tài khoản của bạn.",
  "settings.team.headline": "Nhóm",
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index 37ac383e1..82eece46d 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "發送邀請",
  "invite.successInfo": "已成功發送邀請",
  "locked.headline": "已鎖定",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
  "locked.invalidCredentials": "密碼無效",
  "locked.password.label": "密碼",
  "locked.submit.label": "解除封鎖",
@@ -168,7 +167,6 @@
  "services.login": "登入至 Ferdi",
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "歡迎使用 Ferdi",
  "settings.account.account.editButton": "更改帳戶資訊",
  "settings.account.accountUnavailable": "帳號無法使用",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "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.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "更新",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "密碼",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
  "settings.recipes.customService.openFolder": "開啟資料夾",
  "settings.recipes.headline": "可用服務",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "服務列表",
  "settings.services.headline": "您的服務",
  "settings.services.noServicesAdded": "Start by adding a service.",
-  "settings.services.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.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "已停用服務",
  "settings.services.tooltip.isMuted": "All sounds are muted",
  "settings.services.tooltip.notificationsDisabled": "已停用通知",
  "settings.services.updatedInfo": "您的更改已經儲存",
  "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.headline": "關於 Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,",
  "settings.supportFerdi.textDonationAnd": "和",
  "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",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
  "settings.supportFerdi.textSupportWelcomeHere": "這裡",
  "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.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": "團隊",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index 7c26a7ff7..2225941d1 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -61,7 +61,6 @@
  "invite.submit.label": "发送邀请",
  "invite.successInfo": "已成功发送邀请。",
  "locked.headline": "已锁定",
-  "locked.info": "Ferdi目前被锁定。请使用密码解锁Ferdi以查看您的消息。",
  "locked.invalidCredentials": "密码无效",
  "locked.password.label": "密码",
  "locked.submit.label": "解锁",
@@ -168,7 +167,6 @@
  "services.login": "请登录后使用 Ferdi。",
  "services.serverInfo": "或者，您可以通过单击左下角的齿轮来更改您的 Ferdi 服务器。 如果您要（从一台托管服务器）切换到没有帐户的 Ferdi，请注意，您可以从该服务器导出数据，然后使用“帮助”菜单将其导入，以恢复所有工作区和配置的服务！",
  "services.serverless": "使用不带账户的Ferdi",
-  "services.welcome": "欢迎使用 Ferdi",
  "settings.account.account.editButton": "编辑帐户",
  "settings.account.accountUnavailable": "账户不可用",
  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
@@ -242,6 +240,7 @@
  "settings.app.form.showDragArea": "在窗口上显示可拖动区域",
  "settings.app.form.showMessagesBadgesWhenMuted": "禁用通知时显示未读消息徽章",
  "settings.app.form.showServiceName": "Display service name under the icon",
+  "settings.app.form.splitColumns": "Number of columns",
  "settings.app.form.splitMode": "启用分割视图模式",
  "settings.app.form.startMinimized": "启动时最小化",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
@@ -256,7 +255,6 @@
  "settings.app.headlineUpdates": "更新",
  "settings.app.hibernateInfo": "默认情况下，Ferdi将保持您所有的服务在后台打开并加载，这样当您想要使用它们时他们就可以了。 服务休眠将在指定数量后卸载您的服务。这有助于保存内存或保持服务以减慢您的计算机速度。",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "官方翻译为英语和德语，所有其他语言都是基于社区的翻译。",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "密码",
  "settings.app.lockedPasswordInfo": "请务必设置您将记住的密码。\n如果您丢失了这个密码，您将不得不重新安装Ferdi。",
@@ -286,7 +284,7 @@
  "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.intro": "To add a custom service, copy the service recipe folder inside:",
  "settings.recipes.customService.openDevDocs": "开发者文档",
  "settings.recipes.customService.openFolder": "打开文件夹",
  "settings.recipes.headline": "可用的服务",
@@ -348,16 +346,14 @@
  "settings.services.discoverServices": "发现服务",
  "settings.services.headline": "您的服务",
  "settings.services.noServicesAdded": "从添加服务开始。",
-  "settings.services.nothingFound": "对不起，没有任何服务匹配您的搜索词 - 但您仍然可以使用“自定义网站”选项添加它。 请注意，网站可能会显示自您当前使用的版本以来添加到Ferdi的更多服务。 为了获得这些新服务，请考虑升级为较新版本的费尔迪。",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term.",
  "settings.services.servicesRequestFailed": "无法加载您的服务",
  "settings.services.tooltip.isDisabled": "服务已禁用",
  "settings.services.tooltip.isMuted": "所有声音被静音",
  "settings.services.tooltip.notificationsDisabled": "通知已禁用",
  "settings.services.updatedInfo": "您的更改已保存",
  "settings.supportFerdi.aboutIntro": "<p>Ferdi是一个开源的软件。</p><p>感谢那些使Ferdi成为可能的人：</p>",
-  "settings.supportFerdi.bannerText": "你想要帮助我们改进Ferdi吗？",
  "settings.supportFerdi.headline": "关于 Ferdi",
-  "settings.supportFerdi.openSurvey": "打开调查",
  "settings.supportFerdi.textDonation": "如果你想要捐赠Ferdi的开发，你可以通过：",
  "settings.supportFerdi.textDonationAnd": "和",
  "settings.supportFerdi.textExpenses": "虽然是志愿者做大部分工作，但我们仍然需要用钱来购买服务器和证书。 作为一个社区应用，我们在募集和花费的资金上是完全公开的—— 看看我们的",
@@ -368,7 +364,6 @@
  "settings.supportFerdi.textSupportWelcome": "支持总是受欢迎的。您可以找到我们需要的帮助列表",
  "settings.supportFerdi.textSupportWelcomeHere": "这里",
  "settings.supportFerdi.textVolunteers": "Ferdi是由志愿者开发而成。他们用空闲时间维护、修复和改进Ferdi。",
-  "settings.supportFerdi.title": "你喜欢Ferdi吗？",
  "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": "团队",
diff --git a/src/i18n/translations.ts b/src/i18n/translations.ts
index 9a7dc7453..9b23497e1 100644
--- a/src/i18n/translations.ts
+++ b/src/i18n/translations.ts
@@ -1,15 +1,16 @@
 /* eslint-disable global-require */
 import { APP_LOCALES } from './languages';
-const translations = [];
+export const generatedTranslations = () => {
-for (const key of Object.keys(APP_LOCALES)) {
+  const translations = [];
-  try {
+  for (const key of Object.keys(APP_LOCALES)) {
-    // eslint-disable-next-line import/no-dynamic-require
+    try {
-    const translation = require(`./locales/${key}.json`);
+      // eslint-disable-next-line import/no-dynamic-require
-    translations[key] = translation;
+      const translation = require(`./locales/${key}.json`);
-  } catch {
+      translations[key] = translation;
-    console.warn(`Can't find translations for ${key}`);
+    } catch {
+      console.warn(`Can't find translations for ${key}`);
+    }
  }
-}
+  return translations;
+};
-module.exports = translations;
diff --git a/src/index.ts b/src/index.ts
index 89903a669..d46641fe1 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -213,6 +213,7 @@ const createWindow = () => {
      contextIsolation: false,
      webviewTag: true,
      preload: join(__dirname, 'sentry.js'),
+      nativeWindowOpen: true,
      // @ts-expect-error Object literal may only specify known properties, and 'enableRemoteModule' does not exist in type 'WebPreferences'.
      enableRemoteModule: true,
    },
@@ -406,7 +407,7 @@ const createWindow = () => {
    ) {
      // Toggle the window on 'Alt+X'
      globalShortcut.register(`${altKey()}+X`, () => {
-        trayIcon.trayMenuTemplate[0].click();
+        trayIcon._toggleWindow();
      });
    }
  });
@@ -516,11 +517,10 @@ ipcMain.on('open-browser-window', (_e, { url, serviceId }) => {
  const serviceSession = session.fromPartition(`persist:service-${serviceId}`);
  const child = new BrowserWindow({
    parent: mainWindow,
+    fullscreenable: false,
    webPreferences: {
      session: serviceSession,
-      // TODO: Aren't these needed here?
+      nativeWindowOpen: true,
-      // contextIsolation: false,
-      // enableRemoteModule: true,
    },
  });
  child.show();
diff --git a/src/internal-server/app/Controllers/Http/RecipeController.js b/src/internal-server/app/Controllers/Http/RecipeController.js
index 1b0ac7035..7e35e6831 100644
--- a/src/internal-server/app/Controllers/Http/RecipeController.js
+++ b/src/internal-server/app/Controllers/Http/RecipeController.js
@@ -13,8 +13,10 @@ const RECIPES_URL = `${LIVE_FERDI_API}/${API_VERSION}/recipes`;
 class RecipeController {
  // List official and custom recipes
  async list({ response }) {
-    const officialRecipes = JSON.parse(await (await fetch(RECIPES_URL)).text());
+    const recipesUrlFetch = await fetch(RECIPES_URL);
-    const customRecipesArray = (await Recipe.all()).rows;
+    const officialRecipes = JSON.parse(await recipesUrlFetch).text();
+    const allRecipes = await Recipe.all();
+    const customRecipesArray = allRecipes.rows;
    const customRecipes = customRecipesArray.map(recipe => ({
      id: recipe.recipeId,
      name: recipe.name,
@@ -46,7 +48,8 @@ class RecipeController {
    let results;
    if (needle === 'ferdi:custom') {
-      const dbResults = (await Recipe.all()).toJSON();
+      const allRecipes = await Recipe.all();
+      const dbResults = allRecipes.toJSON();
      results = dbResults.map(recipe => ({
        id: recipe.recipeId,
        name: recipe.name,
@@ -56,20 +59,18 @@ class RecipeController {
      let remoteResults = [];
      // eslint-disable-next-line eqeqeq
      if (Env.get('CONNECT_WITH_FRANZ') == 'true') {
-        remoteResults = JSON.parse(
+        const recipesUrlFetch = await fetch(
-          await (
+          `${RECIPES_URL}/search?needle=${encodeURIComponent(needle)}`,
-            await fetch(
-              `${RECIPES_URL}/search?needle=${encodeURIComponent(needle)}`,
-            )
-          ).text(),
        );
+        remoteResults = JSON.parse(await recipesUrlFetch.text());
      }
      debug('remoteResults:', remoteResults);
-      const localResultsArray = (
+      const recipeQuery = await Recipe.query()
-        await Recipe.query().where('name', 'LIKE', `%${needle}%`).fetch()
+        .where('name', 'LIKE', `%${needle}%`)
-      ).toJSON();
+        .fetch();
+      const localResultsArray = recipeQuery.toJSON();
      const localResults = localResultsArray.map(recipe => ({
        id: recipe.recipeId,
        name: recipe.name,
diff --git a/src/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js
index c4ca5a113..a3add4464 100644
--- a/src/internal-server/app/Controllers/Http/ServiceController.js
+++ b/src/internal-server/app/Controllers/Http/ServiceController.js
@@ -34,6 +34,7 @@ class ServiceController {
    do {
      serviceId = uuid();
    } while (
+      // eslint-disable-next-line no-await-in-loop, unicorn/no-await-expression-member
      (await Service.query().where('serviceId', serviceId).fetch()).rows
        .length > 0
    );
@@ -68,7 +69,8 @@ class ServiceController {
  // List all services a user has created
  async list({ response }) {
-    const services = (await Service.all()).rows;
+    const allServices = await Service.all();
+    const services = allServices.rows;
    // Convert to array with all data Franz wants
    const servicesArray = services.map(service => {
      const settings =
@@ -111,8 +113,8 @@ class ServiceController {
        size: '2mb',
      });
      const { id } = params;
-      const service = (await Service.query().where('serviceId', id).fetch())
+      const serviceQuery = await Service.query().where('serviceId', id).fetch();
-        .rows[0];
+      const service = serviceQuery.rows[0];
      const settings =
        typeof service.settings === 'string'
          ? JSON.parse(service.settings)
@@ -166,8 +168,8 @@ class ServiceController {
    const { id } = params;
    // Get current settings from db
-    const serviceData = (await Service.query().where('serviceId', id).fetch())
+    const serviceQuery = await Service.query().where('serviceId', id).fetch();
-      .rows[0];
+    const serviceData = serviceQuery.rows[0];
    const settings = {
      ...(typeof serviceData.settings === 'string'
@@ -185,8 +187,10 @@ class ServiceController {
      });
    // Get updated row
-    const service = (await Service.query().where('serviceId', id).fetch())
+    const anotherServiceQuery = await Service.query()
-      .rows[0];
+      .where('serviceId', id)
+      .fetch();
+    const service = anotherServiceQuery.rows[0];
    return response.send({
      data: {
@@ -218,11 +222,12 @@ class ServiceController {
    for (const service of Object.keys(data)) {
      // Get current settings from db
-      const serviceData = (
+      // eslint-disable-next-line no-await-in-loop
-        await Service.query() // eslint-disable-line no-await-in-loop
+      const serviceQuery = await Service.query()
-          .where('serviceId', service)
+        .where('serviceId', service)
-          .fetch()
+        .fetch();
-      ).rows[0];
+      const serviceData = serviceQuery.rows[0];
      const settings = {
        ...JSON.parse(serviceData.settings),
@@ -238,7 +243,8 @@ class ServiceController {
    }
    // Get new services
-    const services = (await Service.all()).rows;
+    const allServices = await Service.all();
+    const services = allServices.rows;
    // Convert to array with all data Franz wants
    const servicesArray = services.map(service => {
      const settings =
diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js
index 2ecc8241c..abfbc2470 100644
--- a/src/internal-server/app/Controllers/Http/UserController.js
+++ b/src/internal-server/app/Controllers/Http/UserController.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-await-in-loop, unicorn/no-await-expression-member */
 const User = use('App/Models/User');
 const Service = use('App/Models/Service');
 const Workspace = use('App/Models/Workspace');
@@ -230,8 +231,10 @@ class UserController {
    auth,
    response,
  }) {
-    const services = (await Service.all()).toJSON();
+    const allServices = await Service.all();
-    const workspaces = (await Workspace.all()).toJSON();
+    const services = allServices.toJSON();
+    const allWorkspaces = await Workspace.all();
+    const workspaces = allWorkspaces.toJSON();
    const exportData = {
      username: 'Ferdi',
diff --git a/src/internal-server/app/Controllers/Http/WorkspaceController.js b/src/internal-server/app/Controllers/Http/WorkspaceController.js
index 528721f13..ee5731caf 100644
--- a/src/internal-server/app/Controllers/Http/WorkspaceController.js
+++ b/src/internal-server/app/Controllers/Http/WorkspaceController.js
@@ -25,11 +25,13 @@ class WorkspaceController {
    do {
      workspaceId = uuid();
    } while (
+      // eslint-disable-next-line no-await-in-loop, unicorn/no-await-expression-member
      (await Workspace.query().where('workspaceId', workspaceId).fetch()).rows
        .length > 0
    );
-    const order = (await Workspace.all()).rows.length;
+    const allWorkspaces = await Workspace.all();
+    const order = allWorkspaces.rows.length;
    const { name } = data;
    delete data.name;
@@ -54,7 +56,6 @@ class WorkspaceController {
    // Validate user input
    const validation = await validateAll(request.all(), {
      name: 'required',
-      services: 'required|array',
    });
    if (validation.fails()) {
      return response.status(401).send({
@@ -76,8 +77,10 @@ class WorkspaceController {
      });
    // Get updated row
-    const workspace = (await Workspace.query().where('workspaceId', id).fetch())
+    const workspaceQuery = await Workspace.query()
-      .rows[0];
+      .where('workspaceId', id)
+      .fetch();
+    const workspace = workspaceQuery.rows[0];
    return response.send({
      id: workspace.workspaceId,
@@ -118,7 +121,8 @@ class WorkspaceController {
  // List all workspaces a user has created
  async list({ response }) {
-    const workspaces = (await Workspace.all()).rows;
+    const allWorkspaces = await Workspace.all();
+    const workspaces = allWorkspaces.rows;
    // Convert to array with all data Franz wants
    let workspacesArray = [];
    if (workspaces) {
diff --git a/src/lib/Form.ts b/src/lib/Form.ts
index 9b8321948..14ea82948 100644
--- a/src/lib/Form.ts
+++ b/src/lib/Form.ts
@@ -1,4 +1,5 @@
 import Form from 'mobx-react-form';
+import vjf from 'mobx-react-form/lib/validators/VJF';
 export default class DefaultForm extends Form {
  bindings() {
@@ -29,4 +30,10 @@ export default class DefaultForm extends Form {
      // // },
    };
  }
+  plugins() {
+    return {
+      vjf: vjf(),
+    };
+  }
 }
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 7d4c228f5..8e529d859 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,5 +1,11 @@
 import { clipboard } from 'electron';
-import { app, Menu, dialog, systemPreferences } from '@electron/remote';
+import {
+  app,
+  Menu,
+  dialog,
+  systemPreferences,
+  getCurrentWindow,
+} from '@electron/remote';
 import { autorun, observable } from 'mobx';
 import { defineMessages } from 'react-intl';
 import {
@@ -951,7 +957,8 @@ class FranzMenu {
          this.actions.service.setActive({ serviceId: service.id });
          if (isMac && i === 0) {
-            app.mainWindow.restore();
+            // feat(Mac): Open Window with Cmd+1
+            getCurrentWindow().restore();
          }
        },
      });
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index e7afc3552..63382483e 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -6,6 +6,7 @@ import {
  systemPreferences,
  Tray,
  ipcMain,
+  BrowserWindow,
 } from 'electron';
 import { join } from 'path';
 import macosVersion from 'macos-version';
@@ -28,24 +29,27 @@ export default class TrayIcon {
  visible = false;
-  trayMenuTemplate = [
+  isAppMuted = false;
+  mainWindow = null;
+  trayMenuTemplate = tray => [
    {
-      label: 'Show Ferdi',
+      label:
+        tray.mainWindow.isVisible() && tray.mainWindow.isFocused()
+          ? 'Hide Ferdi'
+          : 'Show Ferdi',
      click() {
-        if (app.mainWindow.isMinimized()) {
+        tray._toggleWindow();
-          app.mainWindow.restore();
-        } else if (app.mainWindow.isVisible()) {
-          app.mainWindow.hide();
-        } else {
-          app.mainWindow.show();
-          app.mainWindow.focus();
-        }
      },
    },
    {
-      label: 'Disable Notifications & Audio',
+      label: tray.isAppMuted
+        ? 'Enable Notifications && Audio'
+        : 'Disable Notifications && Audio',
      click() {
-        app.mainWindow.webContents.send('muteApp');
+        if (!tray.mainWindow) return;
+        tray.mainWindow.webContents.send('muteApp');
      },
    },
    {
@@ -60,24 +64,44 @@ export default class TrayIcon {
    ipcMain.on('initialAppSettings', (event, appSettings) => {
      this._updateTrayMenu(appSettings);
    });
    ipcMain.on('updateAppSettings', (event, appSettings) => {
      this._updateTrayMenu(appSettings);
    });
+    this.mainWindow = BrowserWindow.getAllWindows()[0];
+    // listen to window events to be able to set correct string
+    // to tray menu ('Hide Ferdi' / 'Show Ferdi')
+    this.mainWindow.on('hide', () => {
+      this._updateTrayMenu(null);
+    });
+    this.mainWindow.on('restore', () => {
+      this._updateTrayMenu(null);
+    });
+    this.mainWindow.on('minimize', () => {
+      this._updateTrayMenu(null);
+    });
+    this.mainWindow.on('show', () => {
+      this._updateTrayMenu(null);
+    });
+    this.mainWindow.on('focus', () => {
+      this._updateTrayMenu(null);
+    });
+    this.mainWindow.on('blur', () => {
+      this._updateTrayMenu(null);
+    });
  }
  _updateTrayMenu(appSettings) {
    if (!this.trayIcon) return;
-    if (appSettings.type === 'app') {
+    if (appSettings && appSettings.type === 'app') {
-      const { isAppMuted } = appSettings.data;
+      this.isAppMuted = appSettings.data.isAppMuted; // save current state after a change
-      this.trayMenuTemplate[1].label = isAppMuted
+    }
-        ? 'Enable Notifications && Audio'
-        : 'Disable Notifications && Audio';
+    this.trayMenu = Menu.buildFromTemplate(this.trayMenuTemplate(this));
-      this.trayMenu = Menu.buildFromTemplate(this.trayMenuTemplate);
+    if (isLinux) {
-      if (isLinux) {
+      this.trayIcon.setContextMenu(this.trayMenu);
-        this.trayIcon.setContextMenu(this.trayMenu);
-      }
    }
  }
@@ -90,23 +114,15 @@ export default class TrayIcon {
    if (this.trayIcon) return;
    this.trayIcon = new Tray(this._getAsset('tray', INDICATOR_TRAY_PLAIN));
    this.trayIcon.setToolTip('Ferdi');
-    this.trayMenu = Menu.buildFromTemplate(this.trayMenuTemplate);
+    this.trayMenu = Menu.buildFromTemplate(this.trayMenuTemplate(this));
    if (isLinux) {
      this.trayIcon.setContextMenu(this.trayMenu);
    }
    this.trayIcon.on('click', () => {
-      if (app.mainWindow.isMinimized()) {
+      this._toggleWindow();
-        app.mainWindow.restore();
-      } else if (app.mainWindow.isVisible()) {
-        app.mainWindow.hide();
-      } else {
-        app.mainWindow.show();
-        app.mainWindow.focus();
-      }
    });
    if (isMac || isWindows) {
@@ -125,6 +141,26 @@ export default class TrayIcon {
    }
  }
+  _toggleWindow() {
+    const mainWindow = BrowserWindow.getAllWindows()[0];
+    if (!mainWindow) return;
+    if (mainWindow.isMinimized()) {
+      mainWindow.restore();
+    } else if (mainWindow.isVisible() && mainWindow.isFocused()) {
+      if (isMac && mainWindow.isFullScreen()) {
+        mainWindow.once('show', () => mainWindow?.setFullScreen(true));
+        mainWindow.once('leave-full-screen', () => mainWindow?.hide());
+        mainWindow.setFullScreen(false);
+      } else {
+        mainWindow.hide();
+      }
+    } else {
+      mainWindow.show();
+      mainWindow.focus();
+    }
+  }
  hide() {
    this.visible = false;
    this._hide();
diff --git a/src/models/Service.js b/src/models/Service.js
index 3cf0523c3..bd4f8c223 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -238,6 +238,7 @@ export default class Service {
      let url;
      try {
        url = normalizeUrl(this.customUrl, {
+          stripAuthentication: false,
          stripWWW: false,
          removeTrailingSlash: false,
        });
diff --git a/src/routes.js b/src/routes.tsx
index 9891e5d43..192090737 100644
--- a/src/routes.js
+++ b/src/routes.tsx
@@ -1,5 +1,4 @@
 import { Component } from 'react';
-import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import { Router, Route, IndexRedirect } from 'react-router';
@@ -30,9 +29,14 @@ import { WORKSPACES_ROUTES } from './features/workspaces/constants';
 import SettingsStore from './stores/SettingsStore';
-@inject('stores', 'actions')
+type Props = {
-@observer
+  stores: {
-class Routes extends Component {
+    settings: typeof SettingsStore;
+  };
+  history: any;
+};
+class Routes extends Component<Props> {
  render() {
    const { locked } = this.props.stores.settings.app;
@@ -88,11 +92,4 @@ class Routes extends Component {
  }
 }
-Routes.wrappedComponent.propTypes = {
+export default inject('stores', 'actions')(observer(Routes));
-  stores: PropTypes.shape({
-    settings: PropTypes.instanceOf(SettingsStore).isRequired,
-  }).isRequired,
-  history: PropTypes.any.isRequired,
-};
-export default Routes;
diff --git a/src/stores.types.ts b/src/stores.types.ts
index c63cdd4b8..34922c199 100644
--- a/src/stores.types.ts
+++ b/src/stores.types.ts
@@ -276,6 +276,7 @@ interface UIStore {
  actionStatus: () => void;
  isDarkThemeActive: () => void;
  isSplitModeActive: () => void;
+  splitColumnsNo: () => void;
  showMessageBadgesEvenWhenMuted: () => void;
  theme: () => void;
 }
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 81cef3775..5881e37a4 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -19,7 +19,7 @@ import Request from './lib/Request';
 import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
 import { isMac, electronVersion, osRelease } from '../environment';
 import { ferdiVersion, userDataPath, ferdiLocale } from '../environment-remote';
-import locales from '../i18n/translations';
+import { generatedTranslations } from '../i18n/translations';
 import { getLocale } from '../helpers/i18n-helpers';
 import {
@@ -42,6 +42,8 @@ const autoLauncher = new AutoLaunch({
 const CATALINA_NOTIFICATION_HACK_KEY =
  '_temp_askedForCatalinaNotificationPermissions';
+const locales = generatedTranslations();
 export default class AppStore extends Store {
  updateStatusTypes = {
    CHECKING: 'CHECKING',
@@ -322,10 +324,11 @@ export default class AppStore extends Store {
        this.actions.service.setActive({
          serviceId,
        });
-        if (!app.mainWindow.isVisible()) {
+        if (!mainWindow.isVisible()) {
          mainWindow.show();
        }
-        if (app.mainWindow.isMinimized()) {
+        if (mainWindow.isMinimized()) {
          mainWindow.restore();
        }
        mainWindow.focus();
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 926ee36f0..e546850f9 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -171,6 +171,13 @@ export default class ServicesStore extends Store {
    );
    reaction(
+      () => this.stores.settings.app.splitColumns,
+      () => {
+        this._shareSettingsWithServiceProcess();
+      },
+    );
+    reaction(
      () => this.stores.settings.app.searchEngine,
      () => {
        this._shareSettingsWithServiceProcess();
@@ -580,7 +587,10 @@ export default class ServicesStore extends Store {
    const service = this.one(serviceId);
    for (const s of this.all) {
-      s.isActive = false;
+      if (s.isActive) {
+        s.lastUsed = Date.now();
+        s.isActive = false;
+      }
    }
    service.isActive = true;
    this._awake({ serviceId: service.id });
@@ -617,12 +627,7 @@ export default class ServicesStore extends Store {
      this.allDisplayed.length,
    );
-    for (const s of this.all) {
+    this._setActive({ serviceId: this.allDisplayed[nextIndex].id });
-      s.isActive = false;
-    }
-    this.allDisplayed[nextIndex].isActive = true;
-    this._focusActiveService();
  }
  @action _setActivePrev() {
@@ -632,12 +637,7 @@ export default class ServicesStore extends Store {
      this.allDisplayed.length,
    );
-    for (const s of this.all) {
+    this._setActive({ serviceId: this.allDisplayed[prevIndex].id });
-      s.isActive = false;
-    }
-    this.allDisplayed[prevIndex].isActive = true;
-    this._focusActiveService();
  }
  @action _setUnreadMessageCount({ serviceId, count }) {
@@ -655,20 +655,20 @@ export default class ServicesStore extends Store {
  @action _setWebviewReference({ serviceId, webview }) {
    const service = this.one(serviceId);
+    if (service) {
-    service.webview = webview;
+      service.webview = webview;
-    if (!service.isAttached) {
+      if (!service.isAttached) {
-      debug('Webview is not attached, initializing');
+        debug('Webview is not attached, initializing');
-      service.initializeWebViewEvents({
+        service.initializeWebViewEvents({
-        handleIPCMessage: this.actions.service.handleIPCMessage,
+          handleIPCMessage: this.actions.service.handleIPCMessage,
-        openWindow: this.actions.service.openWindow,
+          openWindow: this.actions.service.openWindow,
-        stores: this.stores,
+          stores: this.stores,
-      });
+        });
-      service.initializeWebViewListener();
+        service.initializeWebViewListener();
+      }
+      service.isAttached = true;
    }
-    service.isAttached = true;
  }
  @action _detachService({ service }) {
@@ -690,20 +690,22 @@ 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} ${
+        if (service._webview) {
-          service.dialogTitle ? ` - ${service.dialogTitle}` : ''
+          document.title = `Ferdi - ${service.name} ${
-        } ${service._webview ? `- ${service._webview.getTitle()}` : ''}`;
+            service.dialogTitle ? ` - ${service.dialogTitle}` : ''
-        this._focusService({ serviceId: service.id });
+          } ${service._webview ? `- ${service._webview.getTitle()}` : ''}`;
-        if (this.stores.settings.app.splitMode && !focusEvent) {
+          this._focusService({ serviceId: service.id });
-          setTimeout(() => {
+          if (this.stores.settings.app.splitMode && !focusEvent) {
-            document
+            setTimeout(() => {
-              .querySelector('.services__webview-wrapper.is-active')
+              document
-              .scrollIntoView({
+                .querySelector('.services__webview-wrapper.is-active')
-                behavior: 'smooth',
+                .scrollIntoView({
-                block: 'end',
+                  behavior: 'smooth',
-                inline: 'nearest',
+                  block: 'end',
-              });
+                  inline: 'nearest',
-          }, 10);
+                });
+            }, 10);
+          }
        }
      } else {
        debug('No service is active');
@@ -797,8 +799,6 @@ export default class ServicesStore extends Store {
            options.icon = '/assets/img/notification-badge.gif';
          }
-          console.log(title, options);
          this.actions.app.notify({
            notificationId: args[0].notificationId,
            title,
@@ -1036,10 +1036,6 @@ export default class ServicesStore extends Store {
    if (!service.canHibernate) {
      return;
    }
-    if (service.isActive) {
-      debug(`Skipping service hibernation for ${service.name}`);
-      return;
-    }
    debug(`Hibernate ${service.name}`);
diff --git a/src/stores/UIStore.ts b/src/stores/UIStore.js
index 6a9597006..9c194aa91 100644
--- a/src/stores/UIStore.ts
+++ b/src/stores/UIStore.js
@@ -6,10 +6,6 @@ import Store from './lib/Store';
 import { isMac, isWindows } from '../environment';
 export default class UIStore extends Store {
-  actions: any;
-  stores: any;
  @observable showServicesUpdatedInfoBar = false;
  @observable isOsDarkThemeActive = nativeTheme.shouldUseDarkColors;
@@ -58,6 +54,13 @@ export default class UIStore extends Store {
      },
      { fireImmediately: true },
    );
+    reaction(
+      () => this.splitColumnsNo,
+      () => {
+        this._setupColumnsInDOM();
+      },
+      { fireImmediately: true },
+    );
  }
  @computed get showMessageBadgesEvenWhenMuted() {
@@ -88,6 +91,10 @@ export default class UIStore extends Store {
    return this.stores.settings.app.splitMode;
  }
+  @computed get splitColumnsNo() {
+    return this.stores.settings.app.splitColumns;
+  }
  @computed get theme() {
    const themeId =
      this.isDarkThemeActive || this.stores.settings.app.darkMode
@@ -117,22 +124,23 @@ export default class UIStore extends Store {
  // Reactions
  _setupThemeInDOM() {
-    const body = document.querySelector('body');
    if (!this.isDarkThemeActive) {
-      body?.classList.remove('theme__dark');
+      document.body.classList.remove('theme__dark');
    } else {
-      body?.classList.add('theme__dark');
+      document.body.classList.add('theme__dark');
    }
  }
  _setupModeInDOM() {
-    const body = document.querySelector('body');
    if (!this.isSplitModeActive) {
-      body?.classList.remove('mode__split');
+      document.body.classList.remove('mode__split');
    } else {
-      body?.classList.add('mode__split');
+      document.body.classList.add('mode__split');
+      document.body.dataset.columns = this.splitColumnsNo;
    }
  }
+  _setupColumnsInDOM() {
+    document.body.dataset.columns = this.splitColumnsNo;
+  }
 }
diff --git a/src/stores/lib/Request.js b/src/stores/lib/Request.js
index 65871ea17..69c2e1a52 100644
--- a/src/stores/lib/Request.js
+++ b/src/stores/lib/Request.js
@@ -97,6 +97,7 @@ export default class Request {
  reload() {
    const args = this._currentApiCall ? this._currentApiCall.args : [];
+    this.error = null;
    return this.execute(...args);
  }
@@ -135,6 +136,7 @@ export default class Request {
  }
  reset = () => {
+    this.error = null;
    this.result = null;
    this.isExecuting = false;
    this.isError = false;
diff --git a/src/styles/auth.scss b/src/styles/auth.scss
index aee255196..710cfe10b 100644
--- a/src/styles/auth.scss
+++ b/src/styles/auth.scss
@@ -19,6 +19,10 @@
    a { color: $dark-theme-text-color; }
  }
+  .welcome__featured-services {
+    background: $dark-theme-gray-dark;
+  }
  .legal {
    color: $dark-theme-text-color;
@@ -36,7 +40,7 @@
 }
 .auth {
-  background: $theme-brand-gradient;
+  background: $dark-theme-gray-darkest;
  display: flex;
  justify-content: center;
diff --git a/src/styles/features.scss b/src/styles/features.scss
index d2931f837..80362b648 100644
--- a/src/styles/features.scss
+++ b/src/styles/features.scss
@@ -11,3 +11,18 @@
    background: $theme-brand-primary;
  }
 }
+.quick-switch {
+  .service {
+    background: $theme-gray-lighter;
+    border: inherit;
+  }
+  .active {
+    background: $theme-brand-primary;
+  }
+}
+.theme__dark .publish-debug, .theme__dark .nightly-builds {
+  background: $dark-theme-gray-darkest;
+}
diff --git a/src/styles/layout.scss b/src/styles/layout.scss
index b5d4d86d0..abd38b506 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -17,6 +17,8 @@ html {
 }
 .theme__dark .app {
+  background: #272727;
  .sidebar {
    background: $dark-theme-gray-darker;
    color: $theme-text-color;
@@ -33,7 +35,6 @@ html {
    .sidebar__button {
      color: $dark-theme-gray-lighter;
-      font-size: 22px;
      &:hover,
      &:active {
@@ -49,27 +50,6 @@ html {
        opacity: 0.25;
        filter: grayscale(1);
      }
-      .update-available {
-        align-items: center;
-        background: $theme-brand-danger;
-        border-radius: 20px;
-        bottom: 5px;
-        color: #fff;
-        display: flex;
-        justify-content: center;
-        padding: 0px 5px;
-        position: absolute;
-        right: 16px;
-        padding-top: 0;
-        font-size: 0px;
-        min-height: 15px;
-        min-width: 15px;
-        animation-name: pulse-danger;
-        animation-duration: 0.75s;
-        animation-iteration-count: 6;
-      }
    }
  }
@@ -78,6 +58,27 @@ html {
  }
 }
+.app .sidebar .sidebar__button .update-available {
+  align-items: center;
+  background: $theme-brand-danger;
+  border-radius: 20px;
+  bottom: 5px;
+  color: #fff;
+  display: flex;
+  justify-content: center;
+  padding: 0px 5px;
+  position: absolute;
+  right: 16px;
+  padding-top: 0;
+  font-size: 0px;
+  min-height: 15px;
+  min-width: 15px;
+  animation-name: pulse-danger;
+  animation-duration: 0.75s;
+  animation-iteration-count: 6;
+}
 body.win32:not(.isFullScreen) .app .app__content {
  height: calc(100% - 28px);
 }
@@ -87,6 +88,7 @@ body.win32:not(.isFullScreen) .app .app__content {
 }
 .app {
+  background: #fff;
  .app__content {
    display: flex;
    width: calc(100% + 300px);
diff --git a/src/styles/services.scss b/src/styles/services.scss
index dd053e93d..cedfcbdd1 100644
--- a/src/styles/services.scss
+++ b/src/styles/services.scss
@@ -18,21 +18,35 @@
  }
 }
-.mode__split .services {
+.mode__split {
-  display: flex;
+  .services {
-  overflow: visible;
+    display: flex;
+    overflow: visible;
-  .services__webview {
-    position: relative;
-    flex: 1 0 50%;
-    @media (min-width: 1280px) {
+    .services__webview {
-      flex-basis: 33.33%;
+      position: relative;
+      flex: 1 0 33.33%;
    }
+  }
-    @media (min-width: 2048px) {
+  &[data-columns="1"] .services .services__webview {
-      flex-basis: 25%;
+    flex-basis: 100%;
-    }
+  }
+  &[data-columns="2"] .services .services__webview {
+    flex-basis: 50%;
+  }
+  &[data-columns="3"] .services .services__webview {
+    flex-basis: 33.33%;
+  }
+  &[data-columns="4"] .services .services__webview {
+    flex-basis: 25%;
+  }
+  &[data-columns="5"] .services .services__webview {
+    flex-basis: 20%;
  }
 }
diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss
index c5111fa91..fbff544ed 100644
--- a/src/styles/tabs.scss
+++ b/src/styles/tabs.scss
@@ -14,9 +14,6 @@
  &.is-disabled .tab-item__icon {
    filter: grayscale(100%) opacity(0.2);
  }
-  .tab-item__icon {
-    width: 34px;
-  }
 }
 .tabs {
@@ -47,9 +44,9 @@
      $theme-brand-primary,
      $lightness: min(lightness($theme-brand-primary) * 1.35, 100)
    );
+    border-color: $theme-brand-primary;
    border-left-width: 4px;
    border-left-style: solid;
-    color: $theme-brand-primary;
    .tab-item__icon {
      margin-left: -4px;
diff --git a/src/styles/vertical.scss b/src/styles/vertical.scss
index 083f98c3d..7f38008b9 100644
--- a/src/styles/vertical.scss
+++ b/src/styles/vertical.scss
@@ -23,7 +23,7 @@ $tabitem-bias: 30px;
  }
  div:first-of-type {
-    overflow-x: scroll;
+    overflow-x: scroll!important;
    width: 100%;
  }
@@ -31,7 +31,7 @@ $tabitem-bias: 30px;
    flex-direction: row;
    .tab-item {
-      
      &.is-active {
        border-left-width: 0px !important;
        border-top-width: 4px;
diff --git a/src/styles/welcome.scss b/src/styles/welcome.scss
index 7202fe148..59f3a6ca3 100644
--- a/src/styles/welcome.scss
+++ b/src/styles/welcome.scss
@@ -44,7 +44,7 @@
    text-align: center;
    height: auto;
-    .button:first-of-type {
+    .button {
      margin-right: 25px;
    }
  }
@@ -93,6 +93,7 @@
    img {
      width: 35px;
+      height: 35px;
    }
  }
 }
diff --git a/src/themes/dark/index.ts b/src/themes/dark/index.ts
index aa132c743..6bb890192 100644
--- a/src/themes/dark/index.ts
+++ b/src/themes/dark/index.ts
@@ -6,12 +6,14 @@ import * as legacyStyles from '../legacy';
 export default (brandPrimary: string) => {
  const defaultStyles = makeDefaultThemeConfig(brandPrimary);
+  /*
  let brandPrimaryColor = color(legacyStyles.themeBrandPrimary);
  try {
    brandPrimaryColor = color(defaultStyles.brandPrimary);
  } catch {
    // Ignore invalid color and fall back to default.
  }
+  */
  const colorBackground = legacyStyles.darkThemeGrayDarkest;
  const colorText = legacyStyles.darkThemeTextColor;
@@ -139,15 +141,15 @@ export default (brandPrimary: string) => {
        },
        listItem: {
          border: color(drawerBg).lighten(0.2).hex(),
-          hoverBackground: color(drawerBg).lighten(0.2).hex(),
+          hoverBackground: legacyStyles.darkThemeGrayDark,
-          activeBackground: defaultStyles.brandPrimary,
+          activeBackground: legacyStyles.darkThemeGrayDarker,
          name: {
            color: colorText,
            activeColor: 'white',
          },
          services: {
            color: color(colorText).darken(0.5).hex(),
-            active: brandPrimaryColor.lighten(0.5).hex(),
+            active: color(colorText).darken(0.5).hex(),
          },
        },
      },
diff --git a/src/themes/default/index.ts b/src/themes/default/index.ts
index 80bcba766..e23b8b328 100644
--- a/src/themes/default/index.ts
+++ b/src/themes/default/index.ts
@@ -210,7 +210,7 @@ export default (brandPrimary: string) => {
          hoverColor: legacyStyles.themeGrayLight,
        },
        listItem: {
-          hoverBackground: color(drawerBg).darken(0.01).hex(),
+          hoverBackground: color(drawerBg).darken(0.05).hex(),
          activeBackground: legacyStyles.themeGrayLightest,
          border: color(drawerBg).darken(0.05).hex(),
          name: {
diff --git a/src/themes/legacy/index.ts b/src/themes/legacy/index.ts
index c6105a4e2..ca3216e7f 100644
--- a/src/themes/legacy/index.ts
+++ b/src/themes/legacy/index.ts
@@ -1,7 +1,6 @@
-import { DEFAULT_ACCENT_COLOR } from '../../config';
 /* legacy config, injected into sass */
-export const themeBrandPrimary = DEFAULT_ACCENT_COLOR;
+export { DEFAULT_ACCENT_COLOR as themeBrandPrimary } from '../../config';
 export const themeBrandSuccess = '#5cb85c';
 export const themeBrandInfo = '#5bc0de';
 export const themeBrandWarning = '#FF9F00';
diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.ts
index ebe88ed85..09dc462ed 100644
--- a/src/webview/lib/RecipeWebview.js
+++ b/src/webview/lib/RecipeWebview.ts
@@ -5,6 +5,14 @@ import { pathExistsSync, readFileSync, existsSync } from 'fs-extra';
 const debug = require('debug')('Ferdi:Plugin:RecipeWebview');
 class RecipeWebview {
+  badgeHandler: any;
+  dialogTitleHandler: any;
+  notificationsHandler: any;
+  sessionHandler: any;
  constructor(
    badgeHandler,
    dialogTitleHandler,
@@ -97,9 +105,12 @@ class RecipeWebview {
        const styles = document.createElement('style');
        styles.innerHTML = readFileSync(file, 'utf8');
-        document.querySelector('head').append(styles);
+        const head = document.querySelector('head');
-        debug('Append styles', styles);
+        if (head) {
+          head.append(styles);
+          debug('Append styles', styles);
+        }
      }
    });
  }
diff --git a/src/webview/lib/Userscript.js b/src/webview/lib/Userscript.ts
index f7bb99206..c50941dc7 100644
--- a/src/webview/lib/Userscript.js
+++ b/src/webview/lib/Userscript.ts
@@ -1,8 +1,12 @@
-import { ipcRenderer } from 'electron';
+type Recipe = {
+  setBadge: (direct: number, indirect: number) => void;
+  setDialogTitle: (title: string) => void;
+  injectCSS: (css: string | string[]) => void;
+};
 export default class Userscript {
  // Current ./lib/RecipeWebview instance
-  recipe = null;
+  recipe: Recipe | null = null;
  // Current ./recipe.js instance
  controller = null;
@@ -13,8 +17,6 @@ export default class Userscript {
  // Ferdi and service settings
  settings = {};
-  settingsUpdateHandler = null;
  constructor(recipe, controller, config) {
    this.recipe = recipe;
    this.controller = controller;
@@ -29,31 +31,18 @@ export default class Userscript {
   * @param {*} settings
   */
  // eslint-disable-next-line camelcase
-  internal_setSettings(settings) {
+  internal_setSettings(settings: any) {
    // This is needed to get a clean JS object from the settings itself to provide better accessibility
    // Otherwise this will be a mobX instance
    this.settings = JSON.parse(JSON.stringify(settings));
-    if (typeof this.settingsUpdateHandler === 'function') {
-      this.settingsUpdateHandler();
-    }
-  }
-  /**
-   * Register a settings handler to be executed when the settings change
-   *
-   * @param {function} handler
-   */
-  onSettingsUpdate(handler) {
-    this.settingsUpdateHandler = handler;
  }
  /**
   * Set badge count for the current service
-   * @param {*} direct Direct messages
+   * @param {number} direct Direct messages
-   * @param {*} indirect Indirect messages
+   * @param {number} indirect Indirect messages
   */
-  setBadge(direct = 0, indirect = 0) {
+  setBadge(direct: number = 0, indirect: number = 0) {
    if (this.recipe && this.recipe.setBadge) {
      this.recipe.setBadge(direct, indirect);
    }
@@ -63,7 +52,7 @@ export default class Userscript {
   * Set active dialog title to the app title
   * @param {*} title Dialog title
   */
-  setDialogTitle(title) {
+  setDialogTitle(title: string) {
    if (this.recipe && this.recipe.setDialogTitle) {
      this.recipe.setDialogTitle(title);
    }
@@ -74,8 +63,9 @@ export default class Userscript {
   *
   * @param  {...string} files
   */
-  injectCSSFiles(...files) {
+  injectCSSFiles(...files: string[]) {
    if (this.recipe && this.recipe.injectCSS) {
+      // @ts-expect-error A spread argument must either have a tuple type or be passed to a rest parameter.
      this.recipe.injectCSS(...files);
    }
  }
@@ -85,54 +75,33 @@ export default class Userscript {
   *
   * @param {string} css
   */
-  injectCSS(css) {
+  injectCSS(css: string) {
    const style = document.createElement('style');
    style.textContent = css;
    document.head.append(style);
  }
  /**
-   * Open "Find in Page" popup
-   */
-  openFindInPage() {
-    this.controller.openFindInPage();
-  }
-  /**
   * Set or update value in storage
   *
-   * @param {*} key
+   * @param {string} key
-   * @param {*} value
+   * @param {any} value
   */
-  set(key, value) {
+  set(key: string, value: string) {
    window.localStorage.setItem(`ferdi-user-${key}`, JSON.stringify(value));
  }
  /**
   * Get value from storage
   *
-   * @param {*} key
+   * @param {string} key
   * @return Value of the key
   */
-  get(key) {
+  get(key: string) {
-    return JSON.parse(window.localStorage.getItem(`ferdi-user-${key}`));
+    const ferdiUserKey = window.localStorage.getItem(`ferdi-user-${key}`);
-  }
-  /**
+    if (ferdiUserKey) {
-   * Open a URL in an external browser
+      return JSON.parse(ferdiUserKey);
-   *
+    }
-   * @param {*} url
-   */
-  externalOpen(url) {
-    ipcRenderer.sendToHost('new-window', url);
-  }
-  /**
-   * Open a URL in the current service
-   *
-   * @param {*} url
-   */
-  internalOpen(url) {
-    window.location.href = url;
  }
 }
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 0b44d1d01..7c069562f 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -16,6 +16,7 @@ import {
  disable as disableDarkMode,
 } from 'darkreader';
+import { existsSync } from 'fs';
 import ignoreList from './darkmode/ignore';
 import customDarkModeCss from './darkmode/custom';
@@ -209,9 +210,11 @@ class RecipeController {
        notificationsHandler,
        sessionHandler,
      );
-      // eslint-disable-next-line import/no-dynamic-require
+      if (existsSync(modulePath)) {
-      require(modulePath)(this.recipe, { ...config, recipe });
+        // eslint-disable-next-line import/no-dynamic-require
-      debug('Initialize Recipe', config, recipe);
+        require(modulePath)(this.recipe, { ...config, recipe });
+        debug('Initialize Recipe', config, recipe);
+      }
      this.settings.service = Object.assign(config, { recipe });
diff --git a/tweets/README.md b/tweets/README.md
new file mode 100644
index 000000000..a66deef76
--- /dev/null
+++ b/tweets/README.md
@@ -0,0 +1,37 @@
+# The tweets/ folder
+To create a new tweet create a new `*.tweet` file in this `tweets/` folder.
+<kbd>[Create new tweet](../../../new/master/?filename=tweets/<your-path>.tweet)</kbd>
+## Example
+Create a new file `tweets/hello-world.tweet` with the content
+> Hello, world!
+You can use subfolders, e.g. `tweets/2019-02/hello-world.tweet`, as long as the file is in the `tweets/` folder and has the `.tweet` file extension
+## Create a tweet with a twitter poll
+**Note**: The configured twitter account needs to be authorized to use Twitters Ads API in order to send tweets including a poll.
+A tweet including a poll must end with 2-4 options in the following format
+> Here is some text
+>
+> ( ) option A  
+> ( ) option B  
+> ( ) option C  
+> ( ) option D
+## Notes
+- Only newly created files are handled, deletions, updates or renames are ignored.
+- `*.tweet` files will not be created for tweets you send out directly from twitter.com
+- If you need to rename an existing tweet file, please do so locally using [`git mv old_filename new_filename`](https://help.github.com/en/articles/renaming-a-file-using-the-command-line), otherwise it may occur as deleted and added which would trigger a new tweet.
+- your message must fit into a single tweet
+## Questions?
+If you have any further questions or suggestions, please create an issue at https://github.com/gr2m/twitter-together/issues/new
author	kytwb <kytwb@pm.me>	2021-12-16 12:02:18 +0100
committer	kytwb <kytwb@pm.me>	2021-12-16 12:02:18 +0100
commit	36c23f67c3783b3986b21ea85d56fc0e37941a0c (patch)
tree	3c9138790d672ff84071bba8e441149c245a80e7
parent	Bumped up ferdi to '5.6.3' (diff)
parent	Iterate on README [skip ci] (diff)
download	ferdium-app-36c23f67c3783b3986b21ea85d56fc0e37941a0c.tar.gz ferdium-app-36c23f67c3783b3986b21ea85d56fc0e37941a0c.tar.zst ferdium-app-36c23f67c3783b3986b21ea85d56fc0e37941a0c.zip