Merge branch 'nightly' into release

152 files changed, 4634 insertions, 4575 deletions

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 78daffcdf..552b8cb93 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -966,6 +966,25 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "sad270",
+      "name": "Sadetdin EYILI",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5607440?v=4",
+      "profile": "https://www.ekino.com",
+      "contributions": [
+        "code",
+        "bug"
+      ]
+    },
+    {
+      "login": "Tsakatac",
+      "name": "Tsakatac",
+      "avatar_url": "https://avatars.githubusercontent.com/u/89021195?v=4",
+      "profile": "https://github.com/Tsakatac",
+      "contributions": [
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 16,
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d7bd89bea..85a9c5a3b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,29 +1,31 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.174.0/containers/javascript-node
 {
-        "name": "Node.js",
-        "build": {
-                "dockerfile": "Dockerfile",
-                // Update 'VARIANT' to pick a Node version: 10, 12, 14
-                "args": { "VARIANT": "14" }
-        },
+  "name": "Node.js",
+  "build": {
+    "dockerfile": "Dockerfile",
+    // Update 'VARIANT' to pick a Node version: 10, 12, 14
+    "args": {
+      "VARIANT": "14"
+    }
+  },
 
-        // Set *default* container specific settings.json values on container create.
-        "settings": {
-                "terminal.integrated.defaultProfile.linux": "/bin/bash"
-        },
+  // Set *default* container specific settings.json values on container create.
+  "settings": {
+    "terminal.integrated.defaultProfile.linux": "/bin/bash"
+  },
 
-        // Add the IDs of extensions you want installed when the container is created.
-        "extensions": [
-                "dbaeumer.vscode-eslint"
-        ],
+  // Add the IDs of extensions you want installed when the container is created.
+  "extensions": [
+    "dbaeumer.vscode-eslint"
+  ],
 
-        // Use 'forwardPorts' to make a list of ports inside the container available locally.
-        // "forwardPorts": [],
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
 
-        // Use 'postCreateCommand' to run commands after the container is created.
-        // "postCreateCommand": "npm install",
+  // Use 'postCreateCommand' to run commands after the container is created.
+  // "postCreateCommand": "npm install",
 
-        // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-        "remoteUser": "node"
+  // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+  "remoteUser": "node"
 }
diff --git a/.dockerignore b/.dockerignore
index d1ed260c9..8690fc9e9 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -16,6 +16,7 @@
 **/lerna-debug.log
 **/node_modules
 **/npm-debug.log*
+**/.pnpm-debug.log
 **/server*.log
 **/yarn-error.log
 Dockerfile
diff --git a/.eslintrc b/.eslintrc
index 3aae0e438..47811e7be 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -2,20 +2,35 @@
   "root": true,
   "parser": "@babel/eslint-parser",
   "extends": "eslint-config-airbnb",
-  "plugins": ["jest"],
+  "plugins": [
+    "jest"
+  ],
   "overrides": [
     {
-      "files": ["**/*.ts", "**/*.tsx"],
-      "env": { "browser": true, "es6": true, "node": true },
-      "extends": ["airbnb-typescript"],
+      "files": [
+        "**/*.ts",
+        "**/*.tsx"
+      ],
+      "env": {
+        "browser": true,
+        "es6": true,
+        "node": true
+      },
+      "extends": [
+        "airbnb-typescript"
+      ],
       "parser": "@typescript-eslint/parser",
       "parserOptions": {
-        "ecmaFeatures": { "jsx": true },
+        "ecmaFeatures": {
+          "jsx": true
+        },
         "ecmaVersion": 2018,
         "sourceType": "module",
         "project": "./tsconfig.json"
       },
-      "plugins": ["@typescript-eslint"],
+      "plugins": [
+        "@typescript-eslint"
+      ],
       "rules": {
         // eslint
         "arrow-parens": 0,
@@ -64,9 +79,13 @@
         "jsx-a11y/label-has-for": [
           2,
           {
-            "components": ["Label"],
+            "components": [
+              "Label"
+            ],
             "required": {
-              "every": ["id"]
+              "every": [
+                "id"
+              ]
             },
             "allowChildren": false
           }
@@ -104,7 +123,15 @@
     "function-paren-newline": 0,
     "max-len": 0,
     "no-await-in-loop": 1,
-    "no-console": [1, { "allow": ["warn", "error"] }],
+    "no-console": [
+      1,
+      {
+        "allow": [
+          "warn",
+          "error"
+        ]
+      }
+    ],
     "no-param-reassign": 1,
     "no-restricted-syntax": 0,
     "no-underscore-dangle": 0,
@@ -121,6 +148,7 @@
     "react/destructuring-assignment": 0,
     "react/jsx-curly-newline": 0,
     "react/jsx-filename-extension": 1,
+    "react/jsx-one-expression-per-line": 0,
     "react/jsx-no-bind": 1,
     "react/jsx-props-no-spreading": 0,
     "react/prefer-stateless-function": 1,
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b2cd3a1eb..a777079a8 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,13 +5,14 @@
 
 #### Pre-flight Checklist
 
-1. Please remember that if you are logging a bug for some service that has *stopped working* or is *working incorrectly*, please log the bug [here](https://github.com/getferdi/recipes/issues)
+1. Please remember that if you are logging a bug for some service that has _stopped working_ or is _working incorrectly_, 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 older versions of recipes that were installed on your machine. (These 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.)
 4. Please consider supporting Ferdi!
-  👉  https://github.com/sponsors/getferdi
-  👉  https://opencollective.com/getferdi/donate
+  👉 https://github.com/sponsors/getferdi
+  👉 https://opencollective.com/getferdi/donate
 5. Please ensure you've completed all of the following.
+
 - [ ] I have read the [Contributing Guidelines](https://github.com/getferdi/ferdi/blob/develop/CONTRIBUTING.md) for this project.
 - [ ] I agree to follow the [Code of Conduct](https://github.com/getferdi/ferdi/blob/develop/CODE_OF_CONDUCT.md) that this project adheres to.
 - [ ] 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.
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml
index dafcfa4d1..d41ded354 100644
--- a/.github/workflows/dependency-updates.yml
+++ b/.github/workflows/dependency-updates.yml
@@ -22,6 +22,7 @@ jobs:
       - name: Set env vars
         run: |
           echo "NPM_CACHE=$HOME/.npm" >> $GITHUB_ENV
+          echo "PNPM_CACHE=$HOME/.pnpm-store" >> $GITHUB_ENV
       - name: Checkout code along with submodules
         uses: actions/checkout@v2
         with:
@@ -40,10 +41,21 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
             ${{ runner.os }}-14.17-build-
-      - name: Use Node.js 14.17.5
+      - name: Cache pnpm modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-pnpm-store
+        with:
+          path: ${{ env.PNPM_CACHE }}
+          key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+      - name: Use Node.js 14.17.6
         uses: actions/setup-node@v2
         with:
-          node-version: 14.17.5
+          node-version: 14.17.6
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2.0.1
+        with:
+          version: 6.14.7
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml
index ec40d267c..e3e504731 100644
--- a/.github/workflows/ferdi-builds.yml
+++ b/.github/workflows/ferdi-builds.yml
@@ -45,7 +45,7 @@ jobs:
         with:
           ref: nightly
           submodules: recursive
-          fetch-depth: 0    # Note: Needed to be able to pull the 'develop' branch as well for merging
+          fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging
       - id: should_run
         name: Check whether there are any commits since this run was last triggered and push them and/or set the output
         if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
@@ -88,6 +88,7 @@ jobs:
       - name: Set env vars
         run: |
           echo "NPM_CACHE=$HOME/.npm" >> $GITHUB_ENV
+          echo "PNPM_CACHE=$HOME/.pnpm-store" >> $GITHUB_ENV
           echo "ELECTRON_CACHE=$HOME/.cache/electron" >> $GITHUB_ENV
           echo "ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder" >> $GITHUB_ENV
           echo "MANUAL_REBUILD_ON_NIGHTLY=${{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]') }}" >> $GITHUB_ENV
@@ -116,6 +117,13 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
             ${{ runner.os }}-14.17-build-
+      - name: Cache pnpm modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-pnpm-store
+        with:
+          path: ${{ env.PNPM_CACHE }}
+          key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
       - name: Cache electron modules
         uses: actions/cache@v2
         env:
@@ -130,14 +138,18 @@ jobs:
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}
           path: ${{ env.ELECTRON_BUILDER_CACHE }}
-      - name: Use Node.js 14.17.5
+      - name: Use Node.js 14.17.6
         uses: actions/setup-node@v2
         with:
-          node-version: 14.17.5
+          node-version: 14.17.6
       - name: Upgrade Xcode version on the macOS 10.15 default runners provided by GH Actions
         run: |
           sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*
           sudo xcode-select -s "/Applications/Xcode_12.4.app"
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2.0.1
+        with:
+          version: 6.14.7
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
@@ -148,7 +160,7 @@ jobs:
       - name: Install node dependencies recursively
         run: npx lerna bootstrap
       - name: Package recipes
-        run: npm i && npm run package
+        run: pnpm i && pnpm run package
         working-directory: ./recipes
       - name: Run linter and tests
         run: npm run lint && npm run test
@@ -186,6 +198,7 @@ jobs:
       - name: Set env vars
         run: |
           echo "NPM_CACHE=$HOME/.npm" >> $GITHUB_ENV
+          echo "PNPM_CACHE=$HOME/.pnpm-store" >> $GITHUB_ENV
           echo "ELECTRON_CACHE=$HOME/.cache/electron" >> $GITHUB_ENV
           echo "ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder" >> $GITHUB_ENV
           echo "MANUAL_REBUILD_ON_NIGHTLY=${{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]') }}" >> $GITHUB_ENV
@@ -214,6 +227,13 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
             ${{ runner.os }}-14.17-build-
+      - name: Cache pnpm modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-pnpm-store
+        with:
+          path: ${{ env.PNPM_CACHE }}
+          key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
       - name: Cache electron modules
         uses: actions/cache@v2
         env:
@@ -228,10 +248,14 @@ jobs:
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}
           path: ${{ env.ELECTRON_BUILDER_CACHE }}
-      - name: Use Node.js 14.17.5
+      - name: Use Node.js 14.17.6
         uses: actions/setup-node@v2
         with:
-          node-version: 14.17.5
+          node-version: 14.17.6
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2.0.1
+        with:
+          version: 6.14.7
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
@@ -245,7 +269,7 @@ jobs:
         run: echo "PACKAGE_VERSION=$(node -p 'require("./package.json").version')" >> $GITHUB_ENV
         shell: bash
       - name: Package recipes
-        run: npm i && npm run package
+        run: pnpm i && pnpm run package
         working-directory: ./recipes
       - name: Run linter and tests
         run: npm run lint && npm run test
@@ -300,6 +324,7 @@ jobs:
         run: |
           echo "HOME=$USERPROFILE" >> $GITHUB_ENV
           echo "NPM_CACHE=$USERPROFILE\.npm" >> $GITHUB_ENV
+          echo "PNPM_CACHE=$USERPROFILE\.pnpm-store" >> $GITHUB_ENV
           echo "ELECTRON_CACHE=$USERPROFILE\.cache\electron" >> $GITHUB_ENV
           echo "ELECTRON_BUILDER_CACHE=$USERPROFILE\.cache\electron-builder" >> $GITHUB_ENV
           echo "MANUAL_REBUILD_ON_NIGHTLY=${{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]') }}" >> $GITHUB_ENV
@@ -329,6 +354,13 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
             ${{ runner.os }}-14.17-build-
+      - name: Cache pnpm modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-pnpm-store
+        with:
+          path: ${{ env.PNPM_CACHE }}
+          key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
       - name: Cache electron modules
         uses: actions/cache@v2
         env:
@@ -343,10 +375,14 @@ jobs:
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}
           path: ${{ env.ELECTRON_BUILDER_CACHE }}
-      - name: Use Node.js 14.17.5
+      - name: Use Node.js 14.17.6
         uses: actions/setup-node@v2
         with:
-          node-version: 14.17.5
+          node-version: 14.17.6
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2.0.1
+        with:
+          version: 6.14.7
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
@@ -360,7 +396,7 @@ jobs:
         run: npx lerna bootstrap
         shell: bash
       - name: Package recipes
-        run: npm i && npm run package
+        run: pnpm i && pnpm run package
         working-directory: ./recipes
         shell: bash
       - name: Run linter and tests
diff --git a/.npmrc b/.npmrc
index cd7566c82..3f8ef9e64 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,3 +1,4 @@
 save-exact = true
 engine-strict = true
-legacy-peer-deps = true
+unsafe-perm = true
+frozen-lockfile = false
diff --git a/.nvmrc b/.nvmrc
index 18711d290..5595ae1aa 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-14.17.5
+14.17.6
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dbc909f5..9b5fa9f63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,104 @@
+# [v5.6.1-beta.4](https://github.com/getferdi/ferdi/compare/v5.6.1-beta.3...v5.6.1-beta.4) (2021-09-11)
+
+Please note that this is the same code as the `v5.6.1-nightly.56` tag.
+The cumulative changes since the previous beta release are:
+
+- Add a confirmation dialog and a preference while quitting Ferdi (#1879) 💖 @vraravam
+- Turn off the certificate-whitelisting in ms-teams since that can cause an MITM attack. 💖 @vraravam, @kris7t
+
+### Bug Fixes
+
+- Fix sidebar dimension when used in horizontal style (#1896) 💖 @CSY54
+- Partially revert the certificate-whitelisting for outlook since it caused crashes 💖 @vraravam
+- Fix macOS black screen when closing to systray in fullscreen mode (#1878) 💖 @sad270
+- Fix issue while importing exported `ferdi.data` file while switching from one laptop to another when it had workspaces (#1874) 💖 @vraravam
+- Fix for 'Support' link not working (404 error) (#1806) 💖 @kytwb
+- Fix zoom actions executed on another services (#1867) 💖 @sad270
+- Fix sidebar context menu not synced when toggling via the context menu (#1871) 💖 @sad270
+- Ferdi locking with lock feature disabled (#1866). Set & run the inactivity timeout only if lock feature is enabled, and use same condition between lock screen and locked menu 💖 @sad270
+
+### Internal
+
+- Build tooling: 'recipes' (using 'pnpm') will coexist with 'ferdi' (using 'npm') (#1905) 💖 @mhatvan, @vraravam
+- Ability for service recipe to expose known certificate hosts (#1890) 💖 @vraravam
+- Remove dependency of recipes requiring `electron` and `electron/remote` modules (#1869 & getferdi/recipes#674) 💖 @vraravam
+- Fix 'stores.app.accentColor is marked as required' console error (#1859) 💖 @sad270, @vraravam
+- Ensure stored settings conform to type-safety 💖 @vraravam
+- Use namespaces when pulling docker base images since this is reqd for podman 💖 @vraravam
+- Remove `What's New` functionality since that is superceded by the `Changelog` (#1864) 💖 @mhatvan
+- Refactoring to have consistent usage (prep for ts conversion) (#1821) 💖 @vraravam
+- Improve contribution documentation (#1865) 💖 @sad270, @vraravam
+
+# [v5.6.1-nightly.56](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.55...v5.6.1-nightly.56) (2021-09-11)
+
+- Turn off the certificate whitelisting in ms-teams since that can cause an MITM attack. 💖 @vraravam, @kris7t
+
+### Internal
+
+- Build tooling: 'recipes' (using 'pnpm') will coexist with 'ferdi' (using 'npm') (#1905) 💖 @mhatvan, @vraravam
+
+# [v5.6.1-nightly.55](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.54...v5.6.1-nightly.55) (2021-09-10)
+
+### Bug fixes
+
+- Fix sidebar dimension when used in horizontal style (#1896) 💖 @CSY54
+- Partially reverted the certificate-whitelisting for outlook since it caused crashes 💖 @vraravam
+
+# [v5.6.1-nightly.54](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.53...v5.6.1-nightly.54) (2021-09-09)
+
+### Internal
+
+- Ability for service recipe to expose known certificate hosts (#1890) 💖 @vraravam
+
+# [v5.6.1-nightly.53](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.52...v5.6.1-nightly.53) (2021-09-08)
+
+- Add a confirmation dialog and a preference while quitting Ferdi (#1879) 💖 @vraravam
+
+### Bug Fixes
+
+- Fix macOS black screen when closing to systray in fullscreen mode (#1878) 💖 @sad270
+
+# [v5.6.1-nightly.52](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.51...v5.6.1-nightly.52) (2021-09-07)
+
+### Bug Fixes
+
+- Fix issue while importing exported `ferdi.data` file while switching from one laptop to another when it had workspaces (#1874) 💖 @vraravam
+- Fix for 'Support' link not working (404 error) (#1806) 💖 @kytwb
+- Fix zoom actions executed on another services (#1867) 💖 @sad270
+
+# [v5.6.1-nightly.51](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.50...v5.6.1-nightly.51) (2021-09-06)
+
+### Bug Fixes
+
+- Fix sidebar context menu not synced when toggling via the context menu (#1871) 💖 @sad270
+
+### Internal
+
+- Remove dependency of recipes requiring `electron` and `electron/remote` modules (#1869 & getferdi/recipes#674) 💖 @vraravam
+
+# [v5.6.1-nightly.50](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.48...v5.6.1-nightly.50) (2021-09-05)
+
+### Bug Fixes
+
+- Ferdi locking with lock feature disabled (#1866). Set & run the inactivity timeout only if lock feature is enabled, and use same condition between lock screen and locked menu 💖 @sad270
+
+### Internal
+
+- Fix 'stores.app.accentColor is marked as required' console error (#1859) 💖 @sad270, @vraravam
+- Ensure stored settings conform to type-safety 💖 @vraravam
+- Use namespaces when pulling docker base images since this is reqd for podman 💖 @vraravam
+- Remove `What's New` functionality since that is superceded by the `Changelog` (#1864) 💖 @mhatvan
+- Refactoring to have consistent usage (prep for ts conversion) (#1821) 💖 @vraravam
+- Improve contribution documentation (#1865) 💖 @sad270, @vraravam
+
+# [v5.6.1-nightly.48](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.46...v5.6.1-nightly.48) (2021-09-03)
+
+- Service: Add ability to use self-hosted option for `youtrack` service (fixes getferdi/recipes#671)
+
+### Internal
+
+- Upgraded `nodejs` to `14.17.6` 💖 @vraravam
+
 # [v5.6.1-beta.3](https://github.com/getferdi/ferdi/compare/v5.6.1-beta.2...v5.6.1-beta.3) (2021-09-01)
 
 Please note that this is the same code as the `v5.6.1-nightly.46` tag.
@@ -58,7 +159,7 @@ The cumulative changes since the previous beta release are:
 
 ### Internal
 
-- Upgraded 'nodejs' to '14.17.5' 💖 @vraravam
+- Upgraded `nodejs` to `14.17.4` 💖 @vraravam
 - Remove some leftover Franz branding 💖 @vantezzen
 - Switch from `misty` to `concurrently` (#1846) 💖 @vantezzen
 - Services: Normalized all service recipes to be es6 compliant 💖 @vraravam
@@ -433,15 +534,15 @@ The cumulative changes since the previous beta release are:
 
 # [5.6.0-beta.8](https://github.com/getferdi/ferdi/compare/v5.6.0-beta.7...v5.6.0-beta.8) (2021-07-16)
 
-- Upgraded electron to '13.1.7' 💖 @vraravam
+- Upgraded `electron` to `13.1.7` 💖 @vraravam
 - Turned on other h/w architectures (arm64, armv7l) for linux builds. (#1633) 💖 @vraravam
 - chore: run security audit on node modules 💖 @mhatvan
-- Upgraded nodejs to '14.17.3' 💖 @vraravam
+- Upgraded `nodejs` to `14.17.3` 💖 @vraravam
 - Use 'useragent-generator' to generate the user-agent string 💖 @vraravam
 
 # [5.6.0-beta.7](https://github.com/getferdi/ferdi/compare/v5.6.0-beta.6...v5.6.0-beta.7) (2021-07-07)
 
-- Upgraded electron to '13.1.5'. 💖 @vraravam
+- Upgraded `electron` to `13.1.5`. 💖 @vraravam
 - Adjust link opening behavior 💖 @stnkl
 - Fix color adjustments in Settings screen 💖 @kris7t
 - Expose Chrome version to todos webview (fix #1211) (#1478) 💖 @kris7t
@@ -615,7 +716,9 @@ The cumulative changes since the previous beta release are:
 - Fix setting of webview disablewebsecurity attribute (#772) 💖 @dannyqiu
 
 # [5.5.0](https://github.com/getferdi/ferdi/compare/v5.4.3...v5.5.0) (2020-04-26)
+
 ### Features
+
 - Merge Franz 5.5.0-beta.2
 - Add modifyRequestHeaders, enable properly setting headers for services (#639), 💖 @mahadevans87 @sampathBlam
 - Add dropdown list to choose Todo service (#418, #477), 💖 @yourcontact
@@ -636,6 +739,7 @@ The cumulative changes since the previous beta release are:
 - Add setting to keep service in hibernation after startup (#577, #584)
 
 ### Minor changes
+
 - Improve user onboarding (#493)
 - Improve "Updates" section in settings (#506), 💖 @yourcontact
 - Improve information about Franz Premium and Teams
@@ -667,6 +771,7 @@ The cumulative changes since the previous beta release are:
 - Improve cache clearing UI feedback (#620), 💖 @saruwman
 
 ### Bug fixes
+
 - Fix cache clearing not working in Windows 10 (#541, #544), 💖 @Room4O4 & @mahadevans87
 - Fix Home button in navigation bar not correctly navigating (#571, #573), 💖 @Room4O4 & @mahadevans87
 - Fix and enhance context menu (#357) (#413) (#452) (#354) (#227)
@@ -686,16 +791,20 @@ The cumulative changes since the previous beta release are:
 - Enable Dark Reader settings to follow the accent color (#646), 💖 @sampathBlam
 
 ### Build changes
+
 - Add retry commands to flaky build steps (#498)
 - Run utility scripts pre-commit instead of pre-push (#515)
 - Sign Windows binaries (#635, #633, #112)
 
 # [5.5.0-gm.2](https://github.com/getferdi/ferdi/compare/v5.5.0-gm...v5.5.0-gm.2) (2020-04-23)
+
 ### Features
+
 - Differentiate between indirect and direct notifications (#590), 💖 @Room4O4 @mahadevans87 @FeikoJoosten @sampathBlam
 - Add setting to keep service in hibernation after startup (#577, #584)
 
 ### Minor changes
+
 - Remove excess code from Franz's hibernate feature (#609)
 - Refocus Webview only for active service (#610), 💖 @Room4O4 & @mahadevans87
 - Use GitHub notifications center and direct notifications (getferdi/recipes#133)
@@ -711,10 +820,13 @@ The cumulative changes since the previous beta release are:
 - Improve cache clearing UI feedback (#620), 💖 @saruwman
 
 ### Bug Fixes
+
 - Fix DarkReader translation problem (#593)
 
 ## [5.5.0-gm](https://github.com/getferdi/ferdi/compare/v5.4.4-beta.3...v5.5.0-gm) (2020-04-19)
+
 ### Features
+
 - Merge Franz 5.5.0-beta.2
 - Add dropdown list to choose Todo service (#418, #477), 💖 @yourcontact
 - Add hotkey for darkmode (#530, #537), 💖 @Room4O4 & @mahadevans87
@@ -726,6 +838,7 @@ The cumulative changes since the previous beta release are:
 - Add support for 11 new services and improve existing ones, 💖 @rctneil @JakeSteam @sampathBlam @tpopela @RoiArthurB
 
 ### Minor changes
+
 - Improve user onboarding (#493)
 - Improve "Updates" section in settings (#506), 💖 @yourcontact
 - Improve information about Franz Premium and Teams
@@ -736,18 +849,23 @@ The cumulative changes since the previous beta release are:
 - Update Electron to 8.1.1 (#480)
 
 ### Bug fixes
+
 - Fix cache clearing not working in Windows 10 (#541, #544), 💖 @Room4O4 & @mahadevans87
 - Fix Home button in navigation bar not correctly navigating (#571, #573), 💖 @Room4O4 & @mahadevans87
 
 ### Build changes
+
 - Add retry commands to flaky build steps (#498)
 - Run utility scripts pre-commit instead of pre-push (#515)
 
 # [5.4.3](https://github.com/getferdi/ferdi/compare/v5.4.0...v5.4.3)
+
 ### Features
+
 - Add inactivity lock #179
 
 ### Minor changes
+
 - Upgrading to Electron 7 https://github.com/getferdi/ferdi/issues/170
 - Review empty lock password behaviour https://github.com/getferdi/ferdi/issues/232
 - Several minor UI improvements
@@ -759,6 +877,7 @@ The cumulative changes since the previous beta release are:
 - Add multisize tray icon for Windows (#316)
 
 ### Bug fixes
+
 - Fix bypass flaw in lock feature https://github.com/getferdi/ferdi/issues/168
 - Fix spellchecker by using setTimeout https://github.com/getferdi/ferdi/issues/220
 - Fix zoom +/- in services https://github.com/getferdi/ferdi/issues/143
@@ -766,9 +885,11 @@ The cumulative changes since the previous beta release are:
 - Fix bugs with using Ferdi without an account
 
 ### Build changes
+
 - Extended Travis build time from 30 to 100 minutes
 
 # [5.4.0](https://github.com/getferdi/ferdi/compare/v5.3.4...v5.4.0)
+
 - Merge Franz v5.4.0
 - Add option to show a service navigation bar
 - Add service hibernation
@@ -780,6 +901,7 @@ The cumulative changes since the previous beta release are:
 - Sorting applications in QuickSwitch by last used
 
 # [5.3.4](https://github.com/getferdi/ferdi/compare/v5.3.3...v5.3.4) (2019-09-25)
+
 - Fix continuous releases/assets delivery on tags builds #53
 - Attempt at making menubar hiding feature cross-platform #7 (comment)
 - Attempt at making "About Ferdi" consistent across platforms #47 (comment)
@@ -789,6 +911,7 @@ The cumulative changes since the previous beta release are:
 - Add "Scheduled Do-not-Disturb" feature
 
 # [5.3.3](https://github.com/getferdi/ferdi/compare/v5.3.2...v5.3.3) (2019-09-18)
+
 - Merged Franz v5.3.3 into Ferdi
 - Allow hiding menubar (#7)
 - Add "back" and "forward" options for browsing history inside services (#39)
@@ -796,9 +919,11 @@ The cumulative changes since the previous beta release are:
 - Add keep workspace loaded option per workspace (#37)
 
 # [5.3.2](https://github.com/getferdi/ferdi/compare/v5.3.1...v5.3.2) (2019-09-13)
+
 Merged Franz v5.3.2 into Ferdi
 
 ## [5.3.1](https://github.com/getferdi/ferdi/compare/v5.3.0...v5.3.1) (2019-09-09)
+
 Merge Franz v5.3.1 into Ferdi.
 
 - Enable todos for all users
@@ -806,16 +931,15 @@ Merge Franz v5.3.1 into Ferdi.
 
 ### Bug Fixes
 
-* **Windows:** Fix app size in fullscreen ([e210701](https://github.com/getferdi/ferdi/commit/e210701))
-* **Windows:** Fix app to be cropped at the bottom on Windows ([42f97b4](https://github.com/getferdi/ferdi/commit/42f97b4))
-
+- **Windows:** Fix app size in fullscreen ([e210701](https://github.com/getferdi/ferdi/commit/e210701))
+- **Windows:** Fix app to be cropped at the bottom on Windows ([42f97b4](https://github.com/getferdi/ferdi/commit/42f97b4))
 
 ### Features
 
-* **Todos:** Add option to disable todos ([5d03b91](https://github.com/getferdi/ferdi/commit/5d03b91))
-
+- **Todos:** Add option to disable todos ([5d03b91](https://github.com/getferdi/ferdi/commit/5d03b91))
 
 ## [5.3.0](https://github.com/getferdi/ferdi/compare/v5.2.1-beta.1...v5.3.0) (2019-09-06)
+
 - Removes pages begging you to donate after registration
 - Makes all users Premium by default
 - [Add option to change server to a custom](https://github.com/getferdi/ferdi#servers) [ferdi-server](https://github.com/getferdi/server)
@@ -827,119 +951,107 @@ Merge Franz v5.3.1 into Ferdi.
 
 ### Features
 
-* **App:** Add second confirmation step for the free 14 day trial.
-* **Todos:** Add option to disable todos ([5d03b91](https://github.com/meetfranz/franz/commit/5d03b91))
+- **App:** Add second confirmation step for the free 14 day trial.
+- **Todos:** Add option to disable todos ([5d03b91](https://github.com/meetfranz/franz/commit/5d03b91))
 
 # [5.3.0](https://github.com/meetfranz/franz/compare/v5.2.1-beta.1...v5.3.0) (2019-09-06)
 
 ### Features
 
-* **Todos:** 🥳🥳🥳 Manage your daily tasks with **Franz Todos** 🥳🥳🥳
-* **App:** Add option to copy debug information via the help menu ([4666e85](https://github.com/meetfranz/franz/commit/4666e85))
-* **App:** Updated Pricing, more infos can be found on  ([meetfranz.com/pricing](https://meetfranz.com/pricing))
-* **App:** Improved Settings UX
-* **3rd Party Services:** Added option to open custom recipes folder
-
+- **Todos:** 🥳🥳🥳 Manage your daily tasks with **Franz Todos** 🥳🥳🥳
+- **App:** Add option to copy debug information via the help menu ([4666e85](https://github.com/meetfranz/franz/commit/4666e85))
+- **App:** Updated Pricing, more infos can be found on ([meetfranz.com/pricing](https://meetfranz.com/pricing))
+- **App:** Improved Settings UX
+- **3rd Party Services:** Added option to open custom recipes folder
 
 ### Bug Fixes
 
-* **Windows:** Fix app size in fullscreen ([e210701](https://github.com/meetfranz/franz/commit/e210701))
-* **Windows:** Fix app to be cropped at the bottom on Windows ([42f97b4](https://github.com/meetfranz/franz/commit/42f97b4))
-* **Notifications:** Fix issue that blocked notifications from e.g. Slack ([44c413b](https://github.com/meetfranz/franz/commit/44c413b))
-* **App:** A ton of various bugfixes and improvements
+- **Windows:** Fix app size in fullscreen ([e210701](https://github.com/meetfranz/franz/commit/e210701))
+- **Windows:** Fix app to be cropped at the bottom on Windows ([42f97b4](https://github.com/meetfranz/franz/commit/42f97b4))
+- **Notifications:** Fix issue that blocked notifications from e.g. Slack ([44c413b](https://github.com/meetfranz/franz/commit/44c413b))
+- **App:** A ton of various bugfixes and improvements
 
 ### General
 
-* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
-
+- **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
 
 # [5.2.0](https://github.com/meetfranz/franz/compare/v5.2.0-beta.4...v5.2.0) (2019-07-19)
 
 ### Features
-* **Service:** You can now add any custom website 🥳
+
+- **Service:** You can now add any custom website 🥳
 
 ### Bug Fixes
 
-* **Notifications:** Don't show notification badges when app is muted ([e844a64](https://github.com/meetfranz/franz/commit/e844a64))
-* **Settings:** Fix position of settings window
-* **Recipes:** Fix recipe install when directly accessing recipe e.g. via url ([eba50bc](https://github.com/meetfranz/franz/commit/eba50bc))
-* **Proxy:** Fix issue with service proxy authentication ([b9e5b23](https://github.com/meetfranz/franz/commit/b9e5b23))
-* **Announcements:** Fix issue with rendering announcements in workspaces ([1e38ec5](https://github.com/meetfranz/franz/commit/1e38ec5))
-* **Windows:** Add Workspaces menu & fix Window menu ([92a61d4](https://github.com/meetfranz/franz/commit/92a61d4))
-* **Windows:** Replace tray icon with high-res version ([a5eb399](https://github.com/meetfranz/franz/commit/a5eb399))
-* **Workspaces:** Fix service reordering within workspaces ([17f3a22](https://github.com/meetfranz/franz/commit/17f3a22))
-* **Workspaces:** Fix issue with service visibility after downgrade ([05294](https://github.com/meetfranz/franz/commit/05294))
+- **Notifications:** Don't show notification badges when app is muted ([e844a64](https://github.com/meetfranz/franz/commit/e844a64))
+- **Settings:** Fix position of settings window
+- **Recipes:** Fix recipe install when directly accessing recipe e.g. via url ([eba50bc](https://github.com/meetfranz/franz/commit/eba50bc))
+- **Proxy:** Fix issue with service proxy authentication ([b9e5b23](https://github.com/meetfranz/franz/commit/b9e5b23))
+- **Announcements:** Fix issue with rendering announcements in workspaces ([1e38ec5](https://github.com/meetfranz/franz/commit/1e38ec5))
+- **Windows:** Add Workspaces menu & fix Window menu ([92a61d4](https://github.com/meetfranz/franz/commit/92a61d4))
+- **Windows:** Replace tray icon with high-res version ([a5eb399](https://github.com/meetfranz/franz/commit/a5eb399))
+- **Workspaces:** Fix service reordering within workspaces ([17f3a22](https://github.com/meetfranz/franz/commit/17f3a22))
+- **Workspaces:** Fix issue with service visibility after downgrade ([05294](https://github.com/meetfranz/franz/commit/05294))
 
 ### General
-* **App:** Improved email validation ([dd8ddcc](https://github.com/meetfranz/franz/commit/dd8ddcc)) ([@Snuggle](https://github.com/Snuggle))
-* **App:** Update electron to 4.2.4 ([404c87a](https://github.com/meetfranz/franz/commit/404c87a))
-* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
 
+- **App:** Improved email validation ([dd8ddcc](https://github.com/meetfranz/franz/commit/dd8ddcc)) ([@Snuggle](https://github.com/Snuggle))
+- **App:** Update electron to 4.2.4 ([404c87a](https://github.com/meetfranz/franz/commit/404c87a))
+- **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
 
 # [5.2.0-beta.4](https://github.com/meetfranz/franz/compare/v5.2.0-beta.3...v5.2.0-beta.4) (2019-07-01)
 
-
 ### Bug Fixes
 
-* **Notifications:** Don't show notification badges when app is muted ([e844a64](https://github.com/meetfranz/franz/commit/e844a64))
-* **Settings:** Fix position of settings window
+- **Notifications:** Don't show notification badges when app is muted ([e844a64](https://github.com/meetfranz/franz/commit/e844a64))
+- **Settings:** Fix position of settings window
 
 ### General
 
-* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
-
+- **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
 
 # [5.2.0-beta.3](https://github.com/meetfranz/franz/compare/v5.2.0-beta.2...v5.2.0-beta.3) (2019-06-24)
 
 ### General
 
-* **App:** Downgraded electron to 4.2.4 ([404c87a](https://github.com/meetfranz/franz/commit/404c87a))
-
+- **App:** Downgraded electron to 4.2.4 ([404c87a](https://github.com/meetfranz/franz/commit/404c87a))
 
 # [5.2.0-beta.2](https://github.com/meetfranz/franz/compare/v5.2.0-beta.1...v5.2.0-beta.2) (2019-06-12)
 
-
 ### Bug Fixes
 
-* **Recipes:** Fix recipe install when directly accessing recipe ([eba50bc](https://github.com/meetfranz/franz/commit/eba50bc))
-
-
+- **Recipes:** Fix recipe install when directly accessing recipe ([eba50bc](https://github.com/meetfranz/franz/commit/eba50bc))
 
 # [5.2.0-beta.1](https://github.com/meetfranz/franz/compare/v5.1.0...v5.2.0-beta.1) (2019-06-11)
 
-
 ### Bug Fixes
 
-* **Workspaces:** Service reordering within workspaces ([17f3a22](https://github.com/meetfranz/franz/commit/17f3a22))
-* **Proxy:** Fix issue with proxy authentication ([b9e5b23](https://github.com/meetfranz/franz/commit/b9e5b23))
-* **Announcements:** Fixes issue with rendering announcements in workspaces ([1e38ec5](https://github.com/meetfranz/franz/commit/1e38ec5))
-* **Windows:** Add Workspaces menu & fix Window menu ([92a61d4](https://github.com/meetfranz/franz/commit/92a61d4))
-* **Windows:** Replace tray icon with high-res version ([a5eb399](https://github.com/meetfranz/franz/commit/a5eb399))
-* **App:** Improved email validation ([dd8ddcc](https://github.com/meetfranz/franz/commit/dd8ddcc)) ([@Snuggle](https://github.com/Snuggle))
-
+- **Workspaces:** Service reordering within workspaces ([17f3a22](https://github.com/meetfranz/franz/commit/17f3a22))
+- **Proxy:** Fix issue with proxy authentication ([b9e5b23](https://github.com/meetfranz/franz/commit/b9e5b23))
+- **Announcements:** Fixes issue with rendering announcements in workspaces ([1e38ec5](https://github.com/meetfranz/franz/commit/1e38ec5))
+- **Windows:** Add Workspaces menu & fix Window menu ([92a61d4](https://github.com/meetfranz/franz/commit/92a61d4))
+- **Windows:** Replace tray icon with high-res version ([a5eb399](https://github.com/meetfranz/franz/commit/a5eb399))
+- **App:** Improved email validation ([dd8ddcc](https://github.com/meetfranz/franz/commit/dd8ddcc)) ([@Snuggle](https://github.com/Snuggle))
 
 ### General
 
-* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
-* **App:** Update electron to 5.0.2 ([5828062](https://github.com/meetfranz/franz/commit/5828062))
-
-
+- **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+- **App:** Update electron to 5.0.2 ([5828062](https://github.com/meetfranz/franz/commit/5828062))
 
 # [5.1.0](https://github.com/meetfranz/franz/compare/v5.1.0...v5.1.0-beta.1) (2019-04-16)
 
 ### Features
 
-* **App:** Added Workspaces for all your daily routines 🎉 ([47c1c99](https://github.com/meetfranz/franz/commit/47c1c99))
-* **App:** Added [Team Management](https://meetfranz.com/user/team) 🎉 ([47c1c99](https://github.com/meetfranz/franz/commit/47c1c99))
-* **App:** Added Kerberos Support via Command Line Switches ([#1331](https://github.com/meetfranz/franz/issues/1331)) ([@frumania](https://github.com/frumania)) ([a1950d7](https://github.com/meetfranz/franz/commit/a1950d7))
-* **App:** Open changelog in app
-* **App:** Various small fixes and improvements
+- **App:** Added Workspaces for all your daily routines 🎉 ([47c1c99](https://github.com/meetfranz/franz/commit/47c1c99))
+- **App:** Added [Team Management](https://meetfranz.com/user/team) 🎉 ([47c1c99](https://github.com/meetfranz/franz/commit/47c1c99))
+- **App:** Added Kerberos Support via Command Line Switches ([#1331](https://github.com/meetfranz/franz/issues/1331)) ([@frumania](https://github.com/frumania)) ([a1950d7](https://github.com/meetfranz/franz/commit/a1950d7))
+- **App:** Open changelog in app
+- **App:** Various small fixes and improvements
 
 ### General
 
-* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
-* **App:** Update electron to 4.1.4 ([2604914](https://github.com/meetfranz/franz/commit/2604914))
-
+- **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+- **App:** Update electron to 4.1.4 ([2604914](https://github.com/meetfranz/franz/commit/2604914))
 
 # [5.1.0-beta.1](https://github.com/meetfranz/franz/compare/v5.0.1-beta.1...v5.1.0-beta.1) (2019-04-16)
 
@@ -949,25 +1061,24 @@ Merge Franz v5.3.1 into Ferdi.
 
 ### Features
 
-* **App:** Add security checks for external URLs ([6e5531a](https://github.com/meetfranz/franz/commit/6e5531a))
-* **Linux:** Add auto updater for Linux AppImage builds ([d641b4e](https://github.com/meetfranz/franz/commit/d641b4e))
-* **Spell check:** Add British English as spell check language ([#1306](https://github.com/meetfranz/franz/issues/1306)) ([67fa325](https://github.com/meetfranz/franz/commit/67fa325))
-* **Windows:** Add option to quit Ferdi from Taskbar icon ([952fc8b](https://github.com/meetfranz/franz/commit/952fc8b))
+- **App:** Add security checks for external URLs ([6e5531a](https://github.com/meetfranz/franz/commit/6e5531a))
+- **Linux:** Add auto updater for Linux AppImage builds ([d641b4e](https://github.com/meetfranz/franz/commit/d641b4e))
+- **Spell check:** Add British English as spell check language ([#1306](https://github.com/meetfranz/franz/issues/1306)) ([67fa325](https://github.com/meetfranz/franz/commit/67fa325))
+- **Windows:** Add option to quit Ferdi from Taskbar icon ([952fc8b](https://github.com/meetfranz/franz/commit/952fc8b))
 
 ### Bug Fixes
 
-* **Linux:** Fix minimized window focusing ([#1304](https://github.com/meetfranz/franz/issues/1304)) ([@skoruppa](https://github.com/skoruppa)) ([5b02c4d](https://github.com/meetfranz/franz/commit/5b02c4d))
-* **Notifications:** Fix notifications & notification click when icon is blob ([03589f6](https://github.com/meetfranz/franz/commit/03589f6))
-* **Service:** Fix service zoom (cmd/ctrl+ & cmd/ctrl-) ([91a0f59](https://github.com/meetfranz/franz/commit/91a0f59))
-* **Service:** Fix shortcut for (un)muting notifications & audio ([1df3342](https://github.com/meetfranz/franz/commit/1df3342))
-* **Windows:** Fix copy & paste in service context menus ([e66fcaa](https://github.com/meetfranz/franz/commit/e66fcaa)), closes [#1316](https://github.com/meetfranz/franz/issues/1316)
-* **Windows:** Fix losing window when "Keep Ferdi in background" is enabled ([78a3722](https://github.com/meetfranz/franz/commit/78a3722))
+- **Linux:** Fix minimized window focusing ([#1304](https://github.com/meetfranz/franz/issues/1304)) ([@skoruppa](https://github.com/skoruppa)) ([5b02c4d](https://github.com/meetfranz/franz/commit/5b02c4d))
+- **Notifications:** Fix notifications & notification click when icon is blob ([03589f6](https://github.com/meetfranz/franz/commit/03589f6))
+- **Service:** Fix service zoom (cmd/ctrl+ & cmd/ctrl-) ([91a0f59](https://github.com/meetfranz/franz/commit/91a0f59))
+- **Service:** Fix shortcut for (un)muting notifications & audio ([1df3342](https://github.com/meetfranz/franz/commit/1df3342))
+- **Windows:** Fix copy & paste in service context menus ([e66fcaa](https://github.com/meetfranz/franz/commit/e66fcaa)), closes [#1316](https://github.com/meetfranz/franz/issues/1316)
+- **Windows:** Fix losing window when "Keep Ferdi in background" is enabled ([78a3722](https://github.com/meetfranz/franz/commit/78a3722))
 
 ### General
 
-* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
-* **App:** Update electron to 4.0.8 ([8336d17](https://github.com/meetfranz/franz/commit/8336d17))
-
+- **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+- **App:** Update electron to 4.0.8 ([8336d17](https://github.com/meetfranz/franz/commit/8336d17))
 
 # [5.0.1-beta.1](https://github.com/meetfranz/franz/compare/v5.0.0...v5.0.1-beta.1) (2019-03-18)
 
@@ -977,318 +1088,304 @@ Merge Franz v5.3.1 into Ferdi.
 
 ### Features
 
-* **Spellchecker:** Add automatic spellcheck language detection ([a5e7171](https://github.com/meetfranz/franz/commit/a5e7171))
-* **Windows:** Add option to quit Ferdi from Taskbar ([8808601](https://github.com/meetfranz/franz/commit/8808601))
+- **Spellchecker:** Add automatic spellcheck language detection ([a5e7171](https://github.com/meetfranz/franz/commit/a5e7171))
+- **Windows:** Add option to quit Ferdi from Taskbar ([8808601](https://github.com/meetfranz/franz/commit/8808601))
 
 ### Bug Fixes
 
-* **App:** Various bugfixes and improvements
+- **App:** Various bugfixes and improvements
 
 ### General
 
-* **App:** Updated electron to 4.0.4
-
-
+- **App:** Updated electron to 4.0.4
 
 # [5.0.0-beta.24](https://github.com/meetfranz/franz/compare/v5.0.0-beta.23...v5.0.0-beta.24) (2019-02-03)
 
-
 ### Bug Fixes
 
-* **Service:** Fix unnecessary webview resize / Slack scroll issue ([4b7d3e2](https://github.com/meetfranz/franz/commit/4b7d3e2))
-* **Service:** Improve focus when switching services ([d130f26](https://github.com/meetfranz/franz/commit/d130f26)), closes [#1255](https://github.com/meetfranz/franz/issues/1255)
-* **Service:** Fix dark mode in services ([d529410](https://github.com/meetfranz/franz/commit/d529410))
-
-
+- **Service:** Fix unnecessary webview resize / Slack scroll issue ([4b7d3e2](https://github.com/meetfranz/franz/commit/4b7d3e2))
+- **Service:** Improve focus when switching services ([d130f26](https://github.com/meetfranz/franz/commit/d130f26)), closes [#1255](https://github.com/meetfranz/franz/issues/1255)
+- **Service:** Fix dark mode in services ([d529410](https://github.com/meetfranz/franz/commit/d529410))
 
 # [5.0.0-beta.23](https://github.com/meetfranz/franz/compare/5.0.0-beta.20...5.0.0-beta.23) (2019-02-01)
 
 ### General
 
-* **App:** Updated electron to 4.0.2 / Chromium 69
+- **App:** Updated electron to 4.0.2 / Chromium 69
 
 ### Features
 
-* **Service:** Add error screen for services that failed to load ([a5e7171](https://github.com/meetfranz/franz/commit/a5e7171))
-* **Service:** Add option to change spellchecking language by service ([baf7d60](https://github.com/meetfranz/franz/commit/baf7d60))
+- **Service:** Add error screen for services that failed to load ([a5e7171](https://github.com/meetfranz/franz/commit/a5e7171))
+- **Service:** Add option to change spellchecking language by service ([baf7d60](https://github.com/meetfranz/franz/commit/baf7d60))
 
 ### Bug Fixes
 
-* **App:** Fixed disable notification sounds 🔇
-* **App:** Fix app delay for Premium Supporters ([08c40f0](https://github.com/meetfranz/franz/commit/08c40f0))
-* **i18n:** Fix "greek" spellchecker name ([89c2eeb](https://github.com/meetfranz/franz/commit/89c2eeb))
-* **Spellchecker:** Dictionaries are now part of app instead of dynamic download ([0cdc165](https://github.com/meetfranz/franz/commit/0cdc165))
-
+- **App:** Fixed disable notification sounds 🔇
+- **App:** Fix app delay for Premium Supporters ([08c40f0](https://github.com/meetfranz/franz/commit/08c40f0))
+- **i18n:** Fix "greek" spellchecker name ([89c2eeb](https://github.com/meetfranz/franz/commit/89c2eeb))
+- **Spellchecker:** Dictionaries are now part of app instead of dynamic download ([0cdc165](https://github.com/meetfranz/franz/commit/0cdc165))
 
 <a name="5.0.0-beta.22"></a>
-# [5.0.0-beta.22](https://github.com/meetfranz/franz/compare/5.0.0-beta.20...5.0.0-beta.22) (2018-12-13)
 
+# [5.0.0-beta.22](https://github.com/meetfranz/franz/compare/5.0.0-beta.20...5.0.0-beta.22) (2018-12-13)
 
 ### Bug Fixes
 
-* **Windows:** Package spellchecker dictionaries
-
+- **Windows:** Package spellchecker dictionaries
 
 <a name="5.0.0-beta.21"></a>
+
 # [5.0.0-beta.21](https://github.com/meetfranz/franz/compare/5.0.0-beta.20...5.0.0-beta.21) (2018-12-11)
 
 ### General
 
-* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+- **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
 
 ### Features
 
-* **Service:** Add option to change spellchecking language by service ([baf7d60](https://github.com/meetfranz/franz/commit/baf7d60))
-* **Context Menu:** Quickly change the spellchecker language for the active service
-* **Service:** Add error screen for services that failed to load ([a5e7171](https://github.com/meetfranz/franz/commit/a5e7171))
-* **Service:** Add port option for proxy configuration ([baf7d60](https://github.com/meetfranz/franz/commit/baf7d60))
-
+- **Service:** Add option to change spellchecking language by service ([baf7d60](https://github.com/meetfranz/franz/commit/baf7d60))
+- **Context Menu:** Quickly change the spellchecker language for the active service
+- **Service:** Add error screen for services that failed to load ([a5e7171](https://github.com/meetfranz/franz/commit/a5e7171))
+- **Service:** Add port option for proxy configuration ([baf7d60](https://github.com/meetfranz/franz/commit/baf7d60))
 
 ### Bug Fixes
 
-* **Spellchecker:** Fix issue with dictionary download ([0cdc165](https://github.com/meetfranz/franz/commit/0cdc165))
+- **Spellchecker:** Fix issue with dictionary download ([0cdc165](https://github.com/meetfranz/franz/commit/0cdc165))
 
 ### Improvements
 
-* **Dark Mode:** Dark Mode polishing
-* **App:** Updated a ton of dependencies
-
+- **Dark Mode:** Dark Mode polishing
+- **App:** Updated a ton of dependencies
 
 <a name="5.0.0-beta.20"></a>
-# [5.0.0-beta.20](https://github.com/meetfranz/franz/compare/v5.0.0-beta.19...v5.0.0-beta.20) (2018-12-05)
 
+# [5.0.0-beta.20](https://github.com/meetfranz/franz/compare/v5.0.0-beta.19...v5.0.0-beta.20) (2018-12-05)
 
 ### Features
 
-* **Windows:** Add taskbar action to reset Ferdi window ([08fa75a](https://github.com/meetfranz/franz/commit/08fa75a))
-* **Context Menu:** Add "Go Back" and "Go Forward" ([5c18595](https://github.com/meetfranz/franz/commit/5c18595))
-* **Context Menu:** Add Lookup, Search Google for ([5d5aa0c](https://github.com/meetfranz/franz/commit/5d5aa0c))
-* **App:** Add `--devtools` command line arg to automatically open Dev Tools ([84fc3a0](https://github.com/meetfranz/franz/commit/84fc3a0))
+- **Windows:** Add taskbar action to reset Ferdi window ([08fa75a](https://github.com/meetfranz/franz/commit/08fa75a))
+- **Context Menu:** Add "Go Back" and "Go Forward" ([5c18595](https://github.com/meetfranz/franz/commit/5c18595))
+- **Context Menu:** Add Lookup, Search Google for ([5d5aa0c](https://github.com/meetfranz/franz/commit/5d5aa0c))
+- **App:** Add `--devtools` command line arg to automatically open Dev Tools ([84fc3a0](https://github.com/meetfranz/franz/commit/84fc3a0))
 
 ### Bug Fixes
 
-* **App:** Use system proxy for services ([8ddae4a](https://github.com/meetfranz/franz/commit/8ddae4a))
-* **App:** Fix service request url ([7751c17](https://github.com/meetfranz/franz/commit/7751c17))
-* **App:** Do not install App updates without user confirmation ([72fcaef](https://github.com/meetfranz/franz/commit/72fcaef))
-* **Windows:** Fix quit app, really! ([ca1d618](https://github.com/meetfranz/franz/commit/ca1d618))
-* **Context Menu:** Fix empty context menu item ([18040d4](https://github.com/meetfranz/franz/commit/18040d4))
-
+- **App:** Use system proxy for services ([8ddae4a](https://github.com/meetfranz/franz/commit/8ddae4a))
+- **App:** Fix service request url ([7751c17](https://github.com/meetfranz/franz/commit/7751c17))
+- **App:** Do not install App updates without user confirmation ([72fcaef](https://github.com/meetfranz/franz/commit/72fcaef))
+- **Windows:** Fix quit app, really! ([ca1d618](https://github.com/meetfranz/franz/commit/ca1d618))
+- **Context Menu:** Fix empty context menu item ([18040d4](https://github.com/meetfranz/franz/commit/18040d4))
 
 <a name="5.0.0-beta.19"></a>
+
 # [5.0.0-beta.19](https://github.com/meetfranz/franz/compare/v5.0.0-beta.18...v5.0.0-beta.19) (2018-12-02)
 
 ### General
 
-* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+- **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
 
 ### Features
 
-* **App:** 👉 Dark Mode 👈 ([fd7954f](https://github.com/meetfranz/franz/commit/fd7954f)) 🙌 [@guillecura](https://github.com/guillecura)
-* **App:** Add proxy support for services ([6297274](https://github.com/meetfranz/franz/commit/6297274))
-* **App:** New spell checker ([3d87c0e](https://github.com/meetfranz/franz/commit/3d87c0e))
-* **App:** New context menu ([3d87c0e](https://github.com/meetfranz/franz/commit/3d87c0e))
-* **App:** Lay groundwork for general themeing support ([4ea044a](https://github.com/meetfranz/franz/commit/4ea044a))
-* **App:** Add option to enable dark mode for supported services ([fd7954f](https://github.com/meetfranz/franz/commit/fd7954f))
+- **App:** 👉 Dark Mode 👈 ([fd7954f](https://github.com/meetfranz/franz/commit/fd7954f)) 🙌 [@guillecura](https://github.com/guillecura)
+- **App:** Add proxy support for services ([6297274](https://github.com/meetfranz/franz/commit/6297274))
+- **App:** New spell checker ([3d87c0e](https://github.com/meetfranz/franz/commit/3d87c0e))
+- **App:** New context menu ([3d87c0e](https://github.com/meetfranz/franz/commit/3d87c0e))
+- **App:** Lay groundwork for general themeing support ([4ea044a](https://github.com/meetfranz/franz/commit/4ea044a))
+- **App:** Add option to enable dark mode for supported services ([fd7954f](https://github.com/meetfranz/franz/commit/fd7954f))
 
 ### Bug Fixes
 
-* **App:** App menu was not initialized on app launch. Resolving copy & paste issues for login. ([72d4164](https://github.com/meetfranz/franz/commit/72d4164))
-* **General:** Convert many links from http to https ([#967](https://github.com/meetfranz/franz/issues/967)) 🙌 [@Stanzilla](https://github.com/Stanzilla) ([04a23b7](https://github.com/meetfranz/franz/commit/04a23b7))
-* **Menu:** Fix File -> Quit menu entry ([#888](https://github.com/meetfranz/franz/issues/888)) 🙌 [@dabalroman](https://github.com/dabalroman) ([4115b27](https://github.com/meetfranz/franz/commit/4115b27))
-* **Windows:** Fix impossible Ctrl+10 Shortcut ([0db7c12](https://github.com/meetfranz/franz/commit/0db7c12))
-* **Windows:** Remove minimize setting check on close event ([#1038](https://github.com/meetfranz/franz/issues/1038)) 🙌 [@imaginarny](https://github.com/imaginarny) ([af9d356](https://github.com/meetfranz/franz/commit/af9d356))
-
+- **App:** App menu was not initialized on app launch. Resolving copy & paste issues for login. ([72d4164](https://github.com/meetfranz/franz/commit/72d4164))
+- **General:** Convert many links from http to https ([#967](https://github.com/meetfranz/franz/issues/967)) 🙌 [@Stanzilla](https://github.com/Stanzilla) ([04a23b7](https://github.com/meetfranz/franz/commit/04a23b7))
+- **Menu:** Fix File -> Quit menu entry ([#888](https://github.com/meetfranz/franz/issues/888)) 🙌 [@dabalroman](https://github.com/dabalroman) ([4115b27](https://github.com/meetfranz/franz/commit/4115b27))
+- **Windows:** Fix impossible Ctrl+10 Shortcut ([0db7c12](https://github.com/meetfranz/franz/commit/0db7c12))
+- **Windows:** Remove minimize setting check on close event ([#1038](https://github.com/meetfranz/franz/issues/1038)) 🙌 [@imaginarny](https://github.com/imaginarny) ([af9d356](https://github.com/meetfranz/franz/commit/af9d356))
 
 <a name="5.0.0-beta.18"></a>
+
 # [5.0.0-beta.18](https://github.com/meetfranz/franz/compare/v5.0.0-beta.16...v5.0.0-beta.18) (2018-04-03)
 
 ### General
-* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+
+- **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
 
 ### Features
 
-* **App:** Add option to enable/disable hardware acceleration ([f720d30](https://github.com/meetfranz/franz/commit/f720d30))
+- **App:** Add option to enable/disable hardware acceleration ([f720d30](https://github.com/meetfranz/franz/commit/f720d30))
 
 ### Bug Fixes
 
-* **Windows:** Fix shortcuts for closing, minimizing, quitting and toggling fullscreen ([f720d30](https://github.com/meetfranz/franz/commit/f720d30))
-* **Windows:** Hide title bar when in fullscreen ([655a6ed](https://github.com/meetfranz/franz/commit/655a6ed))
-
+- **Windows:** Fix shortcuts for closing, minimizing, quitting and toggling fullscreen ([f720d30](https://github.com/meetfranz/franz/commit/f720d30))
+- **Windows:** Hide title bar when in fullscreen ([655a6ed](https://github.com/meetfranz/franz/commit/655a6ed))
 
 <a name="5.0.0-beta.17"></a>
+
 # [5.0.0-beta.17](https://github.com/meetfranz/franz/compare/v5.0.0-beta.16...v5.0.0-beta.17) (2018-03-20)
 
 ### General
 
-* **App:** Various performance improvements
-* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
-
+- **App:** Various performance improvements
+- **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
 
 ### Features
 
-* **Windows:** Replace window frame with custom menu bar ([9af5fd0](https://github.com/meetfranz/franz/commit/9af5fd0))
-* **Electron:** Update electron to 1.8.4 ([b9c6616](https://github.com/meetfranz/franz/commit/b9c6616))
-* **Mac:** Add dock bounce when new update is available ([47885bb](https://github.com/meetfranz/franz/commit/47885bb))
-* **Services:** Improve performance when reordering services ([82e832c](https://github.com/meetfranz/franz/commit/82e832c))
-* **Translations:** Add option to translate error messages and system menus ([82e832c](https://github.com/meetfranz/franz/commit/82e832c))
+- **Windows:** Replace window frame with custom menu bar ([9af5fd0](https://github.com/meetfranz/franz/commit/9af5fd0))
+- **Electron:** Update electron to 1.8.4 ([b9c6616](https://github.com/meetfranz/franz/commit/b9c6616))
+- **Mac:** Add dock bounce when new update is available ([47885bb](https://github.com/meetfranz/franz/commit/47885bb))
+- **Services:** Improve performance when reordering services ([82e832c](https://github.com/meetfranz/franz/commit/82e832c))
+- **Translations:** Add option to translate error messages and system menus ([82e832c](https://github.com/meetfranz/franz/commit/82e832c))
 
 ### Bug Fixes
 
-* **App:** Fix app reload when coming back from sleep ([dd9f447](https://github.com/meetfranz/franz/commit/dd9f447))
-* **App:** Fix issue with app not showing services when recipe has invalid version (e.g. mailbox.org) ([dd9f447](https://github.com/meetfranz/franz/commit/dd9f447))
-* **Linux:** Fix missing/flickering ubuntu tray icon ([592f00a](https://github.com/meetfranz/franz/commit/592f00a))
-* **Service Tabs:** Remove "delete service" context menu when not in development mode ([3a5c3f0](https://github.com/meetfranz/franz/commit/3a5c3f0))
-* **Windows:** Improve app window handling ([dd9f447](https://github.com/meetfranz/franz/commit/dd9f447))
-
+- **App:** Fix app reload when coming back from sleep ([dd9f447](https://github.com/meetfranz/franz/commit/dd9f447))
+- **App:** Fix issue with app not showing services when recipe has invalid version (e.g. mailbox.org) ([dd9f447](https://github.com/meetfranz/franz/commit/dd9f447))
+- **Linux:** Fix missing/flickering ubuntu tray icon ([592f00a](https://github.com/meetfranz/franz/commit/592f00a))
+- **Service Tabs:** Remove "delete service" context menu when not in development mode ([3a5c3f0](https://github.com/meetfranz/franz/commit/3a5c3f0))
+- **Windows:** Improve app window handling ([dd9f447](https://github.com/meetfranz/franz/commit/dd9f447))
 
 <a name="5.0.0-beta.16"></a>
+
 # [5.0.0-beta.16](https://github.com/meetfranz/franz/compare/v5.0.0-beta.15...v5.0.0-beta.16) (2018-02-23)
 
 ### General
-* **App:** Update Electron version to 1.7.12 (fixes critical security vulnerability CVE-2018–1000006 ) ([c67d7d1](https://github.com/meetfranz/franz/commit/c67d7d1))
-* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](https://i18n.meetfranz.com/)**
 
-### Features
-* **App:** Invite Friends in Settings ([ab33c44](https://github.com/meetfranz/franz/commit/ab33c44))
+- **App:** Update Electron version to 1.7.12 (fixes critical security vulnerability CVE-2018–1000006 ) ([c67d7d1](https://github.com/meetfranz/franz/commit/c67d7d1))
+- **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](https://i18n.meetfranz.com/)**
 
-### Bug Fixes
+### Features
 
-* **App:** Fix memory leak in recipe polling loop ([c99848f](https://github.com/meetfranz/franz/commit/c99848f))
-* **App:** Fix validation for side-by-side teamId & customURL ([bd51150](https://github.com/meetfranz/franz/commit/bd51150))
-* **App:** Reload Ferdi instead of all services one by one on sleep resume ([4e5f7af](https://github.com/meetfranz/franz/commit/4e5f7af))
-* **App:** Fix toggle buttons shown during import ([1220e2c](https://github.com/meetfranz/franz/commit/1220e2c))
-fix(App): Bugfix Fix memory leak in recipe polling loop
-* **App:** Fix invite screen [object Object] values ([81c4e99](https://github.com/meetfranz/franz/commit/81c4e99))
-* **App:** Fix Franz-wide form validation ([7618f51](https://github.com/meetfranz/franz/commit/7618f51))
-* **App:** Fix service tooltips not initialized properly ([8765b8f](https://github.com/meetfranz/franz/commit/8765b8f))
-* **Linux:** Invert tray icon color & add border for bright UI's ([0de9c60](https://github.com/meetfranz/franz/commit/0de9c60))
+- **App:** Invite Friends in Settings ([ab33c44](https://github.com/meetfranz/franz/commit/ab33c44))
 
+### Bug Fixes
 
+- **App:** Fix memory leak in recipe polling loop ([c99848f](https://github.com/meetfranz/franz/commit/c99848f))
+- **App:** Fix validation for side-by-side teamId & customURL ([bd51150](https://github.com/meetfranz/franz/commit/bd51150))
+- **App:** Reload Ferdi instead of all services one by one on sleep resume ([4e5f7af](https://github.com/meetfranz/franz/commit/4e5f7af))
+- **App:** Fix toggle buttons shown during import ([1220e2c](https://github.com/meetfranz/franz/commit/1220e2c))
+  fix(App): Bugfix Fix memory leak in recipe polling loop
+- **App:** Fix invite screen [object Object] values ([81c4e99](https://github.com/meetfranz/franz/commit/81c4e99))
+- **App:** Fix Franz-wide form validation ([7618f51](https://github.com/meetfranz/franz/commit/7618f51))
+- **App:** Fix service tooltips not initialized properly ([8765b8f](https://github.com/meetfranz/franz/commit/8765b8f))
+- **Linux:** Invert tray icon color & add border for bright UI's ([0de9c60](https://github.com/meetfranz/franz/commit/0de9c60))
 
 <a name="5.0.0-beta.15"></a>
+
 # [5.0.0-beta.15](https://github.com/meetfranz/franz/compare/v5.0.0-beta.14...v5.0.0-beta.15) (2018-01-10)
 
 ### General
 
-* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+- **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
 
 ### Features
 
-* **App:** Add option to clear app cache ([@dannyqiu](https://github.com/dannyqiu)) ([be801ff](https://github.com/meetfranz/franz/commit/be801ff))
-* **App:** Add option to show/hide notification badges for muted ([893a9f6](https://github.com/meetfranz/franz/commit/893a9f6))
-* **Recipes:** Add semver version validation ([5826dc3](https://github.com/meetfranz/franz/commit/5826dc3))
-* **Recipes:** Add `hasHostedOption` to enable hosted & self hosted services ([03610f2](https://github.com/meetfranz/franz/commit/03610f2))
-* **Services:** Add custom service icon upload ([6b97e42](https://github.com/meetfranz/franz/commit/6b97e42))
-* **Services:** Add option to completely disable message badges ([cea7a5c](https://github.com/meetfranz/franz/commit/cea7a5c))
-* **Services:** Improve handling of external links ([e2d6edf](https://github.com/meetfranz/franz/commit/e2d6edf))
-* **Services:** Improve user experience of service search ([7e784c6](https://github.com/meetfranz/franz/commit/7e784c6))
-* **Account:** Enable a user to delete their own account ([1f3df73](https://github.com/meetfranz/franz/commit/1f3df73))
-
-
+- **App:** Add option to clear app cache ([@dannyqiu](https://github.com/dannyqiu)) ([be801ff](https://github.com/meetfranz/franz/commit/be801ff))
+- **App:** Add option to show/hide notification badges for muted ([893a9f6](https://github.com/meetfranz/franz/commit/893a9f6))
+- **Recipes:** Add semver version validation ([5826dc3](https://github.com/meetfranz/franz/commit/5826dc3))
+- **Recipes:** Add `hasHostedOption` to enable hosted & self hosted services ([03610f2](https://github.com/meetfranz/franz/commit/03610f2))
+- **Services:** Add custom service icon upload ([6b97e42](https://github.com/meetfranz/franz/commit/6b97e42))
+- **Services:** Add option to completely disable message badges ([cea7a5c](https://github.com/meetfranz/franz/commit/cea7a5c))
+- **Services:** Improve handling of external links ([e2d6edf](https://github.com/meetfranz/franz/commit/e2d6edf))
+- **Services:** Improve user experience of service search ([7e784c6](https://github.com/meetfranz/franz/commit/7e784c6))
+- **Account:** Enable a user to delete their own account ([1f3df73](https://github.com/meetfranz/franz/commit/1f3df73))
 
 ### Bug Fixes
 
-* **App:** Allow to turn on notifications when system dnd is enabled ([3045b47](https://github.com/meetfranz/franz/commit/3045b47))
-* **App:** App mute now disables notifications as well ([0fa1caf](https://github.com/meetfranz/franz/commit/0fa1caf))
-* **App:** Fix service reload after waking machine up ([531531e](https://github.com/meetfranz/franz/commit/531531e))
-* **App:** Fix "add services manually" message ([ac417dc](https://github.com/meetfranz/franz/commit/ac417dc))
-* **i18n:** Fallback to system language or english ([9733eaf](https://github.com/meetfranz/franz/commit/9733eaf))
-* **Notification:** Remove notification sound when app is muted ([53fde0c](https://github.com/meetfranz/franz/commit/53fde0c))
-* **Recipes:** Enable `urlInputPrefix` for team and customURL ([873957d](https://github.com/meetfranz/franz/commit/873957d))
-* **Services:** Ctrl/Cmd+R now navigates back to the service root ([7293492](https://github.com/meetfranz/franz/commit/7293492))
-* **Services:** Fix transparent service background ([ed0098f](https://github.com/meetfranz/franz/commit/ed0098f))
-* **Shortcuts:** Fixed settings shortcut inconsistency ([ca74846](https://github.com/meetfranz/franz/commit/ca74846))
-* **Spell checker:** Fixed issues with spell checker ([965fdf2](https://github.com/meetfranz/franz/commit/965fdf2))
-* **Translations:** Re-add Spanish to available languages. ([ad936f2](https://github.com/meetfranz/franz/commit/ad936f2))
-* **Windows:** Open window when clicking on toast notification ([b82bbc8](https://github.com/meetfranz/franz/commit/b82bbc8))
-
+- **App:** Allow to turn on notifications when system dnd is enabled ([3045b47](https://github.com/meetfranz/franz/commit/3045b47))
+- **App:** App mute now disables notifications as well ([0fa1caf](https://github.com/meetfranz/franz/commit/0fa1caf))
+- **App:** Fix service reload after waking machine up ([531531e](https://github.com/meetfranz/franz/commit/531531e))
+- **App:** Fix "add services manually" message ([ac417dc](https://github.com/meetfranz/franz/commit/ac417dc))
+- **i18n:** Fallback to system language or english ([9733eaf](https://github.com/meetfranz/franz/commit/9733eaf))
+- **Notification:** Remove notification sound when app is muted ([53fde0c](https://github.com/meetfranz/franz/commit/53fde0c))
+- **Recipes:** Enable `urlInputPrefix` for team and customURL ([873957d](https://github.com/meetfranz/franz/commit/873957d))
+- **Services:** Ctrl/Cmd+R now navigates back to the service root ([7293492](https://github.com/meetfranz/franz/commit/7293492))
+- **Services:** Fix transparent service background ([ed0098f](https://github.com/meetfranz/franz/commit/ed0098f))
+- **Shortcuts:** Fixed settings shortcut inconsistency ([ca74846](https://github.com/meetfranz/franz/commit/ca74846))
+- **Spell checker:** Fixed issues with spell checker ([965fdf2](https://github.com/meetfranz/franz/commit/965fdf2))
+- **Translations:** Re-add Spanish to available languages. ([ad936f2](https://github.com/meetfranz/franz/commit/ad936f2))
+- **Windows:** Open window when clicking on toast notification ([b82bbc8](https://github.com/meetfranz/franz/commit/b82bbc8))
 
 <a name="5.0.0-beta.14"></a>
-# [5.0.0-beta.14](https://github.com/meetfranz/franz/compare/v5.0.0-beta.13...v5.0.0-beta.14) (2017-11-23)
 
+# [5.0.0-beta.14](https://github.com/meetfranz/franz/compare/v5.0.0-beta.13...v5.0.0-beta.14) (2017-11-23)
 
 ### Features
 
-* **App:** Add link to changelog in app update notification ([2cbd938](https://github.com/meetfranz/franz/commit/2cbd938))
-* **App:** Add option to enable/disable spell checker ([dcab45a](https://github.com/meetfranz/franz/commit/dcab45a))
-* **App:** Add option to mute all services in sidebar ([f5a9aa2](https://github.com/meetfranz/franz/commit/f5a9aa2))
-* **App:** Decrease minimum window size to 600px width ([2521621](https://github.com/meetfranz/franz/commit/2521621))
-* **App:** Respect System DoNotDisturb mode for service audio ([7d41227](https://github.com/meetfranz/franz/commit/7d41227))
-* **Service:** Add option to display disabled services in tabs ([1839eff](https://github.com/meetfranz/franz/commit/1839eff))
-* **Service:** Add option to mute service ([b405ba1](https://github.com/meetfranz/franz/commit/b405ba1))
-* **Service:** Add dialog to reload crashed services ([259d40c](https://github.com/meetfranz/franz/commit/259d40c)) ([dannyqiu](https://github.com/dannyqiu))
-* **Translations:** Added new translations and improved existing ones. **[A million thanks to the amazing community.](https://i18n.meetfranz.com/)**
-
+- **App:** Add link to changelog in app update notification ([2cbd938](https://github.com/meetfranz/franz/commit/2cbd938))
+- **App:** Add option to enable/disable spell checker ([dcab45a](https://github.com/meetfranz/franz/commit/dcab45a))
+- **App:** Add option to mute all services in sidebar ([f5a9aa2](https://github.com/meetfranz/franz/commit/f5a9aa2))
+- **App:** Decrease minimum window size to 600px width ([2521621](https://github.com/meetfranz/franz/commit/2521621))
+- **App:** Respect System DoNotDisturb mode for service audio ([7d41227](https://github.com/meetfranz/franz/commit/7d41227))
+- **Service:** Add option to display disabled services in tabs ([1839eff](https://github.com/meetfranz/franz/commit/1839eff))
+- **Service:** Add option to mute service ([b405ba1](https://github.com/meetfranz/franz/commit/b405ba1))
+- **Service:** Add dialog to reload crashed services ([259d40c](https://github.com/meetfranz/franz/commit/259d40c)) ([dannyqiu](https://github.com/dannyqiu))
+- **Translations:** Added new translations and improved existing ones. **[A million thanks to the amazing community.](https://i18n.meetfranz.com/)**
 
 ### Bug Fixes
 
-* **Windows:** Fix notifications on Windows 10 (Fall Creators Update) ([eea4801](https://github.com/meetfranz/franz/commit/eea4801))
-* **macOS:** Fix TouchBar related crash on macOS 10.12.1 and lower ([9e9a2ed](https://github.com/meetfranz/franz/commit/9e9a2ed))
-* **App:** Add fallback to service menu when service name is empty ([42ed24d](https://github.com/meetfranz/franz/commit/42ed24d))
-* **App:** Prevent app from redirecting when dropping link ([811a527](https://github.com/meetfranz/franz/commit/811a527)) ([dannyqiu](https://github.com/dannyqiu))
-* **Support with CPU:** Reduce maximum CPU usage ([64ad918](https://github.com/meetfranz/franz/commit/64ad918))
-* **Hosted Services:** Do not strip www from custom service Url  ([a764321](https://github.com/meetfranz/franz/commit/a764321)) ([BeneStem](https://github.com/BeneStem))
-* **Services:** Fix onNotify in service API ([b15421b](https://github.com/meetfranz/franz/commit/b15421b)) ([dannyqiu](https://github.com/dannyqiu))
-* **Sidebar:** Fix tabs reordering ([86413ba](https://github.com/meetfranz/franz/commit/86413ba)) ([josescgar](https://github.com/josescgar))
-
-
+- **Windows:** Fix notifications on Windows 10 (Fall Creators Update) ([eea4801](https://github.com/meetfranz/franz/commit/eea4801))
+- **macOS:** Fix TouchBar related crash on macOS 10.12.1 and lower ([9e9a2ed](https://github.com/meetfranz/franz/commit/9e9a2ed))
+- **App:** Add fallback to service menu when service name is empty ([42ed24d](https://github.com/meetfranz/franz/commit/42ed24d))
+- **App:** Prevent app from redirecting when dropping link ([811a527](https://github.com/meetfranz/franz/commit/811a527)) ([dannyqiu](https://github.com/dannyqiu))
+- **Support with CPU:** Reduce maximum CPU usage ([64ad918](https://github.com/meetfranz/franz/commit/64ad918))
+- **Hosted Services:** Do not strip www from custom service Url ([a764321](https://github.com/meetfranz/franz/commit/a764321)) ([BeneStem](https://github.com/BeneStem))
+- **Services:** Fix onNotify in service API ([b15421b](https://github.com/meetfranz/franz/commit/b15421b)) ([dannyqiu](https://github.com/dannyqiu))
+- **Sidebar:** Fix tabs reordering ([86413ba](https://github.com/meetfranz/franz/commit/86413ba)) ([josescgar](https://github.com/josescgar))
 
 <a name="5.0.0-beta.13"></a>
+
 # [5.0.0-beta.13](https://github.com/meetfranz/franz/compare/v5.0.0-beta.12...v5.0.0-beta.13) (2017-11-06)
 
 ### Bug Fixes
 
-* **Windows:** Fix issue with multiple close handlers that prevent the app from quitting  ([eea593e](https://github.com/meetfranz/franz/commit/eea593e))
-
+- **Windows:** Fix issue with multiple close handlers that prevent the app from quitting ([eea593e](https://github.com/meetfranz/franz/commit/eea593e))
 
 <a name="5.0.0-beta.12"></a>
+
 # [5.0.0-beta.12](https://github.com/meetfranz/franz/compare/v5.0.0-beta.11...v5.0.0-beta.12) (2017-11-05)
 
 ### Features
 
-* **Menu:** Add "About Ferdi" Menu item to Windows/Linux ([a21b770](https://github.com/meetfranz/franz/commit/a21b770))
-* **Menu:** Add menu item to toggle (service) dev tools ([e8da383](https://github.com/meetfranz/franz/commit/e8da383))
-* **Translation:** Add italian translation ([ab348cc](https://github.com/meetfranz/franz/commit/ab348cc)) ([dnlup](https://github.com/dnlup))
-
+- **Menu:** Add "About Ferdi" Menu item to Windows/Linux ([a21b770](https://github.com/meetfranz/franz/commit/a21b770))
+- **Menu:** Add menu item to toggle (service) dev tools ([e8da383](https://github.com/meetfranz/franz/commit/e8da383))
+- **Translation:** Add italian translation ([ab348cc](https://github.com/meetfranz/franz/commit/ab348cc)) ([dnlup](https://github.com/dnlup))
 
 ### Bug Fixes
 
-* **App:** Add checks to service url validation to prevent app freeze  ([db8515f](https://github.com/meetfranz/franz/commit/db8515f))
-* **macOS:** Fix disable launch Ferdi on start ([34bba09](https://github.com/meetfranz/franz/commit/34bba09))
-* **Windows:** Launch Ferdi on start when selected ([34bba09](https://github.com/meetfranz/franz/commit/34bba09))
-* **Onboarding:** Fix issue with import of on-premise services ([7c7d27d](https://github.com/meetfranz/franz/commit/7c7d27d))
-* **Shortcuts:** Flip shortcut to navigate to next/previous service ([37d5923](https://github.com/meetfranz/franz/commit/37d5923))
-* **Windows:** Open Window when app is pinned to taskbar and minimized to system tray ([777814a](https://github.com/meetfranz/franz/commit/777814a))
-* **Recipes:** Recipe developers don't need Premium Supporter Account for debugging ([7a9947a](https://github.com/meetfranz/franz/commit/7a9947a))
-
-
+- **App:** Add checks to service url validation to prevent app freeze ([db8515f](https://github.com/meetfranz/franz/commit/db8515f))
+- **macOS:** Fix disable launch Ferdi on start ([34bba09](https://github.com/meetfranz/franz/commit/34bba09))
+- **Windows:** Launch Ferdi on start when selected ([34bba09](https://github.com/meetfranz/franz/commit/34bba09))
+- **Onboarding:** Fix issue with import of on-premise services ([7c7d27d](https://github.com/meetfranz/franz/commit/7c7d27d))
+- **Shortcuts:** Flip shortcut to navigate to next/previous service ([37d5923](https://github.com/meetfranz/franz/commit/37d5923))
+- **Windows:** Open Window when app is pinned to taskbar and minimized to system tray ([777814a](https://github.com/meetfranz/franz/commit/777814a))
+- **Recipes:** Recipe developers don't need Premium Supporter Account for debugging ([7a9947a](https://github.com/meetfranz/franz/commit/7a9947a))
 
 <a name="5.0.0-beta.11"></a>
+
 # [5.0.0-beta.11](https://github.com/meetfranz/franz/compare/v5.0.0-beta.10...v5.0.0-beta.11) (2017-10-24)
 
 ### Features
 
-* **Settings:** Add option to disable system tray icon ([c62f3fc](https://github.com/meetfranz/franz/commit/c62f3fc))
-* **Service:** Display URL of hyperlinks ([a0cec4d](https://github.com/meetfranz/franz/commit/a0cec4d)) ([GustavoKatel](https://github.com/GustavoKatel))
-* **App:** Add tab cycling with ctrl[+shift]+tab or ctrl+[pageup|pagedown] ([e58f558](https://github.com/meetfranz/franz/commit/
-e58f558)) ([GustavoKatel](https://github.com/GustavoKatel))
-* **Translation:** Add Brazilian Portuguese ([phmigotto](https://github.com/phmigotto))
-* **Translation:** Add Dutch ([cpeetersburg](https://github.com/cpeetersburg), [Blizzke](https://github.com/Blizzke))
-* **Translation:** Add Flemish ([Blizzke](https://github.com/Blizzke), [mroeling](https://github.com/mroeling))
-* **Translation:** Add German ([rherwig](https://github.com/rherwig), [berndstelzl](https://github.com/berndstelzl))
-* **Translation:** Add Greek ([apo-mak](https://github.com/apo-mak))
-* **Translation:** Add French ([Shadorc](https://github.com/Shadorc), [ShiiFu](https://github.com/ShiiFu))
-* **Translation:** Add Japanese ([koma-private](https://github.com/koma-private))
-* **Translation:** Add Polish ([grzeswol](https://github.com/grzeswol))
-* **Translation:** Add Russian ([vaseker](https://github.com/vaseker))
-* **Translation:** Add Ukrainian ([Kietzmann](https://github.com/Kietzmann))
+- **Settings:** Add option to disable system tray icon ([c62f3fc](https://github.com/meetfranz/franz/commit/c62f3fc))
+- **Service:** Display URL of hyperlinks ([a0cec4d](https://github.com/meetfranz/franz/commit/a0cec4d)) ([GustavoKatel](https://github.com/GustavoKatel))
+- **App:** Add tab cycling with ctrl[+shift]+tab or ctrl+[pageup|pagedown] ([e58f558](https://github.com/meetfranz/franz/commit/
+  e58f558)) ([GustavoKatel](https://github.com/GustavoKatel))
+- **Translation:** Add Brazilian Portuguese ([phmigotto](https://github.com/phmigotto))
+- **Translation:** Add Dutch ([cpeetersburg](https://github.com/cpeetersburg), [Blizzke](https://github.com/Blizzke))
+- **Translation:** Add Flemish ([Blizzke](https://github.com/Blizzke), [mroeling](https://github.com/mroeling))
+- **Translation:** Add German ([rherwig](https://github.com/rherwig), [berndstelzl](https://github.com/berndstelzl))
+- **Translation:** Add Greek ([apo-mak](https://github.com/apo-mak))
+- **Translation:** Add French ([Shadorc](https://github.com/Shadorc), [ShiiFu](https://github.com/ShiiFu))
+- **Translation:** Add Japanese ([koma-private](https://github.com/koma-private))
+- **Translation:** Add Polish ([grzeswol](https://github.com/grzeswol))
+- **Translation:** Add Russian ([vaseker](https://github.com/vaseker))
+- **Translation:** Add Ukrainian ([Kietzmann](https://github.com/Kietzmann))
 
 ### Bug Fixes
 
-* **App:** Force Ferdi to use single window ([2ae409e](https://github.com/meetfranz/franz/commit/2ae409e))
-* **Onboarding:** Fix enable/disable service import toggle ([23174f9](https://github.com/meetfranz/franz/commit/23174f9))
-* **Onboarding:** Fix service import ([99d1c01](https://github.com/meetfranz/franz/commit/99d1c01))
-* **Payment:** Fix payment window when name contains special character ([a854614](https://github.com/meetfranz/franz/commit/a854614))
-* **macOS:** Add macOS dark theme system tray icon ([55805f1](https://github.com/meetfranz/franz/commit/55805f1))
-* **Windows:** Fix enable/disable autostart on login ([eca7f3b](https://github.com/meetfranz/franz/commit/eca7f3b))
-* **Windows:** Fix multiple system tray icons when opening/closing Ferdi ([5b9b0c7](https://github.com/meetfranz/franz/commit/5b9b0c7))
+- **App:** Force Ferdi to use single window ([2ae409e](https://github.com/meetfranz/franz/commit/2ae409e))
+- **Onboarding:** Fix enable/disable service import toggle ([23174f9](https://github.com/meetfranz/franz/commit/23174f9))
+- **Onboarding:** Fix service import ([99d1c01](https://github.com/meetfranz/franz/commit/99d1c01))
+- **Payment:** Fix payment window when name contains special character ([a854614](https://github.com/meetfranz/franz/commit/a854614))
+- **macOS:** Add macOS dark theme system tray icon ([55805f1](https://github.com/meetfranz/franz/commit/55805f1))
+- **Windows:** Fix enable/disable autostart on login ([eca7f3b](https://github.com/meetfranz/franz/commit/eca7f3b))
+- **Windows:** Fix multiple system tray icons when opening/closing Ferdi ([5b9b0c7](https://github.com/meetfranz/franz/commit/5b9b0c7))
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b79432d43..5c49a977c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,6 +33,10 @@
       - [Javascript Coding style-checker](#javascript-coding-style-checker)
   - [Packaging](#packaging)
   - [Release](#release)
+  - [Update](#update)
+    - [Update the code](#update-the-code)
+    - [Update Node.js and npm](#update-nodejs-and-npm)
+    - [Update dependences](#update-dependences)
 
 <!-- /TOC -->
 
@@ -60,11 +64,13 @@ Currently, these are the combinations of system dependencies that work for MacOS
 
 ```bash
 node -v
-v14.17.5
+v14.17.6
 npm -v
 6.14.13
 ```
 
+_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).
+
 #### Git
 
 The version [2.23.0](https://github.com/git-for-windows/git/releases/tag/v2.23.0.windows.1) for Git is working fine for development. You can then use the console from Git to do the development procedure.
@@ -132,12 +138,12 @@ Run the following command to install all dependencies, and link sibling modules
 npx lerna bootstrap
 ```
 
-If you previously ran `npm install`, it sometimes is necessary to delete your `node_modules` folder before running `npx lerna bootstrap`. If you encounter the `gyp: No Xcode or CLT version` error on macOS at this step, please have a look [here](https://medium.com/flawless-app-stories/gyp-no-xcode-or-clt-version-detected-macos-catalina-anansewaa-38b536389e8d).
+If you previously ran `npm install`, it is sometimes necessary to delete your `node_modules` folder before running `npx lerna bootstrap`. If you encounter the `gyp: No Xcode or CLT version` error on macOS at this step, please have a look [here](https://medium.com/flawless-app-stories/gyp-no-xcode-or-clt-version-detected-macos-catalina-anansewaa-38b536389e8d).
 
 ### Fix native modules to match current electron node version
 
 ```bash
-npm run rebuild
+npm run build
 ```
 
 ### Package recipe repository
@@ -145,7 +151,7 @@ npm run rebuild
 Ferdi requires its recipes to be packaged before it can use it. When running Ferdi as a development instance, you'll need to package the local recipes before you can create any services inside Ferdi.
 
 ```bash
-cd recipes && npm i && npm run package
+cd recipes && pnpm i && pnpm run package
 ```
 
 ### Using Docker to build a linux-targetted packaged app
@@ -235,3 +241,21 @@ 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.
+
+## Update
+
+### Update the code
+
+```bash
+git pull
+```
+
+### Update Node.js and npm
+
+If node.js and/or npm version have changed, don't forget to update them by running the appropriate command of your chosen package manager.
+
+### Update dependences
+
+```bash
+npx lerna bootstrap
+```
diff --git a/Dockerfile b/Dockerfile
index e69babe2b..d3589005b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,6 @@
 # Note: Before running this file, you should have already cloned the git repo + submodules on the host machine. This is used when actively developing on your local machine, but you want to build for a different architecture
 
-FROM node:14.17.5-buster as builder
-
-# TODO: Need to setup a non-root user for security purposes
+FROM docker.io/library/node:14.17.6-buster as builder
 
 ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share"
 
@@ -18,7 +16,8 @@ RUN apt-get update -y \
 
 WORKDIR /usr/src/ferdi
 
-RUN npm i -g node-gyp@8.1.0 \
+RUN npm i -g pnpm@6.14.7 \
+  && npm i -g node-gyp@8.1.0 \
   && npm i -g lerna@4.0.0
 
 COPY . .
@@ -26,18 +25,18 @@ COPY . .
 # Note: Ideally this needs to be done before the COPY step - BUT moving this here resolves the issue with `preval-build-info-cli` not being found
 RUN npx lerna bootstrap
 
-RUN cd recipes \
-  && npm i \
-  && npm run package \
-  && cd ..
+WORKDIR /usr/src/ferdi/recipes
+
+RUN pnpm i \
+  && pnpm run package
+
+WORKDIR /usr/src/ferdi
 
 RUN npm run build
 
 # --------------------------------------------------------------------------------------------
 
-FROM busybox
-
-# TODO: Need to setup a non-root user for security purposes
+FROM docker.io/library/busybox:latest
 
 WORKDIR /ferdi
 
diff --git a/README.md b/README.md
index 1824a0894..d101347d9 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
 <p align="center">
 <img alt="GitHub Releases" src="https://img.shields.io/github/downloads/getferdi/ferdi/latest/total?label=Downloads&logo=iCloud&logoColor=%23FFFFFF">
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href='#contributors-'><img src='https://img.shields.io/badge/contributors-97-default.svg?logo=github' alt='Contributors'/></a>
+<a href='#contributors-'><img src='https://img.shields.io/badge/contributors-99-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>
@@ -386,6 +386,8 @@ Thanks goes to these awesome people:
   </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'><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>
   </tr>
 </table>
 
diff --git a/docs/example-feature/index.js b/docs/example-feature/index.js
deleted file mode 100644
index 0ce068e26..000000000
--- a/docs/example-feature/index.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { reaction, runInAction } from 'mobx';
-import { ExampleFeatureStore } from './store';
-import state, { resetState } from './state';
-import api from './api';
-
-const debug = require('debug')('Ferdi:feature:EXAMPLE_FEATURE');
-
-let store = null;
-
-export default function initAnnouncements(stores, actions) {
-  const { features } = stores;
-
-  // Toggle workspace feature
-  reaction(
-    () => (
-      features.features.isExampleFeatureEnabled
-    ),
-    (isEnabled) => {
-      if (isEnabled) {
-        debug('Initializing `EXAMPLE_FEATURE` feature');
-        store = new ExampleFeatureStore(stores, api, actions, state);
-        store.initialize();
-        runInAction(() => { state.isFeatureActive = true; });
-      } else if (store) {
-        debug('Disabling `EXAMPLE_FEATURE` feature');
-        runInAction(() => { state.isFeatureActive = false; });
-        store.teardown();
-        store = null;
-        resetState(); // Reset state to default
-      }
-    },
-    { fireImmediately: true },
-  );
-}
diff --git a/electron-builder.env b/electron-builder.env
new file mode 100644
index 000000000..b034f3fb7
--- /dev/null
+++ b/electron-builder.env
@@ -0,0 +1 @@
+BUNDLING=true
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index f87958a77..21b2e3d3b 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -149,6 +149,12 @@ export function mvLernaPackages() {
   return gulp.src(['packages/**']).pipe(gulp.dest(`${paths.dest}/packages`));
 }
 
+export function mvPostinstallScript() {
+  return gulp
+    .src(['./scripts/postinstall.js'])
+    .pipe(gulp.dest(`${paths.dest}/scripts`));
+}
+
 export function exportBuildInfo() {
   const buildInfoData = {
     timestamp: buildInfo.timestamp,
@@ -208,12 +214,7 @@ export function styles() {
 
 export function processJavascripts() {
   return gulp
-    .src(
-      [
-        paths.javascripts.src,
-      ],
-      { since: gulp.lastRun(processJavascripts) },
-    )
+    .src([paths.javascripts.src], { since: gulp.lastRun(processJavascripts) })
     .pipe(
       babel({
         comments: false,
@@ -226,15 +227,9 @@ export function processJavascripts() {
 
 export function processTypescripts() {
   return gulp
-    .src(
-      [
-        paths.typescripts.src,
-      ],
-      { since: gulp.lastRun(processTypescripts) },
-    )
+    .src([paths.typescripts.src], { since: gulp.lastRun(processTypescripts) })
     .pipe(tsProject())
-    .js
-    .pipe(
+    .js.pipe(
       babel({
         comments: false,
       }),
@@ -275,8 +270,21 @@ export function recipeInfo() {
 
 const build = gulp.series(
   clean,
-  gulp.parallel(mvSrc, mvPackageJson, mvLernaPackages, exportBuildInfo),
-  gulp.parallel(html, processJavascripts, processTypescripts, styles, recipes, recipeInfo),
+  gulp.parallel(
+    mvSrc,
+    mvPackageJson,
+    mvLernaPackages,
+    mvPostinstallScript,
+    exportBuildInfo,
+  ),
+  gulp.parallel(
+    html,
+    processJavascripts,
+    processTypescripts,
+    styles,
+    recipes,
+    recipeInfo,
+  ),
 );
 export { build };
 
diff --git a/package-lock.json b/package-lock.json
index 4e7b9fa7d..5151f81df 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ferdi",
-  "version": "5.6.1-beta.3",
+  "version": "5.6.1-nightly.56",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -10,164 +10,6 @@
       "integrity": "sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==",
       "dev": true
     },
-    "@adlk/misty": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@adlk/misty/-/misty-0.2.0.tgz",
-      "integrity": "sha512-ZOXsEtUBVH64z590QKFS3pyI+0OT9cNjhlKIc6ppBGiWHvL+lffhmNYva9j62xylKj8OSHEpHdqZzb3wKbRxUQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.4.1",
-        "chokidar": "^2.0.4",
-        "concurrently": "^4.0.1",
-        "js-yaml": "^3.12.0",
-        "lodash": "^4.17.10",
-        "minimist": "^1.2.0",
-        "wait-on": "^3.0.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"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
-          }
-        },
-        "concurrently": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-4.1.2.tgz",
-          "integrity": "sha512-Kim9SFrNr2jd8/0yNYqDTFALzUX1tvimmwFWxmp/D4mRI+kbqIIwE2RkBDrxS2ic25O1UgQMI5AtBqdtX3ynYg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "date-fns": "^1.30.1",
-            "lodash": "^4.17.15",
-            "read-pkg": "^4.0.1",
-            "rxjs": "^6.5.2",
-            "spawn-command": "^0.0.2-1",
-            "supports-color": "^4.5.0",
-            "tree-kill": "^1.2.1",
-            "yargs": "^12.0.5"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "4.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-              "dev": true,
-              "requires": {
-                "has-flag": "^2.0.0"
-              }
-            }
-          }
-        },
-        "date-fns": {
-          "version": "1.30.1",
-          "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
-          "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "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"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz",
-          "integrity": "sha1-ljYlN48+HE1IyFhytabsfV0JMjc=",
-          "dev": true,
-          "requires": {
-            "normalize-package-data": "^2.3.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0"
-          }
-        },
-        "wait-on": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-3.3.0.tgz",
-          "integrity": "sha512-97dEuUapx4+Y12aknWZn7D25kkjMk16PbWoYzpSdA8bYpVfS6hpl2a2pOWZ3c+Tyt3/i4/pglyZctG3J4V1hWQ==",
-          "dev": true,
-          "requires": {
-            "@hapi/joi": "^15.0.3",
-            "core-js": "^2.6.5",
-            "minimist": "^1.2.0",
-            "request": "^2.88.0",
-            "rx": "^4.1.0"
-          }
-        },
-        "yargs": {
-          "version": "12.0.5",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1 || ^4.0.0",
-            "yargs-parser": "^11.1.1"
-          }
-        },
-        "yargs-parser": {
-          "version": "11.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
-        }
-      }
-    },
     "@adonisjs/ace": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/@adonisjs/ace/-/ace-5.0.8.tgz",
@@ -2646,53 +2488,12 @@
         }
       }
     },
-    "@hapi/address": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
-      "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==",
-      "dev": true
-    },
-    "@hapi/bourne": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz",
-      "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==",
-      "dev": true
-    },
     "@hapi/hoek": {
       "version": "9.2.0",
       "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.0.tgz",
       "integrity": "sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug==",
       "dev": true
     },
-    "@hapi/joi": {
-      "version": "15.1.1",
-      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz",
-      "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==",
-      "dev": true,
-      "requires": {
-        "@hapi/address": "2.x.x",
-        "@hapi/bourne": "1.x.x",
-        "@hapi/hoek": "8.x.x",
-        "@hapi/topo": "3.x.x"
-      },
-      "dependencies": {
-        "@hapi/hoek": {
-          "version": "8.5.1",
-          "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz",
-          "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==",
-          "dev": true
-        },
-        "@hapi/topo": {
-          "version": "3.1.6",
-          "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz",
-          "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==",
-          "dev": true,
-          "requires": {
-            "@hapi/hoek": "^8.3.0"
-          }
-        }
-      }
-    },
     "@hapi/topo": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
@@ -2800,16 +2601,16 @@
       "dev": true
     },
     "@jest/console": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.0.6.tgz",
-      "integrity": "sha512-fMlIBocSHPZ3JxgWiDNW/KPj6s+YRd0hicb33IrmelCcjXo/pXPwvuiKFmZz+XuqI/1u7nbUK10zSsWL/1aegg==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.1.0.tgz",
+      "integrity": "sha512-+Vl+xmLwAXLNlqT61gmHEixeRbS4L8MUzAjtpBCOPWH+izNI/dR16IeXjkXJdRtIVWVSf9DO1gdp67B1XorZhQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.1.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^27.0.6",
-        "jest-util": "^27.0.6",
+        "jest-message-util": "^27.1.0",
+        "jest-util": "^27.1.0",
         "slash": "^3.0.0"
       },
       "dependencies": {
@@ -2871,35 +2672,35 @@
       }
     },
     "@jest/core": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.0.6.tgz",
-      "integrity": "sha512-SsYBm3yhqOn5ZLJCtccaBcvD/ccTLCeuDv8U41WJH/V1MW5eKUkeMHT9U+Pw/v1m1AIWlnIW/eM2XzQr0rEmow==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.1.0.tgz",
+      "integrity": "sha512-3l9qmoknrlCFKfGdrmiQiPne+pUR4ALhKwFTYyOeKw6egfDwJkO21RJ1xf41rN8ZNFLg5W+w6+P4fUqq4EMRWA==",
       "dev": true,
       "requires": {
-        "@jest/console": "^27.0.6",
-        "@jest/reporters": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/console": "^27.1.0",
+        "@jest/reporters": "^27.1.0",
+        "@jest/test-result": "^27.1.0",
+        "@jest/transform": "^27.1.0",
+        "@jest/types": "^27.1.0",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "emittery": "^0.8.1",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^27.0.6",
-        "jest-config": "^27.0.6",
-        "jest-haste-map": "^27.0.6",
-        "jest-message-util": "^27.0.6",
+        "jest-changed-files": "^27.1.0",
+        "jest-config": "^27.1.0",
+        "jest-haste-map": "^27.1.0",
+        "jest-message-util": "^27.1.0",
         "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-resolve-dependencies": "^27.0.6",
-        "jest-runner": "^27.0.6",
-        "jest-runtime": "^27.0.6",
-        "jest-snapshot": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-validate": "^27.0.6",
-        "jest-watcher": "^27.0.6",
+        "jest-resolve": "^27.1.0",
+        "jest-resolve-dependencies": "^27.1.0",
+        "jest-runner": "^27.1.0",
+        "jest-runtime": "^27.1.0",
+        "jest-snapshot": "^27.1.0",
+        "jest-util": "^27.1.0",
+        "jest-validate": "^27.1.0",
+        "jest-watcher": "^27.1.0",
         "micromatch": "^4.0.4",
         "p-each-series": "^2.1.0",
         "rimraf": "^3.0.0",
@@ -3046,53 +2847,53 @@
       }
     },
     "@jest/environment": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.0.6.tgz",
-      "integrity": "sha512-4XywtdhwZwCpPJ/qfAkqExRsERW+UaoSRStSHCCiQTUpoYdLukj+YJbQSFrZjhlUDRZeNiU9SFH0u7iNimdiIg==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.1.0.tgz",
+      "integrity": "sha512-wRp50aAMY2w1U2jP1G32d6FUVBNYqmk8WaGkiIEisU48qyDV0WPtw3IBLnl7orBeggveommAkuijY+RzVnNDOQ==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/fake-timers": "^27.1.0",
+        "@jest/types": "^27.1.0",
         "@types/node": "*",
-        "jest-mock": "^27.0.6"
+        "jest-mock": "^27.1.0"
       }
     },
     "@jest/fake-timers": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.0.6.tgz",
-      "integrity": "sha512-sqd+xTWtZ94l3yWDKnRTdvTeZ+A/V7SSKrxsrOKSqdyddb9CeNRF8fbhAU0D7ZJBpTTW2nbp6MftmKJDZfW2LQ==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.1.0.tgz",
+      "integrity": "sha512-22Zyn8il8DzpS+30jJNVbTlm7vAtnfy1aYvNeOEHloMlGy1PCYLHa4PWlSws0hvNsMM5bON6GISjkLoQUV3oMA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.1.0",
         "@sinonjs/fake-timers": "^7.0.2",
         "@types/node": "*",
-        "jest-message-util": "^27.0.6",
-        "jest-mock": "^27.0.6",
-        "jest-util": "^27.0.6"
+        "jest-message-util": "^27.1.0",
+        "jest-mock": "^27.1.0",
+        "jest-util": "^27.1.0"
       }
     },
     "@jest/globals": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.0.6.tgz",
-      "integrity": "sha512-DdTGCP606rh9bjkdQ7VvChV18iS7q0IMJVP1piwTWyWskol4iqcVwthZmoJEf7obE1nc34OpIyoVGPeqLC+ryw==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.1.0.tgz",
+      "integrity": "sha512-73vLV4aNHAlAgjk0/QcSIzzCZSqVIPbmFROJJv9D3QUR7BI4f517gVdJpSrCHxuRH3VZFhe0yGG/tmttlMll9g==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.0.6",
-        "@jest/types": "^27.0.6",
-        "expect": "^27.0.6"
+        "@jest/environment": "^27.1.0",
+        "@jest/types": "^27.1.0",
+        "expect": "^27.1.0"
       }
     },
     "@jest/reporters": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.0.6.tgz",
-      "integrity": "sha512-TIkBt09Cb2gptji3yJXb3EE+eVltW6BjO7frO7NEfjI9vSIYoISi5R3aI3KpEDXlB1xwB+97NXIqz84qYeYsfA==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.1.0.tgz",
+      "integrity": "sha512-5T/zlPkN2HnK3Sboeg64L5eC8iiaZueLpttdktWTJsvALEtP2YMkC5BQxwjRWQACG9SwDmz+XjjkoxXUDMDgdw==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/console": "^27.1.0",
+        "@jest/test-result": "^27.1.0",
+        "@jest/transform": "^27.1.0",
+        "@jest/types": "^27.1.0",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
@@ -3103,10 +2904,10 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-worker": "^27.0.6",
+        "jest-haste-map": "^27.1.0",
+        "jest-resolve": "^27.1.0",
+        "jest-util": "^27.1.0",
+        "jest-worker": "^27.1.0",
         "slash": "^3.0.0",
         "source-map": "^0.6.0",
         "string-length": "^4.0.1",
@@ -3217,45 +3018,45 @@
       }
     },
     "@jest/test-result": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.0.6.tgz",
-      "integrity": "sha512-ja/pBOMTufjX4JLEauLxE3LQBPaI2YjGFtXexRAjt1I/MbfNlMx0sytSX3tn5hSLzQsR3Qy2rd0hc1BWojtj9w==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.1.0.tgz",
+      "integrity": "sha512-Aoz00gpDL528ODLghat3QSy6UBTD5EmmpjrhZZMK/v1Q2/rRRqTGnFxHuEkrD4z/Py96ZdOHxIWkkCKRpmnE1A==",
       "dev": true,
       "requires": {
-        "@jest/console": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/console": "^27.1.0",
+        "@jest/types": "^27.1.0",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       }
     },
     "@jest/test-sequencer": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.0.6.tgz",
-      "integrity": "sha512-bISzNIApazYOlTHDum9PwW22NOyDa6VI31n6JucpjTVM0jD6JDgqEZ9+yn575nDdPF0+4csYDxNNW13NvFQGZA==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.1.0.tgz",
+      "integrity": "sha512-lnCWawDr6Z1DAAK9l25o3AjmKGgcutq1iIbp+hC10s/HxnB8ZkUsYq1FzjOoxxZ5hW+1+AthBtvS4x9yno3V1A==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^27.0.6",
+        "@jest/test-result": "^27.1.0",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.0.6",
-        "jest-runtime": "^27.0.6"
+        "jest-haste-map": "^27.1.0",
+        "jest-runtime": "^27.1.0"
       }
     },
     "@jest/transform": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.0.6.tgz",
-      "integrity": "sha512-rj5Dw+mtIcntAUnMlW/Vju5mr73u8yg+irnHwzgtgoeI6cCPOvUwQ0D1uQtc/APmWgvRweEb1g05pkUpxH3iCA==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.1.0.tgz",
+      "integrity": "sha512-ZRGCA2ZEVJ00ubrhkTG87kyLbN6n55g1Ilq0X9nJb5bX3MhMp3O6M7KG+LvYu+nZRqG5cXsQnJEdZbdpTAV8pQ==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.1.0",
         "babel-plugin-istanbul": "^6.0.0",
         "chalk": "^4.0.0",
         "convert-source-map": "^1.4.0",
         "fast-json-stable-stringify": "^2.0.0",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.0.6",
+        "jest-haste-map": "^27.1.0",
         "jest-regex-util": "^27.0.6",
-        "jest-util": "^27.0.6",
+        "jest-util": "^27.1.0",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.1",
         "slash": "^3.0.0",
@@ -3370,9 +3171,9 @@
       }
     },
     "@jest/types": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.0.6.tgz",
-      "integrity": "sha512-aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.1.0.tgz",
+      "integrity": "sha512-pRP5cLIzN7I7Vp6mHKRSaZD7YpBTK7hawx5si8trMKqk4+WOdK8NEKOTO2G8PKWD1HbKMVckVB6/XHh/olhf2g==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -5845,17 +5646,32 @@
     "@meetfranz/theme": {
       "version": "file:packages/theme",
       "requires": {
-        "color": "3.1.2"
+        "color": "4.0.1"
       },
       "dependencies": {
         "color": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
-          "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/color/-/color-4.0.1.tgz",
+          "integrity": "sha512-rpZjOKN5O7naJxkH2Rx1sZzzBgaiWECc6BYXjeCE6kF0kcASJYbUq02u7JqIHwCb/j3NhV+QhRL2683aICeGZA==",
           "requires": {
-            "color-convert": "^1.9.1",
-            "color-string": "^1.5.2"
+            "color-convert": "^2.0.1",
+            "color-string": "^1.6.0"
+          },
+          "dependencies": {
+            "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==",
+              "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=="
         }
       }
     },
@@ -6377,9 +6193,9 @@
       }
     },
     "@sentry/electron": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@sentry/electron/-/electron-2.5.1.tgz",
-      "integrity": "sha512-1rVE1IgGZTAy2qlLQxDsuhv7/0sT88oHYyD4f6ZTDzge3lsReeMu4xA32M4ldo4yRlRQM5gpdSS/D7Q/4huH0A==",
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/@sentry/electron/-/electron-2.5.3.tgz",
+      "integrity": "sha512-WxfLd8Q9ddk38TUTscahh594MugHNBsN5/82gBhIdPwjKnd4JtuD+BAeZfz0ihe7xhP07SNSkkAszmFOIGnTcg==",
       "requires": {
         "@sentry/browser": "6.7.1",
         "@sentry/core": "6.7.1",
@@ -6651,9 +6467,15 @@
       }
     },
     "@types/du": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/du/-/du-1.0.0.tgz",
-      "integrity": "sha512-gyG+2sBzYwIcwaj2zyRZ75qOwvhFeD6XytT16jBTyqiS9nH9tYy39Ln1oRcECxBfDCJmUmOEyjQoTHJeMFM91w==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/du/-/du-1.0.1.tgz",
+      "integrity": "sha512-vwNP+pzkI1ipznek2fCA4xj1kQyL9EJcfdBezD9eToe9eP2IgT3WLEBrVqiXal34LOyiAs8xCQKwugEYOKcMkw==",
+      "dev": true
+    },
+    "@types/expect.js": {
+      "version": "0.3.29",
+      "resolved": "https://registry.npmjs.org/@types/expect.js/-/expect.js-0.3.29.tgz",
+      "integrity": "sha1-KN01kVW4S47LCUr8P0t0wyItyjs=",
       "dev": true
     },
     "@types/fs-extra": {
@@ -6720,6 +6542,12 @@
       "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
       "dev": true
     },
+    "@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "dev": true
+    },
     "@types/lodash": {
       "version": "4.14.172",
       "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.172.tgz",
@@ -6747,6 +6575,12 @@
         "@types/node": "*"
       }
     },
+    "@types/mocha": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz",
+      "integrity": "sha512-scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA==",
+      "dev": true
+    },
     "@types/ms": {
       "version": "0.7.31",
       "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
@@ -6961,13 +6795,13 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.1.tgz",
-      "integrity": "sha512-AHqIU+SqZZgBEiWOrtN94ldR3ZUABV5dUG94j8Nms9rQnHFc8fvDOue/58K4CFz6r8OtDDc35Pw9NQPWo0Ayrw==",
+      "version": "4.30.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz",
+      "integrity": "sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "4.29.1",
-        "@typescript-eslint/scope-manager": "4.29.1",
+        "@typescript-eslint/experimental-utils": "4.30.0",
+        "@typescript-eslint/scope-manager": "4.30.0",
         "debug": "^4.3.1",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.1.0",
@@ -6976,43 +6810,43 @@
       },
       "dependencies": {
         "@typescript-eslint/experimental-utils": {
-          "version": "4.29.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.1.tgz",
-          "integrity": "sha512-kl6QG6qpzZthfd2bzPNSJB2YcZpNOrP6r9jueXupcZHnL74WiuSjaft7WSu17J9+ae9zTlk0KJMXPUj0daBxMw==",
+          "version": "4.30.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz",
+          "integrity": "sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.7",
-            "@typescript-eslint/scope-manager": "4.29.1",
-            "@typescript-eslint/types": "4.29.1",
-            "@typescript-eslint/typescript-estree": "4.29.1",
+            "@typescript-eslint/scope-manager": "4.30.0",
+            "@typescript-eslint/types": "4.30.0",
+            "@typescript-eslint/typescript-estree": "4.30.0",
             "eslint-scope": "^5.1.1",
             "eslint-utils": "^3.0.0"
           }
         },
         "@typescript-eslint/scope-manager": {
-          "version": "4.29.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz",
-          "integrity": "sha512-Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A==",
+          "version": "4.30.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz",
+          "integrity": "sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.29.1",
-            "@typescript-eslint/visitor-keys": "4.29.1"
+            "@typescript-eslint/types": "4.30.0",
+            "@typescript-eslint/visitor-keys": "4.30.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "4.29.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.1.tgz",
-          "integrity": "sha512-Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA==",
+          "version": "4.30.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.30.0.tgz",
+          "integrity": "sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "4.29.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz",
-          "integrity": "sha512-lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw==",
+          "version": "4.30.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz",
+          "integrity": "sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.29.1",
-            "@typescript-eslint/visitor-keys": "4.29.1",
+            "@typescript-eslint/types": "4.30.0",
+            "@typescript-eslint/visitor-keys": "4.30.0",
             "debug": "^4.3.1",
             "globby": "^11.0.3",
             "is-glob": "^4.0.1",
@@ -7021,12 +6855,12 @@
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "4.29.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz",
-          "integrity": "sha512-zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag==",
+          "version": "4.30.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz",
+          "integrity": "sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.29.1",
+            "@typescript-eslint/types": "4.30.0",
             "eslint-visitor-keys": "^2.0.0"
           }
         },
@@ -8628,13 +8462,13 @@
       "dev": true
     },
     "babel-jest": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.0.6.tgz",
-      "integrity": "sha512-iTJyYLNc4wRofASmofpOc5NK9QunwMk+TLFgGXsTFS8uEqmd8wdI7sga0FPe2oVH3b5Agt/EAK1QjPEuKL8VfA==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.1.0.tgz",
+      "integrity": "sha512-6NrdqzaYemALGCuR97QkC/FkFIEBWP5pw5TMJoUHZTVXyOgocujp6A0JE2V6gE0HtqAAv6VKU/nI+OCR1Z4gHA==",
       "dev": true,
       "requires": {
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/transform": "^27.1.0",
+        "@jest/types": "^27.1.0",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.0.0",
         "babel-preset-jest": "^27.0.6",
@@ -9864,9 +9698,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001252",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz",
-      "integrity": "sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw==",
+      "version": "1.0.30001256",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001256.tgz",
+      "integrity": "sha512-QirrvMLmB4txNnxiaG/xbm6FSzv9LqOZ3Jp9VtCYb3oPIfCHpr/oGn38pFq0udwlkctvXQgPthaXqJ76DaYGnA==",
       "dev": true
     },
     "caseless": {
@@ -12842,9 +12676,9 @@
       }
     },
     "electron-fetch": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/electron-fetch/-/electron-fetch-1.7.3.tgz",
-      "integrity": "sha512-1AVMaxrHXTTMqd7EK0MGWusdqNr07Rpj8Th6bG4at0oNgIi/1LBwa9CjT/0Zy+M0k/tSJPS04nFxHj0SXDVgVw==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/electron-fetch/-/electron-fetch-1.7.4.tgz",
+      "integrity": "sha512-+fBLXEy4CJWQ5bz8dyaeSG1hD6JJ15kBZyj3eh24pIVrd3hLM47H/umffrdQfS6GZ0falF0g9JT9f3Rs6AVUhw==",
       "requires": {
         "encoding": "^0.1.13"
       }
@@ -13053,9 +12887,9 @@
       }
     },
     "electron-util": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/electron-util/-/electron-util-0.17.0.tgz",
-      "integrity": "sha512-61+NEPdIN68EBC9XDPNAKs14HlPdc7HsL6lfQ+QTiya+3BMzayBqUsvN1LrT7IoGpPuuZns+iaCKf1N78dEF+w==",
+      "version": "0.17.2",
+      "resolved": "https://registry.npmjs.org/electron-util/-/electron-util-0.17.2.tgz",
+      "integrity": "sha512-4Kg/aZxJ2BZklgyfH86px/D2GyROPyIcnAZar+7KiNmKI2I5l09pwQTP7V95zM3FVhgDQwV9iuJta5dyEvuWAw==",
       "requires": {
         "electron-is-dev": "^1.1.0",
         "new-github-issue-url": "^0.2.1"
@@ -13737,9 +13571,9 @@
       "dev": true
     },
     "eslint-import-resolver-node": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.5.tgz",
-      "integrity": "sha512-XMoPKjSpXbkeJ7ZZ9icLnJMTY5Mc1kZbCakHquaFsXPpyWOwK0TK6CODO+0ca54UoM9LKOxyUNnoVZRl8TeaAg==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
       "dev": true,
       "requires": {
         "debug": "^3.2.7",
@@ -13837,26 +13671,26 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.24.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.0.tgz",
-      "integrity": "sha512-Kc6xqT9hiYi2cgybOc0I2vC9OgAYga5o/rAFinam/yF/t5uBqxQbauNPMC6fgb640T/89P0gFoO27FOilJ/Cqg==",
+      "version": "2.24.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz",
+      "integrity": "sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==",
       "dev": true,
       "requires": {
         "array-includes": "^3.1.3",
         "array.prototype.flat": "^1.2.4",
         "debug": "^2.6.9",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.5",
+        "eslint-import-resolver-node": "^0.3.6",
         "eslint-module-utils": "^2.6.2",
         "find-up": "^2.0.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.4.0",
+        "is-core-module": "^2.6.0",
         "minimatch": "^3.0.4",
-        "object.values": "^1.1.3",
+        "object.values": "^1.1.4",
         "pkg-up": "^2.0.0",
         "read-pkg-up": "^3.0.0",
         "resolve": "^1.20.0",
-        "tsconfig-paths": "^3.9.0"
+        "tsconfig-paths": "^3.11.0"
       },
       "dependencies": {
         "debug": {
@@ -13886,6 +13720,15 @@
             "locate-path": "^2.0.0"
           }
         },
+        "is-core-module": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz",
+          "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==",
+          "dev": true,
+          "requires": {
+            "has": "^1.0.3"
+          }
+        },
         "locate-path": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -14016,14 +13859,15 @@
       }
     },
     "eslint-plugin-react": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz",
-      "integrity": "sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==",
+      "version": "7.25.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.25.1.tgz",
+      "integrity": "sha512-P4j9K1dHoFXxDNP05AtixcJEvIT6ht8FhYKsrkY0MPCPaUMYijhpWwNiRDZVtA8KFuZOkGSeft6QwH8KuVpJug==",
       "dev": true,
       "requires": {
         "array-includes": "^3.1.3",
         "array.prototype.flatmap": "^1.2.4",
         "doctrine": "^2.1.0",
+        "estraverse": "^5.2.0",
         "has": "^1.0.3",
         "jsx-ast-utils": "^2.4.1 || ^3.0.0",
         "minimatch": "^3.0.4",
@@ -14044,16 +13888,11 @@
             "esutils": "^2.0.2"
           }
         },
-        "prop-types": {
-          "version": "15.7.2",
-          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-          "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-          "dev": true,
-          "requires": {
-            "loose-envify": "^1.4.0",
-            "object-assign": "^4.1.1",
-            "react-is": "^16.8.1"
-          }
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
         },
         "resolve": {
           "version": "2.0.0-next.3",
@@ -14393,16 +14232,16 @@
       }
     },
     "expect": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.0.6.tgz",
-      "integrity": "sha512-psNLt8j2kwg42jGBDSfAlU49CEZxejN1f1PlANWDZqIhBOVU/c2Pm888FcjWJzFewhIsNWfZJeLjUjtKGiPuSw==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-27.1.0.tgz",
+      "integrity": "sha512-9kJngV5hOJgkFil4F/uXm3hVBubUK2nERVfvqNNwxxuW8ZOUwSTTSysgfzckYtv/LBzj/LJXbiAF7okHCXgdug==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.1.0",
         "ansi-styles": "^5.0.0",
         "jest-get-type": "^27.0.6",
-        "jest-matcher-utils": "^27.0.6",
-        "jest-message-util": "^27.0.6",
+        "jest-matcher-utils": "^27.1.0",
+        "jest-message-util": "^27.1.0",
         "jest-regex-util": "^27.0.6"
       },
       "dependencies": {
@@ -16971,9 +16810,9 @@
       }
     },
     "husky": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.1.tgz",
-      "integrity": "sha512-gceRaITVZ+cJH9sNHqx5tFwbzlLCVxtVZcusME8JYQ8Edy5mpGDOqD8QBCdMhpyo9a+JXddnujQ4rpY2Ff9SJA==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.2.tgz",
+      "integrity": "sha512-8yKEWNX4z2YsofXAMT7KvA1g8p+GxtB1ffV8XtpAEGuXNAbCV5wdNKH+qTpw8SM9fh4aMPDR+yQuKfgnreyZlg==",
       "dev": true
     },
     "hyphenate-style-name": {
@@ -17409,12 +17248,6 @@
         "loose-envify": "^1.0.0"
       }
     },
-    "invert-kv": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-      "dev": true
-    },
     "ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
@@ -18002,22 +17835,16 @@
       }
     },
     "jest": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-27.0.6.tgz",
-      "integrity": "sha512-EjV8aETrsD0wHl7CKMibKwQNQc3gIRBXlTikBmmHUeVMKaPFxdcUIBfoDqTSXDoGJIivAYGqCWVlzCSaVjPQsA==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-27.1.0.tgz",
+      "integrity": "sha512-pSQDVwRSwb109Ss13lcMtdfS9r8/w2Zz8+mTUA9VORD66GflCdl8nUFCqM96geOD2EBwWCNURrNAfQsLIDNBdg==",
       "dev": true,
       "requires": {
-        "@jest/core": "^27.0.6",
+        "@jest/core": "^27.1.0",
         "import-local": "^3.0.2",
-        "jest-cli": "^27.0.6"
+        "jest-cli": "^27.1.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -18037,17 +17864,6 @@
             "supports-color": "^7.1.0"
           }
         },
-        "cliui": {
-          "version": "7.0.4",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
-            "wrap-ansi": "^7.0.0"
-          }
-        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -18063,64 +17879,32 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "get-caller-file": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-          "dev": true
-        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "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
-        },
         "jest-cli": {
-          "version": "27.0.6",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.0.6.tgz",
-          "integrity": "sha512-qUUVlGb9fdKir3RDE+B10ULI+LQrz+MCflEH2UJyoUjoHHCbxDrMxSzjQAPUMsic4SncI62ofYCcAvW6+6rhhg==",
+          "version": "27.1.0",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.1.0.tgz",
+          "integrity": "sha512-h6zPUOUu+6oLDrXz0yOWY2YXvBLk8gQinx4HbZ7SF4V3HzasQf+ncoIbKENUMwXyf54/6dBkYXvXJos+gOHYZw==",
           "dev": true,
           "requires": {
-            "@jest/core": "^27.0.6",
-            "@jest/test-result": "^27.0.6",
-            "@jest/types": "^27.0.6",
+            "@jest/core": "^27.1.0",
+            "@jest/test-result": "^27.1.0",
+            "@jest/types": "^27.1.0",
             "chalk": "^4.0.0",
             "exit": "^0.1.2",
             "graceful-fs": "^4.2.4",
             "import-local": "^3.0.2",
-            "jest-config": "^27.0.6",
-            "jest-util": "^27.0.6",
-            "jest-validate": "^27.0.6",
+            "jest-config": "^27.1.0",
+            "jest-util": "^27.1.0",
+            "jest-validate": "^27.1.0",
             "prompts": "^2.0.1",
             "yargs": "^16.0.3"
           }
         },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -18129,54 +17913,16 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
-        },
-        "wrap-ansi": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "y18n": {
-          "version": "5.0.8",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-          "dev": true
-        },
-        "yargs": {
-          "version": "16.2.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^7.0.2",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.0",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^20.2.2"
-          }
-        },
-        "yargs-parser": {
-          "version": "20.2.9",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-          "dev": true
         }
       }
     },
     "jest-changed-files": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.0.6.tgz",
-      "integrity": "sha512-BuL/ZDauaq5dumYh5y20sn4IISnf1P9A0TDswTxUi84ORGtVa86ApuBHqICL0vepqAnZiY6a7xeSPWv2/yy4eA==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.1.0.tgz",
+      "integrity": "sha512-eRcb13TfQw0xiV2E98EmiEgs9a5uaBIqJChyl0G7jR9fCIvGjXovnDS6Zbku3joij4tXYcSK4SE1AXqOlUxjWg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.1.0",
         "execa": "^5.0.0",
         "throat": "^6.0.1"
       },
@@ -18254,27 +18000,27 @@
       }
     },
     "jest-circus": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.0.6.tgz",
-      "integrity": "sha512-OJlsz6BBeX9qR+7O9lXefWoc2m9ZqcZ5Ohlzz0pTEAG4xMiZUJoacY8f4YDHxgk0oKYxj277AfOk9w6hZYvi1Q==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.1.0.tgz",
+      "integrity": "sha512-6FWtHs3nZyZlMBhRf1wvAC5CirnflbGJAY1xssSAnERLiiXQRH+wY2ptBVtXjX4gz4AA2EwRV57b038LmifRbA==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/environment": "^27.1.0",
+        "@jest/test-result": "^27.1.0",
+        "@jest/types": "^27.1.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
         "dedent": "^0.7.0",
-        "expect": "^27.0.6",
+        "expect": "^27.1.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.0.6",
-        "jest-matcher-utils": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-runtime": "^27.0.6",
-        "jest-snapshot": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "pretty-format": "^27.0.6",
+        "jest-each": "^27.1.0",
+        "jest-matcher-utils": "^27.1.0",
+        "jest-message-util": "^27.1.0",
+        "jest-runtime": "^27.1.0",
+        "jest-snapshot": "^27.1.0",
+        "jest-util": "^27.1.0",
+        "pretty-format": "^27.1.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3",
         "throat": "^6.0.1"
@@ -18338,32 +18084,32 @@
       }
     },
     "jest-config": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.0.6.tgz",
-      "integrity": "sha512-JZRR3I1Plr2YxPBhgqRspDE2S5zprbga3swYNrvY3HfQGu7p/GjyLOqwrYad97tX3U3mzT53TPHVmozacfP/3w==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.1.0.tgz",
+      "integrity": "sha512-GMo7f76vMYUA3b3xOdlcKeKQhKcBIgurjERO2hojo0eLkKPGcw7fyIoanH+m6KOP2bLad+fGnF8aWOJYxzNPeg==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^27.0.6",
-        "@jest/types": "^27.0.6",
-        "babel-jest": "^27.0.6",
+        "@jest/test-sequencer": "^27.1.0",
+        "@jest/types": "^27.1.0",
+        "babel-jest": "^27.1.0",
         "chalk": "^4.0.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.1",
         "graceful-fs": "^4.2.4",
         "is-ci": "^3.0.0",
-        "jest-circus": "^27.0.6",
-        "jest-environment-jsdom": "^27.0.6",
-        "jest-environment-node": "^27.0.6",
+        "jest-circus": "^27.1.0",
+        "jest-environment-jsdom": "^27.1.0",
+        "jest-environment-node": "^27.1.0",
         "jest-get-type": "^27.0.6",
-        "jest-jasmine2": "^27.0.6",
+        "jest-jasmine2": "^27.1.0",
         "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-runner": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-validate": "^27.0.6",
+        "jest-resolve": "^27.1.0",
+        "jest-runner": "^27.1.0",
+        "jest-util": "^27.1.0",
+        "jest-validate": "^27.1.0",
         "micromatch": "^4.0.4",
-        "pretty-format": "^27.0.6"
+        "pretty-format": "^27.1.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -18475,15 +18221,15 @@
       }
     },
     "jest-diff": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.0.6.tgz",
-      "integrity": "sha512-Z1mqgkTCSYaFgwTlP/NUiRzdqgxmmhzHY1Tq17zL94morOHfHu3K4bgSgl+CR4GLhpV8VxkuOYuIWnQ9LnFqmg==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.1.0.tgz",
+      "integrity": "sha512-rjfopEYl58g/SZTsQFmspBODvMSytL16I+cirnScWTLkQVXYVZfxm78DFfdIIXc05RCYuGjxJqrdyG4PIFzcJg==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "diff-sequences": "^27.0.6",
         "jest-get-type": "^27.0.6",
-        "pretty-format": "^27.0.6"
+        "pretty-format": "^27.1.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -18547,16 +18293,16 @@
       }
     },
     "jest-each": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.0.6.tgz",
-      "integrity": "sha512-m6yKcV3bkSWrUIjxkE9OC0mhBZZdhovIW5ergBYirqnkLXkyEn3oUUF/QZgyecA1cF1QFyTE8bRRl8Tfg1pfLA==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.1.0.tgz",
+      "integrity": "sha512-K/cNvQlmDqQMRHF8CaQ0XPzCfjP5HMJc2bIJglrIqI9fjwpNqITle63IWE+wq4p+3v+iBgh7Wq0IdGpLx5xjDg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.1.0",
         "chalk": "^4.0.0",
         "jest-get-type": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "pretty-format": "^27.0.6"
+        "jest-util": "^27.1.0",
+        "pretty-format": "^27.1.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -18611,32 +18357,32 @@
       }
     },
     "jest-environment-jsdom": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.0.6.tgz",
-      "integrity": "sha512-FvetXg7lnXL9+78H+xUAsra3IeZRTiegA3An01cWeXBspKXUhAwMM9ycIJ4yBaR0L7HkoMPaZsozCLHh4T8fuw==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.1.0.tgz",
+      "integrity": "sha512-JbwOcOxh/HOtsj56ljeXQCUJr3ivnaIlM45F5NBezFLVYdT91N5UofB1ux2B1CATsQiudcHdgTaeuqGXJqjJYQ==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.0.6",
-        "@jest/fake-timers": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/environment": "^27.1.0",
+        "@jest/fake-timers": "^27.1.0",
+        "@jest/types": "^27.1.0",
         "@types/node": "*",
-        "jest-mock": "^27.0.6",
-        "jest-util": "^27.0.6",
+        "jest-mock": "^27.1.0",
+        "jest-util": "^27.1.0",
         "jsdom": "^16.6.0"
       }
     },
     "jest-environment-node": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.0.6.tgz",
-      "integrity": "sha512-+Vi6yLrPg/qC81jfXx3IBlVnDTI6kmRr08iVa2hFCWmJt4zha0XW7ucQltCAPhSR0FEKEoJ3i+W4E6T0s9is0w==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.1.0.tgz",
+      "integrity": "sha512-JIyJ8H3wVyM4YCXp7njbjs0dIT87yhGlrXCXhDKNIg1OjurXr6X38yocnnbXvvNyqVTqSI4M9l+YfPKueqL1lw==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.0.6",
-        "@jest/fake-timers": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/environment": "^27.1.0",
+        "@jest/fake-timers": "^27.1.0",
+        "@jest/types": "^27.1.0",
         "@types/node": "*",
-        "jest-mock": "^27.0.6",
-        "jest-util": "^27.0.6"
+        "jest-mock": "^27.1.0",
+        "jest-util": "^27.1.0"
       }
     },
     "jest-get-type": {
@@ -18646,12 +18392,12 @@
       "dev": true
     },
     "jest-haste-map": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.0.6.tgz",
-      "integrity": "sha512-4ldjPXX9h8doB2JlRzg9oAZ2p6/GpQUNAeiYXqcpmrKbP0Qev0wdZlxSMOmz8mPOEnt4h6qIzXFLDi8RScX/1w==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.1.0.tgz",
+      "integrity": "sha512-7mz6LopSe+eA6cTFMf10OfLLqRoIPvmMyz5/OnSXnHO7hB0aDP1iIeLWCXzAcYU5eIJVpHr12Bk9yyq2fTW9vg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.1.0",
         "@types/graceful-fs": "^4.1.2",
         "@types/node": "*",
         "anymatch": "^3.0.3",
@@ -18660,8 +18406,8 @@
         "graceful-fs": "^4.2.4",
         "jest-regex-util": "^27.0.6",
         "jest-serializer": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-worker": "^27.0.6",
+        "jest-util": "^27.1.0",
+        "jest-worker": "^27.1.0",
         "micromatch": "^4.0.4",
         "walker": "^1.0.7"
       },
@@ -18729,28 +18475,28 @@
       }
     },
     "jest-jasmine2": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.0.6.tgz",
-      "integrity": "sha512-cjpH2sBy+t6dvCeKBsHpW41mjHzXgsavaFMp+VWRf0eR4EW8xASk1acqmljFtK2DgyIECMv2yCdY41r2l1+4iA==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.1.0.tgz",
+      "integrity": "sha512-Z/NIt0wBDg3przOW2FCWtYjMn3Ip68t0SL60agD/e67jlhTyV3PIF8IzT9ecwqFbeuUSO2OT8WeJgHcalDGFzQ==",
       "dev": true,
       "requires": {
         "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^27.0.6",
+        "@jest/environment": "^27.1.0",
         "@jest/source-map": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/test-result": "^27.1.0",
+        "@jest/types": "^27.1.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "expect": "^27.0.6",
+        "expect": "^27.1.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.0.6",
-        "jest-matcher-utils": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-runtime": "^27.0.6",
-        "jest-snapshot": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "pretty-format": "^27.0.6",
+        "jest-each": "^27.1.0",
+        "jest-matcher-utils": "^27.1.0",
+        "jest-message-util": "^27.1.0",
+        "jest-runtime": "^27.1.0",
+        "jest-snapshot": "^27.1.0",
+        "jest-util": "^27.1.0",
+        "pretty-format": "^27.1.0",
         "throat": "^6.0.1"
       },
       "dependencies": {
@@ -18806,25 +18552,25 @@
       }
     },
     "jest-leak-detector": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.0.6.tgz",
-      "integrity": "sha512-2/d6n2wlH5zEcdctX4zdbgX8oM61tb67PQt4Xh8JFAIy6LRKUnX528HulkaG6nD5qDl5vRV1NXejCe1XRCH5gQ==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.1.0.tgz",
+      "integrity": "sha512-oHvSkz1E80VyeTKBvZNnw576qU+cVqRXUD3/wKXh1zpaki47Qty2xeHg2HKie9Hqcd2l4XwircgNOWb/NiGqdA==",
       "dev": true,
       "requires": {
         "jest-get-type": "^27.0.6",
-        "pretty-format": "^27.0.6"
+        "pretty-format": "^27.1.0"
       }
     },
     "jest-matcher-utils": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz",
-      "integrity": "sha512-OFgF2VCQx9vdPSYTHWJ9MzFCehs20TsyFi6bIHbk5V1u52zJOnvF0Y/65z3GLZHKRuTgVPY4Z6LVePNahaQ+tA==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.1.0.tgz",
+      "integrity": "sha512-VmAudus2P6Yt/JVBRdTPFhUzlIN8DYJd+et5Rd9QDsO/Z82Z4iwGjo43U8Z+PTiz8CBvKvlb6Fh3oKy39hykkQ==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^27.0.6",
+        "jest-diff": "^27.1.0",
         "jest-get-type": "^27.0.6",
-        "pretty-format": "^27.0.6"
+        "pretty-format": "^27.1.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -18879,18 +18625,18 @@
       }
     },
     "jest-message-util": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.0.6.tgz",
-      "integrity": "sha512-rBxIs2XK7rGy+zGxgi+UJKP6WqQ+KrBbD1YMj517HYN3v2BG66t3Xan3FWqYHKZwjdB700KiAJ+iES9a0M+ixw==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.1.0.tgz",
+      "integrity": "sha512-Eck8NFnJ5Sg36R9XguD65cf2D5+McC+NF5GIdEninoabcuoOfWrID5qJhufq5FB0DRKoiyxB61hS7MKoMD0trQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.1.0",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "micromatch": "^4.0.4",
-        "pretty-format": "^27.0.6",
+        "pretty-format": "^27.1.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -18996,12 +18742,12 @@
       }
     },
     "jest-mock": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.0.6.tgz",
-      "integrity": "sha512-lzBETUoK8cSxts2NYXSBWT+EJNzmUVtVVwS1sU9GwE1DLCfGsngg+ZVSIe0yd0ZSm+y791esiuo+WSwpXJQ5Bw==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.1.0.tgz",
+      "integrity": "sha512-iT3/Yhu7DwAg/0HvvLCqLvrTKTRMyJlrrfJYWzuLSf9RCAxBoIXN3HoymZxMnYsC3eD8ewGbUa9jUknwBenx2w==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.1.0",
         "@types/node": "*"
       }
     },
@@ -19018,18 +18764,19 @@
       "dev": true
     },
     "jest-resolve": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.0.6.tgz",
-      "integrity": "sha512-yKmIgw2LgTh7uAJtzv8UFHGF7Dm7XfvOe/LQ3Txv101fLM8cx2h1QVwtSJ51Q/SCxpIiKfVn6G2jYYMDNHZteA==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.1.0.tgz",
+      "integrity": "sha512-TXvzrLyPg0vLOwcWX38ZGYeEztSEmW+cQQKqc4HKDUwun31wsBXwotRlUz4/AYU/Fq4GhbMd/ileIWZEtcdmIA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.1.0",
         "chalk": "^4.0.0",
         "escalade": "^3.1.1",
         "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^27.1.0",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^27.0.6",
-        "jest-validate": "^27.0.6",
+        "jest-util": "^27.1.0",
+        "jest-validate": "^27.1.0",
         "resolve": "^1.20.0",
         "slash": "^3.0.0"
       },
@@ -19092,42 +18839,42 @@
       }
     },
     "jest-resolve-dependencies": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.6.tgz",
-      "integrity": "sha512-mg9x9DS3BPAREWKCAoyg3QucCr0n6S8HEEsqRCKSPjPcu9HzRILzhdzY3imsLoZWeosEbJZz6TKasveczzpJZA==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.1.0.tgz",
+      "integrity": "sha512-Kq5XuDAELuBnrERrjFYEzu/A+i2W7l9HnPWqZEeKGEQ7m1R+6ndMbdXCVCx29Se1qwLZLgvoXwinB3SPIaitMQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.1.0",
         "jest-regex-util": "^27.0.6",
-        "jest-snapshot": "^27.0.6"
+        "jest-snapshot": "^27.1.0"
       }
     },
     "jest-runner": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.0.6.tgz",
-      "integrity": "sha512-W3Bz5qAgaSChuivLn+nKOgjqNxM7O/9JOJoKDCqThPIg2sH/d4A/lzyiaFgnb9V1/w29Le11NpzTJSzga1vyYQ==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.1.0.tgz",
+      "integrity": "sha512-ZWPKr9M5w5gDplz1KsJ6iRmQaDT/yyAFLf18fKbb/+BLWsR1sCNC2wMT0H7pP3gDcBz0qZ6aJraSYUNAGSJGaw==",
       "dev": true,
       "requires": {
-        "@jest/console": "^27.0.6",
-        "@jest/environment": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/console": "^27.1.0",
+        "@jest/environment": "^27.1.0",
+        "@jest/test-result": "^27.1.0",
+        "@jest/transform": "^27.1.0",
+        "@jest/types": "^27.1.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.8.1",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
         "jest-docblock": "^27.0.6",
-        "jest-environment-jsdom": "^27.0.6",
-        "jest-environment-node": "^27.0.6",
-        "jest-haste-map": "^27.0.6",
-        "jest-leak-detector": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-runtime": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-worker": "^27.0.6",
+        "jest-environment-jsdom": "^27.1.0",
+        "jest-environment-node": "^27.1.0",
+        "jest-haste-map": "^27.1.0",
+        "jest-leak-detector": "^27.1.0",
+        "jest-message-util": "^27.1.0",
+        "jest-resolve": "^27.1.0",
+        "jest-runtime": "^27.1.0",
+        "jest-util": "^27.1.0",
+        "jest-worker": "^27.1.0",
         "source-map-support": "^0.5.6",
         "throat": "^6.0.1"
       },
@@ -19184,34 +18931,35 @@
       }
     },
     "jest-runtime": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.0.6.tgz",
-      "integrity": "sha512-BhvHLRVfKibYyqqEFkybsznKwhrsu7AWx2F3y9G9L95VSIN3/ZZ9vBpm/XCS2bS+BWz3sSeNGLzI3TVQ0uL85Q==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.1.0.tgz",
+      "integrity": "sha512-okiR2cpGjY0RkWmUGGado6ETpFOi9oG3yV0CioYdoktkVxy5Hv0WRLWnJFuArSYS8cHMCNcceUUMGiIfgxCO9A==",
       "dev": true,
       "requires": {
-        "@jest/console": "^27.0.6",
-        "@jest/environment": "^27.0.6",
-        "@jest/fake-timers": "^27.0.6",
-        "@jest/globals": "^27.0.6",
+        "@jest/console": "^27.1.0",
+        "@jest/environment": "^27.1.0",
+        "@jest/fake-timers": "^27.1.0",
+        "@jest/globals": "^27.1.0",
         "@jest/source-map": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/test-result": "^27.1.0",
+        "@jest/transform": "^27.1.0",
+        "@jest/types": "^27.1.0",
         "@types/yargs": "^16.0.0",
         "chalk": "^4.0.0",
         "cjs-module-lexer": "^1.0.0",
         "collect-v8-coverage": "^1.0.0",
+        "execa": "^5.0.0",
         "exit": "^0.1.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-mock": "^27.0.6",
+        "jest-haste-map": "^27.1.0",
+        "jest-message-util": "^27.1.0",
+        "jest-mock": "^27.1.0",
         "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-snapshot": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-validate": "^27.0.6",
+        "jest-resolve": "^27.1.0",
+        "jest-snapshot": "^27.1.0",
+        "jest-util": "^27.1.0",
+        "jest-validate": "^27.1.0",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0",
         "yargs": "^16.0.3"
@@ -19226,12 +18974,6 @@
             "@types/yargs-parser": "*"
           }
         },
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -19251,17 +18993,6 @@
             "supports-color": "^7.1.0"
           }
         },
-        "cliui": {
-          "version": "7.0.4",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
-            "wrap-ansi": "^7.0.0"
-          }
-        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -19277,10 +19008,38 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "get-caller-file": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "execa": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^7.0.3",
+            "get-stream": "^6.0.0",
+            "human-signals": "^2.1.0",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.1",
+            "onetime": "^5.1.2",
+            "signal-exit": "^3.0.3",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
           "dev": true
         },
         "glob": {
@@ -19303,37 +19062,38 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+        "human-signals": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+          "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
           "dev": true
         },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
           "dev": true
         },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
           "dev": true,
           "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
+            "shebang-regex": "^3.0.0"
           }
         },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "slash": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+          "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
@@ -19344,43 +19104,14 @@
             "has-flag": "^4.0.0"
           }
         },
-        "wrap-ansi": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "y18n": {
-          "version": "5.0.8",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-          "dev": true
-        },
-        "yargs": {
-          "version": "16.2.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
           "dev": true,
           "requires": {
-            "cliui": "^7.0.2",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.0",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^20.2.2"
+            "isexe": "^2.0.0"
           }
-        },
-        "yargs-parser": {
-          "version": "20.2.9",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-          "dev": true
         }
       }
     },
@@ -19395,9 +19126,9 @@
       }
     },
     "jest-snapshot": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.0.6.tgz",
-      "integrity": "sha512-NTHaz8He+ATUagUgE7C/UtFcRoHqR2Gc+KDfhQIyx+VFgwbeEMjeP+ILpUTLosZn/ZtbNdCF5LkVnN/l+V751A==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.1.0.tgz",
+      "integrity": "sha512-eaeUBoEjuuRwmiRI51oTldUsKOohB1F6fPqWKKILuDi/CStxzp2IWekVUXbuHHoz5ik33ioJhshiHpgPFbYgcA==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.7.2",
@@ -19406,23 +19137,23 @@
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/traverse": "^7.7.2",
         "@babel/types": "^7.0.0",
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/transform": "^27.1.0",
+        "@jest/types": "^27.1.0",
         "@types/babel__traverse": "^7.0.4",
         "@types/prettier": "^2.1.5",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^27.0.6",
+        "expect": "^27.1.0",
         "graceful-fs": "^4.2.4",
-        "jest-diff": "^27.0.6",
+        "jest-diff": "^27.1.0",
         "jest-get-type": "^27.0.6",
-        "jest-haste-map": "^27.0.6",
-        "jest-matcher-utils": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-util": "^27.0.6",
+        "jest-haste-map": "^27.1.0",
+        "jest-matcher-utils": "^27.1.0",
+        "jest-message-util": "^27.1.0",
+        "jest-resolve": "^27.1.0",
+        "jest-util": "^27.1.0",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^27.0.6",
+        "pretty-format": "^27.1.0",
         "semver": "^7.3.2"
       },
       "dependencies": {
@@ -19478,12 +19209,12 @@
       }
     },
     "jest-util": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.0.6.tgz",
-      "integrity": "sha512-1JjlaIh+C65H/F7D11GNkGDDZtDfMEM8EBXsvd+l/cxtgQ6QhxuloOaiayt89DxUvDarbVhqI98HhgrM1yliFQ==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.1.0.tgz",
+      "integrity": "sha512-edSLD2OneYDKC6gZM1yc+wY/877s/fuJNoM1k3sOEpzFyeptSmke3SLnk1dDHk9CgTA+58mnfx3ew3J11Kes/w==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.1.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
@@ -19543,17 +19274,17 @@
       }
     },
     "jest-validate": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.0.6.tgz",
-      "integrity": "sha512-yhZZOaMH3Zg6DC83n60pLmdU1DQE46DW+KLozPiPbSbPhlXXaiUTDlhHQhHFpaqIFRrInko1FHXjTRpjWRuWfA==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.1.0.tgz",
+      "integrity": "sha512-QiJ+4XuSuMsfPi9zvdO//IrSRSlG6ybJhOpuqYSsuuaABaNT84h0IoD6vvQhThBOKT+DIKvl5sTM0l6is9+SRA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.1.0",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
         "jest-get-type": "^27.0.6",
         "leven": "^3.1.0",
-        "pretty-format": "^27.0.6"
+        "pretty-format": "^27.1.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -19614,17 +19345,17 @@
       }
     },
     "jest-watcher": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.0.6.tgz",
-      "integrity": "sha512-/jIoKBhAP00/iMGnTwUBLgvxkn7vsOweDrOTSPzc7X9uOyUtJIDthQBTI1EXz90bdkrxorUZVhJwiB69gcHtYQ==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.1.0.tgz",
+      "integrity": "sha512-ivaWTrA46aHWdgPDgPypSHiNQjyKnLBpUIHeBaGg11U+pDzZpkffGlcB1l1a014phmG0mHgkOHtOgiqJQM6yKQ==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/test-result": "^27.1.0",
+        "@jest/types": "^27.1.0",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "jest-util": "^27.0.6",
+        "jest-util": "^27.1.0",
         "string-length": "^4.0.1"
       },
       "dependencies": {
@@ -19680,9 +19411,9 @@
       }
     },
     "jest-worker": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.6.tgz",
-      "integrity": "sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.0.tgz",
+      "integrity": "sha512-mO4PHb2QWLn9yRXGp7rkvXLAYuxwhq1ZYUo0LoDhg8wqvv4QizP1ZWEJOeolgbEgAWZLIEU0wsku8J+lGWfBhg==",
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -20294,15 +20025,6 @@
         }
       }
     },
-    "lcid": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-      "dev": true,
-      "requires": {
-        "invert-kv": "^2.0.0"
-      }
-    },
     "lead": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
@@ -20810,9 +20532,9 @@
       "integrity": "sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0="
     },
     "macos-notification-state": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/macos-notification-state/-/macos-notification-state-1.3.5.tgz",
-      "integrity": "sha512-uTfue/exD5AtZnJHgjvaHCi0/MQOWigcTjKGmRmRSJz+SGdXZMM2TVAI/js8SnLILUzoA3FW1wveaPZne9x/Tg==",
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/macos-notification-state/-/macos-notification-state-1.3.6.tgz",
+      "integrity": "sha512-/iL0Mepra7laWWxCWvXWQea+D8j7o73iazcgap5gYd/Lbx29JY0nfH3dYVNzWQT/AKvoB0I55fdTY/fd5JiTPg==",
       "requires": {
         "bindings": "^1.5.0"
       }
@@ -20959,15 +20681,6 @@
         "tmpl": "1.0.x"
       }
     },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "dev": true,
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
     "map-async": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/map-async/-/map-async-0.1.1.tgz",
@@ -21055,17 +20768,6 @@
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
-    "mem": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-      "dev": true,
-      "requires": {
-        "map-age-cleaner": "^0.1.1",
-        "mimic-fn": "^2.0.0",
-        "p-is-promise": "^2.0.0"
-      }
-    },
     "memory-fs": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
@@ -21698,9 +21400,9 @@
       "integrity": "sha1-gzKLEIOTAXFI2G/qF/YR3i0qrNw="
     },
     "mocha": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.0.3.tgz",
-      "integrity": "sha512-hnYFrSefHxYS2XFGtN01x8un0EwNu2bzKvhpRFhgoybIvMaOkkL60IVPmkb5h6XDmUl4IMSB+rT5cIO4/4bJgg==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.1.tgz",
+      "integrity": "sha512-0wE74YMgOkCgBUj8VyIDwmLUjTsS13WV1Pg7l0SHea2qzZzlq7MDnfbPsHKcELBRk3+izEVkRofjmClpycudCA==",
       "dev": true,
       "requires": {
         "@ungap/promise-all-settled": "1.1.2",
@@ -21736,21 +21438,6 @@
           "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
           "dev": true
         },
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "anymatch": {
           "version": "3.1.2",
           "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
@@ -21792,32 +21479,6 @@
             "readdirp": "~3.6.0"
           }
         },
-        "cliui": {
-          "version": "7.0.4",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
-            "wrap-ansi": "^7.0.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
         "debug": {
           "version": "4.3.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
@@ -21867,12 +21528,6 @@
           "dev": true,
           "optional": true
         },
-        "get-caller-file": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-          "dev": true
-        },
         "glob": {
           "version": "7.1.7",
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
@@ -21911,12 +21566,6 @@
             "binary-extensions": "^2.0.0"
           }
         },
-        "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
-        },
         "is-glob": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
@@ -21968,26 +21617,6 @@
             "picomatch": "^2.2.1"
           }
         },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
         "strip-json-comments": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -22021,38 +21650,6 @@
             "isexe": "^2.0.0"
           }
         },
-        "wrap-ansi": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "y18n": {
-          "version": "5.0.8",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-          "dev": true
-        },
-        "yargs": {
-          "version": "16.2.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^7.0.2",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.0",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^20.2.2"
-          }
-        },
         "yargs-parser": {
           "version": "20.2.4",
           "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
@@ -23224,49 +22821,6 @@
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
-    "os-locale": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
-      "dev": true,
-      "requires": {
-        "execa": "^1.0.0",
-        "lcid": "^2.0.0",
-        "mem": "^4.0.0"
-      },
-      "dependencies": {
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "is-stream": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-          "dev": true
-        },
-        "npm-run-path": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-          "dev": true,
-          "requires": {
-            "path-key": "^2.0.0"
-          }
-        }
-      }
-    },
     "os-name": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz",
@@ -23296,12 +22850,6 @@
       "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
       "dev": true
     },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
-      "dev": true
-    },
     "p-each-series": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
@@ -23314,12 +22862,6 @@
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
       "dev": true
     },
-    "p-is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
-      "dev": true
-    },
     "p-limit": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -24120,12 +23662,12 @@
       }
     },
     "pretty-format": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.0.6.tgz",
-      "integrity": "sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ==",
+      "version": "27.1.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.1.0.tgz",
+      "integrity": "sha512-4aGaud3w3rxAO6OXmK3fwBFQ0bctIOG3/if+jYEFGNGIs0EvuidQm3bZ9mlP2/t9epLNC/12czabfy7TZNSwVA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.1.0",
         "ansi-regex": "^5.0.0",
         "ansi-styles": "^5.0.0",
         "react-is": "^17.0.1"
@@ -26115,12 +25657,6 @@
         "aproba": "^1.1.1"
       }
     },
-    "rx": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
-      "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=",
-      "dev": true
-    },
     "rxjs": {
       "version": "6.6.7",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
@@ -26717,9 +26253,9 @@
       }
     },
     "simple-git": {
-      "version": "2.44.0",
-      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.44.0.tgz",
-      "integrity": "sha512-wIjcAmymhzgdaM0Y/a+XxmNGlivvHQTPZDYXVmyHMShVDwdeVqu3+OOyDbYu0DnfVzqLs2EOxRTgMNbC3YquwQ==",
+      "version": "2.45.0",
+      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.45.0.tgz",
+      "integrity": "sha512-wu/Ujs9IXn0HuyYm4HyRvne+EKsjJSWKEMkB3wQa3gNHSMHt7y3oeNX9zRQ3UBPk7bRRMLLHAdIZCZfHT9ehPg==",
       "dev": true,
       "requires": {
         "@kwsites/file-exists": "^1.1.1",
@@ -28455,17 +27991,61 @@
         }
       }
     },
+    "ts-mocha": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/ts-mocha/-/ts-mocha-8.0.0.tgz",
+      "integrity": "sha512-Kou1yxTlubLnD5C3unlCVO7nh0HERTezjoVhVw/M5S1SqoUec0WgllQvPk3vzPMc6by8m6xD1uR1yRf8lnVUbA==",
+      "dev": true,
+      "requires": {
+        "ts-node": "7.0.1",
+        "tsconfig-paths": "^3.5.0"
+      }
+    },
+    "ts-node": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.1.tgz",
+      "integrity": "sha512-BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw==",
+      "dev": true,
+      "requires": {
+        "arrify": "^1.0.0",
+        "buffer-from": "^1.1.0",
+        "diff": "^3.1.0",
+        "make-error": "^1.1.1",
+        "minimist": "^1.2.0",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.5.6",
+        "yn": "^2.0.0"
+      },
+      "dependencies": {
+        "diff": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+          "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+          "dev": true
+        }
+      }
+    },
     "tsconfig-paths": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz",
-      "integrity": "sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz",
+      "integrity": "sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==",
       "dev": true,
       "requires": {
-        "json5": "^2.2.0",
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
         "minimist": "^1.2.0",
         "strip-bom": "^3.0.0"
       },
       "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
         "strip-bom": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -30732,6 +30312,12 @@
         "fd-slicer": "~1.1.0"
       }
     },
+    "yn": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz",
+      "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=",
+      "dev": true
+    },
     "yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
diff --git a/package.json b/package.json
index 1336b831e..0d2b9e42d 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Ferdi",
   "desktopName": "ferdi.desktop",
   "appId": "com.kytwb.ferdi",
-  "version": "5.6.1-beta.3",
+  "version": "5.6.1-nightly.56",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "kytwb",
   "main": "index.js",
@@ -17,7 +17,7 @@
   },
   "engine-strict": true,
   "scripts": {
-    "prepare": "husky install",
+    "prepare": "node scripts/prepare.js",
     "start": "electron ./build",
     "start:local": "cross-env USE_LOCAL_API=1 npm start",
     "start:live": "cross-env USE_LIVE_API=1 npm start",
@@ -35,7 +35,7 @@
     "reformat-files": "./node_modules/.bin/prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\"",
     "packages": "npx lerna publish --no-git-tag-version",
     "uidev": "cd uidev && webpack-dev-server",
-    "postinstall": "npx lerna run prepare",
+    "postinstall": "node scripts/postinstall.js",
     "apply-branding": "node ./src/i18n/apply-branding.js",
     "update-submodules": "git submodule update --remote --force",
     "prepare-code": "npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding",
@@ -66,7 +66,7 @@
     "@meetfranz/forms": "file:packages/forms",
     "@meetfranz/theme": "file:packages/theme",
     "@meetfranz/ui": "file:packages/ui",
-    "@sentry/electron": "2.5.1",
+    "@sentry/electron": "2.5.3",
     "atob": "2.1.2",
     "auto-launch": "5.0.5",
     "btoa": "1.2.1",
@@ -80,17 +80,17 @@
     "debug": "4.3.2",
     "du": "1.0.0",
     "electron-dl": "3.2.1",
-    "electron-fetch": "1.7.3",
+    "electron-fetch": "1.7.4",
     "electron-find": "1.0.7",
     "electron-react-titlebar": "0.8.2",
     "electron-updater": "4.3.9",
-    "electron-util": "0.17.0",
+    "electron-util": "0.17.2",
     "electron-window-state": "5.0.3",
     "fs-extra": "10.0.0",
     "jsonwebtoken": "8.5.1",
     "jss": "10.7.1",
     "lodash": "4.17.21",
-    "macos-notification-state": "1.3.5",
+    "macos-notification-state": "1.3.6",
     "macos-version": "5.2.1",
     "marked": "0.7.0",
     "mime-types": "2.1.32",
@@ -132,13 +132,13 @@
     "ws": "7.4.6"
   },
   "devDependencies": {
-    "@adlk/misty": "0.2.0",
     "@babel/cli": "7.14.8",
     "@babel/core": "7.15.0",
     "@babel/eslint-parser": "7.15.0",
     "@babel/plugin-proposal-class-properties": "7.14.5",
     "@babel/plugin-proposal-decorators": "7.14.5",
     "@babel/plugin-proposal-export-default-from": "7.14.5",
+    "@babel/plugin-proposal-private-methods": "7.14.5",
     "@babel/plugin-proposal-throw-expressions": "7.14.5",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
     "@babel/preset-env": "7.15.0",
@@ -148,16 +148,19 @@
     "@commitlint/config-conventional": "13.1.0",
     "@tsconfig/node14": "1.0.1",
     "@types/color": "3.0.2",
-    "@types/du": "1.0.0",
+    "@types/du": "1.0.1",
+    "@types/expect.js": "0.3.29",
     "@types/fs-extra": "9.0.12",
     "@types/lodash": "4.14.172",
+    "@types/mocha": "9.0.0",
+    "@types/ms": "0.7.31",
     "@types/node": "14.17.6",
     "@types/react": "16.14.6",
     "@types/react-dom": "16.9.13",
     "@types/route-parser": "0.1.3",
     "@types/tar": "4.0.5",
     "@types/uuid": "3.4.9",
-    "@typescript-eslint/eslint-plugin": "4.29.1",
+    "@typescript-eslint/eslint-plugin": "4.30.0",
     "@typescript-eslint/parser": "4.29.1",
     "all-contributors-cli": "6.20.0",
     "babel-plugin-react-intl": "3.5.1",
@@ -174,11 +177,11 @@
     "eslint-config-airbnb": "18.2.1",
     "eslint-config-airbnb-typescript": "12.3.1",
     "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-import": "2.24.0",
+    "eslint-plugin-import": "2.24.2",
     "eslint-plugin-jest": "24.4.0",
     "eslint-plugin-jsx-a11y": "6.4.1",
     "eslint-plugin-prettier": "3.4.0",
-    "eslint-plugin-react": "7.24.0",
+    "eslint-plugin-react": "7.25.1",
     "eslint-plugin-react-hooks": "4.2.0",
     "expect.js": "0.3.1",
     "gulp": "4.0.2",
@@ -194,19 +197,20 @@
     "gulp-uglify": "3.0.2",
     "hex-rgb": "4.3.0",
     "html-webpack-plugin": "4.5.2",
-    "husky": "7.0.1",
-    "jest": "27.0.6",
+    "husky": "7.0.2",
+    "jest": "27.1.0",
     "kebab-case": "1.0.1",
     "lerna": "4.0.0",
-    "mocha": "9.0.3",
+    "mocha": "9.1.1",
     "node-abi": "2.30.0",
     "prettier": "2.3.2",
     "preval-build-info": "1.0.3",
     "react-intl-translations-manager": "5.0.3",
     "sass": "1.37.5",
-    "simple-git": "2.44.0",
+    "simple-git": "2.45.0",
     "terser": "4.8.0",
     "ts-loader": "5.4.5",
+    "ts-mocha": "8.0.0",
     "typescript": "3.9.10",
     "wait-on": "6.0.0",
     "webpack": "4.46.0",
diff --git a/packages/forms/package.json b/packages/forms/package.json
index 29ccc3f25..5676ed6c3 100644
--- a/packages/forms/package.json
+++ b/packages/forms/package.json
@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "scripts": {
     "dev": "tsc -w",
-    "prepare": "tsc"
+    "build": "tsc"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/misty.yml b/packages/misty.yml
deleted file mode 100644
index 2d8cff014..000000000
--- a/packages/misty.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-theme:
-  cwd: ./theme
-  cmd: npm run dev
-
-forms:
-  cwd: ./forms
-  cmd: npm run dev
-
-ui:
-  cwd: ./ui
-  cmd: npm run dev
diff --git a/packages/theme/package.json b/packages/theme/package.json
index 7e3c4722d..7f3226bd8 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -15,15 +15,15 @@
   },
   "scripts": {
     "dev": "tsc -w",
-    "prepare": "tsc",
+    "build": "tsc",
     "preprepare": "npm run test",
-    "test": "npx mocha"
+    "test": "ts-mocha 'test/**/*.test.ts'"
   },
   "bugs": {
     "url": "https://github.com/meetfranz/franz/issues"
   },
   "dependencies": {
-    "color": "3.1.2"
+    "color": "4.0.1"
   },
   "gitHead": "9f2ab40b7602bc3df26ebb093b484b9917768f69"
 }
diff --git a/packages/theme/src/themes/IStyleTypes.ts b/packages/theme/src/themes/IStyleTypes.ts
index cf8bdea33..48f52daf2 100644
--- a/packages/theme/src/themes/IStyleTypes.ts
+++ b/packages/theme/src/themes/IStyleTypes.ts
@@ -1,4 +1,4 @@
-export default interface IStyleTypes {
+export interface IStyleTypes {
   [index: string]: {
     accent: string;
     contrast: string;
diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts
index 7d7bab399..87a68cb5d 100644
--- a/packages/theme/src/themes/dark/index.ts
+++ b/packages/theme/src/themes/dark/index.ts
@@ -153,13 +153,6 @@ export default (brandPrimary: string) => {
       },
     }),
 
-    // Announcements
-    announcements: merge({}, defaultStyles.announcements, {
-      spotlight: {
-        background: legacyStyles.darkThemeGrayDark,
-      },
-    }),
-
     // Todos
     todos: merge({}, defaultStyles.todos, {
       todosLayer: {
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts
index 21017bbe0..80bcba766 100644
--- a/packages/theme/src/themes/default/index.ts
+++ b/packages/theme/src/themes/default/index.ts
@@ -2,7 +2,7 @@ import color from 'color';
 import { cloneDeep } from 'lodash';
 
 import * as legacyStyles from '../legacy';
-import IStyleTypes from '../IStyleTypes';
+import type { IStyleTypes } from '../IStyleTypes';
 
 export default (brandPrimary: string) => {
   const brandSuccess = '#5cb85c';
@@ -228,13 +228,6 @@ export default (brandPrimary: string) => {
       },
     },
 
-    // Announcements
-    announcements: {
-      spotlight: {
-        background: legacyStyles.themeGrayLightest,
-      },
-    },
-
     // Todos
     todos: {
       todosLayer: {
diff --git a/packages/theme/test/index.test.js b/packages/theme/test/index.test.js
deleted file mode 100644
index 3906433c1..000000000
--- a/packages/theme/test/index.test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const expect = require('expect.js');
-
-const { colorBackground: colorBackgroundDefault } = require('../lib/themes/default');
-const { colorBackground: colorBackgroundDark } = require('../lib/themes/dark');
-const { default: theme } = require('../lib');
-
-describe('Load theme', () => {
-  it('Should load default theme', () => {
-    const { colorBackground } = theme('default');
-    expect(colorBackground).to.be(colorBackgroundDefault);
-  });
-
-  it('Should load dark theme', () => {
-    const { colorBackground } = theme('dark');
-    expect(colorBackground).to.be(colorBackgroundDark);
-  });
-});
diff --git a/packages/theme/test/index.test.ts b/packages/theme/test/index.test.ts
new file mode 100644
index 000000000..7eda4e359
--- /dev/null
+++ b/packages/theme/test/index.test.ts
@@ -0,0 +1,19 @@
+import expect from 'expect.js';
+
+import makeDefaultThemeConfig from '../src/themes/default';
+import makeDarkThemeConfig from '../src/themes/dark';
+import { theme, ThemeType } from '../src';
+
+describe('Load theme', () => {
+  it('Should load default theme', () => {
+    const { colorBackground } = theme('default' as ThemeType);
+    expect(colorBackground).to.be(
+      makeDefaultThemeConfig('default').colorBackground,
+    );
+  });
+
+  it('Should load dark theme', () => {
+    const { colorBackground } = theme('dark' as ThemeType);
+    expect(colorBackground).to.be(makeDarkThemeConfig('dark').colorBackground);
+  });
+});
diff --git a/packages/theme/tsconfig.json b/packages/theme/tsconfig.json
index d80ee9ee7..4deaa5dd7 100644
--- a/packages/theme/tsconfig.json
+++ b/packages/theme/tsconfig.json
@@ -4,4 +4,5 @@
     "outDir": "lib",
     "rootDir": "src"
   },
+  "exclude": ["node_modules", "lib", "test"]
 }
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 2b24803f5..23af393f5 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "scripts": {
     "dev": "tsc -w",
-    "prepare": "tsc"
+    "build": "tsc"
   },
   "publishConfig": {
     "access": "public"
diff --git a/recipes b/recipes
-Subproject 2486fbbd72f08b759a2781913f388e91149e79e
+Subproject 62599c06f4b2039219e282b34a51a4ff4fbe5e6
diff --git a/scripts/postinstall.js b/scripts/postinstall.js
new file mode 100644
index 000000000..84e7492ef
--- /dev/null
+++ b/scripts/postinstall.js
@@ -0,0 +1,8 @@
+const { exec } = require('child_process');
+
+// eslint-disable-next-line no-console
+const log = (err, stdout, stderr) => console.log(err || stdout || stderr);
+
+if (!process.env.BUNDLING) {
+  exec('npx lerna run build', log);
+}
diff --git a/scripts/prepare.js b/scripts/prepare.js
new file mode 100644
index 000000000..0b4daa82b
--- /dev/null
+++ b/scripts/prepare.js
@@ -0,0 +1,6 @@
+const isDev = process.env.NODE_ENV === 'development';
+
+if (isDev) {
+  // eslint-disable-next-line global-require
+  require('husky').install();
+}
diff --git a/src/actions/index.js b/src/actions/index.js
index ed8283d6c..aecdac675 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -10,7 +10,6 @@ import user from './user';
 import news from './news';
 import settings from './settings';
 import requests from './requests';
-import announcements from '../features/announcements/actions';
 import workspaces from '../features/workspaces/actions';
 import todos from '../features/todos/actions';
 
@@ -28,7 +27,6 @@ const actions = {
 
 export default Object.assign(
   defineActions(actions, PropTypes.checkPropTypes),
-  { announcements },
   { workspaces },
   { todos },
 );
diff --git a/src/components/AppUpdateInfoBar.js b/src/components/AppUpdateInfoBar.js
index f51fe029b..30804262a 100644
--- a/src/components/AppUpdateInfoBar.js
+++ b/src/components/AppUpdateInfoBar.js
@@ -2,8 +2,9 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { defineMessages, intlShape } from 'react-intl';
 
-import { announcementActions } from '../features/announcements/actions';
 import InfoBar from './ui/InfoBar';
+import { GITHUB_FERDI_URL } from '../config';
+import { openExternalUrl } from '../helpers/url-helpers';
 
 const messages = defineMessages({
   updateAvailable: {
@@ -23,25 +24,16 @@ const messages = defineMessages({
 class AppUpdateInfoBar extends Component {
   static propTypes = {
     onInstallUpdate: PropTypes.func.isRequired,
-    nextAppReleaseVersion: PropTypes.string,
     onHide: PropTypes.func.isRequired,
   };
 
-  static defaultProps = {
-    nextAppReleaseVersion: null,
-  };
-
   static contextTypes = {
     intl: intlShape,
   };
 
   render() {
     const { intl } = this.context;
-    const {
-      onInstallUpdate,
-      nextAppReleaseVersion,
-      onHide,
-    } = this.props;
+    const { onInstallUpdate, onHide } = this.props;
 
     return (
       <InfoBar
@@ -51,12 +43,16 @@ class AppUpdateInfoBar extends Component {
         onHide={onHide}
       >
         <span className="mdi mdi-information" />
-        {intl.formatMessage(messages.updateAvailable)}
-        {' '}
+        {intl.formatMessage(messages.updateAvailable)}{' '}
         <button
           className="info-bar__inline-button"
           type="button"
-          onClick={() => announcementActions.show({ targetVersion: nextAppReleaseVersion })}
+          onClick={() =>
+            openExternalUrl(
+              `${GITHUB_FERDI_URL}/ferdi/blob/develop/CHANGELOG.md`,
+              true,
+            )
+          }
         >
           <u>{intl.formatMessage(messages.changelog)}</u>
         </button>
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js
index c0e6b982b..8235932c2 100644
--- a/src/components/auth/AuthLayout.js
+++ b/src/components/auth/AuthLayout.js
@@ -28,7 +28,6 @@ class AuthLayout extends Component {
     retryHealthCheck: PropTypes.func.isRequired,
     isHealthCheckLoading: PropTypes.bool.isRequired,
     isFullScreen: PropTypes.bool.isRequired,
-    nextAppReleaseVersion: PropTypes.string,
     installAppUpdate: PropTypes.func.isRequired,
     appUpdateIsDownloaded: PropTypes.bool.isRequired,
   };
@@ -37,10 +36,6 @@ class AuthLayout extends Component {
     shouldShowAppUpdateInfoBar: true,
   };
 
-  static defaultProps = {
-    nextAppReleaseVersion: null,
-  };
-
   static contextTypes = {
     intl: intlShape,
   };
@@ -54,7 +49,6 @@ class AuthLayout extends Component {
       retryHealthCheck,
       isHealthCheckLoading,
       isFullScreen,
-      nextAppReleaseVersion,
       installAppUpdate,
       appUpdateIsDownloaded,
     } = this.props;
@@ -77,7 +71,6 @@ class AuthLayout extends Component {
           )}
           {appUpdateIsDownloaded && this.state.shouldShowAppUpdateInfoBar && (
             <AppUpdateInfoBar
-              nextAppReleaseVersion={nextAppReleaseVersion}
               onInstallUpdate={installAppUpdate}
               onHide={() => {
                 this.setState({ shouldShowAppUpdateInfoBar: false });
diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js
index 7bab80280..8e8a7af32 100644
--- a/src/components/auth/ChangeServer.js
+++ b/src/components/auth/ChangeServer.js
@@ -9,6 +9,7 @@ import Button from '../ui/Button';
 import Infobox from '../ui/Infobox';
 import { url, required } from '../../helpers/validation-helpers';
 import { LIVE_FERDI_API, LIVE_FRANZ_API } from '../../config';
+import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
   headline: {
@@ -31,11 +32,6 @@ const messages = defineMessages({
     id: 'changeserver.urlError',
     defaultMessage: '!!!Enter a valid URL',
   },
-  submit: {
-    id: 'changeserver.submit',
-    defaultMessage: '!!!Submit',
-  },
-
 });
 
 export default @observer class ChangeServer extends Component {
@@ -120,7 +116,7 @@ export default @observer class ChangeServer extends Component {
           <Button
             type="submit"
             className="auth__button"
-            label={intl.formatMessage(messages.submit)}
+            label={intl.formatMessage(globalMessages.submit)}
           />
         </form>
       </div>
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js
index eafc48502..1be2097bd 100644
--- a/src/components/auth/Password.js
+++ b/src/components/auth/Password.js
@@ -9,6 +9,7 @@ import Input from '../ui/Input';
 import Button from '../ui/Button';
 import Link from '../ui/Link';
 import Infobox from '../ui/Infobox';
+import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
   headline: {
@@ -19,10 +20,6 @@ const messages = defineMessages({
     id: 'password.email.label',
     defaultMessage: '!!!Email address',
   },
-  submitButtonLabel: {
-    id: 'password.submit.label',
-    defaultMessage: '!!!Submit',
-  },
   successInfo: {
     id: 'password.successInfo',
     defaultMessage: '!!!Your new password was sent to your email address',
@@ -112,7 +109,7 @@ export default @observer class Password extends Component {
             <Button
               className="auth__button is-loading"
               buttonType="secondary"
-              label={`${intl.formatMessage(messages.submitButtonLabel)} ...`}
+              label={`${intl.formatMessage(globalMessages.submit)} ...`}
               loaded={false}
               disabled
             />
@@ -120,7 +117,7 @@ export default @observer class Password extends Component {
             <Button
               type="submit"
               className="auth__button"
-              label={intl.formatMessage(messages.submitButtonLabel)}
+              label={intl.formatMessage(globalMessages.submit)}
             />
           )}
         </form>
diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js
index 0f821d4fc..ded36bbe7 100644
--- a/src/components/auth/SetupAssistant.js
+++ b/src/components/auth/SetupAssistant.js
@@ -10,6 +10,7 @@ import { Badge } from '@meetfranz/ui';
 import Modal from '../ui/Modal';
 import Infobox from '../ui/Infobox';
 import Appear from '../ui/effects/Appear';
+import globalMessages from '../../i18n/globalMessages';
 
 import { CDN_URL } from '../../config';
 
@@ -300,11 +301,14 @@ class SetupAssistant extends Component {
                 value={slackWorkspace}
               />
               <div className={classes.modalActionContainer}>
-                <Button type="submit" label="Save" />
+                <Button
+                  type="submit"
+                  label={intl.formatMessage(globalMessages.save)}
+                />
                 <Button
                   type="link"
                   buttonType="secondary"
-                  label="Cancel"
+                  label={intl.formatMessage(globalMessages.cancel)}
                   className={classes.ctaCancel}
                   onClick={() => this.setState({ slackWorkspace: '' })}
                 />
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 00d7a759b..e6e5d40fe 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -76,7 +76,6 @@ class AppLayout extends Component {
     news: MobxPropTypes.arrayOrObservableArray.isRequired,
     showServicesUpdatedInfoBar: PropTypes.bool.isRequired,
     appUpdateIsDownloaded: PropTypes.bool.isRequired,
-    nextAppReleaseVersion: PropTypes.string,
     authRequestFailed: PropTypes.bool.isRequired,
     removeNewsItem: PropTypes.func.isRequired,
     reloadServicesAfterUpdate: PropTypes.func.isRequired,
@@ -93,7 +92,6 @@ class AppLayout extends Component {
 
   static defaultProps = {
     children: [],
-    nextAppReleaseVersion: null,
   };
 
   static contextTypes = {
@@ -111,7 +109,6 @@ class AppLayout extends Component {
       news,
       showServicesUpdatedInfoBar,
       appUpdateIsDownloaded,
-      nextAppReleaseVersion,
       authRequestFailed,
       removeNewsItem,
       reloadServicesAfterUpdate,
@@ -195,7 +192,6 @@ class AppLayout extends Component {
               )}
               {appUpdateIsDownloaded && this.state.shouldShowAppUpdateInfoBar && (
                 <AppUpdateInfoBar
-                  nextAppReleaseVersion={nextAppReleaseVersion}
                   onInstallUpdate={installAppUpdate}
                   onHide={() => {
                     this.setState({ shouldShowAppUpdateInfoBar: false });
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index a1a4ab64f..1ee7733b9 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -12,12 +12,9 @@ import { todosStore } from '../../features/todos';
 import { todoActions } from '../../features/todos/actions';
 import AppStore from '../../stores/AppStore';
 import SettingsStore from '../../stores/SettingsStore';
+import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
-  settings: {
-    id: 'sidebar.settings',
-    defaultMessage: '!!!Settings',
-  },
   addNewService: {
     id: 'sidebar.addNewService',
     defaultMessage: '!!!Add new service',
@@ -40,11 +37,11 @@ const messages = defineMessages({
   },
   openTodosDrawer: {
     id: 'sidebar.openTodosDrawer',
-    defaultMessage: '!!!Open Franz Todos',
+    defaultMessage: '!!!Open Ferdi Todos',
   },
   closeTodosDrawer: {
     id: 'sidebar.closeTodosDrawer',
-    defaultMessage: '!!!Close Franz Todos',
+    defaultMessage: '!!!Close Ferdi Todos',
   },
   lockFerdi: {
     id: 'sidebar.lockFerdi',
@@ -215,7 +212,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
           type="button"
           onClick={() => openSettings({ path: 'app' })}
           className="sidebar__button sidebar__button--settings"
-          data-tip={`${intl.formatMessage(messages.settings)} (${settingsShortcutKey(false)})`}
+          data-tip={`${intl.formatMessage(globalMessages.settings)} (${settingsShortcutKey(false)})`}
         >
           <i className="mdi mdi-cog" />
           { (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index 6ad925670..e5892be5d 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -11,6 +11,7 @@ import ms from 'ms';
 import { observable, autorun } from 'mobx';
 import ServiceModel from '../../../models/Service';
 import { cmdOrCtrlShortcutKey } from '../../../environment';
+import globalMessages from '../../../i18n/globalMessages';
 
 const IS_SERVICE_DEBUGGING_ENABLED = (
   localStorage.getItem('debug') || ''
@@ -21,10 +22,6 @@ const messages = defineMessages({
     id: 'tabs.item.reload',
     defaultMessage: '!!!Reload',
   },
-  edit: {
-    id: 'tabs.item.edit',
-    defaultMessage: '!!!Edit',
-  },
   disableNotifications: {
     id: 'tabs.item.disableNotifications',
     defaultMessage: '!!!Disable notifications',
@@ -204,7 +201,7 @@ class TabItem extends Component {
         accelerator: `${cmdOrCtrlShortcutKey()}+R`,
       },
       {
-        label: intl.formatMessage(messages.edit),
+        label: intl.formatMessage(globalMessages.edit),
         click: () =>
           openSettings({
             path: `services/edit/${service.id}`,
@@ -227,8 +224,8 @@ class TabItem extends Component {
       },
       {
         label: service.isDarkModeEnabled
-          ? intl.formatMessage(messages.enableDarkMode)
-          : intl.formatMessage(messages.disableDarkMode),
+          ? intl.formatMessage(messages.disableDarkMode)
+          : intl.formatMessage(messages.enableDarkMode),
         click: () => toggleDarkMode(),
       },
       {
@@ -259,7 +256,7 @@ class TabItem extends Component {
             detail: intl.formatMessage(messages.confirmDeleteService, {
               serviceName: service.name || service.recipe.name,
             }),
-            buttons: ['Yes', 'No'],
+            buttons: [intl.formatMessage(globalMessages.yes), intl.formatMessage(globalMessages.no)],
           });
           if (selection === 0) {
             deleteService();
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 02cae6b69..0a5ace586 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -10,6 +10,7 @@ import { workspaceStore } from '../../../features/workspaces';
 import UIStore from '../../../stores/UIStore';
 import SettingsStore from '../../../stores/SettingsStore';
 import UserStore from '../../../stores/UserStore';
+import globalMessages from '../../../i18n/globalMessages';
 
 const messages = defineMessages({
   availableServices: {
@@ -32,10 +33,6 @@ const messages = defineMessages({
     id: 'settings.navigation.team',
     defaultMessage: '!!!Manage Team',
   },
-  settings: {
-    id: 'settings.navigation.settings',
-    defaultMessage: '!!!Settings',
-  },
   supportFerdi: {
     id: 'settings.navigation.supportFerdi',
     defaultMessage: '!!!About Ferdi',
@@ -159,7 +156,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
           className="settings-navigation__link"
           activeClassName="is-active"
         >
-          {intl.formatMessage(messages.settings)}
+          {intl.formatMessage(globalMessages.settings)}
         </Link>
         <Link
           to="/settings/support"
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 41580ca78..6a919b902 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -18,10 +18,6 @@ import { openPath } from '../../../helpers/url-helpers';
 import globalMessages from '../../../i18n/globalMessages';
 
 const messages = defineMessages({
-  headline: {
-    id: 'settings.app.headline',
-    defaultMessage: '!!!Settings',
-  },
   headlineGeneral: {
     id: 'settings.app.headlineGeneral',
     defaultMessage: '!!!General',
@@ -275,7 +271,7 @@ export default @observer class EditSettingsForm extends Component {
     return (
       <div className="settings__main">
         <div className="settings__header">
-          <h1>{intl.formatMessage(messages.headline)}</h1>
+          <h1>{intl.formatMessage(globalMessages.settings)}</h1>
         </div>
         <div className="settings__body">
           <form
@@ -334,6 +330,7 @@ export default @observer class EditSettingsForm extends Component {
               <div>
                 <Toggle field={form.$('autoLaunchOnStart')} />
                 <Toggle field={form.$('runInBackground')} />
+                <Toggle field={form.$('confirmOnQuit')} />
                 <Toggle field={form.$('enableSystemTray')} />
                 <Toggle field={form.$('reloadAfterResume')} />
                 <Toggle field={form.$('startMinimized')} />
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js
index 97ab93dcf..2952cd96b 100644
--- a/src/components/ui/FullscreenLoader/index.js
+++ b/src/components/ui/FullscreenLoader/index.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { observer, inject } from 'mobx-react';
+import { observer } from 'mobx-react';
 import injectSheet, { withTheme } from 'react-jss';
 import classnames from 'classnames';
 
@@ -8,7 +8,7 @@ import Loader from '../Loader';
 
 import styles from './styles';
 
-export default @inject('stores') @withTheme @injectSheet(styles) @observer class FullscreenLoader extends Component {
+export default @withTheme @injectSheet(styles) @observer class FullscreenLoader extends Component {
   static propTypes = {
     className: PropTypes.string,
     title: PropTypes.string.isRequired,
@@ -16,16 +16,6 @@ export default @inject('stores') @withTheme @injectSheet(styles) @observer class
     theme: PropTypes.object.isRequired,
     spinnerColor: PropTypes.string,
     children: PropTypes.node,
-    stores: PropTypes.shape({
-      app: PropTypes.shape({
-        accentColor: PropTypes.string.isRequired,
-      }).isRequired,
-      settings: PropTypes.shape({
-        app: PropTypes.shape({
-          accentColor: PropTypes.string.isRequired,
-        }).isRequired,
-      }).isRequired,
-    }).isRequired,
   };
 
   static defaultProps = {
@@ -42,16 +32,10 @@ export default @inject('stores') @withTheme @injectSheet(styles) @observer class
       spinnerColor,
       className,
       theme,
-      stores,
     } = this.props;
 
     return (
-      <div
-        className={classes.wrapper}
-        style={{
-          background: stores.app.accentColor,
-        }}
-      >
+      <div className={classes.wrapper}>
         <div
           className={classnames({
             [`${classes.component}`]: true,
diff --git a/src/config.ts b/src/config.ts
index 835d130da..7bb2525a5 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -27,7 +27,8 @@ export const STATS_API = 'https://stats.franzinfra.com';
 
 export const LOCAL_TODOS_FRONTEND_URL = 'http://localhost:4000';
 export const PRODUCTION_TODOS_FRONTEND_URL = 'https://app.franztodos.com';
-export const DEVELOPMENT_TODOS_FRONTEND_URL = 'https://development--franz-todos.netlify.com';
+export const DEVELOPMENT_TODOS_FRONTEND_URL =
+  'https://development--franz-todos.netlify.com';
 
 export const CDN_URL = 'https://cdn.franzinfra.com';
 
@@ -69,8 +70,10 @@ export const SEARCH_ENGINE_NAMES = {
 };
 
 export const SEARCH_ENGINE_URLS = {
-  [SEARCH_ENGINE_GOOGLE]: ({ searchTerm }) => `https://www.google.com/search?q=${searchTerm}`,
-  [SEARCH_ENGINE_DDG]: ({ searchTerm }) => `https://duckduckgo.com/?q=${searchTerm}`,
+  [SEARCH_ENGINE_GOOGLE]: ({ searchTerm }) =>
+    `https://www.google.com/search?q=${searchTerm}`,
+  [SEARCH_ENGINE_DDG]: ({ searchTerm }) =>
+    `https://duckduckgo.com/?q=${searchTerm}`,
 };
 
 export const CUSTOM_TODO_SERVICE = 'isUsingCustomTodoService';
@@ -83,7 +86,8 @@ 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_ANYDO_URL = 'https://desktop.any.do/';
-const TODO_GOOGLETASKS_URL = 'https://tasks.google.com/embed/?origin=https%3A%2F%2Fcalendar.google.com&fullWidth=1';
+const TODO_GOOGLETASKS_URL =
+  'https://tasks.google.com/embed/?origin=https%3A%2F%2Fcalendar.google.com&fullWidth=1';
 
 export const TODO_SERVICE_RECIPE_IDS = {
   [TODO_TODOIST_URL]: 'todoist',
@@ -108,7 +112,8 @@ export const TODO_APPS = {
 };
 
 export const DEFAULT_TODO_SERVICE = TODO_FRANZ_TODOS_URL;
-export const DEFAULT_TODO_RECIPE_ID = TODO_SERVICE_RECIPE_IDS[DEFAULT_TODO_SERVICE];
+export const DEFAULT_TODO_RECIPE_ID =
+  TODO_SERVICE_RECIPE_IDS[DEFAULT_TODO_SERVICE];
 export const DEFAULT_TODO_SERVICE_NAME = TODO_APPS[DEFAULT_TODO_SERVICE];
 
 export const SIDEBAR_WIDTH = {
@@ -135,7 +140,6 @@ export const iconSizeBias = 20;
 
 export const DEFAULT_FEATURES_CONFIG = {
   isServiceProxyEnabled: true,
-  isAnnouncementsEnabled: true,
   isWorkspaceEnabled: true,
   isTodosEnabled: true,
   isSettingsWSEnabled: false,
@@ -158,20 +162,12 @@ export const GITHUB_ORG_NAME = 'getferdi';
 export const GITHUB_FERDI_REPO_NAME = 'ferdi';
 export const GITHUB_NIGHTLIES_REPO_NAME = 'nightlies';
 
-export const FILE_SYSTEM_SETTINGS_TYPES = [
-  'app',
-  'proxy',
-];
+export const FILE_SYSTEM_SETTINGS_TYPES = ['app', 'proxy'];
 
 export const LOCAL_SERVER = 'You are using Ferdi without a server';
 export const SERVER_NOT_LOADED = 'Ferdi::SERVER_NOT_LOADED';
 
-export const ALLOWED_PROTOCOLS = [
-  'https:',
-  'http:',
-  'ftp:',
-  'ferdi:',
-];
+export const ALLOWED_PROTOCOLS = ['https:', 'http:', 'ftp:', 'ferdi:'];
 
 export const DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED = false;
 
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js
index f99a8a73f..a0d50ab54 100644
--- a/src/containers/auth/AuthLayoutContainer.js
+++ b/src/containers/auth/AuthLayoutContainer.js
@@ -14,7 +14,10 @@ import AppLoader from '../../components/ui/AppLoader';
 import { oneOrManyChildElements } from '../../prop-types';
 import FeaturesStore from '../../stores/FeaturesStore';
 
-export default @inject('stores', 'actions') @observer class AuthLayoutContainer extends Component {
+export default
+@inject('stores', 'actions')
+@observer
+class AuthLayoutContainer extends Component {
   static propTypes = {
     children: oneOrManyChildElements.isRequired,
     location: PropTypes.shape({
@@ -23,15 +26,12 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer
   };
 
   render() {
-    const {
-      stores, actions, children, location,
-    } = this.props;
-    const {
-      app, features, globalError, user,
-    } = stores;
+    const { stores, actions, children, location } = this.props;
+    const { app, features, globalError, user } = stores;
 
-    const isLoadingBaseFeatures = features.defaultFeaturesRequest.isExecuting
-      && !features.defaultFeaturesRequest.wasExecuted;
+    const isLoadingBaseFeatures =
+      features.defaultFeaturesRequest.isExecuting &&
+      !features.defaultFeaturesRequest.wasExecuted;
 
     if (isLoadingBaseFeatures) {
       return (
@@ -61,8 +61,9 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer
           isHealthCheckLoading={app.healthCheckRequest.isExecuting}
           isFullScreen={app.isFullScreen}
           installAppUpdate={actions.app.installUpdate}
-          nextAppReleaseVersion={app.nextAppReleaseVersion}
-          appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED}
+          appUpdateIsDownloaded={
+            app.updateStatus === app.updateStatusTypes.DOWNLOADED
+          }
         >
           {children}
         </AuthLayout>
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 32b1f1cf7..83a25168b 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -25,7 +25,10 @@ import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawe
 import { workspaceStore } from '../../features/workspaces';
 import WorkspacesStore from '../../features/workspaces/store';
 
-export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component {
+export default
+@inject('stores', 'actions')
+@observer
+class AppLayoutContainer extends Component {
   static defaultProps = {
     children: null,
   };
@@ -65,25 +68,25 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
 
     const { retryRequiredRequests } = this.props.actions.requests;
 
-    const {
-      installUpdate,
-      toggleMuteApp,
-    } = this.props.actions.app;
+    const { installUpdate, toggleMuteApp } = this.props.actions.app;
 
-    const {
-      openSettings,
-      closeSettings,
-    } = this.props.actions.ui;
+    const { openSettings, closeSettings } = this.props.actions.ui;
 
     const { children } = this.props;
 
-    const isLoadingFeatures = features.featuresRequest.isExecuting
-      && !features.featuresRequest.wasExecuted;
+    const isLoadingFeatures =
+      features.featuresRequest.isExecuting &&
+      !features.featuresRequest.wasExecuted;
 
-    const isLoadingServices = services.allServicesRequest.isExecuting
-      && services.allServicesRequest.isExecutingFirstTime;
+    const isLoadingServices =
+      services.allServicesRequest.isExecuting &&
+      services.allServicesRequest.isExecutingFirstTime;
 
-    if (isLoadingFeatures || isLoadingServices || workspaces.isLoadingWorkspaces) {
+    if (
+      isLoadingFeatures ||
+      isLoadingServices ||
+      workspaces.isLoadingWorkspaces
+    ) {
       return (
         <ThemeProvider theme={ui.theme}>
           <AppLoader />
@@ -93,9 +96,11 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
 
     const workspacesDrawer = (
       <WorkspaceDrawer
-        getServicesForWorkspace={(workspace) => (
-          workspace ? workspaceStore.getWorkspaceServices(workspace).map((s) => s.name) : services.all.map((s) => s.name)
-        )}
+        getServicesForWorkspace={workspace =>
+          (workspace
+            ? workspaceStore.getWorkspaceServices(workspace).map(s => s.name)
+            : services.all.map(s => s.name))
+        }
       />
     );
 
@@ -118,7 +123,9 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
         toggleMuteApp={toggleMuteApp}
         toggleWorkspaceDrawer={workspaceActions.toggleWorkspaceDrawer}
         isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen}
-        showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted}
+        showMessageBadgeWhenMutedSetting={
+          settings.all.app.showMessageBadgeWhenMuted
+        }
         showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted}
         isTodosServiceActive={services.isTodosServiceActive || false}
       />
@@ -145,8 +152,9 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
           isFullScreen={app.isFullScreen}
           isOnline={app.isOnline}
           showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar}
-          appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED}
-          nextAppReleaseVersion={app.nextAppReleaseVersion}
+          appUpdateIsDownloaded={
+            app.updateStatus === app.updateStatusTypes.DOWNLOADED
+          }
           authRequestFailed={app.authRequestFailed}
           sidebar={sidebar}
           workspacesDrawer={workspacesDrawer}
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index d65d8d5d5..09244bc3c 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -45,6 +45,10 @@ const messages = defineMessages({
     id: 'settings.app.form.startMinimized',
     defaultMessage: '!!!Start minimized',
   },
+  confirmOnQuit: {
+    id: 'settings.app.form.confirmOnQuit',
+    defaultMessage: '!!!Confirm when quitting Ferdi',
+  },
   enableSystemTray: {
     id: 'settings.app.form.enableSystemTray',
     defaultMessage: '!!!Always show Ferdi in System Tray',
@@ -239,78 +243,80 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
     });
 
     app.launchOnStartup({
-      enable: settingsData.autoLaunchOnStart,
-      openInBackground: settingsData.autoLaunchInBackground,
+      enable: Boolean(settingsData.autoLaunchOnStart),
+      openInBackground: Boolean(settingsData.autoLaunchInBackground),
     });
 
     debug(`Updating settings store with data: ${settingsData}`);
 
     settings.update({
       type: 'app',
+      // TODO: The conversions might not be necessary once we convert to typescript
       data: {
-        runInBackground: settingsData.runInBackground,
-        enableSystemTray: settingsData.enableSystemTray,
-        reloadAfterResume: settingsData.reloadAfterResume,
-        startMinimized: settingsData.startMinimized,
-        minimizeToSystemTray: settingsData.minimizeToSystemTray,
-        closeToSystemTray: settingsData.closeToSystemTray,
-        privateNotifications: settingsData.privateNotifications,
-        clipboardNotifications: settingsData.clipboardNotifications,
-        notifyTaskBarOnMessage: settingsData.notifyTaskBarOnMessage,
+        runInBackground: Boolean(settingsData.runInBackground),
+        enableSystemTray: Boolean(settingsData.enableSystemTray),
+        reloadAfterResume: Boolean(settingsData.reloadAfterResume),
+        startMinimized: Boolean(settingsData.startMinimized),
+        confirmOnQuit: Boolean(settingsData.confirmOnQuit),
+        minimizeToSystemTray: Boolean(settingsData.minimizeToSystemTray),
+        closeToSystemTray: Boolean(settingsData.closeToSystemTray),
+        privateNotifications: Boolean(settingsData.privateNotifications),
+        clipboardNotifications: Boolean(settingsData.clipboardNotifications),
+        notifyTaskBarOnMessage: Boolean(settingsData.notifyTaskBarOnMessage),
         navigationBarBehaviour: settingsData.navigationBarBehaviour,
         searchEngine: settingsData.searchEngine,
-        sentry: settingsData.sentry,
-        hibernateOnStartup: settingsData.hibernateOnStartup,
-        hibernationStrategy: settingsData.hibernationStrategy,
-        wakeUpStrategy: settingsData.wakeUpStrategy,
+        sentry: Boolean(settingsData.sentry),
+        hibernateOnStartup: Boolean(settingsData.hibernateOnStartup),
+        hibernationStrategy: Number(settingsData.hibernationStrategy),
+        wakeUpStrategy: Number(settingsData.wakeUpStrategy),
         predefinedTodoServer: settingsData.predefinedTodoServer,
         customTodoServer: settingsData.customTodoServer,
-        lockingFeatureEnabled: settingsData.lockingFeatureEnabled,
+        lockingFeatureEnabled: Boolean(settingsData.lockingFeatureEnabled),
         lockedPassword: hash(String(settingsData.lockedPassword)),
-        useTouchIdToUnlock: settingsData.useTouchIdToUnlock,
-        inactivityLock: settingsData.inactivityLock,
-        scheduledDNDEnabled: settingsData.scheduledDNDEnabled,
+        useTouchIdToUnlock: Boolean(settingsData.useTouchIdToUnlock),
+        inactivityLock: Number(settingsData.inactivityLock),
+        scheduledDNDEnabled: Boolean(settingsData.scheduledDNDEnabled),
         scheduledDNDStart: settingsData.scheduledDNDStart,
         scheduledDNDEnd: settingsData.scheduledDNDEnd,
-        enableGPUAcceleration: settingsData.enableGPUAcceleration,
-        showDisabledServices: settingsData.showDisabledServices,
-        darkMode: settingsData.darkMode,
-        adaptableDarkMode: settingsData.adaptableDarkMode,
-        universalDarkMode: settingsData.universalDarkMode,
-        serviceRibbonWidth: settingsData.serviceRibbonWidth,
-        iconSize: settingsData.iconSize,
-        useVerticalStyle: settingsData.useVerticalStyle,
-        alwaysShowWorkspaces: settingsData.alwaysShowWorkspaces,
+        enableGPUAcceleration: Boolean(settingsData.enableGPUAcceleration),
+        showDisabledServices: Boolean(settingsData.showDisabledServices),
+        darkMode: Boolean(settingsData.darkMode),
+        adaptableDarkMode: Boolean(settingsData.adaptableDarkMode),
+        universalDarkMode: Boolean(settingsData.universalDarkMode),
+        serviceRibbonWidth: Number(settingsData.serviceRibbonWidth),
+        iconSize: Number(settingsData.iconSize),
+        useVerticalStyle: Boolean(settingsData.useVerticalStyle),
+        alwaysShowWorkspaces: Boolean(settingsData.alwaysShowWorkspaces),
         accentColor: settingsData.accentColor,
-        showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted,
-        showDragArea: settingsData.showDragArea,
-        enableSpellchecking: settingsData.enableSpellchecking,
+        showMessageBadgeWhenMuted: Boolean(settingsData.showMessageBadgeWhenMuted),
+        showDragArea: Boolean(settingsData.showDragArea),
+        enableSpellchecking: Boolean(settingsData.enableSpellchecking),
         spellcheckerLanguage: settingsData.spellcheckerLanguage,
         userAgentPref: settingsData.userAgentPref,
-        beta: settingsData.beta, // we need this info in the main process as well
-        automaticUpdates: settingsData.automaticUpdates, // we need this info in the main process as well
+        beta: Boolean(settingsData.beta), // we need this info in the main process as well
+        automaticUpdates: Boolean(settingsData.automaticUpdates), // we need this info in the main process as well
         locale: settingsData.locale, // we need this info in the main process as well
       },
     });
 
     user.update({
       userData: {
-        automaticUpdates: settingsData.automaticUpdates,
-        beta: settingsData.beta,
+        automaticUpdates: Boolean(settingsData.automaticUpdates),
+        beta: Boolean(settingsData.beta),
         locale: settingsData.locale,
       },
     });
 
     if (workspaces.isFeatureActive) {
       const { keepAllWorkspacesLoaded } = workspaces.settings;
-      if (keepAllWorkspacesLoaded !== settingsData.keepAllWorkspacesLoaded) {
+      if (Boolean(keepAllWorkspacesLoaded) !== Boolean(settingsData.keepAllWorkspacesLoaded)) {
         workspaceActions.toggleKeepAllWorkspacesLoadedSetting();
       }
     }
 
     if (todos.isFeatureActive) {
       const { isFeatureEnabledByUser } = todos.settings;
-      if (isFeatureEnabledByUser !== settingsData.enableTodos) {
+      if (Boolean(isFeatureEnabledByUser) !== Boolean(settingsData.enableTodos)) {
         todosActions.toggleTodosFeatureVisibility();
       }
     }
@@ -389,6 +395,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.startMinimized,
           default: DEFAULT_APP_SETTINGS.startMinimized,
         },
+        confirmOnQuit: {
+          label: intl.formatMessage(messages.confirmOnQuit),
+          value: settings.all.app.confirmOnQuit,
+          default: DEFAULT_APP_SETTINGS.confirmOnQuit,
+        },
         enableSystemTray: {
           label: intl.formatMessage(isMac ? messages.enableMenuBar : messages.enableSystemTray),
           value: settings.all.app.enableSystemTray,
diff --git a/src/environment.js b/src/environment.js
index f8a51b207..caeada94b 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -124,6 +124,7 @@ export const DEFAULT_APP_SETTINGS = {
   reloadAfterResume: true,
   enableSystemTray: true,
   startMinimized: false,
+  confirmOnQuit: false,
   minimizeToSystemTray: false,
   closeToSystemTray: false,
   privateNotifications: false,
diff --git a/src/features/announcements/actions.js b/src/features/announcements/actions.js
deleted file mode 100644
index bab496314..000000000
--- a/src/features/announcements/actions.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import PropTypes from 'prop-types';
-import { createActionsFromDefinitions } from '../../actions/lib/actions';
-
-export const announcementActions = createActionsFromDefinitions({
-  show: {
-    targetVersion: PropTypes.string,
-  },
-}, PropTypes.checkPropTypes);
-
-export default announcementActions;
diff --git a/src/features/announcements/api.js b/src/features/announcements/api.js
deleted file mode 100644
index 962f3e694..000000000
--- a/src/features/announcements/api.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import Request from '../../stores/lib/Request';
-import apiBase from '../../api/apiBase';
-import { GITHUB_FERDI_REPO_NAME, GITHUB_NIGHTLIES_REPO_NAME, GITHUB_ORG_NAME } from '../../config';
-import { ferdiVersion } from '../../environment';
-
-const debug = require('debug')('Ferdi:feature:announcements:api');
-
-export const announcementsApi = {
-  async getCurrentVersion() {
-    debug('getting current version of electron app');
-    return Promise.resolve(ferdiVersion);
-  },
-
-  async getChangelog(version) {
-    const ferdiRepoName = version.includes('nightly') ? GITHUB_NIGHTLIES_REPO_NAME : GITHUB_FERDI_REPO_NAME;
-    const url = `https://api.github.com/repos/${GITHUB_ORG_NAME}/${ferdiRepoName}/releases/tags/v${version}`;
-    debug(`fetching release changelog from Github url: ${url}`);
-    const request = await window.fetch(url, { method: 'GET' });
-    if (!request.ok) return null;
-    const data = await request.json();
-    return data.body;
-  },
-
-  async getAnnouncement(version) {
-    const url = `${apiBase()}/announcements/${version}`;
-    debug(`fetching release announcement from api url: ${url}`);
-    const response = await window.fetch(url, { method: 'GET' });
-    if (!response.ok) return null;
-    return response.json();
-  },
-};
-
-export const getCurrentVersionRequest = new Request(announcementsApi, 'getCurrentVersion');
-export const getChangelogRequest = new Request(announcementsApi, 'getChangelog');
-export const getAnnouncementRequest = new Request(announcementsApi, 'getAnnouncement');
diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js
deleted file mode 100644
index 315843db3..000000000
--- a/src/features/announcements/components/AnnouncementScreen.js
+++ /dev/null
@@ -1,300 +0,0 @@
-import React, { Component } from 'react';
-import marked from 'marked';
-import PropTypes from 'prop-types';
-import { inject, observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
-import injectSheet from 'react-jss';
-import { Button } from '@meetfranz/forms';
-
-import { announcementsStore } from '../index';
-import UIStore from '../../../stores/UIStore';
-import AppStore from '../../../stores/AppStore';
-
-const renderer = new marked.Renderer();
-
-renderer.link = (href, title, text) => `<a target="_blank" href="${href}" title="${title}">${text}</a>`;
-
-const markedOptions = { sanitize: true, renderer };
-
-const messages = defineMessages({
-  headline: {
-    id: 'feature.announcements.changelog.headline',
-    defaultMessage: '!!!Changes in Ferdi {version}',
-  },
-});
-
-const smallScreen = '1000px';
-
-const styles = (theme) => ({
-  container: {
-    background: theme.colorBackground,
-    position: 'relative',
-    top: 0,
-    zIndex: 140,
-    width: '100%',
-    height: '100%',
-    overflowY: 'auto',
-  },
-  headline: {
-    color: theme.colorHeadline,
-    margin: [25, 0, 40],
-    // 'max-width': 500,
-    'text-align': 'center',
-    'line-height': '1.3em',
-  },
-  announcement: {
-    height: 'auto',
-
-    [`@media(min-width: ${smallScreen})`]: {
-      display: 'flex',
-      flexDirection: 'column',
-      justifyContent: 'center',
-      height: '100vh',
-    },
-  },
-  main: {
-    display: 'flex',
-    flexDirection: 'column',
-    flexGrow: 1,
-    justifyContent: 'center',
-
-    '& h1': {
-      margin: [40, 0, 15],
-      fontSize: 70,
-      color: theme.styleTypes.primary.accent,
-      textAlign: 'center',
-
-      [`@media(min-width: ${smallScreen})`]: {
-        marginTop: 0,
-      },
-    },
-    '& h2': {
-      fontSize: 30,
-      fontWeight: 300,
-      color: theme.colorText,
-      textAlign: 'center',
-      marginBottom: 60,
-    },
-  },
-  mainBody: {
-    display: 'flex',
-    flexDirection: 'column',
-    alignItems: 'center',
-    width: 'calc(100% - 80px)',
-    height: 'auto',
-    margin: '0 auto',
-    [`@media(min-width: ${smallScreen})`]: {
-      flexDirection: 'row',
-      justifyContent: 'center',
-    },
-  },
-  mainImage: {
-    minWidth: 250,
-    maxWidth: 400,
-    margin: '0 auto',
-    marginBottom: 40,
-    '& img': {
-      width: '100%',
-    },
-    [`@media(min-width: ${smallScreen})`]: {
-      margin: 0,
-    },
-  },
-  mainText: {
-    height: 'auto',
-    maxWidth: 600,
-    textAlign: 'center',
-    '& p': {
-      lineHeight: '1.5em',
-    },
-    [`@media(min-width: ${smallScreen})`]: {
-      textAlign: 'left',
-    },
-  },
-  mainCtaButton: {
-    textAlign: 'center',
-    marginTop: 40,
-    [`@media(min-width: ${smallScreen})`]: {
-      textAlign: 'left',
-    },
-  },
-  spotlight: {
-    height: 'auto',
-    background: theme.announcements.spotlight.background,
-    padding: [40, 0],
-    marginTop: 80,
-    [`@media(min-width: ${smallScreen})`]: {
-      marginTop: 0,
-      justifyContent: 'center',
-      alignItems: 'flex-start',
-      display: 'flex',
-      flexDirection: 'row',
-    },
-  },
-  spotlightTopicContainer: {
-    textAlign: 'center',
-    marginBottom: 20,
-
-    [`@media(min-width: ${smallScreen})`]: {
-      marginBottom: 0,
-      minWidth: 250,
-      maxWidth: 330,
-      width: '100%',
-      textAlign: 'right',
-      marginRight: 60,
-    },
-  },
-  spotlightContentContainer: {
-    textAlign: 'center',
-    [`@media(min-width: ${smallScreen})`]: {
-      height: 'auto',
-      maxWidth: 600,
-      paddingRight: 40,
-      textAlign: 'left',
-    },
-    '& p': {
-      lineHeight: '1.5em',
-    },
-  },
-  spotlightTopic: {
-    fontSize: 20,
-    marginBottom: 5,
-    letterSpacing: 0,
-    fontWeight: 100,
-  },
-  spotlightSubject: {
-    fontSize: 20,
-  },
-  changelog: {
-    padding: [0, 60],
-    maxWidth: 700,
-    margin: [100, 'auto'],
-    height: 'auto',
-
-    '& h3': {
-      fontSize: '24px',
-      margin: '1.5em 0 1em 0',
-    },
-    '& li': {
-      marginBottom: '1em',
-      lineHeight: '1.4em',
-    },
-    '& div': {
-      height: 'auto',
-    },
-  },
-});
-
-@inject('stores', 'actions') @injectSheet(styles) @observer
-class AnnouncementScreen extends Component {
-  static propTypes = {
-    classes: PropTypes.object.isRequired,
-    stores: PropTypes.shape({
-      ui: PropTypes.instanceOf(UIStore).isRequired,
-    }).isRequired,
-    actions: PropTypes.shape({
-      app: PropTypes.instanceOf(AppStore).isRequired,
-    }).isRequired,
-  };
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  render() {
-    const { classes, stores, actions } = this.props;
-    const { intl } = this.context;
-    const { changelog, announcement } = announcementsStore;
-    const themeImage = stores.ui.isDarkThemeActive ? 'dark' : 'light';
-    return (
-      <div className={classes.container}>
-        {announcement && (
-          <div className={classes.announcement}>
-            <div className={classes.main}>
-              <h1>{announcement.main.headline}</h1>
-              <h2>{announcement.main.subHeadline}</h2>
-              <div className={classes.mainBody}>
-                <div className={classes.mainImage}>
-                  <img
-                    src={announcement.main.image[themeImage]}
-                    alt=""
-                  />
-                </div>
-                <div className={classes.mainText}>
-                  <div
-                    dangerouslySetInnerHTML={{
-                      __html: marked(announcement.main.text, markedOptions),
-                    }}
-                  />
-                  {(announcement.main.cta.label || announcement.main.cta.href) && (
-                    <div className={classes.mainCtaButton}>
-                      <Button
-                        label={announcement.main.cta.label}
-                        onClick={() => {
-                          const {
-                            href,
-                          } = announcement.main.cta;
-                          if (announcement.main.cta.href.startsWith('http')) {
-                            actions.app.openExternalUrl({ url: href });
-                          } else {
-                            window.location.href = `#${href}`;
-                          }
-                        }}
-                      />
-                    </div>
-                  )}
-                </div>
-              </div>
-            </div>
-            {announcement.spotlight && (
-              <div className={classes.spotlight}>
-                <div className={classes.spotlightTopicContainer}>
-                  <h2 className={classes.spotlightTopic}>{announcement.spotlight.title}</h2>
-                  <h3 className={classes.spotlightSubject}>{announcement.spotlight.subject}</h3>
-                </div>
-                <div className={classes.spotlightContentContainer}>
-                  <div
-                    dangerouslySetInnerHTML={{
-                      __html: marked(announcement.spotlight.text, markedOptions),
-                    }}
-                  />
-                  <div className={classes.mainCtaButton}>
-                    <Button
-                      label={announcement.spotlight.cta.label}
-                      onClick={() => {
-                        const {
-                          href,
-                        } = announcement.spotlight.cta;
-                        if (announcement.spotlight.cta.href.startsWith('http')) {
-                          actions.app.openExternalUrl({ url: href });
-                        } else {
-                          window.location.href = `#${href}`;
-                        }
-                      }}
-                    />
-                  </div>
-                </div>
-              </div>
-            )}
-          </div>
-        )}
-        {changelog && (
-          <div className={classes.changelog}>
-            <h1 className={classes.headline}>
-              {intl.formatMessage(messages.headline, {
-                version: announcementsStore.targetVersion,
-              })}
-            </h1>
-            <div
-              dangerouslySetInnerHTML={{
-                __html: marked(changelog, markedOptions),
-              }}
-            />
-          </div>
-        )}
-      </div>
-    );
-  }
-}
-
-export default AnnouncementScreen;
diff --git a/src/features/announcements/constants.js b/src/features/announcements/constants.js
deleted file mode 100644
index 284226fdf..000000000
--- a/src/features/announcements/constants.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export const ANNOUNCEMENTS_ROUTES = {
-  TARGET: '/announcements/:id',
-};
-
-export const GA_CATEGORY_ANNOUNCEMENTS = 'Announcements';
diff --git a/src/features/announcements/index.js b/src/features/announcements/index.js
deleted file mode 100644
index 19930c5b1..000000000
--- a/src/features/announcements/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { reaction } from 'mobx';
-import { AnnouncementsStore } from './store';
-
-const debug = require('debug')('Ferdi:feature:announcements');
-
-export const GA_CATEGORY_ANNOUNCEMENTS = 'Announcements';
-
-export const announcementsStore = new AnnouncementsStore();
-
-export default function initAnnouncements(stores, actions) {
-  const { features } = stores;
-
-  // Toggle announcement feature
-  reaction(
-    () => (
-      features.features.isAnnouncementsEnabled
-    ),
-    (isEnabled) => {
-      if (isEnabled) {
-        debug('Initializing `announcements` feature');
-        announcementsStore.start(stores, actions);
-      } else if (announcementsStore.isFeatureActive) {
-        debug('Disabling `announcements` feature');
-        announcementsStore.stop();
-      }
-    },
-    { fireImmediately: true },
-  );
-}
diff --git a/src/features/announcements/store.js b/src/features/announcements/store.js
deleted file mode 100644
index 794d20142..000000000
--- a/src/features/announcements/store.js
+++ /dev/null
@@ -1,148 +0,0 @@
-import {
-  action,
-  computed,
-  observable,
-} from 'mobx';
-import semver from 'semver';
-import localStorage from 'mobx-localstorage';
-
-import { FeatureStore } from '../utils/FeatureStore';
-import { ANNOUNCEMENTS_ROUTES } from './constants';
-import { getAnnouncementRequest, getChangelogRequest, getCurrentVersionRequest } from './api';
-import { announcementActions } from './actions';
-import { createActionBindings } from '../utils/ActionBinding';
-import { createReactions } from '../../stores/lib/Reaction';
-import { matchRoute } from '../../helpers/routing-helpers';
-import { DEFAULT_APP_SETTINGS } from '../../environment';
-
-const LOCAL_STORAGE_KEY = 'announcements';
-
-const debug = require('debug')('Ferdi:feature:announcements:store');
-
-export class AnnouncementsStore extends FeatureStore {
-  @observable targetVersion = null;
-
-  @observable isFeatureActive = false;
-
-  @computed get changelog() {
-    return getChangelogRequest.result;
-  }
-
-  @computed get announcement() {
-    if (!this.stores || !getAnnouncementRequest.result) return null;
-    const { locale } = this.stores.app;
-    const announcement = getAnnouncementRequest.result;
-    // User locale
-    if (announcement[locale]) return announcement[locale];
-    // Default locale
-    if (announcement[DEFAULT_APP_SETTINGS.fallbackLocale]) return announcement[DEFAULT_APP_SETTINGS.fallbackLocale];
-    // No locales specified
-    return announcement;
-  }
-
-  @computed get areNewsAvailable() {
-    const isChangelogAvailable = getChangelogRequest.wasExecuted && !!this.changelog;
-    const isAnnouncementAvailable = getAnnouncementRequest.wasExecuted && !!this.announcement;
-    return isChangelogAvailable || isAnnouncementAvailable;
-  }
-
-  @computed get settings() {
-    return localStorage.getItem(LOCAL_STORAGE_KEY) || {};
-  }
-
-  @computed get lastSeenAnnouncementVersion() {
-    return this.settings.lastSeenAnnouncementVersion || null;
-  }
-
-  @computed get currentVersion() {
-    return getCurrentVersionRequest.result;
-  }
-
-  @computed get isNewUser() {
-    return this.stores.settings.stats.appStarts <= 1;
-  }
-
-  @computed get isAnnouncementShown() {
-    const { router } = this.stores;
-    return router.location.pathname.includes('/announcements');
-  }
-
-  async start(stores, actions) {
-    debug('AnnouncementsStore::start');
-    this.stores = stores;
-    this.actions = actions;
-    getCurrentVersionRequest.execute();
-
-    this._registerActions(createActionBindings([
-      [announcementActions.show, this._showAnnouncement],
-    ]));
-
-    this._reactions = createReactions([
-      this._showAnnouncementOnRouteMatch,
-      this._showAnnouncementToUsersWhoUpdatedApp,
-      this._fetchAnnouncements,
-    ]);
-    this._registerReactions(this._reactions);
-    this.isFeatureActive = true;
-  }
-
-  stop() {
-    super.stop();
-    debug('AnnouncementsStore::stop');
-    this.isFeatureActive = false;
-  }
-
-  // ======= HELPERS ======= //
-
-  _updateSettings = (changes) => {
-    localStorage.setItem(LOCAL_STORAGE_KEY, {
-      ...this.settings,
-      ...changes,
-    });
-  };
-
-  // ======= ACTIONS ======= //
-
-  @action _showAnnouncement = ({ targetVersion } = {}) => {
-    const { router } = this.stores;
-    this.targetVersion = targetVersion || this.currentVersion;
-    this._updateSettings({
-      lastSeenAnnouncementVersion: this.currentVersion,
-    });
-    const targetRoute = `/announcements/${this.targetVersion}`;
-    if (router.location.pathname !== targetRoute) {
-      this.stores.router.push(targetRoute);
-    }
-  };
-
-  // ======= REACTIONS ========
-
-  _showAnnouncementToUsersWhoUpdatedApp = () => {
-    const { announcement, isNewUser } = this;
-    // Check if there is an announcement and don't show announcements to new users
-    if (!announcement || isNewUser) return;
-
-    // Check if the user has already used current version (= has seen the announcement)
-    const { currentVersion, lastSeenAnnouncementVersion } = this;
-    if (semver.gt(currentVersion, lastSeenAnnouncementVersion || '0.0.0')) {
-      debug(`${currentVersion} > ${lastSeenAnnouncementVersion}: announcement is shown`);
-      this._showAnnouncement();
-    }
-  };
-
-  _fetchAnnouncements = () => {
-    const targetVersion = this.targetVersion || this.currentVersion;
-    if (!targetVersion) return;
-    getChangelogRequest.reset().execute(targetVersion);
-    getAnnouncementRequest.reset().execute(targetVersion);
-  };
-
-  _showAnnouncementOnRouteMatch = () => {
-    const { router } = this.stores;
-    const match = matchRoute(ANNOUNCEMENTS_ROUTES.TARGET, router.location.pathname);
-    if (match) {
-      const targetVersion = match.id;
-      this._showAnnouncement({ targetVersion });
-    }
-  }
-}
diff --git a/src/features/appearance/index.js b/src/features/appearance/index.js
index c3425ba9c..3aab2fcad 100644
--- a/src/features/appearance/index.js
+++ b/src/features/appearance/index.js
@@ -122,7 +122,7 @@ function generateShowDragAreaStyle(accentColor) {
       background-color: ${accentColor};
     }
     #root {
-      /** Remove 22px from app height, otherwise the page will be to high */
+      /** Remove 22px from app height, otherwise the page will be too high */
       height: calc(100% - 22px);
     }
   `;
@@ -139,11 +139,12 @@ function generateVerticalStyle(widthStr, alwaysShowWorkspaces) {
     document.head.appendChild(link);
   }
   const width = Number(widthStr);
-  const sidebarWidthStr = `${width - 4}px`;
+  const sidebarWidth = width - 4;
+  const verticalStyleOffset = 23;
 
   return `
   .sidebar {
-    height: ${sidebarWidthStr} !important;
+    height: ${sidebarWidth + verticalStyleOffset + 1}px !important;
   ${alwaysShowWorkspaces ? `
     width: calc(100% - 300px) !important;
   ` : ''}
@@ -154,11 +155,11 @@ function generateVerticalStyle(widthStr, alwaysShowWorkspaces) {
   }
 
   .app .app__content {
-    padding-top: ${sidebarWidthStr} !important;
+    padding-top: ${sidebarWidth + verticalStyleOffset + 1}px !important;
   }
 
   .workspaces-drawer {
-    maring-top: -${sidebarWidthStr} !important;
+    margin-top: -${sidebarWidth - verticalStyleOffset - 1}px !important;
   }
 
   .todos__todos-panel--expanded {
diff --git a/src/features/basicAuth/Component.js b/src/features/basicAuth/Component.js
index 14184f80b..a9601836b 100644
--- a/src/features/basicAuth/Component.js
+++ b/src/features/basicAuth/Component.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import injectSheet from 'react-jss';
 import { observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
 import classnames from 'classnames';
 
 import Modal from '../../components/ui/Modal';
@@ -17,12 +18,24 @@ import {
 import Form from './Form';
 
 import styles from './styles';
+import globalMessages from '../../i18n/globalMessages';
+
+const messages = defineMessages({
+  signIn: {
+    id: 'feature.basicAuth.signIn',
+    defaultMessage: '!!!Sign In',
+  },
+});
 
 export default @injectSheet(styles) @observer class BasicAuthModal extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
   }
 
+  static contextTypes = {
+    intl: intlShape,
+  };
+
   submit(e) {
     e.preventDefault();
 
@@ -56,6 +69,8 @@ export default @injectSheet(styles) @observer class BasicAuthModal extends Compo
       return null;
     }
 
+    const { intl } = this.context;
+
     return (
       <Modal
         isOpen={isModalVisible}
@@ -63,7 +78,7 @@ export default @injectSheet(styles) @observer class BasicAuthModal extends Compo
         close={this.cancel.bind(this)}
         showClose={false}
       >
-        <h1>Sign in</h1>
+        <h1>{intl.formatMessage(messages.signIn)}</h1>
         <p>
           http
           {authInfo.port === 443 && 's'}
@@ -86,13 +101,13 @@ export default @injectSheet(styles) @observer class BasicAuthModal extends Compo
           <div className={classes.buttons}>
             <Button
               type="button"
-              label="Cancel"
+              label={intl.formatMessage(globalMessages.cancel)}
               buttonType="secondary"
               onClick={this.cancel.bind(this)}
             />
             <Button
               type="submit"
-              label="Sign In"
+              label={intl.formatMessage(messages.signIn)}
             />
           </div>
         </form>
diff --git a/src/features/nightlyBuilds/Component.js b/src/features/nightlyBuilds/Component.js
index 6e5941948..e43287db5 100644
--- a/src/features/nightlyBuilds/Component.js
+++ b/src/features/nightlyBuilds/Component.js
@@ -11,6 +11,7 @@ import { state as ModalState } from './store';
 import SettingsStore from '../../stores/SettingsStore';
 import UIStore from '../../stores/UIStore';
 import UserStore from '../../stores/UserStore';
+import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
   title: {
@@ -25,10 +26,6 @@ const messages = defineMessages({
     id: 'feature.nightlyBuilds.activate',
     defaultMessage: '!!!Activate',
   },
-  cancel: {
-    id: 'feature.nightlyBuilds.cancel',
-    defaultMessage: '!!!Cancel',
-  },
 });
 
 const styles = () => ({
@@ -114,7 +111,7 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
           />
           <Button
             type="button"
-            label={intl.formatMessage(messages.cancel)}
+            label={intl.formatMessage(globalMessages.cancel)}
             className={classes.button}
             onClick={() => this.close()}
           />
diff --git a/src/features/todos/index.js b/src/features/todos/index.js
index 55956d1d7..573190881 100644
--- a/src/features/todos/index.js
+++ b/src/features/todos/index.js
@@ -3,8 +3,6 @@ import TodoStore from './store';
 
 const debug = require('debug')('Ferdi:feature:todos');
 
-export const GA_CATEGORY_TODOS = 'Todos';
-
 export const todosStore = new TodoStore();
 
 export default function initTodos(stores, actions) {
diff --git a/src/features/todos/store.js b/src/features/todos/store.js
index f283c1e59..ec06c279d 100644
--- a/src/features/todos/store.js
+++ b/src/features/todos/store.js
@@ -1,9 +1,5 @@
 import { ThemeType } from '@meetfranz/theme';
-import {
-  computed,
-  action,
-  observable,
-} from 'mobx';
+import { computed, action, observable } from 'mobx';
 import localStorage from 'mobx-localstorage';
 
 import { todoActions } from './actions';
@@ -44,12 +40,13 @@ export default class TodoStore extends FeatureStore {
   }
 
   @computed get isTodosPanelForceHidden() {
-    const { isAnnouncementShown } = this.stores.announcements;
-    return !this.isFeatureEnabledByUser || isAnnouncementShown;
+    return !this.isFeatureEnabledByUser;
   }
 
   @computed get isTodosPanelVisible() {
-    if (this.settings.isTodosPanelVisible === undefined) return DEFAULT_TODOS_VISIBLE;
+    if (this.settings.isTodosPanelVisible === undefined) {
+      return DEFAULT_TODOS_VISIBLE;
+    }
     return this.settings.isTodosPanelVisible;
   }
 
@@ -66,7 +63,10 @@ export default class TodoStore extends FeatureStore {
   }
 
   @computed get isUsingPredefinedTodoServer() {
-    return this.stores && this.stores.settings.app.predefinedTodoServer !== CUSTOM_TODO_SERVICE;
+    return (
+      this.stores &&
+      this.stores.settings.app.predefinedTodoServer !== CUSTOM_TODO_SERVICE
+    );
   }
 
   @computed get todoUrl() {
@@ -79,12 +79,17 @@ export default class TodoStore extends FeatureStore {
   }
 
   @computed get isTodoUrlValid() {
-    return !this.isUsingPredefinedTodoServer || isValidExternalURL(this.todoUrl);
+    return (
+      !this.isUsingPredefinedTodoServer || isValidExternalURL(this.todoUrl)
+    );
   }
 
   @computed get todoRecipeId() {
-    if (this.isFeatureEnabledByUser && this.isUsingPredefinedTodoServer
-        && this.todoUrl in TODO_SERVICE_RECIPE_IDS) {
+    if (
+      this.isFeatureEnabledByUser &&
+      this.isUsingPredefinedTodoServer &&
+      this.todoUrl in TODO_SERVICE_RECIPE_IDS
+    ) {
       return TODO_SERVICE_RECIPE_IDS[this.todoUrl];
     }
     return null;
@@ -99,16 +104,21 @@ export default class TodoStore extends FeatureStore {
 
     // ACTIONS
 
-    this._registerActions(createActionBindings([
-      [todoActions.resize, this._resize],
-      [todoActions.toggleTodosPanel, this._toggleTodosPanel],
-      [todoActions.setTodosWebview, this._setTodosWebview],
-      [todoActions.handleHostMessage, this._handleHostMessage],
-      [todoActions.handleClientMessage, this._handleClientMessage],
-      [todoActions.toggleTodosFeatureVisibility, this._toggleTodosFeatureVisibility],
-      [todoActions.openDevTools, this._openDevTools],
-      [todoActions.reload, this._reload],
-    ]));
+    this._registerActions(
+      createActionBindings([
+        [todoActions.resize, this._resize],
+        [todoActions.toggleTodosPanel, this._toggleTodosPanel],
+        [todoActions.setTodosWebview, this._setTodosWebview],
+        [todoActions.handleHostMessage, this._handleHostMessage],
+        [todoActions.handleClientMessage, this._handleClientMessage],
+        [
+          todoActions.toggleTodosFeatureVisibility,
+          this._toggleTodosFeatureVisibility,
+        ],
+        [todoActions.openDevTools, this._openDevTools],
+        [todoActions.reload, this._reload],
+      ]),
+    );
 
     // REACTIONS
 
@@ -133,7 +143,7 @@ export default class TodoStore extends FeatureStore {
 
   // ========== PRIVATE METHODS ========= //
 
-  _updateSettings = (changes) => {
+  _updateSettings = changes => {
     localStorage.setItem('todos', {
       ...this.settings,
       ...changes,
@@ -162,7 +172,7 @@ export default class TodoStore extends FeatureStore {
     }
   };
 
-  @action _handleHostMessage = (message) => {
+  @action _handleHostMessage = message => {
     debug('_handleHostMessage', message);
     if (message.action === 'todos:create') {
       this.webview.send(IPC.TODOS_HOST_CHANNEL, message);
@@ -172,11 +182,18 @@ export default class TodoStore extends FeatureStore {
   @action _handleClientMessage = ({ channel, message = {} }) => {
     debug('_handleClientMessage', channel, message);
     switch (message.action) {
-      case 'todos:initialized': this._onTodosClientInitialized(); break;
-      case 'todos:goToService': this._goToService(message.data); break;
+      case 'todos:initialized':
+        this._onTodosClientInitialized();
+        break;
+      case 'todos:goToService':
+        this._goToService(message.data);
+        break;
       default:
         debug('Other message received', channel, message);
-        console.log('this.stores.services.isTodosServiceAdded', this.stores.services.isTodosServiceAdded);
+        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,
@@ -189,7 +206,7 @@ export default class TodoStore extends FeatureStore {
 
   _handleNewWindowEvent = ({ url }) => {
     this.actions.app.openExternalUrl({ url });
-  }
+  };
 
   @action _toggleTodosFeatureVisibility = () => {
     debug('_toggleTodosFeatureVisibility');
@@ -204,14 +221,14 @@ export default class TodoStore extends FeatureStore {
 
     const webview = document.querySelector('#todos-panel webview');
     if (webview) webview.openDevTools();
-  }
+  };
 
   _reload = () => {
     debug('_reload');
 
     const webview = document.querySelector('#todos-panel webview');
     if (webview) webview.reload();
-  }
+  };
 
   // Todos client message handlers
 
@@ -291,5 +308,5 @@ export default class TodoStore extends FeatureStore {
         });
       }
     }
-  }
+  };
 }
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index 8319d3bc6..5f34204f1 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -20,7 +20,7 @@ const messages = defineMessages({
   },
   noServicesAdded: {
     id: 'settings.workspaces.noWorkspacesAdded',
-    defaultMessage: '!!!You haven\'t created any workspaces yet.',
+    defaultMessage: "!!!You haven't created any workspaces yet.",
   },
   workspacesRequestFailed: {
     id: 'settings.workspaces.workspacesRequestFailed',
@@ -61,9 +61,6 @@ const styles = () => ({
   appear: {
     height: 'auto',
   },
-  announcementHeadline: {
-    marginBottom: 0,
-  },
   teaserImage: {
     width: 250,
     margin: [-8, 0, 0, 20],
@@ -71,7 +68,9 @@ const styles = () => ({
   },
 });
 
-@inject('stores') @injectSheet(styles) @observer
+@inject('stores')
+@injectSheet(styles)
+@observer
 class WorkspacesDashboard extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -108,7 +107,6 @@ class WorkspacesDashboard extends Component {
           <h1>{intl.formatMessage(messages.headline)}</h1>
         </div>
         <div className="settings__body">
-
           {/* ===== Workspace updated info ===== */}
           {updateWorkspaceRequest.wasExecuted && updateWorkspaceRequest.result && (
             <Appear className={classes.appear}>
@@ -175,11 +173,11 @@ class WorkspacesDashboard extends Component {
                     <table className={classes.table}>
                       {/* ===== Workspaces list ===== */}
                       <tbody>
-                        {workspaces.map((workspace) => (
+                        {workspaces.map(workspace => (
                           <WorkspaceItem
                             key={workspace.id}
                             workspace={workspace}
-                            onItemClick={(w) => onWorkspaceClick(w)}
+                            onItemClick={w => onWorkspaceClick(w)}
                           />
                         ))}
                       </tbody>
diff --git a/src/features/workspaces/constants.js b/src/features/workspaces/constants.js
index 413afa1e8..2d1416ee0 100644
--- a/src/features/workspaces/constants.js
+++ b/src/features/workspaces/constants.js
@@ -2,5 +2,3 @@ export const WORKSPACES_ROUTES = {
   ROOT: '/settings/workspaces',
   EDIT: '/settings/workspaces/:action/:id',
 };
-
-export const GA_CATEGORY_WORKSPACES = 'Workspaces';
diff --git a/src/features/workspaces/models/Workspace.js b/src/features/workspaces/models/Workspace.js
index 11ee377cd..d9488e991 100644
--- a/src/features/workspaces/models/Workspace.js
+++ b/src/features/workspaces/models/Workspace.js
@@ -23,7 +23,7 @@ export default class Workspace {
     this.order = data.order;
 
     let { services } = data;
-    if (data.saving && data.keepLoaded) {
+    if (data.saving && Boolean(data.keepLoaded)) {
       // Keep workspaces loaded
       services.push(KEEP_WS_LOADED_USID);
     } else if (data.saving && data.services.includes(KEEP_WS_LOADED_USID)) {
diff --git a/src/i18n/globalMessages.js b/src/i18n/globalMessages.js
index cc219957a..66fce8d0f 100644
--- a/src/i18n/globalMessages.js
+++ b/src/i18n/globalMessages.js
@@ -33,4 +33,45 @@ export default defineMessages({
     id: 'global.userAgentHelp',
     defaultMessage: "!!!Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   },
+  yes: {
+    id: 'global.yes',
+    defaultMessage: '!!!Yes',
+  },
+  no: {
+    id: 'global.no',
+    defaultMessage: '!!!No',
+  },
+  ok: {
+    id: 'global.ok',
+    defaultMessage: '!!!Ok',
+  },
+  cancel: {
+    id: 'global.cancel',
+    defaultMessage: '!!!Cancel',
+  },
+  save: {
+    id: 'global.save',
+    defaultMessage: '!!!Save',
+  },
+  submit: {
+    id: 'global.submit',
+    defaultMessage: '!!!Submit',
+  },
+  quit: {
+    id: 'global.quit',
+    defaultMessage: '!!!Quit',
+  },
+  quitConfirmation: {
+    id: 'global.quitConfirmation',
+    defaultMessage:
+      '!!!Do you really want to quit Ferdi?',
+  },
+  settings: {
+    id: 'global.settings',
+    defaultMessage: '!!!Settings',
+  },
+  edit: {
+    id: 'global.edit',
+    defaultMessage: '!!!Edit',
+  },
 });
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index ff3ed1486..2c145d6f4 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Submit",
   "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": "Changes in Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Cancel",
   "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": "Nightly Builds",
   "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.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
+  "global.edit": "Edit",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "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.yes": "Yes",
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "About Ferdi",
-  "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.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Include beta versions",
   "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",
@@ -251,7 +256,6 @@
   "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.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.supportFerdi": "About Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index ded4a1913..ae2952f86 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "خادم مخصص",
   "changeserver.headline": "تغيير الخادم",
   "changeserver.label": "خادم",
-  "changeserver.submit": "إرسال",
   "changeserver.urlError": "الرجاء إدخال URL صحيح",
   "changeserver.warning": "لن يتم حفظ الإعدادات الإضافية التي يوفرها فردي",
   "connectionLostBanner.cta": "إعادة تحميل الخدمة",
   "connectionLostBanner.informationLink": "ماذا حدث؟",
   "connectionLostBanner.message": "أوه لا! فقد فردي الاتصال بـ.",
-  "feature.announcements.changelog.headline": "تغيرات في فريدي {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "نشر معلومات تصحيح الأخطاء",
   "feature.nightlyBuilds.activate": "تفعيل",
-  "feature.nightlyBuilds.cancel": "إلغاء",
   "feature.nightlyBuilds.info": "الإصدارات الليلية هي إصدارات تجريبية للغاية من فردي والتي قد تحتوي على ميزات غير مصقولة أو غير كاملة. يتم استخدام هذه الإنشاءات الليلية بشكل أساسي من قبل المطورين لاختبار ميزاتهم المطورة حديثًا وكيفية أدائهم في التصميم النهائي. إذا كنت لا تعرف ما تفعله ، فنقترح عدم تنشيط الإنشاءات الليلية.",
   "feature.nightlyBuilds.title": "المباني الليلية",
   "feature.publishDebugInfo.error": "حدث خطأ أثناء محاولة نشر معلومات التصحيح. الرجاء المحاولة مرة أخرى لاحقاً أو عرض وحدة التحكم لمزيد من المعلومات.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "بحث...",
   "feature.quickSwitch.title": "تبديل سريع",
   "global.api.unhealthy": "لا يمكن الإتصال بخدمات فردي عبر الإنترنت",
+  "global.cancel": "إلغاء",
+  "global.edit": "تعديل",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "أنت غير متصل بالإنترنت.",
+  "global.ok": "Ok",
+  "global.quit": "خروج",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "الإعدادات",
   "global.spellchecker.useDefault": "إستخدم الإعدادت الافتراضية ({default})",
   "global.spellchecking.autodetect": "الكشف عن اللغة تلقائياً",
   "global.spellchecking.autodetect.short": "تلقائي",
   "global.spellchecking.language": "لغة التدقيق الإملائي",
+  "global.submit": "إرسال",
   "global.userAgentHelp": "استخدم 'https://whatmyuseragent.com/' (لاكتشاف) أو 'https://developers.whatismybrowser.com/useragents/explore/' (لاختار) وكيل المستخدم المنشود و نسخه لصقه هنا.",
   "global.userAgentPref": "وكيل المستخدم",
+  "global.yes": "Yes",
   "import.headline": "استيراد خدمات فردي الأربع",
   "import.notSupportedHeadline": "الخدمات غير مدعومة بعد في فردي الإصدار 5",
   "import.skip.label": "أريد أن أضيف الخدمات يدوياً",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "إغلاق درج المهام",
   "menu.Todoss.openTodosDrawer": "فتح درج المهام",
   "menu.app.about": "حول فردي",
-  "menu.app.announcement": "ما الجديد؟",
   "menu.app.autohideMenuBar": "إخفاء شريط القوائم تلقائيا",
   "menu.app.checkForUpdates": "التحقق من وجود تحديثات",
   "menu.app.hide": "إخفاء",
   "menu.app.hideOthers": "إخفاء الآخرين",
-  "menu.app.quit": "خروج",
-  "menu.app.settings": "الإعدادات",
   "menu.app.unhide": "إظهار",
   "menu.edit": "تعديل",
   "menu.edit.copy": "نسخ",
@@ -147,7 +152,6 @@
   "password.link.login": "سجل الدخول لحسابك",
   "password.link.signup": "إنشاء حساب مجاني",
   "password.noUser": "لم يُعثر على مُستخدمٍ بعنوانِ البريدِ هذا",
-  "password.submit.label": "إرسال",
   "password.successInfo": "رجاءً تحقق من عنوان بريدك الإلكتروني",
   "pricing.features.accountSync": "مزامنةُ الحساب",
   "pricing.features.customWebsites": "إضافة مواقع مخصصة",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "تضمين الإصدارات التجريبية",
   "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": "خادم مهام مخصص",
   "settings.app.form.darkMode": "تفعيل الوضع المظلم",
   "settings.app.form.enableGPUAcceleration": "تفعيل التسريع بوحدة معالجة الرسومات",
@@ -251,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "السماح باستخدام TouchID لفتح فردي",
   "settings.app.form.useVerticalStyle": "استخدام النمط الأفقي",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "الإعدادات",
   "settings.app.headlineAdvanced": "متقدم",
   "settings.app.headlineAppearance": "المظهر",
   "settings.app.headlineGeneral": "عام",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "الحساب",
   "settings.navigation.availableServices": "الخدمات المتاحة",
   "settings.navigation.logout": "تسجيل خروج",
-  "settings.navigation.settings": "الإعدادات",
   "settings.navigation.supportFerdi": "حول فردي",
   "settings.navigation.team": "إدارة الفريق",
   "settings.navigation.yourServices": "خدماتك",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "تعطيل الإشعارات والصوت",
   "sidebar.openTodosDrawer": "فتح Todos فيردي",
   "sidebar.openWorkspaceDrawer": "فتحُ دُرجِ مساحة العمل",
-  "sidebar.settings": "الإعدادات",
   "sidebar.unmuteApp": "تمكين الإشعارات والصوت",
   "signup.email.label": "البريد الإلكتروني",
   "signup.emailDuplicate": "مستخدم بهذا البريد الإلكتروني موجود بالفعل",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "تعطيل الإشعارات",
   "tabs.item.disableService": "تعطيل الخدمة",
-  "tabs.item.edit": "تعديل",
   "tabs.item.enableAudio": "تمكين الصوت",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "تفعيل الإشعارات",
diff --git a/src/i18n/locales/be.json b/src/i18n/locales/be.json
index 30fae6dd8..31a5111a9 100644
--- a/src/i18n/locales/be.json
+++ b/src/i18n/locales/be.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Паслужнік",
-  "changeserver.submit": "Submit",
   "changeserver.urlError": "Напішыце дзейсны 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": "Changes in Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Cancel",
   "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": "Nightly Builds",
   "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.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
+  "global.edit": "Edit",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "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.yes": "Yes",
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "About Ferdi",
-  "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.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Include beta versions",
   "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",
@@ -251,7 +256,6 @@
   "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.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.supportFerdi": "About Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
diff --git a/src/i18n/locales/bg.json b/src/i18n/locales/bg.json
index 87d1083a8..f62a5ffb9 100644
--- a/src/i18n/locales/bg.json
+++ b/src/i18n/locales/bg.json
@@ -13,12 +13,16 @@
   "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.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
   "global.api.unhealthy": "Няма връзка с онлайн услугите на Франц",
+  "global.edit": "Редакция",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Не сте свързани към интернет",
+  "global.quit": "Изход",
+  "global.settings": "Настройки",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Изпращане",
   "import.headline": "Вмъкнете вашите услуги на Франц 4",
   "import.notSupportedHeadline": "Тези услуги не се подържат все още във Франц 5. ",
   "import.skip.label": "Искам да прибавя ръчно услуги",
@@ -51,8 +55,6 @@
   "menu.app.checkForUpdates": "Проверка за обновления",
   "menu.app.hide": "Скрий",
   "menu.app.hideOthers": "Скрий другите",
-  "menu.app.quit": "Изход",
-  "menu.app.settings": "Настройки",
   "menu.app.unhide": "Покажи",
   "menu.edit": "Редактиране",
   "menu.edit.copy": "Копирай",
@@ -109,7 +111,6 @@
   "password.link.login": "Влизте в профила си",
   "password.link.signup": "Създаване на безплатен профил",
   "password.noUser": "Абонат с такава е-поща не бе намерен",
-  "password.submit.label": "Изпращане",
   "password.successInfo": "Моля отбележете вашата е-поща",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
@@ -178,7 +179,6 @@
   "settings.app.form.runInBackground": "Дръж Франж влючен в задния план когато прозореца е затворен",
   "settings.app.form.showDisabledServices": "Покажи панели на изключени услуги",
   "settings.app.form.showMessagesBadgesWhenMuted": "Покажи непрочетени съобщения когато известията са изключени",
-  "settings.app.headline": "Настройки",
   "settings.app.headlineAdvanced": "Допълнителни",
   "settings.app.headlineAppearance": "Изглед",
   "settings.app.headlineGeneral": "Общи",
@@ -196,7 +196,6 @@
   "settings.navigation.availableServices": "Налични услуги",
   "settings.navigation.inviteFriends": "Поканете приятели",
   "settings.navigation.logout": "Изход",
-  "settings.navigation.settings": "Настройки",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Вашите услуги",
   "settings.navigation.yourWorkspaces": "Your workspaces",
@@ -302,7 +301,6 @@
   "sidebar.muteApp": "Дезактивирай известията и звуците",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Настройки",
   "sidebar.unmuteApp": "Активирай известията и звуците",
   "signup.email.label": "Адрес на ел. поща:",
   "signup.emailDuplicate": "Вече съществува потребител с този имейл адрес",
@@ -319,7 +317,6 @@
   "tabs.item.disableAudio": "Изключване на звука",
   "tabs.item.disableNotifications": "Изключване на известията",
   "tabs.item.disableService": "Спиране на услугата",
-  "tabs.item.edit": "Редакция",
   "tabs.item.enableAudio": "Включване на звука",
   "tabs.item.enableNotification": "Включване на известяванията",
   "tabs.item.enableService": "Разрешаване на услугата",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index ff3ed1486..2c145d6f4 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Submit",
   "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": "Changes in Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Cancel",
   "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": "Nightly Builds",
   "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.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
+  "global.edit": "Edit",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "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.yes": "Yes",
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "About Ferdi",
-  "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.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Include beta versions",
   "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",
@@ -251,7 +256,6 @@
   "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.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.supportFerdi": "About Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 96741e317..3cb52af9b 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Servidor personalitzat",
   "changeserver.headline": "Canvía de Servidor",
   "changeserver.label": "Servidor",
-  "changeserver.submit": "Enviar",
   "changeserver.urlError": "Enter a valid URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Torna a carregar el servei",
   "connectionLostBanner.informationLink": "Què ha passat?",
   "connectionLostBanner.message": "Oh no! Ferdi ha perdut la connexió a {name}.",
-  "feature.announcements.changelog.headline": "Canvis en Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Registra la informació de depuració",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Cancel·la",
   "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": "Nightly Builds",
   "feature.publishDebugInfo.error": "S'ha produït un error en intentar publicar la informació de depuració. Torneu-ho a provar més tard o visualitzeu la consola per obtenir més informació.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Cerca...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "No es pot connectar amb els serveis en línia de Ferdi",
+  "global.cancel": "Cancel·la",
+  "global.edit": "Edita",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "No esteu connectat a Internet.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Configuració",
   "global.spellchecker.useDefault": "Utilitzar el predeterminat del sistema ({default})",
   "global.spellchecking.autodetect": "Detectar l'idioma automàticament",
   "global.spellchecking.autodetect.short": "Automàtic",
   "global.spellchecking.language": "Corrector ortogràfic",
+  "global.submit": "Enviar",
   "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.yes": "Yes",
   "import.headline": "Importa els teus serveis Ferdi 4",
   "import.notSupportedHeadline": "Serveis que encara no s'admeten a Ferdi 5",
   "import.skip.label": "Vull afegir serveis manualment",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Tanca el calaix de tasques",
   "menu.Todoss.openTodosDrawer": "Obre el calaix de tasques",
   "menu.app.about": "Sobre Ferdi",
-  "menu.app.announcement": "Què hi ha de nou?",
   "menu.app.autohideMenuBar": "Amaga automàticament la barra de menú",
   "menu.app.checkForUpdates": "Comprova si hi ha actualitzacions",
   "menu.app.hide": "Amaga",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Configuració",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edita",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Inicia la sessió al teu compte",
   "password.link.signup": "Crea un compte gratuït",
   "password.noUser": "No s'ha trobat cap usuari amb aquesta adreça de correu electrònic",
-  "password.submit.label": "Enviar",
   "password.successInfo": "Comproveu el vostre correu electrònic",
   "pricing.features.accountSync": "Sincronització de Conte",
   "pricing.features.customWebsites": "Afegir llocs web personalitzats",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Inclou versions beta",
   "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": "Activar acceleració GPU",
@@ -251,7 +256,6 @@
   "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.headline": "Configuració",
   "settings.app.headlineAdvanced": "Avançat",
   "settings.app.headlineAppearance": "Aparença",
   "settings.app.headlineGeneral": "General",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Compte",
   "settings.navigation.availableServices": "Serveis disponibles",
   "settings.navigation.logout": "Sortir",
-  "settings.navigation.settings": "Configuració",
   "settings.navigation.supportFerdi": "Sobre Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Els vostres serveis",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Desactivar notificacions i àudio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Obrir el calaix d'espais de treball",
-  "sidebar.settings": "Configuració",
   "sidebar.unmuteApp": "Activar notificacions i àudio",
   "signup.email.label": "Correu electrònic",
   "signup.emailDuplicate": "Ja existeix un usuari amb aquesta adreça de correu electrònic",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Desactiva les notificacions",
   "tabs.item.disableService": "Desactiva el servei",
-  "tabs.item.edit": "Edita",
   "tabs.item.enableAudio": "Activa l'àudio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Activa les notificacions",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index a1326c772..1a82d3016 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Vlastní server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Odeslat",
   "changeserver.urlError": "Enter a valid URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Obnovit službu",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
-  "feature.announcements.changelog.headline": "Změny ve Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Zrušit",
   "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": "Nightly Builds",
   "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.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nemůžeme připojit Ferdi k online službám",
+  "global.cancel": "Zrušit",
+  "global.edit": "Upravit",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Připojení k internetu není k dispozici.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Nastavení",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Automaticky rozpoznat jazyk",
   "global.spellchecking.autodetect.short": "Automaticky",
   "global.spellchecking.language": "Oprava překlepů jazyka",
+  "global.submit": "Odeslat",
   "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.yes": "Yes",
   "import.headline": "Importovat služby z Ferdi 4",
   "import.notSupportedHeadline": "Služby nejsou podporovány ve verzi Ferdi 5",
   "import.skip.label": "Chci přidat službu ručně",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "O aplikaci",
-  "menu.app.announcement": "What's new?",
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Zkontrolovat aktualizace",
   "menu.app.hide": "Skrýt",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Nastavení",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Upravit",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Přihlásit se k účtu",
   "password.link.signup": "Vytvořit uživatelský účet zdarma",
   "password.noUser": "Pro emailovou adresu nebyl nalezený žádný uživatel",
-  "password.submit.label": "Odeslat",
   "password.successInfo": "Prosím, zkontrolujte svůj e-mail",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Zahrnout beta verze",
   "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": "Aktivovat GPU zrychlení",
@@ -251,7 +256,6 @@
   "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.headline": "Nastavení",
   "settings.app.headlineAdvanced": "Pokročilé",
   "settings.app.headlineAppearance": "Vzhled",
   "settings.app.headlineGeneral": "Obecné",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Účet",
   "settings.navigation.availableServices": "Dostupné služby",
   "settings.navigation.logout": "Odhlásit",
-  "settings.navigation.settings": "Nastavení",
   "settings.navigation.supportFerdi": "O aplikaci",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Vaše služby",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Vypnout upozornění a zvuky",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Nastavení",
   "sidebar.unmuteApp": "Zapnout upozornění a zvuky",
   "signup.email.label": "E-mailová adresa",
   "signup.emailDuplicate": "Uživatel s touto emailovou adresou již existuje",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Zakázat upozornění",
   "tabs.item.disableService": "Zakázat službu",
-  "tabs.item.edit": "Upravit",
   "tabs.item.enableAudio": "Zapnout zvuk",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Povolit upozornění",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index 48fe12245..31271cae5 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Brugerdefineret server",
   "changeserver.headline": "Skift server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Send",
   "changeserver.urlError": "Indtast en gyldig URL",
   "changeserver.warning": "Ekstra indstillinger, der tilbydes af Ferdi, vil ikke blive gemt",
   "connectionLostBanner.cta": "Genindlæs tjeneste",
   "connectionLostBanner.informationLink": "Hvad skete der?",
   "connectionLostBanner.message": "Åh nej! Ferdi mistede forbindelsen til {name}.",
-  "feature.announcements.changelog.headline": "Ændringer i Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Udgiv fejlfindingsoplysninger",
   "feature.nightlyBuilds.activate": "Aktiver",
-  "feature.nightlyBuilds.cancel": "Annuller",
   "feature.nightlyBuilds.info": "Natlige byg af Ferdi er meget eksperimentelle versioner, der kan indeholde ikke polerede eller ufærdige funktioner. Disse natlige byg bruges hovedsageligt af udviklere til at teste deres nyudviklede funktioner, og hvordan de vil opføre sig i den endelige version. Hvis du er usikker, foreslår vi ikke at aktivere natlige byg.",
   "feature.nightlyBuilds.title": "Natlige byg",
   "feature.publishDebugInfo.error": "Der opstod en fejl under forsøg på at udgive fejlfindingsoplysningerne. Prøv igen senere, eller se konsollen for mere information.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Søg...",
   "feature.quickSwitch.title": "Hurtigskift",
   "global.api.unhealthy": "Kan ikke oprette forbindelse til Ferdi onlinetjenester",
+  "global.cancel": "Annuller",
+  "global.edit": "Rediger",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Du har ikke forbindelse til internettet.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Indstillinger",
   "global.spellchecker.useDefault": "Benyt systemstandard ({default})",
   "global.spellchecking.autodetect": "Vælg sprog automatisk",
   "global.spellchecking.autodetect.short": "Automatisk",
   "global.spellchecking.language": "Stavekontrolsprog",
+  "global.submit": "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.yes": "Yes",
   "import.headline": "Importer dine Ferdi 4-tjenester",
   "import.notSupportedHeadline": "Tjenester endnu ikke understøttet i Ferdi 5",
   "import.skip.label": "Jeg ønsker at tilføje tjenester manuelt",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Luk Todos panel",
   "menu.Todoss.openTodosDrawer": "Åbn Todos panel",
   "menu.app.about": "Om Ferdi",
-  "menu.app.announcement": "Hvad er nyt?",
   "menu.app.autohideMenuBar": "Auto-skjul menulinje",
   "menu.app.checkForUpdates": "Søg efter opdateringer",
   "menu.app.hide": "Skjul",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Indstillinger",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Rediger",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Log ind på din konto",
   "password.link.signup": "Opret en gratis konto",
   "password.noUser": "Der blev ikke fundet nogen bruger med den mailadresse",
-  "password.submit.label": "Send",
   "password.successInfo": "Tjek venligst din mail",
   "pricing.features.accountSync": "Kontosynkronisering",
   "pricing.features.customWebsites": "Tilføj brugerdefinerede hjemmesider",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Medtag betaversioner",
   "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
   "settings.app.form.closeToSystemTray": "Luk Ferdi til systembakken",
+  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
   "settings.app.form.customTodoServer": "Brugerdefineret Todo server",
   "settings.app.form.darkMode": "Aktiver mørk tilstand",
   "settings.app.form.enableGPUAcceleration": "Aktiver GPU-acceleration",
@@ -251,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Tillad brug af TouchID for at låse Ferdi op",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Indstillinger",
   "settings.app.headlineAdvanced": "Avanceret",
   "settings.app.headlineAppearance": "Udseende",
   "settings.app.headlineGeneral": "Generelt",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Konto",
   "settings.navigation.availableServices": "Tilgængelige tjenester",
   "settings.navigation.logout": "Log ud",
-  "settings.navigation.settings": "Indstillinger",
   "settings.navigation.supportFerdi": "Om Ferdi",
   "settings.navigation.team": "Administrer Team",
   "settings.navigation.yourServices": "Dine tjenester",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Deaktiver notifikationer og lyd",
   "sidebar.openTodosDrawer": "Åbn Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Åbn arbejdsrumspanel",
-  "sidebar.settings": "Indstillinger",
   "sidebar.unmuteApp": "Aktiver notifikationer og lyd",
   "signup.email.label": "Mailadresse",
   "signup.emailDuplicate": "Der findes allerede en bruger med den mailadresse",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Deaktiver notifikationer",
   "tabs.item.disableService": "Deaktiver tjeneste",
-  "tabs.item.edit": "Rediger",
   "tabs.item.enableAudio": "Aktiver lyd",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktiver notifikationer",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 5390ef35c..1deee8e54 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Eigener Server",
   "changeserver.headline": "Server wechseln",
   "changeserver.label": "Server",
-  "changeserver.submit": "Absenden",
   "changeserver.urlError": "Bitte gib eine gültige URL ein",
   "changeserver.warning": "Zusätzliche Einstellungen von Ferdi werden nicht gespeichert",
   "connectionLostBanner.cta": "Dienst neu laden",
   "connectionLostBanner.informationLink": "Was ist passiert?",
   "connectionLostBanner.message": "Oh nein! Ferdi hat die Verbindung zu {name} verloren.",
-  "feature.announcements.changelog.headline": "Was ist neu in Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Debug-Informationen veröffentlichen",
   "feature.nightlyBuilds.activate": "Aktivieren",
-  "feature.nightlyBuilds.cancel": "Abbrechen",
   "feature.nightlyBuilds.info": "Nightly builds sind experimentelle Versionen von Ferdi die unfertige Funktionen enthalten kann. Nightly builds werden hauptsächlich von Entwicklern genutzt um neu entwickelte Features zu testen und zu sehen wie sie sich in der finalen Version verhalten. Wenn du nicht genau weisst was du tust, empfehlen wir dir Nightly Builds nicht zu aktivieren.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "Beim Veröffentlichen der Debug-Informationen ist ein Fehler aufgetreten. Bitte versuche es später noch einmal oder sehe dir die Konsole für weitere Informationen an.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Suchen...",
   "feature.quickSwitch.title": "Schnellauswahl",
   "global.api.unhealthy": "Verbindung zu den Ferdi Online Services fehlgeschlagen",
+  "global.cancel": "Abbrechen",
+  "global.edit": "Bearbeiten",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Du bist nicht mit dem Internet verbunden.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Einstellungen",
   "global.spellchecker.useDefault": "Standard benutzen ({default})",
   "global.spellchecking.autodetect": "Sprache automatisch erkennen",
   "global.spellchecking.autodetect.short": "Automatisch",
   "global.spellchecking.language": "Sprache für Rechtschreibprüfung",
+  "global.submit": "Absenden",
   "global.userAgentHelp": "Benutze 'https://whatmyuseragent.com/' (für das Entdecken) oder 'https://developers.whatismybrowser.com/useragents/explore/' (für die Wahl) deines gewünschten User Agenten und kopiere ihn hier hinein.",
   "global.userAgentPref": "User Agent",
+  "global.yes": "Yes",
   "import.headline": "Deine Ferdi-4-Dienste importieren",
   "import.notSupportedHeadline": "Dienste, die noch nicht von Ferdi 5 unterstützt werden",
   "import.skip.label": "Ich möchte Dienste selbst hinzufügen",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Todos schließen",
   "menu.Todoss.openTodosDrawer": "Todos öffnen",
   "menu.app.about": "Über Ferdi",
-  "menu.app.announcement": "Was ist neu?",
   "menu.app.autohideMenuBar": "Menü automatisch verstecken",
   "menu.app.checkForUpdates": "Nach Updates suchen",
   "menu.app.hide": "Ausblenden",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Einstellungen",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Bearbeiten",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Mit deinem Konto anmelden",
   "password.link.signup": "Kostenloses Konto erstellen",
   "password.noUser": "Es wurde kein Benutzer mit dieser E-Mail-Adresse gefunden",
-  "password.submit.label": "Absenden",
   "password.successInfo": "Wir haben Dir eine E-Mail mit weiteren Anweisungen geschickt",
   "pricing.features.accountSync": "Konto-Synchronisierung",
   "pricing.features.customWebsites": "Hinzufügen von eigenen Websites",
@@ -214,6 +218,7 @@
   "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.confirmOnQuit": "Confirm when quitting Ferdi",
   "settings.app.form.customTodoServer": "Eigener Todo Server",
   "settings.app.form.darkMode": "Dunkles Design verwenden",
   "settings.app.form.enableGPUAcceleration": "Hardwarebeschleunigung aktivieren",
@@ -251,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Verwenden von Touch ID zum Entsperren von Ferdi erlauben",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Einstellungen",
   "settings.app.headlineAdvanced": "Erweitert",
   "settings.app.headlineAppearance": "Darstellung",
   "settings.app.headlineGeneral": "Allgemeines",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Konto",
   "settings.navigation.availableServices": "Verfügbare Dienste",
   "settings.navigation.logout": "Abmelden",
-  "settings.navigation.settings": "Einstellungen",
   "settings.navigation.supportFerdi": "Über Ferdi",
   "settings.navigation.team": "Team verwalten",
   "settings.navigation.yourServices": "Deine Dienste",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Benachrichtigungen & Audio deaktivieren",
   "sidebar.openTodosDrawer": "Ferdi Todos öffnen",
   "sidebar.openWorkspaceDrawer": "Workspaces schließen",
-  "sidebar.settings": "Einstellungen",
   "sidebar.unmuteApp": "Benachrichtigungen & Audio aktivieren",
   "signup.email.label": "E-Mail-Adresse",
   "signup.emailDuplicate": "Es existiert bereits ein Benutzer mit dieser E-Mail Adresse.",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Benachrichtigungen deaktivieren",
   "tabs.item.disableService": "Dienst deaktivieren",
-  "tabs.item.edit": "Bearbeiten",
   "tabs.item.enableAudio": "Audio aktivieren",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Benachrichtigungen aktivieren",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 7aff45503..7624168ba 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -5,39 +5,39 @@
         "defaultMessage": "!!!A new update for Ferdi is available.",
         "end": {
           "column": 3,
-          "line": 12
+          "line": 13
         },
         "file": "src/components/AppUpdateInfoBar.js",
         "id": "infobar.updateAvailable",
         "start": {
           "column": 19,
-          "line": 9
+          "line": 10
         }
       },
       {
         "defaultMessage": "!!!Changelog",
         "end": {
           "column": 3,
-          "line": 16
+          "line": 17
         },
         "file": "src/components/AppUpdateInfoBar.js",
         "id": "infobar.buttonChangelog",
         "start": {
           "column": 13,
-          "line": 13
+          "line": 14
         }
       },
       {
         "defaultMessage": "!!!Restart & install update",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 21
         },
         "file": "src/components/AppUpdateInfoBar.js",
         "id": "infobar.buttonInstallUpdate",
         "start": {
           "column": 23,
-          "line": 17
+          "line": 18
         }
       }
     ],
@@ -49,78 +49,65 @@
         "defaultMessage": "!!!Change server",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 18
         },
         "file": "src/components/auth/ChangeServer.js",
         "id": "changeserver.headline",
         "start": {
           "column": 12,
-          "line": 14
+          "line": 15
         }
       },
       {
         "defaultMessage": "!!!Server",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 22
         },
         "file": "src/components/auth/ChangeServer.js",
         "id": "changeserver.label",
         "start": {
           "column": 9,
-          "line": 18
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Extra settings offered by Ferdi will not be saved",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 26
         },
         "file": "src/components/auth/ChangeServer.js",
         "id": "changeserver.warning",
         "start": {
           "column": 11,
-          "line": 22
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Custom server",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 30
         },
         "file": "src/components/auth/ChangeServer.js",
         "id": "changeserver.customServerLabel",
         "start": {
           "column": 21,
-          "line": 26
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Enter a valid URL",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 34
         },
         "file": "src/components/auth/ChangeServer.js",
         "id": "changeserver.urlError",
         "start": {
           "column": 12,
-          "line": 30
-        }
-      },
-      {
-        "defaultMessage": "!!!Submit",
-        "end": {
-          "column": 3,
-          "line": 37
-        },
-        "file": "src/components/auth/ChangeServer.js",
-        "id": "changeserver.submit",
-        "start": {
-          "column": 10,
-          "line": 34
+          "line": 31
         }
       }
     ],
@@ -568,91 +555,78 @@
         "defaultMessage": "!!!Forgot password",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 18
         },
         "file": "src/components/auth/Password.js",
         "id": "password.headline",
         "start": {
           "column": 12,
-          "line": 14
+          "line": 15
         }
       },
       {
         "defaultMessage": "!!!Email address",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 22
         },
         "file": "src/components/auth/Password.js",
         "id": "password.email.label",
         "start": {
           "column": 14,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Submit",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.submit.label",
-        "start": {
-          "column": 21,
-          "line": 22
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Your new password was sent to your email address",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 26
         },
         "file": "src/components/auth/Password.js",
         "id": "password.successInfo",
         "start": {
           "column": 15,
-          "line": 26
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!No user affiliated with that email address",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 30
         },
         "file": "src/components/auth/Password.js",
         "id": "password.noUser",
         "start": {
           "column": 10,
-          "line": 30
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Create a free account",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 34
         },
         "file": "src/components/auth/Password.js",
         "id": "password.link.signup",
         "start": {
           "column": 14,
-          "line": 34
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Sign in to your account",
         "end": {
           "column": 3,
-          "line": 41
+          "line": 38
         },
         "file": "src/components/auth/Password.js",
         "id": "password.link.login",
         "start": {
           "column": 13,
-          "line": 38
+          "line": 35
         }
       }
     ],
@@ -760,52 +734,52 @@
         "defaultMessage": "!!!Let's get started",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 23
         },
         "file": "src/components/auth/SetupAssistant.js",
         "id": "setupAssistant.headline",
         "start": {
           "column": 12,
-          "line": 19
+          "line": 20
         }
       },
       {
         "defaultMessage": "!!!Choose from our most used services and get back on top of your messaging now.",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 28
         },
         "file": "src/components/auth/SetupAssistant.js",
         "id": "setupAssistant.subheadline",
         "start": {
           "column": 15,
-          "line": 23
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Let's go",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 32
         },
         "file": "src/components/auth/SetupAssistant.js",
         "id": "setupAssistant.submit.label",
         "start": {
           "column": 21,
-          "line": 28
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Invitations sent successfully",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 36
         },
         "file": "src/components/auth/SetupAssistant.js",
         "id": "invite.successInfo",
         "start": {
           "column": 21,
-          "line": 32
+          "line": 33
         }
       }
     ],
@@ -1089,120 +1063,107 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Settings",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.settings",
-        "start": {
-          "column": 12,
-          "line": 17
-        }
-      },
-      {
         "defaultMessage": "!!!Add new service",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 21
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.addNewService",
         "start": {
           "column": 17,
-          "line": 21
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 25
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 8,
-          "line": 25
+          "line": 22
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 29
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 10,
-          "line": 29
+          "line": 26
         }
       },
       {
         "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 33
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.openWorkspaceDrawer",
         "start": {
           "column": 23,
-          "line": 33
+          "line": 30
         }
       },
       {
         "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 37
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.closeWorkspaceDrawer",
         "start": {
           "column": 24,
-          "line": 37
+          "line": 34
         }
       },
       {
-        "defaultMessage": "!!!Open Franz Todos",
+        "defaultMessage": "!!!Open Ferdi Todos",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 41
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.openTodosDrawer",
         "start": {
           "column": 19,
-          "line": 41
+          "line": 38
         }
       },
       {
-        "defaultMessage": "!!!Close Franz Todos",
+        "defaultMessage": "!!!Close Ferdi Todos",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 45
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.closeTodosDrawer",
         "start": {
           "column": 20,
-          "line": 45
+          "line": 42
         }
       },
       {
         "defaultMessage": "!!!Lock Ferdi",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 49
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.lockFerdi",
         "start": {
           "column": 13,
-          "line": 49
+          "line": 46
         }
       }
     ],
@@ -1696,182 +1657,169 @@
         "defaultMessage": "!!!Reload",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 24
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.reload",
         "start": {
           "column": 10,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Edit",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.edit",
-        "start": {
-          "column": 8,
-          "line": 24
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Disable notifications",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 28
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.disableNotifications",
         "start": {
           "column": 24,
-          "line": 28
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Enable notifications",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 32
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.enableNotification",
         "start": {
           "column": 23,
-          "line": 32
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Disable audio",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 36
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.disableAudio",
         "start": {
           "column": 16,
-          "line": 36
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Enable audio",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 40
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.enableAudio",
         "start": {
           "column": 15,
-          "line": 40
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Enable Dark mode",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 44
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.enableDarkMode",
         "start": {
           "column": 18,
-          "line": 44
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Disable Dark mode",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 48
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.disableDarkMode",
         "start": {
           "column": 19,
-          "line": 48
+          "line": 45
         }
       },
       {
         "defaultMessage": "!!!Disable Service",
         "end": {
           "column": 3,
-          "line": 55
+          "line": 52
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.disableService",
         "start": {
           "column": 18,
-          "line": 52
+          "line": 49
         }
       },
       {
         "defaultMessage": "!!!Enable Service",
         "end": {
           "column": 3,
-          "line": 59
+          "line": 56
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.enableService",
         "start": {
           "column": 17,
-          "line": 56
+          "line": 53
         }
       },
       {
         "defaultMessage": "!!!Hibernate Service",
         "end": {
           "column": 3,
-          "line": 63
+          "line": 60
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.hibernateService",
         "start": {
           "column": 20,
-          "line": 60
+          "line": 57
         }
       },
       {
         "defaultMessage": "!!!Wake Up Service",
         "end": {
           "column": 3,
-          "line": 67
+          "line": 64
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.wakeUpService",
         "start": {
           "column": 17,
-          "line": 64
+          "line": 61
         }
       },
       {
         "defaultMessage": "!!!Delete Service",
         "end": {
           "column": 3,
-          "line": 71
+          "line": 68
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.deleteService",
         "start": {
           "column": 17,
-          "line": 68
+          "line": 65
         }
       },
       {
         "defaultMessage": "!!!Do you really want to delete the {serviceName} service?",
         "end": {
           "column": 3,
-          "line": 76
+          "line": 73
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.confirmDeleteService",
         "start": {
           "column": 24,
-          "line": 72
+          "line": 69
         }
       }
     ],
@@ -2044,104 +1992,91 @@
         "defaultMessage": "!!!Available services",
         "end": {
           "column": 3,
-          "line": 18
+          "line": 19
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.availableServices",
         "start": {
           "column": 21,
-          "line": 15
+          "line": 16
         }
       },
       {
         "defaultMessage": "!!!Your services",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 23
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.yourServices",
         "start": {
           "column": 16,
-          "line": 19
+          "line": 20
         }
       },
       {
         "defaultMessage": "!!!Your workspaces",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 27
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.yourWorkspaces",
         "start": {
           "column": 18,
-          "line": 23
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Account",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 31
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.account",
         "start": {
           "column": 11,
-          "line": 27
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Manage Team",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 35
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.team",
         "start": {
           "column": 8,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Settings",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.settings",
-        "start": {
-          "column": 12,
-          "line": 35
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!About Ferdi",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 39
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.supportFerdi",
         "start": {
           "column": 16,
-          "line": 39
+          "line": 36
         }
       },
       {
         "defaultMessage": "!!!Logout",
         "end": {
           "column": 3,
-          "line": 46
+          "line": 43
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.logout",
         "start": {
           "column": 10,
-          "line": 43
+          "line": 40
         }
       }
     ],
@@ -2890,458 +2825,445 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Settings",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headline",
-        "start": {
-          "column": 12,
-          "line": 21
-        }
-      },
-      {
         "defaultMessage": "!!!General",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 24
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineGeneral",
         "start": {
           "column": 19,
-          "line": 25
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 28
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.sentryInfo",
         "start": {
           "column": 14,
-          "line": 29
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!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.",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 32
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.hibernateInfo",
         "start": {
           "column": 17,
-          "line": 33
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 36
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.inactivityLockInfo",
         "start": {
           "column": 22,
-          "line": 37
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 40
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.todoServerInfo",
         "start": {
           "column": 18,
-          "line": 41
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 44
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.lockedPassword",
         "start": {
           "column": 18,
-          "line": 45
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 48
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.lockedPasswordInfo",
         "start": {
           "column": 22,
-          "line": 49
+          "line": 45
         }
       },
       {
         "defaultMessage": "!!!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}.",
         "end": {
           "column": 3,
-          "line": 56
+          "line": 52
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.lockInfo",
         "start": {
           "column": 12,
-          "line": 53
+          "line": 49
         }
       },
       {
         "defaultMessage": "!!!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.",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 56
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.scheduledDNDTimeInfo",
         "start": {
           "column": 24,
-          "line": 57
+          "line": 53
         }
       },
       {
         "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
         "end": {
           "column": 3,
-          "line": 64
+          "line": 60
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.scheduledDNDInfo",
         "start": {
           "column": 20,
-          "line": 61
+          "line": 57
         }
       },
       {
         "defaultMessage": "!!!Language",
         "end": {
           "column": 3,
-          "line": 68
+          "line": 64
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineLanguage",
         "start": {
           "column": 20,
-          "line": 65
+          "line": 61
         }
       },
       {
         "defaultMessage": "!!!Updates",
         "end": {
           "column": 3,
-          "line": 72
+          "line": 68
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineUpdates",
         "start": {
           "column": 19,
-          "line": 69
+          "line": 65
         }
       },
       {
         "defaultMessage": "!!!Appearance",
         "end": {
           "column": 3,
-          "line": 76
+          "line": 72
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineAppearance",
         "start": {
           "column": 22,
-          "line": 73
+          "line": 69
         }
       },
       {
         "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
         "end": {
           "column": 3,
-          "line": 80
+          "line": 76
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.universalDarkModeInfo",
         "start": {
           "column": 25,
-          "line": 77
+          "line": 73
         }
       },
       {
         "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
         "end": {
           "column": 3,
-          "line": 84
+          "line": 80
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.accentColorInfo",
         "start": {
           "column": 19,
-          "line": 81
+          "line": 77
         }
       },
       {
         "defaultMessage": "!!!Privacy",
         "end": {
           "column": 3,
-          "line": 88
+          "line": 84
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlinePrivacy",
         "start": {
           "column": 19,
-          "line": 85
+          "line": 81
         }
       },
       {
         "defaultMessage": "!!!Advanced",
         "end": {
           "column": 3,
-          "line": 92
+          "line": 88
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineAdvanced",
         "start": {
           "column": 20,
-          "line": 89
+          "line": 85
         }
       },
       {
         "defaultMessage": "!!!Help us to translate Ferdi into your language.",
         "end": {
           "column": 3,
-          "line": 96
+          "line": 92
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.translationHelp",
         "start": {
           "column": 19,
-          "line": 93
+          "line": 89
         }
       },
       {
         "defaultMessage": "!!!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.",
         "end": {
           "column": 3,
-          "line": 100
+          "line": 96
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.spellCheckerLanguageInfo",
         "start": {
           "column": 28,
-          "line": 97
+          "line": 93
         }
       },
       {
         "defaultMessage": "!!!Cache",
         "end": {
           "column": 3,
-          "line": 104
+          "line": 100
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.subheadlineCache",
         "start": {
           "column": 20,
-          "line": 101
+          "line": 97
         }
       },
       {
         "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
         "end": {
           "column": 3,
-          "line": 108
+          "line": 104
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.cacheInfo",
         "start": {
           "column": 13,
-          "line": 105
+          "line": 101
         }
       },
       {
         "defaultMessage": "!!!Couldn't clear all cache",
         "end": {
           "column": 3,
-          "line": 112
+          "line": 108
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.cacheNotCleared",
         "start": {
           "column": 19,
-          "line": 109
+          "line": 105
         }
       },
       {
         "defaultMessage": "!!!Clear cache",
         "end": {
           "column": 3,
-          "line": 116
+          "line": 112
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonClearAllCache",
         "start": {
           "column": 23,
-          "line": 113
+          "line": 109
         }
       },
       {
         "defaultMessage": "!!!Ferdi Profile",
         "end": {
           "column": 3,
-          "line": 120
+          "line": 116
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.subheadlineFerdiProfile",
         "start": {
           "column": 27,
-          "line": 117
+          "line": 113
         }
       },
       {
         "defaultMessage": "!!!Open Profile folder",
         "end": {
           "column": 3,
-          "line": 124
+          "line": 120
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonOpenFerdiProfileFolder",
         "start": {
           "column": 32,
-          "line": 121
+          "line": 117
         }
       },
       {
         "defaultMessage": "!!!Open Service Recipes folder",
         "end": {
           "column": 3,
-          "line": 128
+          "line": 124
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonOpenFerdiServiceRecipesFolder",
         "start": {
           "column": 39,
-          "line": 125
+          "line": 121
         }
       },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 132
+          "line": 128
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonSearchForUpdate",
         "start": {
           "column": 25,
-          "line": 129
+          "line": 125
         }
       },
       {
         "defaultMessage": "!!!Restart & install update",
         "end": {
           "column": 3,
-          "line": 136
+          "line": 132
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonInstallUpdate",
         "start": {
           "column": 23,
-          "line": 133
+          "line": 129
         }
       },
       {
         "defaultMessage": "!!!Is searching for update",
         "end": {
           "column": 3,
-          "line": 140
+          "line": 136
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusSearching",
         "start": {
           "column": 25,
-          "line": 137
+          "line": 133
         }
       },
       {
         "defaultMessage": "!!!Update available, downloading...",
         "end": {
           "column": 3,
-          "line": 144
+          "line": 140
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusAvailable",
         "start": {
           "column": 25,
-          "line": 141
+          "line": 137
         }
       },
       {
         "defaultMessage": "!!!You are using the latest version of Ferdi",
         "end": {
           "column": 3,
-          "line": 148
+          "line": 144
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusUpToDate",
         "start": {
           "column": 24,
-          "line": 145
+          "line": 141
         }
       },
       {
         "defaultMessage": "!!!Current version:",
         "end": {
           "column": 3,
-          "line": 152
+          "line": 148
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.currentVersion",
         "start": {
           "column": 18,
-          "line": 149
+          "line": 145
         }
       },
       {
         "defaultMessage": "!!!Changes require restart",
         "end": {
           "column": 3,
-          "line": 156
+          "line": 152
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.restartRequired",
         "start": {
           "column": 22,
-          "line": 153
+          "line": 149
         }
       },
       {
         "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
         "end": {
           "column": 3,
-          "line": 160
+          "line": 156
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.languageDisclaimer",
         "start": {
           "column": 22,
-          "line": 157
+          "line": 153
         }
       }
     ],
@@ -4302,536 +4224,549 @@
         }
       },
       {
-        "defaultMessage": "!!!Always show Ferdi in System Tray",
+        "defaultMessage": "!!!Confirm when quitting Ferdi",
         "end": {
           "column": 3,
           "line": 51
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.confirmOnQuit",
+        "start": {
+          "column": 17,
+          "line": 48
+        }
+      },
+      {
+        "defaultMessage": "!!!Always show Ferdi in System Tray",
+        "end": {
+          "column": 3,
+          "line": 55
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSystemTray",
         "start": {
           "column": 20,
-          "line": 48
+          "line": 52
         }
       },
       {
         "defaultMessage": "!!!Always show Ferdi in Menu Bar",
         "end": {
           "column": 3,
-          "line": 55
+          "line": 59
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableMenuBar",
         "start": {
           "column": 17,
-          "line": 52
+          "line": 56
         }
       },
       {
         "defaultMessage": "!!!Reload Ferdi after system resume",
         "end": {
           "column": 3,
-          "line": 59
+          "line": 63
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.reloadAfterResume",
         "start": {
           "column": 21,
-          "line": 56
+          "line": 60
         }
       },
       {
         "defaultMessage": "!!!Minimize Ferdi to system tray",
         "end": {
           "column": 3,
-          "line": 63
+          "line": 67
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.minimizeToSystemTray",
         "start": {
           "column": 24,
-          "line": 60
+          "line": 64
         }
       },
       {
         "defaultMessage": "!!!Close Ferdi to system tray",
         "end": {
           "column": 3,
-          "line": 67
+          "line": 71
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.closeToSystemTray",
         "start": {
           "column": 21,
-          "line": 64
+          "line": 68
         }
       },
       {
         "defaultMessage": "!!!Don't show message content in notifications",
         "end": {
           "column": 3,
-          "line": 71
+          "line": 75
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.privateNotifications",
         "start": {
           "column": 24,
-          "line": 68
+          "line": 72
         }
       },
       {
         "defaultMessage": "!!!Don't show notifications for clipboard events",
         "end": {
           "column": 3,
-          "line": 75
+          "line": 79
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.clipboardNotifications",
         "start": {
           "column": 26,
-          "line": 72
+          "line": 76
         }
       },
       {
         "defaultMessage": "!!!Notify TaskBar/Dock on new message",
         "end": {
           "column": 3,
-          "line": 79
+          "line": 83
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.notifyTaskBarOnMessage",
         "start": {
           "column": 26,
-          "line": 76
+          "line": 80
         }
       },
       {
         "defaultMessage": "!!!Navigation bar behaviour",
         "end": {
           "column": 3,
-          "line": 83
+          "line": 87
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.navigationBarBehaviour",
         "start": {
           "column": 26,
-          "line": 80
+          "line": 84
         }
       },
       {
         "defaultMessage": "!!!Search engine",
         "end": {
           "column": 3,
-          "line": 87
+          "line": 91
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.searchEngine",
         "start": {
           "column": 16,
-          "line": 84
+          "line": 88
         }
       },
       {
         "defaultMessage": "!!!Send telemetry data",
         "end": {
           "column": 3,
-          "line": 91
+          "line": 95
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.sentry",
         "start": {
           "column": 10,
-          "line": 88
+          "line": 92
         }
       },
       {
         "defaultMessage": "!!!Keep services in hibernation on startup",
         "end": {
           "column": 3,
-          "line": 95
+          "line": 99
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.hibernateOnStartup",
         "start": {
           "column": 22,
-          "line": 92
+          "line": 96
         }
       },
       {
         "defaultMessage": "!!!Hibernation strategy",
         "end": {
           "column": 3,
-          "line": 99
+          "line": 103
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.hibernationStrategy",
         "start": {
           "column": 23,
-          "line": 96
+          "line": 100
         }
       },
       {
         "defaultMessage": "!!!Wake up strategy",
         "end": {
           "column": 3,
-          "line": 103
+          "line": 107
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.wakeUpStrategy",
         "start": {
           "column": 18,
-          "line": 100
+          "line": 104
         }
       },
       {
         "defaultMessage": "!!!Todo Server",
         "end": {
           "column": 3,
-          "line": 107
+          "line": 111
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.predefinedTodoServer",
         "start": {
           "column": 24,
-          "line": 104
+          "line": 108
         }
       },
       {
         "defaultMessage": "!!!Custom TodoServer",
         "end": {
           "column": 3,
-          "line": 111
+          "line": 115
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.customTodoServer",
         "start": {
           "column": 20,
-          "line": 108
+          "line": 112
         }
       },
       {
         "defaultMessage": "!!!Enable Password Lock",
         "end": {
           "column": 3,
-          "line": 115
+          "line": 119
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableLock",
         "start": {
           "column": 14,
-          "line": 112
+          "line": 116
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 119
+          "line": 123
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.lockPassword",
         "start": {
           "column": 16,
-          "line": 116
+          "line": 120
         }
       },
       {
         "defaultMessage": "!!!Allow using Touch ID to unlock",
         "end": {
           "column": 3,
-          "line": 123
+          "line": 127
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.useTouchIdToUnlock",
         "start": {
           "column": 22,
-          "line": 120
+          "line": 124
         }
       },
       {
         "defaultMessage": "!!!Lock after inactivity",
         "end": {
           "column": 3,
-          "line": 127
+          "line": 131
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.inactivityLock",
         "start": {
           "column": 18,
-          "line": 124
+          "line": 128
         }
       },
       {
         "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
         "end": {
           "column": 3,
-          "line": 131
+          "line": 135
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDEnabled",
         "start": {
           "column": 23,
-          "line": 128
+          "line": 132
         }
       },
       {
         "defaultMessage": "!!!From",
         "end": {
           "column": 3,
-          "line": 135
+          "line": 139
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDStart",
         "start": {
           "column": 21,
-          "line": 132
+          "line": 136
         }
       },
       {
         "defaultMessage": "!!!To",
         "end": {
           "column": 3,
-          "line": 139
+          "line": 143
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDEnd",
         "start": {
           "column": 19,
-          "line": 136
+          "line": 140
         }
       },
       {
         "defaultMessage": "!!!Language",
         "end": {
           "column": 3,
-          "line": 143
+          "line": 147
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.language",
         "start": {
           "column": 12,
-          "line": 140
+          "line": 144
         }
       },
       {
         "defaultMessage": "!!!Dark Mode",
         "end": {
           "column": 3,
-          "line": 147
+          "line": 151
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.darkMode",
         "start": {
           "column": 12,
-          "line": 144
+          "line": 148
         }
       },
       {
         "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
         "end": {
           "column": 3,
-          "line": 151
+          "line": 155
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.adaptableDarkMode",
         "start": {
           "column": 21,
-          "line": 148
+          "line": 152
         }
       },
       {
         "defaultMessage": "!!!Enable universal Dark Mode",
         "end": {
           "column": 3,
-          "line": 155
+          "line": 159
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.universalDarkMode",
         "start": {
           "column": 21,
-          "line": 152
+          "line": 156
         }
       },
       {
         "defaultMessage": "!!!Sidebar width",
         "end": {
           "column": 3,
-          "line": 159
+          "line": 163
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.serviceRibbonWidth",
         "start": {
           "column": 22,
-          "line": 156
+          "line": 160
         }
       },
       {
         "defaultMessage": "!!!Service icon size",
         "end": {
           "column": 3,
-          "line": 163
+          "line": 167
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.iconSize",
         "start": {
           "column": 12,
-          "line": 160
+          "line": 164
         }
       },
       {
         "defaultMessage": "!!!Use horizontal style",
         "end": {
           "column": 3,
-          "line": 167
+          "line": 171
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.useVerticalStyle",
         "start": {
           "column": 20,
-          "line": 164
+          "line": 168
         }
       },
       {
         "defaultMessage": "!!!Always show workspace drawer",
         "end": {
           "column": 3,
-          "line": 171
+          "line": 175
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.alwaysShowWorkspaces",
         "start": {
           "column": 24,
-          "line": 168
+          "line": 172
         }
       },
       {
         "defaultMessage": "!!!Accent color",
         "end": {
           "column": 3,
-          "line": 175
+          "line": 179
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.accentColor",
         "start": {
           "column": 15,
-          "line": 172
+          "line": 176
         }
       },
       {
         "defaultMessage": "!!!Display disabled services tabs",
         "end": {
           "column": 3,
-          "line": 179
+          "line": 183
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDisabledServices",
         "start": {
           "column": 24,
-          "line": 176
+          "line": 180
         }
       },
       {
         "defaultMessage": "!!!Show unread message badge when notifications are disabled",
         "end": {
           "column": 3,
-          "line": 183
+          "line": 187
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showMessagesBadgesWhenMuted",
         "start": {
           "column": 29,
-          "line": 180
+          "line": 184
         }
       },
       {
         "defaultMessage": "!!!Show draggable area on window",
         "end": {
           "column": 3,
-          "line": 187
+          "line": 191
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDragArea",
         "start": {
           "column": 16,
-          "line": 184
+          "line": 188
         }
       },
       {
         "defaultMessage": "!!!Enable spell checking",
         "end": {
           "column": 3,
-          "line": 191
+          "line": 195
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSpellchecking",
         "start": {
           "column": 23,
-          "line": 188
+          "line": 192
         }
       },
       {
         "defaultMessage": "!!!Enable GPU Acceleration",
         "end": {
           "column": 3,
-          "line": 195
+          "line": 199
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableGPUAcceleration",
         "start": {
           "column": 25,
-          "line": 192
+          "line": 196
         }
       },
       {
         "defaultMessage": "!!!Include beta versions",
         "end": {
           "column": 3,
-          "line": 199
+          "line": 203
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.beta",
         "start": {
           "column": 8,
-          "line": 196
+          "line": 200
         }
       },
       {
         "defaultMessage": "!!!Enable updates",
         "end": {
           "column": 3,
-          "line": 203
+          "line": 207
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.automaticUpdates",
         "start": {
           "column": 20,
-          "line": 200
+          "line": 204
         }
       },
       {
         "defaultMessage": "!!!Enable Franz Todos",
         "end": {
           "column": 3,
-          "line": 207
+          "line": 211
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableTodos",
         "start": {
           "column": 15,
-          "line": 204
+          "line": 208
         }
       },
       {
         "defaultMessage": "!!!Keep all workspaces loaded",
         "end": {
           "column": 3,
-          "line": 211
+          "line": 215
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.keepAllWorkspacesLoaded",
         "start": {
           "column": 27,
-          "line": 208
+          "line": 212
         }
       }
     ],
@@ -4962,20 +4897,20 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Changes in Ferdi {version}",
+        "defaultMessage": "!!!Sign In",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 27
         },
-        "file": "src/features/announcements/components/AnnouncementScreen.js",
-        "id": "feature.announcements.changelog.headline",
+        "file": "src/features/basicAuth/Component.js",
+        "id": "feature.basicAuth.signIn",
         "start": {
-          "column": 12,
-          "line": 20
+          "column": 10,
+          "line": 24
         }
       }
     ],
-    "path": "src/features/announcements/components/AnnouncementScreen.json"
+    "path": "src/features/basicAuth/Component.json"
   },
   {
     "descriptors": [
@@ -5001,52 +4936,39 @@
         "defaultMessage": "!!!Nightly Builds",
         "end": {
           "column": 3,
-          "line": 19
+          "line": 20
         },
         "file": "src/features/nightlyBuilds/Component.js",
         "id": "feature.nightlyBuilds.title",
         "start": {
           "column": 9,
-          "line": 16
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!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.",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 24
         },
         "file": "src/features/nightlyBuilds/Component.js",
         "id": "feature.nightlyBuilds.info",
         "start": {
           "column": 8,
-          "line": 20
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Activate",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 28
         },
         "file": "src/features/nightlyBuilds/Component.js",
         "id": "feature.nightlyBuilds.activate",
         "start": {
           "column": 12,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Cancel",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/features/nightlyBuilds/Component.js",
-        "id": "feature.nightlyBuilds.cancel",
-        "start": {
-          "column": 10,
-          "line": 28
+          "line": 25
         }
       }
     ],
@@ -5888,6 +5810,136 @@
           "column": 17,
           "line": 32
         }
+      },
+      {
+        "defaultMessage": "!!!Yes",
+        "end": {
+          "column": 3,
+          "line": 39
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.yes",
+        "start": {
+          "column": 7,
+          "line": 36
+        }
+      },
+      {
+        "defaultMessage": "!!!No",
+        "end": {
+          "column": 3,
+          "line": 43
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.no",
+        "start": {
+          "column": 6,
+          "line": 40
+        }
+      },
+      {
+        "defaultMessage": "!!!Ok",
+        "end": {
+          "column": 3,
+          "line": 47
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.ok",
+        "start": {
+          "column": 6,
+          "line": 44
+        }
+      },
+      {
+        "defaultMessage": "!!!Cancel",
+        "end": {
+          "column": 3,
+          "line": 51
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.cancel",
+        "start": {
+          "column": 10,
+          "line": 48
+        }
+      },
+      {
+        "defaultMessage": "!!!Save",
+        "end": {
+          "column": 3,
+          "line": 55
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.save",
+        "start": {
+          "column": 8,
+          "line": 52
+        }
+      },
+      {
+        "defaultMessage": "!!!Submit",
+        "end": {
+          "column": 3,
+          "line": 59
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.submit",
+        "start": {
+          "column": 10,
+          "line": 56
+        }
+      },
+      {
+        "defaultMessage": "!!!Quit",
+        "end": {
+          "column": 3,
+          "line": 63
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.quit",
+        "start": {
+          "column": 8,
+          "line": 60
+        }
+      },
+      {
+        "defaultMessage": "!!!Do you really want to quit Ferdi?",
+        "end": {
+          "column": 3,
+          "line": 68
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.quitConfirmation",
+        "start": {
+          "column": 20,
+          "line": 64
+        }
+      },
+      {
+        "defaultMessage": "!!!Settings",
+        "end": {
+          "column": 3,
+          "line": 72
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.settings",
+        "start": {
+          "column": 12,
+          "line": 69
+        }
+      },
+      {
+        "defaultMessage": "!!!Edit",
+        "end": {
+          "column": 3,
+          "line": 76
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.edit",
+        "start": {
+          "column": 8,
+          "line": 73
+        }
       }
     ],
     "path": "src/i18n/globalMessages.json"
@@ -5898,949 +5950,910 @@
         "defaultMessage": "!!!Edit",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 36
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit",
         "start": {
           "column": 8,
-          "line": 19
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Undo",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 40
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.undo",
         "start": {
           "column": 8,
-          "line": 23
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Redo",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 44
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.redo",
         "start": {
           "column": 8,
-          "line": 27
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Cut",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 48
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.cut",
         "start": {
           "column": 7,
-          "line": 31
+          "line": 45
         }
       },
       {
         "defaultMessage": "!!!Copy",
         "end": {
           "column": 3,
-          "line": 38
+          "line": 52
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.copy",
         "start": {
           "column": 8,
-          "line": 35
+          "line": 49
         }
       },
       {
         "defaultMessage": "!!!Paste",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 56
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.paste",
         "start": {
           "column": 9,
-          "line": 39
+          "line": 53
         }
       },
       {
         "defaultMessage": "!!!Paste And Match Style",
         "end": {
           "column": 3,
-          "line": 46
+          "line": 60
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.pasteAndMatchStyle",
         "start": {
           "column": 22,
-          "line": 43
+          "line": 57
         }
       },
       {
         "defaultMessage": "!!!Delete",
         "end": {
           "column": 3,
-          "line": 50
+          "line": 64
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.delete",
         "start": {
           "column": 10,
-          "line": 47
+          "line": 61
         }
       },
       {
         "defaultMessage": "!!!Select All",
         "end": {
           "column": 3,
-          "line": 54
+          "line": 68
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.selectAll",
         "start": {
           "column": 13,
-          "line": 51
+          "line": 65
         }
       },
       {
         "defaultMessage": "!!!Find in Page",
         "end": {
           "column": 3,
-          "line": 58
+          "line": 72
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.findInPage",
         "start": {
           "column": 14,
-          "line": 55
+          "line": 69
         }
       },
       {
         "defaultMessage": "!!!Speech",
         "end": {
           "column": 3,
-          "line": 62
+          "line": 76
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.speech",
         "start": {
           "column": 10,
-          "line": 59
+          "line": 73
         }
       },
       {
         "defaultMessage": "!!!Start Speaking",
         "end": {
           "column": 3,
-          "line": 66
+          "line": 80
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startSpeaking",
         "start": {
           "column": 17,
-          "line": 63
+          "line": 77
         }
       },
       {
         "defaultMessage": "!!!Stop Speaking",
         "end": {
           "column": 3,
-          "line": 70
+          "line": 84
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.stopSpeaking",
         "start": {
           "column": 16,
-          "line": 67
+          "line": 81
         }
       },
       {
         "defaultMessage": "!!!Start Dictation",
         "end": {
           "column": 3,
-          "line": 74
+          "line": 88
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startDictation",
         "start": {
           "column": 18,
-          "line": 71
+          "line": 85
         }
       },
       {
         "defaultMessage": "!!!Emoji & Symbols",
         "end": {
           "column": 3,
-          "line": 78
+          "line": 92
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.emojiSymbols",
         "start": {
           "column": 16,
-          "line": 75
+          "line": 89
         }
       },
       {
         "defaultMessage": "!!!Open Quick Switch",
         "end": {
           "column": 3,
-          "line": 82
+          "line": 96
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.openQuickSwitch",
         "start": {
           "column": 19,
-          "line": 79
+          "line": 93
         }
       },
       {
         "defaultMessage": "!!!Back",
         "end": {
           "column": 3,
-          "line": 86
+          "line": 100
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.back",
         "start": {
           "column": 8,
-          "line": 83
+          "line": 97
         }
       },
       {
         "defaultMessage": "!!!Forward",
         "end": {
           "column": 3,
-          "line": 90
+          "line": 104
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.forward",
         "start": {
           "column": 11,
-          "line": 87
+          "line": 101
         }
       },
       {
         "defaultMessage": "!!!Actual Size",
         "end": {
           "column": 3,
-          "line": 94
+          "line": 108
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.resetZoom",
         "start": {
           "column": 13,
-          "line": 91
+          "line": 105
         }
       },
       {
         "defaultMessage": "!!!Zoom In",
         "end": {
           "column": 3,
-          "line": 98
+          "line": 112
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomIn",
         "start": {
           "column": 10,
-          "line": 95
+          "line": 109
         }
       },
       {
         "defaultMessage": "!!!Zoom Out",
         "end": {
           "column": 3,
-          "line": 102
+          "line": 116
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomOut",
         "start": {
           "column": 11,
-          "line": 99
+          "line": 113
         }
       },
       {
         "defaultMessage": "!!!Toggle Full Screen",
         "end": {
           "column": 3,
-          "line": 106
+          "line": 120
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleFullScreen",
         "start": {
           "column": 20,
-          "line": 103
+          "line": 117
         }
       },
       {
         "defaultMessage": "!!!Toggle Dark Mode",
         "end": {
           "column": 3,
-          "line": 110
+          "line": 124
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleDarkMode",
         "start": {
           "column": 18,
-          "line": 107
+          "line": 121
         }
       },
       {
         "defaultMessage": "!!!Toggle Developer Tools",
         "end": {
           "column": 3,
-          "line": 114
+          "line": 128
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleDevTools",
         "start": {
           "column": 18,
-          "line": 111
+          "line": 125
         }
       },
       {
         "defaultMessage": "!!!Toggle Todos Developer Tools",
         "end": {
           "column": 3,
-          "line": 118
+          "line": 132
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleTodosDevTools",
         "start": {
           "column": 23,
-          "line": 115
+          "line": 129
         }
       },
       {
         "defaultMessage": "!!!Toggle Service Developer Tools",
         "end": {
           "column": 3,
-          "line": 122
+          "line": 136
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleServiceDevTools",
         "start": {
           "column": 25,
-          "line": 119
+          "line": 133
         }
       },
       {
         "defaultMessage": "!!!Reload Service",
         "end": {
           "column": 3,
-          "line": 126
+          "line": 140
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadService",
         "start": {
           "column": 17,
-          "line": 123
+          "line": 137
         }
       },
       {
         "defaultMessage": "!!!Reload Ferdi",
         "end": {
           "column": 3,
-          "line": 130
+          "line": 144
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadFerdi",
         "start": {
           "column": 15,
-          "line": 127
+          "line": 141
         }
       },
       {
         "defaultMessage": "!!!Lock Ferdi",
         "end": {
           "column": 3,
-          "line": 134
+          "line": 148
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.lockFerdi",
         "start": {
           "column": 13,
-          "line": 131
+          "line": 145
         }
       },
       {
         "defaultMessage": "!!!Reload ToDos",
         "end": {
           "column": 3,
-          "line": 138
+          "line": 152
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadTodos",
         "start": {
           "column": 15,
-          "line": 135
+          "line": 149
         }
       },
       {
         "defaultMessage": "!!!Minimize",
         "end": {
           "column": 3,
-          "line": 142
+          "line": 156
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.minimize",
         "start": {
           "column": 12,
-          "line": 139
+          "line": 153
         }
       },
       {
         "defaultMessage": "!!!Close",
         "end": {
           "column": 3,
-          "line": 146
+          "line": 160
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.close",
         "start": {
           "column": 9,
-          "line": 143
+          "line": 157
         }
       },
       {
         "defaultMessage": "!!!Learn More",
         "end": {
           "column": 3,
-          "line": 150
+          "line": 164
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.learnMore",
         "start": {
           "column": 13,
-          "line": 147
+          "line": 161
         }
       },
       {
         "defaultMessage": "!!!Changelog",
         "end": {
           "column": 3,
-          "line": 154
+          "line": 168
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.changelog",
         "start": {
           "column": 13,
-          "line": 151
+          "line": 165
         }
       },
       {
         "defaultMessage": "!!!Import/Export Configuration Data",
         "end": {
           "column": 3,
-          "line": 158
+          "line": 172
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.importExportData",
         "start": {
           "column": 20,
-          "line": 155
+          "line": 169
         }
       },
       {
         "defaultMessage": "!!!Support",
         "end": {
           "column": 3,
-          "line": 162
+          "line": 176
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.support",
         "start": {
           "column": 11,
-          "line": 159
+          "line": 173
         }
       },
       {
         "defaultMessage": "!!!Copy Debug Information",
         "end": {
           "column": 3,
-          "line": 166
+          "line": 180
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfo",
         "start": {
           "column": 13,
-          "line": 163
+          "line": 177
         }
       },
       {
         "defaultMessage": "!!!Publish Debug Information",
         "end": {
           "column": 3,
-          "line": 170
+          "line": 184
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.publishDebugInfo",
         "start": {
           "column": 20,
-          "line": 167
+          "line": 181
         }
       },
       {
         "defaultMessage": "!!!Ferdi Debug Information",
         "end": {
           "column": 3,
-          "line": 174
+          "line": 188
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedHeadline",
         "start": {
           "column": 27,
-          "line": 171
+          "line": 185
         }
       },
       {
         "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
         "end": {
           "column": 3,
-          "line": 178
+          "line": 193
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedBody",
         "start": {
           "column": 23,
-          "line": 175
+          "line": 189
         }
       },
       {
         "defaultMessage": "!!!Unlock with Touch ID",
         "end": {
           "column": 3,
-          "line": 182
+          "line": 197
         },
         "file": "src/lib/Menu.js",
         "id": "locked.touchId",
         "start": {
           "column": 11,
-          "line": 179
+          "line": 194
         }
       },
       {
         "defaultMessage": "!!!unlock via Touch ID",
         "end": {
           "column": 3,
-          "line": 186
+          "line": 201
         },
         "file": "src/lib/Menu.js",
         "id": "locked.touchIdPrompt",
         "start": {
           "column": 17,
-          "line": 183
+          "line": 198
         }
       },
       {
         "defaultMessage": "!!!Terms of Service",
         "end": {
           "column": 3,
-          "line": 190
+          "line": 205
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.tos",
         "start": {
           "column": 7,
-          "line": 187
+          "line": 202
         }
       },
       {
         "defaultMessage": "!!!Privacy Statement",
         "end": {
           "column": 3,
-          "line": 194
+          "line": 209
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.privacy",
         "start": {
           "column": 11,
-          "line": 191
+          "line": 206
         }
       },
       {
         "defaultMessage": "!!!File",
         "end": {
           "column": 3,
-          "line": 198
+          "line": 213
         },
         "file": "src/lib/Menu.js",
         "id": "menu.file",
         "start": {
           "column": 8,
-          "line": 195
+          "line": 210
         }
       },
       {
         "defaultMessage": "!!!View",
         "end": {
           "column": 3,
-          "line": 202
+          "line": 217
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view",
         "start": {
           "column": 8,
-          "line": 199
+          "line": 214
         }
       },
       {
         "defaultMessage": "!!!Services",
         "end": {
           "column": 3,
-          "line": 206
+          "line": 221
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services",
         "start": {
           "column": 12,
-          "line": 203
+          "line": 218
         }
       },
       {
         "defaultMessage": "!!!Window",
         "end": {
           "column": 3,
-          "line": 210
+          "line": 225
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window",
         "start": {
           "column": 10,
-          "line": 207
+          "line": 222
         }
       },
       {
         "defaultMessage": "!!!Help",
         "end": {
           "column": 3,
-          "line": 214
+          "line": 229
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help",
         "start": {
           "column": 8,
-          "line": 211
+          "line": 226
         }
       },
       {
         "defaultMessage": "!!!About Ferdi",
         "end": {
           "column": 3,
-          "line": 218
+          "line": 233
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.about",
         "start": {
           "column": 9,
-          "line": 215
-        }
-      },
-      {
-        "defaultMessage": "!!!What's new?",
-        "end": {
-          "column": 3,
-          "line": 222
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.announcement",
-        "start": {
-          "column": 16,
-          "line": 219
-        }
-      },
-      {
-        "defaultMessage": "!!!Settings",
-        "end": {
-          "column": 3,
-          "line": 226
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.settings",
-        "start": {
-          "column": 12,
-          "line": 223
+          "line": 230
         }
       },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 230
+          "line": 237
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.checkForUpdates",
         "start": {
           "column": 19,
-          "line": 227
+          "line": 234
         }
       },
       {
         "defaultMessage": "!!!Hide",
         "end": {
           "column": 3,
-          "line": 234
+          "line": 241
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hide",
         "start": {
           "column": 8,
-          "line": 231
+          "line": 238
         }
       },
       {
         "defaultMessage": "!!!Hide Others",
         "end": {
           "column": 3,
-          "line": 238
+          "line": 245
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hideOthers",
         "start": {
           "column": 14,
-          "line": 235
+          "line": 242
         }
       },
       {
         "defaultMessage": "!!!Unhide",
         "end": {
           "column": 3,
-          "line": 242
+          "line": 249
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.unhide",
         "start": {
           "column": 10,
-          "line": 239
+          "line": 246
         }
       },
       {
         "defaultMessage": "!!!Auto-hide menu bar",
         "end": {
           "column": 3,
-          "line": 246
+          "line": 253
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.autohideMenuBar",
         "start": {
           "column": 19,
-          "line": 243
-        }
-      },
-      {
-        "defaultMessage": "!!!Quit",
-        "end": {
-          "column": 3,
           "line": 250
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.quit",
-        "start": {
-          "column": 8,
-          "line": 247
         }
       },
       {
         "defaultMessage": "!!!Add New Service...",
         "end": {
           "column": 3,
-          "line": 254
+          "line": 257
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.addNewService",
         "start": {
           "column": 17,
-          "line": 251
+          "line": 254
         }
       },
       {
         "defaultMessage": "!!!Add New Workspace...",
         "end": {
           "column": 3,
-          "line": 258
+          "line": 261
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.addNewWorkspace",
         "start": {
           "column": 19,
-          "line": 255
+          "line": 258
         }
       },
       {
         "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
-          "line": 262
+          "line": 265
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.openWorkspaceDrawer",
         "start": {
           "column": 23,
-          "line": 259
+          "line": 262
         }
       },
       {
         "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
-          "line": 266
+          "line": 269
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.closeWorkspaceDrawer",
         "start": {
           "column": 24,
-          "line": 263
+          "line": 266
         }
       },
       {
         "defaultMessage": "!!!Activate next service...",
         "end": {
           "column": 3,
-          "line": 270
+          "line": 273
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.setNextServiceActive",
         "start": {
           "column": 23,
-          "line": 267
+          "line": 270
         }
       },
       {
         "defaultMessage": "!!!Activate previous service...",
         "end": {
           "column": 3,
-          "line": 274
+          "line": 277
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.activatePreviousService",
         "start": {
           "column": 27,
-          "line": 271
+          "line": 274
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 278
+          "line": 281
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 11,
-          "line": 275
+          "line": 278
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 282
+          "line": 285
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 13,
-          "line": 279
+          "line": 282
         }
       },
       {
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 286
+          "line": 289
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces",
         "start": {
           "column": 14,
-          "line": 283
+          "line": 286
         }
       },
       {
         "defaultMessage": "!!!Default",
         "end": {
           "column": 3,
-          "line": 290
+          "line": 293
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.defaultWorkspace",
         "start": {
           "column": 20,
-          "line": 287
+          "line": 290
         }
       },
       {
         "defaultMessage": "!!!Todos",
         "end": {
           "column": 3,
-          "line": 294
+          "line": 297
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos",
         "start": {
           "column": 9,
-          "line": 291
+          "line": 294
         }
       },
       {
         "defaultMessage": "!!!Open Todos drawer",
         "end": {
           "column": 3,
-          "line": 298
+          "line": 301
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.openTodosDrawer",
         "start": {
           "column": 19,
-          "line": 295
+          "line": 298
         }
       },
       {
         "defaultMessage": "!!!Close Todos drawer",
         "end": {
           "column": 3,
-          "line": 302
+          "line": 305
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.closeTodosDrawer",
         "start": {
           "column": 20,
-          "line": 299
+          "line": 302
         }
       },
       {
         "defaultMessage": "!!!Enable Todos",
         "end": {
           "column": 3,
-          "line": 306
+          "line": 309
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos.enableTodos",
         "start": {
           "column": 15,
-          "line": 303
+          "line": 306
         }
       },
       {
         "defaultMessage": "!!!Home",
         "end": {
           "column": 3,
-          "line": 310
+          "line": 313
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.goHome",
         "start": {
           "column": 17,
-          "line": 307
+          "line": 310
         }
       }
     ],
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 679720748..6964a93f1 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Προσαρμοσμένος διακομιστής",
   "changeserver.headline": "Change server",
   "changeserver.label": "Διακομιστής",
-  "changeserver.submit": "Υποβολή",
   "changeserver.urlError": "Εισάγετε μια έγκυρη διεύθυνση URL",
   "changeserver.warning": "Οι επιπλέον ρυθμίσεις από το Ferdi δεν θα αποθηκευτούν",
   "connectionLostBanner.cta": "Ανανέωση Υπηρεσίας",
   "connectionLostBanner.informationLink": "Τι συνέβη;",
   "connectionLostBanner.message": "Ωχ όχι! Ο Ferdi έχασε την επικοινωνία με το",
-  "feature.announcements.changelog.headline": "Αλλαγές σχετικά με το Ferdi",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Εγγραφή πληροφοριών εντοπισμού σφαλμάτων",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Ακύρωση",
   "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": "Nightly Builds",
   "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.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Δεν είναι δυνατή η σύνδεση με τις ζωντανές υπηρεσίες του Ferdi",
+  "global.cancel": "Ακύρωση",
+  "global.edit": "Επεξεργασία",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Έχετε αποσυνδεθεί από το Διαδίκτυο",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Ρυθμίσεις",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "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.yes": "Yes",
   "import.headline": "Εισαγάγετε τις υπηρεσίες σας Ferdi 4",
   "import.notSupportedHeadline": "Υπηρεσίες που δεν υποστηρίζονται ακόμα στο Ferdi 5",
   "import.skip.label": "Θέλω να προσθέσω υπηρεσίες χειροκίνητα",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "Σχετικά με το Ferdi",
-  "menu.app.announcement": "What's new?",
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Έλεγχος για ενημερώσεις",
   "menu.app.hide": "Απόκρυψη",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Ρυθμίσεις",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Επεξεργασία",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Σύνδεση στο λογαριασμό σας",
   "password.link.signup": "Δημιουργία δωρεάν λογαριασμού",
   "password.noUser": "Δεν βρέθηκε χρήστης με τη συγκεκριμένη διεύθυνση ηλεκτρονικού ταχυδρομείου",
-  "password.submit.label": "Υποβολή",
   "password.successInfo": "Ελέγξτε το email σας",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Συμπεριλάβετε εκδόσεις beta",
   "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": "Ενεργοποιήση Ενίσχυσης GPU ",
@@ -251,7 +256,6 @@
   "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.headline": "Ρυθμίσεις",
   "settings.app.headlineAdvanced": "Για προχωρημένους",
   "settings.app.headlineAppearance": "Εμφάνιση",
   "settings.app.headlineGeneral": "Γενικά",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Λογαριασμός",
   "settings.navigation.availableServices": "Διαθέσιμες υπηρεσίες",
   "settings.navigation.logout": "Αποσύνδεση",
-  "settings.navigation.settings": "Ρυθμίσεις",
   "settings.navigation.supportFerdi": "Σχετικά με το Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Οι υπηρεσίες σας",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Απενεργοποίηση ειδοποιήσεων & ήχου",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Ρυθμίσεις",
   "sidebar.unmuteApp": "Ενεργοποίηση ειδοποιήσεων & ήχου",
   "signup.email.label": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
   "signup.emailDuplicate": "Ένας χρήστης με τη συγκεκριμένη διεύθυνση ηλεκτρονικού ταχυδρομείου υπάρχει ήδη",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Απενεργοποίηση ειδοποιήσεων",
   "tabs.item.disableService": "Απενεργοποίηση υπηρεσίας",
-  "tabs.item.edit": "Επεξεργασία",
   "tabs.item.enableAudio": "Ενεργοποίηση ήχου",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Ενεργοποίηση ειδοποιήσεων",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index f7e3d662a..be9bbb961 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Submit",
   "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": "Changes in Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Cancel",
   "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": "Nightly Builds",
   "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.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
+  "global.edit": "Edit",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "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.yes": "Yes",
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "About Ferdi",
-  "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.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Include beta versions",
   "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",
@@ -251,7 +256,6 @@
   "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.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.supportFerdi": "About Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index ae558c98f..9a5c248a2 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Servidor personalizado",
   "changeserver.headline": "Cambiar servidor",
   "changeserver.label": "Servidor",
-  "changeserver.submit": "Enviar",
   "changeserver.urlError": "Ingrese una URL válida",
   "changeserver.warning": "Los ajustes extra ofrecidos por Ferdi no serán guardados",
   "connectionLostBanner.cta": "Recargar Servicio",
   "connectionLostBanner.informationLink": "¿Qué ocurrió?",
   "connectionLostBanner.message": "¡Oh no! Ferdi perdió la conexión con {name}.",
-  "feature.announcements.changelog.headline": "Cambios en Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Publica la información de depuración",
   "feature.nightlyBuilds.activate": "Activar",
-  "feature.nightlyBuilds.cancel": "Cancelar",
   "feature.nightlyBuilds.info": "Las \"Nightly builds\" son versiones altamente experimentales de Ferdi que pueden contener características sin pulir o sin completar. Estas versiones son utilizadas principalmente por los desarrolladores para probar sus nuevas características desarrolladas y cómo se comportarán en la versión final. Si no sabe lo que está haciendo, le sugerimos que no active las estas versiones.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "Hubo un error al intentar publicar la información de depuración. Por favor, inténtalo de nuevo más tarde o revisa la consola para más información.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Buscar...",
   "feature.quickSwitch.title": "Cambiar rápidamente",
   "global.api.unhealthy": "No es posible conectarse a los servicios en línea de Ferdi.",
+  "global.cancel": "Cancelar",
+  "global.edit": "Editar",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "No estás conectado a Internet",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Configuración",
   "global.spellchecker.useDefault": "Utilizar estándar del sistema ({default})",
   "global.spellchecking.autodetect": "Detectar el idioma automáticamente",
   "global.spellchecking.autodetect.short": "Automático",
   "global.spellchecking.language": "Corrector de ortografía",
+  "global.submit": "Enviar",
   "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": "Navegador",
+  "global.yes": "Yes",
   "import.headline": "Importa tus servicios de Ferdi 4",
   "import.notSupportedHeadline": "Servicios aún no admitidos en Ferdi 5",
   "import.skip.label": "Quiero agregar servicios manualmente",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Cerrar la pestaña de Tareas",
   "menu.Todoss.openTodosDrawer": "Abrir la pestaña de tareas",
   "menu.app.about": "Acerca de Ferdi",
-  "menu.app.announcement": "¿Qué hay de nuevo?",
   "menu.app.autohideMenuBar": "Auto-ocultar barra de menú",
   "menu.app.checkForUpdates": "Comprobar actualizaciones",
   "menu.app.hide": "Ocultar",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Configuración",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Editar",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Inicia sesión en tu cuenta",
   "password.link.signup": "Crear una cuenta gratuita",
   "password.noUser": "No se encontró un usuario con esa dirección de correo electrónico",
-  "password.submit.label": "Enviar",
   "password.successInfo": "Por favor revisa tu correo electrónico",
   "pricing.features.accountSync": "Sincronización de cuenta",
   "pricing.features.customWebsites": "Agregue sitios personalizados",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Incluir versiones beta",
   "settings.app.form.clipboardNotifications": "Dejar de mostrar notificaciones acerca del portapapeles",
   "settings.app.form.closeToSystemTray": "Cerrar Ferdi a la barra de tareas",
+  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
   "settings.app.form.customTodoServer": "Servidor de Todo personalizado",
   "settings.app.form.darkMode": "Activar tema oscuro",
   "settings.app.form.enableGPUAcceleration": "Habilitar aceleración de GPU",
@@ -251,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Permitir usar TouchID para desbloquear Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Configuración",
   "settings.app.headlineAdvanced": "Avanzado",
   "settings.app.headlineAppearance": "Apariencia",
   "settings.app.headlineGeneral": "General",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Cuenta",
   "settings.navigation.availableServices": "Servicios disponibles",
   "settings.navigation.logout": "Cerrar sesión",
-  "settings.navigation.settings": "Configuración",
   "settings.navigation.supportFerdi": "Acerca de Ferdi",
   "settings.navigation.team": "Gestionar equipo",
   "settings.navigation.yourServices": "Tus servicios",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Desactivar notificaciones y sonido",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Abrir diseñador de espacios de trabajo",
-  "sidebar.settings": "Configuración",
   "sidebar.unmuteApp": "Activar notificaciones y sonido",
   "signup.email.label": "Dirección de correo electrónico",
   "signup.emailDuplicate": "Ya existe un usuario con esa dirección de correo electrónico",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Desactivar notificaciones",
   "tabs.item.disableService": "Desactivar servicio",
-  "tabs.item.edit": "Editar",
   "tabs.item.enableAudio": "Habilitar audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Activar notificaciones",
diff --git a/src/i18n/locales/et.json b/src/i18n/locales/et.json
index 62efbc5aa..46c249768 100644
--- a/src/i18n/locales/et.json
+++ b/src/i18n/locales/et.json
@@ -13,12 +13,16 @@
   "feature.shareFranz.shareText.twitter": "Olen lisanud Ferdi'i {count} teenust! Hankige tasuta rakendus WhatsApp'ile, Messenger'ile, Slack'ile, Skype'ile ja muule veebiaadressilt www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Rääkige oma sõpradele ja kolleegidele, kui vinge Ferdi on, ja aidake meil seda sõna levitada.",
   "global.api.unhealthy": "Ups! Ferdi'i võrguteenustega ei saa ühendust luua",
+  "global.edit": "Muuda",
   "global.franzProRequired": "Vajalik Ferdi Professional tellimus",
   "global.notConnectedToTheInternet": "Teil pole Interneti-ühendust.",
+  "global.quit": "Sulge",
+  "global.settings": "Sätted",
   "global.spellchecker.useDefault": "Kasuta süsteemi vaikeväärtust ({default})",
   "global.spellchecking.autodetect": "Tuvastage keel automaatselt",
   "global.spellchecking.autodetect.short": "Automaatne",
   "global.spellchecking.language": "Õigekirja kontrollimise keel",
+  "global.submit": "Saada",
   "import.headline": "Importige oma Ferdi 4 teenused",
   "import.notSupportedHeadline": "Teenused, mida Ferdi 5 veel ei toeta",
   "import.skip.label": "Soovin teenuseid käsitsi lisada",
@@ -51,8 +55,6 @@
   "menu.app.checkForUpdates": "Kontrolli kas värskendused on saadaval",
   "menu.app.hide": "Peida",
   "menu.app.hideOthers": "Peida teised",
-  "menu.app.quit": "Sulge",
-  "menu.app.settings": "Sätted",
   "menu.app.unhide": "Näita",
   "menu.edit": "Muuda",
   "menu.edit.copy": "Kopeeri",
@@ -109,7 +111,6 @@
   "password.link.login": "Logige sisse oma kontole",
   "password.link.signup": "Loo tasuta konto",
   "password.noUser": "Ühtegi selle e-posti aadressiga kasutajat ei leitud",
-  "password.submit.label": "Saada",
   "password.successInfo": "Palun kontrollige oma e-posti aadressi",
   "pricing.features.accountSync": "Konto sünkroonimine",
   "pricing.features.adFree": "Igavesti reklaamivaba",
@@ -178,7 +179,6 @@
   "settings.app.form.runInBackground": "Hoia akna sulgemisel Ferdi taustal töös",
   "settings.app.form.showDisabledServices": "Kuva keelatud teenuste vahelehed",
   "settings.app.form.showMessagesBadgesWhenMuted": "Kuva lugemata sõnumimärk, kui teated on keelatud",
-  "settings.app.headline": "Sätted",
   "settings.app.headlineAdvanced": "Täpsemalt",
   "settings.app.headlineAppearance": "Välimus",
   "settings.app.headlineGeneral": "Üldine",
@@ -196,7 +196,6 @@
   "settings.navigation.availableServices": "Saadaolevad teenused",
   "settings.navigation.inviteFriends": "Kutsu sõpru",
   "settings.navigation.logout": "Logi välja",
-  "settings.navigation.settings": "Sätted",
   "settings.navigation.team": "Halda meeskonda",
   "settings.navigation.yourServices": "Teie teenused",
   "settings.navigation.yourWorkspaces": "Teie tööruumid",
@@ -302,7 +301,6 @@
   "sidebar.muteApp": "Keela teated ja heli",
   "sidebar.openTodosDrawer": "Ava Ferdi ülesanded",
   "sidebar.openWorkspaceDrawer": "Ava tööruumide sahtel",
-  "sidebar.settings": "Sätted",
   "sidebar.unmuteApp": "Luba teated ja heli",
   "signup.email.label": "E-posti aadress",
   "signup.emailDuplicate": "Selle e-posti aadressiga kasutaja on juba olemas",
@@ -319,7 +317,6 @@
   "tabs.item.disableAudio": "Keela heli",
   "tabs.item.disableNotifications": "Keela teated",
   "tabs.item.disableService": "Keela teenus",
-  "tabs.item.edit": "Muuda",
   "tabs.item.enableAudio": "Luba heli",
   "tabs.item.enableNotification": "Luba teated",
   "tabs.item.enableService": "Luba teenus",
diff --git a/src/i18n/locales/fa.json b/src/i18n/locales/fa.json
index bfc275e58..be8b1be20 100644
--- a/src/i18n/locales/fa.json
+++ b/src/i18n/locales/fa.json
@@ -13,12 +13,16 @@
   "feature.shareFranz.shareText.twitter": "من {count} تا سرویس تو فرَنز اضافه کردم! برنامه رایگان برای واتسآپ، اسکایپ، مسنجر، اسلک رو از سایت www.getferdi.com دانلود کن /cc @FerdiMessenger",
   "feature.shareFranz.text": "به دوستات بگو فرَنز چقدر باحاله و بهمون کمک کن گسترش پیدا کنیم.",
   "global.api.unhealthy": "به سرویس های آنلاین فرَنز متصل نشدی",
+  "global.edit": "ویرایش",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "اینترنت وصل نیست",
+  "global.quit": "خروج ",
+  "global.settings": "تنظیمات",
   "global.spellchecker.useDefault": "استفاده از پیشفرض سیستم ({default})",
   "global.spellchecking.autodetect": "تشخیص خودکار زبان",
   "global.spellchecking.autodetect.short": "خودکار",
   "global.spellchecking.language": "زبان غلط یاب املایی",
+  "global.submit": "ارسال ",
   "import.headline": "جانشانی سرویس های فرانز 4",
   "import.notSupportedHeadline": "این سرویس ها در Ferdi ۵ پشتیبانی نمیشوند.",
   "import.skip.label": "میخواهم سرویس ها را به صورت دستی اضافه کنم.",
@@ -51,8 +55,6 @@
   "menu.app.checkForUpdates": "بررسی وجود نسخه جدید ",
   "menu.app.hide": "مخفی‌کردن ",
   "menu.app.hideOthers": "مخفی کردن بقیه ",
-  "menu.app.quit": "خروج ",
-  "menu.app.settings": "تنظیمات ",
   "menu.app.unhide": "آشکارسازی",
   "menu.edit": "ویرایش ",
   "menu.edit.copy": "کپی",
@@ -109,7 +111,6 @@
   "password.link.login": "وارد شدن به اکانت خود",
   "password.link.signup": "ساخت یک حساب کاربری",
   "password.noUser": "هیچ کاربری با این نشانی ایمیل یافت نشد ",
-  "password.submit.label": "ارسال ",
   "password.successInfo": "لطفا ایمیل خود را چک کنید",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
@@ -178,7 +179,6 @@
   "settings.app.form.runInBackground": "فرانز را در پشت زمینه نگه دار زمانی که پنجره آن بسته میشود",
   "settings.app.form.showDisabledServices": "سرویس های غیرفعال را نشان بده ",
   "settings.app.form.showMessagesBadgesWhenMuted": "نماد پیام خوانده نشده را زمانی که نوتیفیکیشن ها غیرفعالند نشان بده",
-  "settings.app.headline": "تنظیمات ",
   "settings.app.headlineAdvanced": "پیشرفته ",
   "settings.app.headlineAppearance": "ظاهر ",
   "settings.app.headlineGeneral": "عمومی ",
@@ -196,7 +196,6 @@
   "settings.navigation.availableServices": "سرویس های موجود",
   "settings.navigation.inviteFriends": "دعوت دوستان",
   "settings.navigation.logout": "خروج از سیستم ",
-  "settings.navigation.settings": "تنظیمات ",
   "settings.navigation.team": "مدیریت گروه",
   "settings.navigation.yourServices": "سرویس های شما",
   "settings.navigation.yourWorkspaces": "فضای کاری شما",
@@ -302,7 +301,6 @@
   "sidebar.muteApp": "غیرفعال کردن اعلان ها و صدا",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "بازکردن کشوی فضای کاری",
-  "sidebar.settings": "تنظیمات",
   "sidebar.unmuteApp": "فعال سازی اعلان ها  و صدا",
   "signup.email.label": "نشانی ایمیل",
   "signup.emailDuplicate": "یک کاربر با این ایمیل هم اکنون موجود است.",
@@ -319,7 +317,6 @@
   "tabs.item.disableAudio": "غیرفعال کردن صدا",
   "tabs.item.disableNotifications": "غیر فعال کردن اعلان ها",
   "tabs.item.disableService": "غیر فعال کردن سرویس",
-  "tabs.item.edit": "ویرایش",
   "tabs.item.enableAudio": "فعال‌سازی صدا",
   "tabs.item.enableNotification": "فعال سازی اعلان‌ها",
   "tabs.item.enableService": "فعال سازی سرویس",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index 544c54c77..5ccea37e5 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Mukautettu palvelin",
   "changeserver.headline": "Vaihda palvelinta",
   "changeserver.label": "Palvelin",
-  "changeserver.submit": "Jatka",
   "changeserver.urlError": "Anna kelvollinen URL-osoite",
   "changeserver.warning": "Ferdin tarjoamia lisäasetuksia ei tallenneta",
   "connectionLostBanner.cta": "Lataa Palvelu uudelleen",
   "connectionLostBanner.informationLink": "Mitä tapahtui?",
   "connectionLostBanner.message": "Voi ei! Ferdi menetti yhteyden {name}.",
-  "feature.announcements.changelog.headline": "Muutoksia Ferdissä {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Julkaise virheraportti",
   "feature.nightlyBuilds.activate": "Aktivoi",
-  "feature.nightlyBuilds.cancel": "Peruuta",
   "feature.nightlyBuilds.info": "Uusimmat versiot ovat Ferdin kokeellisia versioita, jotka voivat sisältää viimeistelemättömiä tai keskeneräisiä ominaisuuksia. Näitä uusimpia versioita käyttävät pääasiassa kehittäjät testaamaan uusia ominaisuuksia ja miten ne toimivat lopullisessa versiossa. Jos et tiedä mitä olet tekemässä, suosittelemme ettet aktivoi uusimpia versioita.",
   "feature.nightlyBuilds.title": "Uusimmat versiot",
   "feature.publishDebugInfo.error": "Virheraportin julkaisussa tapahtui virhe. Yritä myöhemmin uudelleen tai katso konsolista saadaksesi lisätietoja.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Etsi...",
   "feature.quickSwitch.title": "Pikavalitsin",
   "global.api.unhealthy": "Ferdin verkkopalveluihin ei saada yhteyttä",
+  "global.cancel": "Peruuta",
+  "global.edit": "Muokkaa",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Et ole yhteydessä internetiin.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Asetukset",
   "global.spellchecker.useDefault": "Käytä järjestelmän oletusasetusta ({default})",
   "global.spellchecking.autodetect": "Tunnista kieli automaattisesti",
   "global.spellchecking.autodetect.short": "Automaattinen",
   "global.spellchecking.language": "Oikeinkirjoituksen tarkistuskieli",
+  "global.submit": "Jatka",
   "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.yes": "Yes",
   "import.headline": "Tuo Ferdin 4 palveluasi",
   "import.notSupportedHeadline": "Palvelut eivät vielä tue Ferdi 5-versiota",
   "import.skip.label": "Haluan lisätä palvelut manuaalisesti",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Sulje Todos-valikko",
   "menu.Todoss.openTodosDrawer": "Avaa Todos-valikko",
   "menu.app.about": "Tietoja Ferdistä",
-  "menu.app.announcement": "Mitä uutta?",
   "menu.app.autohideMenuBar": "Piilota valikko automaattisesti",
   "menu.app.checkForUpdates": "Tarkista päivitykset",
   "menu.app.hide": "Piilota",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Asetukset",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Muokkaa",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Kirjaudu tilillesi",
   "password.link.signup": "Luo ilmainen tili",
   "password.noUser": "Tälle sähköpostiosoiteelle ei löytynyt käyttäjää",
-  "password.submit.label": "Jatka",
   "password.successInfo": "Ole hyvä ja tarkista sähköpostisi",
   "pricing.features.accountSync": "Tilin Synkronointi",
   "pricing.features.customWebsites": "Lisää mukautettuja sivustoja",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Sisällytä beta-versiot",
   "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": "Mukautettu Todo-Palvelin",
   "settings.app.form.darkMode": "Ota tumma tila käyttöön",
   "settings.app.form.enableGPUAcceleration": "Ota Gpu-kiihdytys käyttöön",
@@ -251,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Salli TouchID:n käyttö Ferdin avaamiseksi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Asetukset",
   "settings.app.headlineAdvanced": "Lisäasetukset",
   "settings.app.headlineAppearance": "Ulkoasu",
   "settings.app.headlineGeneral": "Yleinen",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Tili",
   "settings.navigation.availableServices": "Käytettävissä olevat palvelut",
   "settings.navigation.logout": "Kirjaudu ulos",
-  "settings.navigation.settings": "Asetukset",
   "settings.navigation.supportFerdi": "Tietoja Ferdistä",
   "settings.navigation.team": "Hallinnoi tiimiä",
   "settings.navigation.yourServices": "Sinun palvelusi",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Poista ilmoitukset ja äänet käytöstä",
   "sidebar.openTodosDrawer": "Avaa Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Avaa työtilan valikko",
-  "sidebar.settings": "Asetukset",
   "sidebar.unmuteApp": "Käytä ilmoituksia ja ääniä",
   "signup.email.label": "Sähköpostiosoite",
   "signup.emailDuplicate": "Käyttäjä, jolla on tämä sähköpostiosoite, on jo olemassa",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Poista ilmoitukset käytöstä",
   "tabs.item.disableService": "Poista palvelu",
-  "tabs.item.edit": "Muokkaa",
   "tabs.item.enableAudio": "Ota ääni käyttöön",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Ota ilmoitukset käyttöön",
diff --git a/src/i18n/locales/fil.json b/src/i18n/locales/fil.json
index 0bcaad1ee..54326b84b 100644
--- a/src/i18n/locales/fil.json
+++ b/src/i18n/locales/fil.json
@@ -13,12 +13,16 @@
   "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.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
   "global.api.unhealthy": "Hindi maka connect sa 'Ferdi online services'",
+  "global.edit": "Edit",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Hindi ka naka connect sa internet.",
+  "global.quit": "Quit",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Submit",
   "import.headline": "Ilagay ang iyonhg Ferdi 4 services",
   "import.notSupportedHeadline": "Ang mga services ay hindi pa supported ni Ferdi 5",
   "import.skip.label": "Gusto kong magdagdag",
@@ -51,8 +55,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -109,7 +111,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
@@ -178,7 +179,6 @@
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -196,7 +196,6 @@
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.inviteFriends": "Invite Friends",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
   "settings.navigation.yourWorkspaces": "Your workspaces",
@@ -302,7 +301,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email Address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -319,7 +317,6 @@
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index c3968b2c0..d81d23d79 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Serveur personnalisé",
   "changeserver.headline": "Changer de serveur",
   "changeserver.label": "Serveur",
-  "changeserver.submit": "Soumettre",
   "changeserver.urlError": "Entrez une URL valide",
   "changeserver.warning": "Les paramètres supplémentaires proposés par Ferdi ne seront pas sauvegardés",
   "connectionLostBanner.cta": "Redémarrer le service",
   "connectionLostBanner.informationLink": "Que s'est-il passé?",
   "connectionLostBanner.message": "Oh non ! Ferdi a perdu la connexion avec {name}.",
-  "feature.announcements.changelog.headline": "Les nouveaux changements dans Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Publier les informations de débogage",
   "feature.nightlyBuilds.activate": "Activer",
-  "feature.nightlyBuilds.cancel": "Annuler",
   "feature.nightlyBuilds.info": "Les versions de développement sont des versions expérimentales de Ferdi qui peuvent contenir des fonctionnalités non optimisées ou incomplètes. Ces versions de développement sont principalement utilisés par les développeurs pour tester leurs nouvelles fonctionnalités et leurs performances. Si vous ne savez pas ce que vous faites, nous vous suggérons de ne pas activer les versions de développement.",
   "feature.nightlyBuilds.title": "Versions de développement",
   "feature.publishDebugInfo.error": "Il y a eu une erreur en essayant de publier les informations de débogage. Veuillez réessayer plus tard ou consulter la console pour plus d'informations.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Rechercher...",
   "feature.quickSwitch.title": "Changement rapide",
   "global.api.unhealthy": "Impossible de se connecter aux services en ligne de Ferdi",
+  "global.cancel": "Annuler",
+  "global.edit": "Éditer",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Vous n'êtes pas connecté à Internet.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Paramètres",
   "global.spellchecker.useDefault": "Par défaut ({default})",
   "global.spellchecking.autodetect": "Détecter automatiquement la langue",
   "global.spellchecking.autodetect.short": "Automatiquement",
   "global.spellchecking.language": "Langue de la vérification orthographique",
+  "global.submit": "Soumettre",
   "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.yes": "Yes",
   "import.headline": "Importez vos services depuis la version 4 de Ferdi",
   "import.notSupportedHeadline": "Ces services ne sont pas encore supportés par la version 5 de Ferdi",
   "import.skip.label": "Je veux ajouter des services manuellement",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Fermer le tiroir Todos",
   "menu.Todoss.openTodosDrawer": "Ouvrir le tiroir Todos",
   "menu.app.about": "À propos de Ferdi",
-  "menu.app.announcement": "Quoi de neuf?",
   "menu.app.autohideMenuBar": "Cacher automatiquement la barre de menu",
   "menu.app.checkForUpdates": "Vérifier les mises à jour",
   "menu.app.hide": "Masquer",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Paramètres",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Éditer",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Connectez-vous à votre compte",
   "password.link.signup": "Créer un compte gratuit",
   "password.noUser": "Aucun utilisateur n'a été trouvé avec cette adresse email",
-  "password.submit.label": "Soumettre",
   "password.successInfo": "Merci de consulter vos emails",
   "pricing.features.accountSync": "Synchronisation de compte",
   "pricing.features.customWebsites": "Ajouter des sites web modifiés",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Accepter les versions bêta",
   "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
   "settings.app.form.closeToSystemTray": "Afficher Ferdi dans la barre d'état système",
+  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
   "settings.app.form.customTodoServer": "Serveur Todo personnalisé",
   "settings.app.form.darkMode": "Activer le mode sombre",
   "settings.app.form.enableGPUAcceleration": "Activer l'accélération GPU",
@@ -251,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Autoriser l'utilisation de TouchID pour déverrouiller Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Paramètres",
   "settings.app.headlineAdvanced": "Paramètres avancés",
   "settings.app.headlineAppearance": "Apparence",
   "settings.app.headlineGeneral": "Général",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Compte",
   "settings.navigation.availableServices": "Services disponibles",
   "settings.navigation.logout": "Se déconnecter",
-  "settings.navigation.settings": "Paramètres",
   "settings.navigation.supportFerdi": "À propos de Ferdi",
   "settings.navigation.team": "Gérer l'équipe",
   "settings.navigation.yourServices": "Vos services",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Désactiver les notifications et les sons",
   "sidebar.openTodosDrawer": "Ouvrir Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Ouvrir l'espace de travail",
-  "sidebar.settings": "Paramètres",
   "sidebar.unmuteApp": "Activer les notifications et les sons",
   "signup.email.label": "Adresse Email",
   "signup.emailDuplicate": "Cette adresse email est déjà utilisée",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Désactiver les notifications",
   "tabs.item.disableService": "Désactiver le service",
-  "tabs.item.edit": "Éditer",
   "tabs.item.enableAudio": "Activer l'audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Activer les notifications",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index da1f17bca..a78c90771 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Freastalaí saincheaptha",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Cuir isteach",
   "changeserver.urlError": "Enter a valid URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Athlódáil seirbhís",
   "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.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Cealaigh",
   "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": "Nightly Builds",
   "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.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Ní féidir nascadh le seirbhísí Ferdi ar líne",
+  "global.cancel": "Cealaigh",
+  "global.edit": "Cuir in eagar",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Níl tú nasctha leis an Idirlíon.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Socruithe",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Cuir isteach",
   "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.yes": "Yes",
   "import.headline": "Iompórtáil do sheirbhísí Ferdi 4",
   "import.notSupportedHeadline": "Níl na seirbhísí seo taca ag Ferdi 5 go fóill",
   "import.skip.label": "Ba mhaith liom seirbhísí a chur de láimh",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "Faoi Ferdi",
-  "menu.app.announcement": "What's new?",
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Cuardaigh le nuashonruithe",
   "menu.app.hide": "Cuir Ferdi i bhfolach",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Socruithe",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Cuir in eagar",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Logáil isteach i do chuntas",
   "password.link.signup": "Cruthaigh cuntas saor in aisce",
   "password.noUser": "Níor aimsíodh úsáideoir leis an seoladh ríomhphoist seo",
-  "password.submit.label": "Cuir isteach",
   "password.successInfo": "Seiceáil do chuid ríomhphoist le do thoil",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Cuir leagain béite san áireamh",
   "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": "Cumasaigh luasghéarú APG",
@@ -251,7 +256,6 @@
   "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.headline": "Socruithe",
   "settings.app.headlineAdvanced": "Casta",
   "settings.app.headlineAppearance": "Dealramh",
   "settings.app.headlineGeneral": "Ginearálta",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Cuntas",
   "settings.navigation.availableServices": "Seirbhísí le fáil",
   "settings.navigation.logout": "Logáil amach",
-  "settings.navigation.settings": "Socruithe",
   "settings.navigation.supportFerdi": "Faoi Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Do sheirbhísí",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Díchumasaigh fógraí ⁊ fuaim",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Socruithe",
   "sidebar.unmuteApp": "Cumasaigh fógraí ⁊ fuaim",
   "signup.email.label": "Seoladh ríomhphoist",
   "signup.emailDuplicate": "Tá úsáideoir leis an seoladh ríomhphoist sin cheana féin",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Díchumasaigh fógraí",
   "tabs.item.disableService": "Díchumasaigh seirbhís",
-  "tabs.item.edit": "Cuir in eagar",
   "tabs.item.enableAudio": "Cumasaigh fuaim",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Cumasaigh fógraí",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 427e60640..79e1532b5 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "שרת מותאם אישית",
   "changeserver.headline": "החלף שרת",
   "changeserver.label": "שרת",
-  "changeserver.submit": "שלח",
   "changeserver.urlError": "אנא הזן כתובת URL תקינה",
   "changeserver.warning": "הגדרות נוספות המוצעות על ידי פרדי לא ישמרו",
   "connectionLostBanner.cta": "טען מחדש את השירות",
   "connectionLostBanner.informationLink": "מה קרה?",
   "connectionLostBanner.message": "הו לא! פרדי איבד את החיבור ל {name}.",
-  "feature.announcements.changelog.headline": "שינויים בגרסת פרדי מספר {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "פרסם את פרטי ניפוי השגיאות",
   "feature.nightlyBuilds.activate": "הפעל",
-  "feature.nightlyBuilds.cancel": "בטל",
   "feature.nightlyBuilds.info": "גרסאות נייטלי הם גרסאות נסיוניות ביותר של פרדי, העשויות להכיל פיצ'רים בלתי גמורים. גרסאות אלה מיועדות בעיקר לשימוש מפתחים על מנת לנסות את הפיצ'רים החדשים הנמצאים בפיתוח - לפני הכנסתם לגרסה הסופית. אם אתה לא יודע מה אתה עושה, אנו ממליצים שלא תפעיל את האופציה הזאת.",
   "feature.nightlyBuilds.title": "גרסאות נייטלי",
   "feature.publishDebugInfo.error": "קיימת שגיאה בפרסום מידע ניפוי השגיאות, אנא נסה שנית מאוחר יותר או הסתכל בקובץ הלוג למידע נוסף.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "חיפוש...",
   "feature.quickSwitch.title": "החלפה מהירה",
   "global.api.unhealthy": "לא ניתן להתחבר לשרותי האינטרנת של Ferdi",
+  "global.cancel": "בטל",
+  "global.edit": "ערוך",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "נראה שאתה לא מחובר לאינטרנט.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "הגדרות",
   "global.spellchecker.useDefault": "השתמש בברירת המחדל של המערכת ({default})",
   "global.spellchecking.autodetect": "זהה שפה באופן אוטומטי",
   "global.spellchecking.autodetect.short": "אוטומטי",
   "global.spellchecking.language": "שפה לבדיקת איות",
+  "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": "סוכן משתמש",
+  "global.yes": "Yes",
   "import.headline": "ייבא את השירותים שלך מפרדי גרסה 4",
   "import.notSupportedHeadline": "השירות עדיין אינו נתמך בפרדי גרסה 5",
   "import.skip.label": "אני רוצה להוסיף שירותים באופן ידני",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "סגור את רשימת המשימות",
   "menu.Todoss.openTodosDrawer": "פתח את רשימת המשימות",
   "menu.app.about": "אודות פרדי",
-  "menu.app.announcement": "מה חדש?",
   "menu.app.autohideMenuBar": "הסתרת שורת התפריטים באופן אוטומטי",
   "menu.app.checkForUpdates": "חפש עדכונים",
   "menu.app.hide": "הסתר",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "הגדרות",
   "menu.app.unhide": "Unhide",
   "menu.edit": "ערוך",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "היכנס לחשבונך",
   "password.link.signup": "צור חשבון חדש בחינם",
   "password.noUser": "לא נמצא משתמש עם כתובת הדוא\"ל הזאת",
-  "password.submit.label": "שלח",
   "password.successInfo": "אנא בדוק את הדוא\"ל שלך",
   "pricing.features.accountSync": "סנכון החשבון",
   "pricing.features.customWebsites": "הוסף אתרים מותאמים אישית",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "כלול גרסאות בטא",
   "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": "שרת מותאם אישית לרשימת המשימות",
   "settings.app.form.darkMode": "אפשר מצב לילה",
   "settings.app.form.enableGPUAcceleration": "אפשר האצת חומרה (GPU)",
@@ -251,7 +256,6 @@
   "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.headline": "הגדרות",
   "settings.app.headlineAdvanced": "מתקדם",
   "settings.app.headlineAppearance": "תצוגה",
   "settings.app.headlineGeneral": "כללי",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "חשבון",
   "settings.navigation.availableServices": "שירותים זמינים",
   "settings.navigation.logout": "התנתק",
-  "settings.navigation.settings": "הגדרות",
   "settings.navigation.supportFerdi": "אודות פרדי",
   "settings.navigation.team": "נהל צוות",
   "settings.navigation.yourServices": "השירותים שלך",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "כבה התראות ואודיו",
   "sidebar.openTodosDrawer": "פתח את המשימות של פרדי",
   "sidebar.openWorkspaceDrawer": "פתח את סרגל סביבות העבודה",
-  "sidebar.settings": "הגדרות",
   "sidebar.unmuteApp": "אפשר התראות ואודיו",
   "signup.email.label": "כתובת דוא\"ל",
   "signup.emailDuplicate": "כבר קיים חשבון עם כתובת דוא\"ל זו",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "כבה התראות",
   "tabs.item.disableService": "כבה שירות",
-  "tabs.item.edit": "ערוך",
   "tabs.item.enableAudio": "אפשר אודיו",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "אפשר התראות",
diff --git a/src/i18n/locales/hi.json b/src/i18n/locales/hi.json
index a4e4e4e85..be9bbb961 100644
--- a/src/i18n/locales/hi.json
+++ b/src/i18n/locales/hi.json
@@ -1,120 +1,159 @@
 {
-  "app.errorHandler.action": "पुन: लोड करें",
-  "app.errorHandler.headline": "कुछ तो गड़बड़ है, दया",
-  "connectionLostBanner.cta": "सेवा पुनः लोड करें",
+  "app.errorHandler.action": "Reload",
+  "app.errorHandler.headline": "Something went wrong",
+  "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.shareFranz.action.email": "ईमेल के रूप में भेजें",
-  "feature.shareFranz.action.facebook": "फेसबुक पर सांझा करें",
-  "feature.shareFranz.action.twitter": "ट्विटर पर सांझा करें",
-  "feature.shareFranz.headline": "फ्रांज़ एक साथ बेहतर है!",
-  "feature.shareFranz.shareText.email": "मैंने फ्रांज में {count} सेवाएं जोड़ी हैं! व्हाट्सएप, मैसेंजर, स्लैक, स्काइप के लिए मुफ्त ऐप www.getferdi.com पर प्राप्त करें",
-  "feature.shareFranz.shareText.twitter": "मैंने फ्रांज में {count} सेवाएं जोड़ी हैं! व्हाट्सएप, मैसेंजर, स्लैक, स्काइप के लिए मुफ्त ऐप www.getferdi.com पर प्राप्त करें / cc @FerdiMessenger",
-  "feature.shareFranz.text": "अपने दोस्तों और सहकर्मियों को बताएं की फ्रांज़ कितना बढ़िया है और हमें इस बात को फैलाने में मदद करें।",
-  "global.api.unhealthy": "फ्रांज़ ऑनलाइन सेवाओं से कनेक्ट नहीं किया जा सका",
-  "global.franzProRequired": "Ferdi Professional Required",
-  "global.notConnectedToTheInternet": "आप इंटरनेट से नहीं जुड़े हैं।",
-  "global.spellchecker.useDefault": "सिस्टम डिफ़ॉल्ट ({default}) का उपयोग करें",
-  "global.spellchecking.autodetect": "स्वचालित रूप से भाषा का पता लगाएं",
-  "global.spellchecking.autodetect.short": "स्वचालित",
-  "global.spellchecking.language": "वर्तनी जाँच भाषा",
-  "import.headline": "अपनी फ्रांज़ 4 की सेवाओं का आयात करें",
-  "import.notSupportedHeadline": "सेवाएं अभी तक फ्रांज़ 5 में समर्थित नहीं हैं",
-  "import.skip.label": "मैं स्वयं सेवाएं जोड़ना चाहता हूं",
-  "import.submit.label": "सेवाएं आयात करें",
-  "infobar.buttonChangelog": "क्या-क्या नया है?",
-  "infobar.buttonInstallUpdate": "पुनरारंभ करें, और अद्यतन स्थापित करें",
-  "infobar.buttonReloadServices": "सेवाओं को फिर से लोड करें",
-  "infobar.requiredRequestsFailed": "सेवाएं और उपयोगकर्ताओं की जानकारी लोड नहीं हो सकी",
-  "infobar.servicesUpdated": "आपकी सेवाएं अपडेट कर दी गई हैं।",
-  "infobar.updateAvailable": "फ्रांज़ के लिए एक नया अपडेट उपलब्ध है।",
-  "invite.email.label": "ईमेल पता",
-  "invite.headline.friends": "अपने दोस्तों या सहयोगियों में से 3 को आमंत्रित करें",
-  "invite.name.label": "नाम",
-  "invite.skip.label": "मैं इसे बाद में करना चाहता हूं",
-  "invite.submit.label": "आमंत्रण भेजें",
-  "invite.successInfo": "निमंत्रण सफलतापूर्वक भेजे गए",
-  "login.email.label": "ईमेल पता",
-  "login.headline": "लॉग इन करें",
-  "login.invalidCredentials": "ईमेल या पासवर्ड मान्य नहीं है",
-  "login.link.password": "पासवर्ड रीसेट",
-  "login.link.signup": "एक नि: शुल्क खाता बनाए",
-  "login.password.label": "पासवर्ड",
-  "login.serverLogout": "आपका सत्र समाप्त हो गया है, कृपया फिर से लॉगिन करें।",
-  "login.submit.label": "लॉग इन करें",
-  "login.tokenExpired": "आपका सत्र समाप्त हो गया है, कृपया फिर से लॉगिन करें।",
+  "feature.basicAuth.signIn": "Sign In",
+  "feature.debugger.title": "Publish debugging information",
+  "feature.nightlyBuilds.activate": "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": "Nightly Builds",
+  "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.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.privacy": "Privacy policy",
+  "feature.publishDebugInfo.publish": "Accept and publish",
+  "feature.publishDebugInfo.published": "Your debug log was published and is now availible at",
+  "feature.publishDebugInfo.terms": "Terms of service",
+  "feature.publishDebugInfo.title": "Publish debug information",
+  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
+  "feature.quickSwitch.search": "Search...",
+  "feature.quickSwitch.title": "QuickSwitch",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
+  "global.edit": "Edit",
+  "global.no": "No",
+  "global.notConnectedToTheInternet": "You are not connected to the internet.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Settings",
+  "global.spellchecker.useDefault": "Use System Default ({default})",
+  "global.spellchecking.autodetect": "Detect language automatically",
+  "global.spellchecking.autodetect.short": "Automatic",
+  "global.spellchecking.language": "Spell checking language",
+  "global.submit": "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.yes": "Yes",
+  "import.headline": "Import your Ferdi 4 services",
+  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
+  "import.skip.label": "I want to add services manually",
+  "import.submit.label": "Import services",
+  "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.buttonInstallUpdate": "Restart & install update",
+  "infobar.buttonReloadServices": "Reload services",
+  "infobar.hide": "Hide",
+  "infobar.requiredRequestsFailed": "Could not load services and user information",
+  "infobar.servicesUpdated": "Your services have been updated.",
+  "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.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.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.announcement": "नया क्या है?",
-  "menu.app.checkForUpdates": "अद्यतन के लिए जाँचें...",
-  "menu.app.hide": "छिपाएं ",
-  "menu.app.hideOthers": "दूसरों को छिपाओ",
-  "menu.app.quit": "छोड़ो",
-  "menu.app.settings": "सेटिंग्स",
-  "menu.app.unhide": "सामने लाएँ",
-  "menu.edit": "संपादित करें",
-  "menu.edit.copy": "प्रतिलिपि",
-  "menu.edit.cut": "काटो",
-  "menu.edit.delete": "मिटाओ",
-  "menu.edit.emojiSymbols": "इमोजी और प्रतीक",
-  "menu.edit.paste": "चिपकाएं",
-  "menu.edit.pasteAndMatchStyle": "पेस्ट और मैच स्टाइल",
-  "menu.edit.redo": "फिर से करना",
-  "menu.edit.selectAll": "सभी का चयन करे",
-  "menu.edit.speech": "भाषण",
-  "menu.edit.startDictation": "श्रुतलेख शुरू करें",
-  "menu.edit.startSpeaking": "बोलना शुरू करें",
-  "menu.edit.stopSpeaking": "बोलना बंद करें",
-  "menu.edit.undo": "पूर्ववत् करें",
-  "menu.file": "फ़ाइल",
-  "menu.help": "मदद",
-  "menu.help.changelog": "चेंजलॉग",
+  "menu.app.about": "About Ferdi",
+  "menu.app.autohideMenuBar": "Auto-hide menu bar",
+  "menu.app.checkForUpdates": "Check for updates",
+  "menu.app.hide": "Hide",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.unhide": "Unhide",
+  "menu.edit": "Edit",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
+  "menu.edit.delete": "Delete",
+  "menu.edit.emojiSymbols": "Emoji & Symbols",
+  "menu.edit.findInPage": "Find in Page",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "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.file": "File",
+  "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.privacy": "प्राइवेसी स्टेटमेंट",
-  "menu.help.support": "सहयोग",
-  "menu.help.tos": "सेवा की शर्तें",
-  "menu.services": "सेवाएं",
-  "menu.services.activatePreviousService": "पिछली सेवा को सक्रिय करें",
+  "menu.help.importExportData": "Import/Export Configuration Data",
+  "menu.help.learnMore": "Learn More",
+  "menu.help.privacy": "Privacy Statement",
+  "menu.help.publishDebugInfo": "Publish Debug Information",
+  "menu.help.support": "Support",
+  "menu.help.tos": "Terms of 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.reloadFerdi": "फ्रांज़ को पुनः लोड",
-  "menu.view.reloadService": "सेवा पुनः लोड करें",
+  "menu.view": "View",
+  "menu.view.back": "Back",
+  "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.toggleDevTools": "डेवलपर टूल टॉगल करें",
-  "menu.view.toggleFullScreen": "फुलस्क्रीन टॉगल करें",
-  "menu.view.toggleServiceDevTools": "सेवा डेवलपर उपकरण टॉगल करें",
+  "menu.view.resetZoom": "Actual Size",
+  "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",
   "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
-  "menu.view.zoomIn": "बड़ा करें",
-  "menu.view.zoomOut": "छोटा करें",
-  "menu.window": "खिड़की",
-  "menu.window.close": "बंद करें",
-  "menu.window.minimize": "न्यूनतम करें",
-  "menu.workspaces": "कार्यस्थान",
-  "menu.workspaces.addNewWorkspace": "नया कार्यक्षेत्र जोड़ें ...",
-  "menu.workspaces.closeWorkspaceDrawer": "कार्यक्षेत्र दराज को बंद करें",
-  "menu.workspaces.defaultWorkspace": "सभी सेवाएं",
-  "menu.workspaces.openWorkspaceDrawer": "कार्यक्षेत्र दराज खोलें",
-  "password.email.label": "ईमेल पता",
-  "password.headline": "पासवर्ड रीसेट",
-  "password.link.login": "अपने अकाउंट में लॉग इन करें",
-  "password.link.signup": "एक नि: शुल्क खाता बनाए",
-  "password.noUser": "उस ईमेल पते वाला कोई उपयोगकर्ता नहीं मिला",
-  "password.submit.label": "जमा करें",
-  "password.successInfo": "कृपया अपनी ईमेल देखें",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
+  "menu.workspaces": "Workspaces",
+  "menu.workspaces.addNewWorkspace": "Add New Workspace...",
+  "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
+  "menu.workspaces.defaultWorkspace": "All services",
+  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
+  "password.email.label": "Email address",
+  "password.headline": "Reset password",
+  "password.link.login": "Sign in to your account",
+  "password.link.signup": "Create a free account",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -124,83 +163,133 @@
   "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": "कार्यस्थान",
-  "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": "{name} को संपादित करें",
-  "service.errorHandler.headline": "अरे नहीं!",
-  "service.errorHandler.message": "त्रुटि",
-  "service.errorHandler.text": "{name} लोड करने में विफलता हुई ",
-  "service.webviewLoader.loading": "लोड हो रहा है",
-  "services.getStarted": "आरंभ करें",
-  "services.welcome": "फ्रांज़ में आपका स्वागत है",
-  "settings.account.account.editButton": "खाता संपादित करें",
-  "settings.account.accountType.basic": "मूल खाता",
-  "settings.account.accountType.premium": "प्रीमियम समर्थक खाता",
-  "settings.account.buttonSave": "प्रोफ़ाइल अपडेट करें",
-  "settings.account.deleteAccount": "खाता मिटाएं",
-  "settings.account.deleteEmailSent": "आपको अपने खाते को हटाने की पुष्टि करने के लिए एक लिंक प्राप्त हुआ है। आपके खाते और डेटा को पुनर्स्थापित नहीं किया जा सकता है!",
-  "settings.account.deleteInfo": "यदि आपको अपने फ्रांज़ खाते की आवश्यकता नहीं है, तो आप यहां अपना खाता और संबंधित डेटा हटा सकते हैं।",
-  "settings.account.headline": "खाता",
-  "settings.account.headlineAccount": "खाते की जानकारी",
-  "settings.account.headlineDangerZone": "खतरे का क्षेत्र",
-  "settings.account.headlineInvoices": "चालान",
-  "settings.account.headlinePassword": "पासवर्ड बदलें",
-  "settings.account.headlineProfile": "प्रोफ़ाइल अपडेट करें",
-  "settings.account.successInfo": "आपके परिवर्तनों को सहेजा गया है",
-  "settings.account.tryReloadServices": "फिर कोशिश करें",
-  "settings.account.tryReloadUserInfoRequest": "फिर कोशिश करें",
-  "settings.account.userInfoRequestFailed": "उपयोगकर्ता की जानकारी लोड नहीं हो सकी",
+  "pricing.features.workspaces": "Workspaces",
+  "service.crashHandler.action": "Reload {name}",
+  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
+  "service.crashHandler.headline": "Oh no!",
+  "service.crashHandler.text": "{name} has caused an error.",
+  "service.disabledHandler.action": "Enable {name}",
+  "service.disabledHandler.headline": "{name} is disabled",
+  "service.errorHandler.action": "Reload {name}",
+  "service.errorHandler.editAction": "Edit {name}",
+  "service.errorHandler.headline": "Oh no!",
+  "service.errorHandler.message": "Error",
+  "service.errorHandler.text": "{name} has failed to load.",
+  "service.webviewLoader.loading": "Loading {service}",
+  "services.getStarted": "Get started",
+  "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.",
+  "settings.account.buttonSave": "Update profile",
+  "settings.account.deleteAccount": "Delete account",
+  "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": "Account",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
+  "settings.account.headlineProfile": "Update profile",
+  "settings.account.successInfo": "Your changes have been saved",
+  "settings.account.tryReloadServices": "Try again",
+  "settings.account.tryReloadUserInfoRequest": "Try again",
+  "settings.account.userInfoRequestFailed": "Could not load user information",
   "settings.account.yourLicense": "Your Ferdi License",
-  "settings.app.buttonClearAllCache": "कैश को साफ़ करें",
-  "settings.app.buttonInstallUpdate": "पुनरारंभ करें, और अद्यतन स्थापित करें",
-  "settings.app.buttonSearchForUpdate": "अद्यतन के लिए खोजें",
-  "settings.app.cacheInfo": "फ्रांज़ कैश वर्तमान में आपके डिस्क का {size} उपयोग कर रहा है।",
-  "settings.app.currentVersion": "वर्तमान संस्करण:",
-  "settings.app.form.autoLaunchInBackground": "पृष्ठभूमि में खोलें",
-  "settings.app.form.autoLaunchOnStart": "कंप्यूटर शुरू होते ही क्या फ्रांज़ भी लॉन्च होना चाहिए?",
-  "settings.app.form.beta": "बीटा संस्करण शामिल करें",
-  "settings.app.form.darkMode": "डार्क मोड सक्षम करें",
-  "settings.app.form.enableGPUAcceleration": "GPU त्वरण सक्षम करें",
-  "settings.app.form.enableSpellchecking": "शब्द विन्यास सक्रिय करो",
-  "settings.app.form.enableSystemTray": "फ्रांज़ को सिस्टम ट्रे में दिखाएं",
+  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
+  "settings.app.buttonClearAllCache": "Clear cache",
+  "settings.app.buttonInstallUpdate": "Restart & install update",
+  "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder",
+  "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.cacheNotCleared": "Couldn't clear all cache",
+  "settings.app.closeSettings": "Close settings",
+  "settings.app.currentVersion": "Current version:",
+  "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": "Open in background",
+  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
+  "settings.app.form.automaticUpdates": "Enable updates",
+  "settings.app.form.beta": "Include beta versions",
+  "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.enableLock": "Enable Password Lock",
+  "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.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.minimizeToSystemTray": "फ्रांज़ को सिस्टम ट्रे में न्यूनतम करें",
-  "settings.app.form.runInBackground": "खिड़की बंद करते समय फ्रांज को पृष्ठभूमि में रखें",
-  "settings.app.form.showDisabledServices": "अक्षम सेवाओं टैब प्रदर्शित करें",
-  "settings.app.form.showMessagesBadgesWhenMuted": "जब सूचनाएं अक्षम हों तो अपठित संदेश बैज दिखाएं",
-  "settings.app.headline": "सेटिंग्स",
-  "settings.app.headlineAdvanced": "विकसित",
-  "settings.app.headlineAppearance": "रूप",
-  "settings.app.headlineGeneral": "सामान्य",
-  "settings.app.headlineLanguage": "भाषा",
-  "settings.app.headlineUpdates": "अद्यतन",
-  "settings.app.languageDisclaimer": "आधिकारिक अनुवाद अंग्रेजी और जर्मन में हैं। अन्य सभी भाषाएँ समुदाय आधारित अनुवाद हैं।",
-  "settings.app.restartRequired": "परिवर्तनों को पुनरारंभ की आवश्यकता है",
-  "settings.app.subheadlineCache": "कैश",
-  "settings.app.translationHelp": "आपकी भाषा में फ्रांज़ का अनुवाद करने में हमारी मदद करें।",
-  "settings.app.updateStatusAvailable": "अद्यतन उपलब्ध है, डाउनलोड हो रहा है ...",
-  "settings.app.updateStatusSearching": "अद्यतन की खोज जारी है",
-  "settings.app.updateStatusUpToDate": "आप फ्रांज़ के नवीनतम संस्करण का उपयोग कर रहे हैं",
-  "settings.invite.headline": "मित्रों को आमंत्रित करें",
-  "settings.navigation.account": "खाता",
-  "settings.navigation.availableServices": "उपलब्ध सेवाएं",
-  "settings.navigation.inviteFriends": "मित्रों को आमंत्रित करें",
-  "settings.navigation.logout": "लॉग आउट",
-  "settings.navigation.settings": "सेटिंग्स",
-  "settings.navigation.team": "टीम का प्रबंधन करें",
-  "settings.navigation.yourServices": "आपकी सेवाएं",
-  "settings.navigation.yourWorkspaces": "आपके कार्यक्षेत्र",
-  "settings.recipes.all": "सभी सेवाएं",
+  "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": "From",
+  "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.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": "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.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.",
+  "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",
@@ -208,142 +297,169 @@
   "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
   "settings.recipes.customService.openDevDocs": "Developer Documentation",
   "settings.recipes.customService.openFolder": "Open folder",
-  "settings.recipes.headline": "उपलब्ध सेवाएं",
-  "settings.recipes.missingService": "क्या कोई सेवा गुम है?",
-  "settings.recipes.nothingFound": "क्षमा करें, लेकिन आपके खोज शब्द से किसी भी सेवा का मिलान नहीं हुआ।",
-  "settings.recipes.servicesSuccessfulAddedInfo": "सेवा सफलतापूर्वक जोड़ी गई",
-  "settings.searchService": "खोज सेवा",
-  "settings.service.error.goBack": "सेवाओं पर वापस",
-  "settings.service.error.headline": "त्रुटि",
-  "settings.service.error.message": "सेवा की रेसिपी लोड नहीं हो पायी।",
-  "settings.service.form.addServiceHeadline": "{name} जोड़ें",
-  "settings.service.form.availableServices": "उपलब्ध सेवाएं",
-  "settings.service.form.customUrl": "कस्टम सर्वर",
-  "settings.service.form.customUrlPremiumInfo": "स्वयं की होस्ट की गई सेवाओं को जोड़ने के लिए, आपको फ्रांज प्रीमियम सपोर्टर अकाउंट की आवश्यकता है।",
-  "settings.service.form.customUrlValidationError": "कस्टम {name} सर्वर का मान्यकरण नहीं किया जा सका।",
-  "settings.service.form.deleteButton": "सेवा हटाएँ",
-  "settings.service.form.editServiceHeadline": "{name} संपादित करें",
-  "settings.service.form.enableAudio": "ऑडियो सक्षम करें",
-  "settings.service.form.enableBadge": "अपठित संदेश बैज दिखाएं",
-  "settings.service.form.enableDarkMode": "डार्क मोड सक्षम करें",
+  "settings.recipes.headline": "Available services",
+  "settings.recipes.missingService": "Missing a service?",
+  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
+  "settings.recipes.servicesSuccessfulAddedInfo": "Service 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.customUrl": "Custom server",
+  "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.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.enableService": "सेवा सक्षम करें",
-  "settings.service.form.headlineBadges": "अपठित संदेश बैज",
-  "settings.service.form.headlineGeneral": "सामान्य",
-  "settings.service.form.headlineNotifications": "सूचनाएँ",
-  "settings.service.form.icon": "कस्टम आइकॉन",
-  "settings.service.form.iconDelete": "मिटाएँ",
-  "settings.service.form.iconUpload": "अपना फ़ोटो छोड़ें, या यहाँ क्लिक करें",
-  "settings.service.form.indirectMessageInfo": "आपको एक चैनल में सभी नए संदेशों के बारे में सूचित किया जाएगा, न केवल @username, @channel, @here, ...",
-  "settings.service.form.indirectMessages": "सभी नए संदेशों के लिए संदेश बैज दिखाएं",
+  "settings.service.form.enableNotification": "Enable notifications",
+  "settings.service.form.enableService": "Enable service",
+  "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.icon": "Custom 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": "अक्षम होने पर, सभी सूचना ध्वनियाँ और ऑडियो प्लेबैक मौन रहेंगे ",
-  "settings.service.form.name": "नाम",
-  "settings.service.form.proxy.headline": "HTTP/HTTPS प्रॉक्सी सेटिंग्स",
-  "settings.service.form.proxy.host": "प्रॉक्सी होस्ट / आईपी",
-  "settings.service.form.proxy.info": "प्रॉक्सी सेटिंग्स फ्रांज़ सर्वर के साथ सिंक नहीं होंगी।",
-  "settings.service.form.proxy.isEnabled": "प्रॉक्सी का प्रयोग करें",
-  "settings.service.form.proxy.password": "पासवर्ड (वैकल्पिक)",
-  "settings.service.form.proxy.port": "पोर्ट",
-  "settings.service.form.proxy.restartInfo": "प्रॉक्सी सेटिंग बदलने के बाद फ्रांज़ को पुनः आरंभ करें।",
-  "settings.service.form.proxy.user": "उपयोगकर्ता (वैकल्पिक)",
-  "settings.service.form.saveButton": "इस सेवा को सहेजें",
-  "settings.service.form.tabHosted": "होस्ट किया गया",
-  "settings.service.form.tabOnPremise": "स्वयं द्वारा होस्ट किया हुआ",
-  "settings.service.form.team": "टीम",
-  "settings.service.form.useHostedService": "होस्ट किये हुए {name} सेवा का उपयोग करें।",
-  "settings.service.form.yourServices": "आपकी सेवाएं",
-  "settings.services.deletedInfo": "सेवा को हटा दिया गया है",
-  "settings.services.discoverServices": "सेवाओं की खोज करें",
-  "settings.services.headline": "आपकी सेवाएं",
-  "settings.services.noServicesAdded": "आपने अभी तक कोई सेवाएं नहीं जोड़ी है।",
-  "settings.services.servicesRequestFailed": "आपकी सेवाएं लोड नहीं हो सकीं",
-  "settings.services.tooltip.isDisabled": "सेवा अक्षम है",
-  "settings.services.tooltip.isMuted": "सभी ध्वनियाँ मौन हैं",
-  "settings.services.tooltip.notificationsDisabled": "सूचनाएं अक्षम हैं",
-  "settings.services.updatedInfo": "आपके परिवर्तनों को सहेजा गया है",
-  "settings.team.contentHeadline": "टीमों के लिए फ्रांज़",
-  "settings.team.copy": "Franz for Teams आपको ईमेल आमंत्रण भेजकर और अपने खाते की प्राथमिकताओं में उनकी सदस्यता को प्रबंधित करके अपनी टीम में सह-कार्यकर्ताओं को आमंत्रित करने का विकल्प देता है। हर टीम के सदस्य के लिए अलग-अलग सदस्यताएँ सेट करने में समय बर्बाद न करें, कई चालान और विभिन्न बिलिंग चक्रों के बारे में भूल जाएं - एक टीम सभी के लिए !",
-  "settings.team.headline": "टीम",
-  "settings.team.intro": "आप और आपकी टीम फ्रांज़ का उपयोग करते हैं? अब आप सभी सहयोगियों, दोस्तों या परिवार के सदस्यों के लिए प्रीमियम सदस्यता का प्रबंधन कर सकते हैं, जैसा कि आप चाहते हैं, सभी एक खाते के भीतर से।",
-  "settings.team.manageAction": "अपनी टीम को meetfranz.com पर प्रबंधित करें",
-  "settings.team.upgradeAction": "अपने खाते को अपग्रेड करें",
-  "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": "पहला नाम",
-  "settings.user.form.lastname": "उपनाम",
-  "settings.user.form.newPassword": "नया पासवर्ड",
-  "settings.workspace.add.form.name": "नाम",
-  "settings.workspace.add.form.submitButton": "कार्यक्षेत्र बनाएँ",
-  "settings.workspace.form.buttonDelete": "कार्यक्षेत्र हटाएं",
-  "settings.workspace.form.buttonSave": "कार्यक्षेत्र सहेजें",
-  "settings.workspace.form.name": "नाम",
-  "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": "कम अधिक है: फ्रांज़ कार्यस्थानों का परिचय",
-  "settings.workspaces.workspaceFeatureInfo": "फ्रांज वर्कस्पेस आपको इस बात पर ध्यान केंद्रित करने देता है कि अभी क्या महत्वपूर्ण है। सेवाओं के विभिन्न समूहों को तैयार करें और किसी भी समय उनके बीच आसानी से स्विच करें। आप यह तय करते हैं कि आपको कब और कहाँ किन सेवाओं की ज़रूरत है, इसलिए हम आपको अपने खेल में शीर्ष पर बने रहने में मदद कर सकते हैं - या जब भी आप चाहें, आसानी से काम बंद कर सकते हैं।",
-  "settings.workspaces.workspacesRequestFailed": "आपके कार्यस्थानों को लोड नहीं किया जा सका",
+  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
+  "settings.service.form.name": "Name",
+  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
+  "settings.service.form.openUserCss": "Open user.css",
+  "settings.service.form.openUserJs": "Open user.js",
+  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy 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.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.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.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",
+  "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.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.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.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": "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.muteApp": "सूचनाएं और ऑडियो अक्षम करें",
+  "sidebar.closeWorkspaceDrawer": "Close workspace drawer",
+  "sidebar.lockFerdi": "Lock Ferdi",
+  "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
-  "sidebar.openWorkspaceDrawer": "कार्यक्षेत्र दराज खोलें",
-  "sidebar.settings": "सेटिंग्स",
-  "sidebar.unmuteApp": "सूचनाएं और ऑडियो सक्षम करें",
-  "signup.email.label": "ईमेल पता",
-  "signup.emailDuplicate": "उस ईमेल पते वाला उपयोगकर्ता पहले से मौजूद है",
-  "signup.firstname.label": "पहला नाम",
-  "signup.headline": "साइन अप करें",
-  "signup.lastname.label": "उपनाम",
-  "signup.legal.info": "फ्रांज़ में खाता बनाकर आप इसे स्वीकार करते हैं",
-  "signup.legal.privacy": "प्राइवेसी स्टेटमेंट",
-  "signup.legal.terms": "सेवा की शर्तें",
-  "signup.link.login": "पहले से ही एक खाता है? लॉग इन करें।",
-  "signup.password.label": "पासवर्ड",
-  "signup.submit.label": "खता खोलें",
-  "tabs.item.deleteService": "सेवा हटाएँ",
-  "tabs.item.disableAudio": "ऑडियो अक्षम करें",
-  "tabs.item.disableNotifications": "ऑडियो अक्षम करें",
-  "tabs.item.disableService": "सेवा अक्षम करें",
-  "tabs.item.edit": "संपादित करें",
-  "tabs.item.enableAudio": "ऑडियो सक्षम करें",
-  "tabs.item.enableNotification": "सूचनाएँ सक्षम करें ",
-  "tabs.item.enableService": "सेवा सक्षम करें",
-  "tabs.item.reload": "पुन: लोड करें",
-  "validation.email": "{field} मान्य नहीं है",
-  "validation.minLength": "{field} कम से कम {length} अक्षर लंबे होने चाहिए",
-  "validation.oneRequired": "कम से कम एक की आवश्यकता है",
-  "validation.required": "{field} की आवश्यकता है",
-  "validation.url": "{field} एक मान्य URL नहीं है",
+  "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.headline": "Sign up",
+  "signup.lastname.label": "Last Name",
+  "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": "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.disableDarkMode": "Disable Dark mode",
+  "tabs.item.disableNotifications": "Disable notifications",
+  "tabs.item.disableService": "Disable service",
+  "tabs.item.enableAudio": "Enable audio",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
+  "tabs.item.enableNotification": "Enable notifications",
+  "tabs.item.enableService": "Enable service",
+  "tabs.item.hibernateService": "Hibernate service",
+  "tabs.item.reload": "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.forward": "Forward",
   "webControls.goHome": "Home",
   "webControls.openInBrowser": "Open in Browser",
-  "webControls.reload": "पुन: लोड करें",
-  "welcome.loginButton": "अपने खाते में प्रवेश करें",
-  "welcome.signupButton": "एक नि: शुल्क खाता बनाए",
-  "workspaceDrawer.addNewWorkspaceLabel": "नया कार्यक्षेत्र जोड़ें",
-  "workspaceDrawer.allServices": "सभी सेवाएं",
-  "workspaceDrawer.headline": "कार्यस्थान",
-  "workspaceDrawer.item.contextMenuEdit": "संपादन करें",
-  "workspaceDrawer.item.noServicesAddedYet": "अभी तक कोई सेवा नहीं जोड़ी गई है",
-  "workspaceDrawer.premiumCtaButtonLabel": "अपना पहला कार्यक्षेत्र बनाएँ",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "प्रीमियम खाता पुनः सक्रिय करें",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>फ्रांज वर्कस्पेस आपको इस बात पर ध्यान केंद्रित करने देता है कि अभी क्या महत्वपूर्ण है। सेवाओं के विभिन्न समूहों को तैयार करें और किसी भी समय उनके बीच आसानी से स्विच करें।</p><p>आप यह तय करते हैं कि आपको कब और कहाँ किन सेवाओं की ज़रूरत है, इसलिए हम आपको अपने खेल में शीर्ष पर बने रहने में मदद कर सकते हैं - या जब भी आप चाहें, आसानी से काम बंद कर सकते हैं।</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "कार्यस्थान सेटिंग्स संपादित करें",
-  "workspaces.switchingIndicator.switchingTo": "इसमें स्विच हो रहा है-"
+  "webControls.reload": "Reload",
+  "welcome.loginButton": "Login to your account",
+  "welcome.signupButton": "Create a free account",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
+  "workspaceDrawer.allServices": "All services",
+  "workspaceDrawer.headline": "Workspaces",
+  "workspaceDrawer.item.contextMenuEdit": "edit",
+  "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",
+  "workspaces.switchingIndicator.switchingTo": "Switching to"
 }
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 80cce61fa..f7e046ed9 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Prilagođen server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Pošalji",
   "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": "Changes in Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Odustani",
   "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": "Nightly Builds",
   "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.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nije se moguće povezati na Francove on-line servise. ",
+  "global.cancel": "Odustani",
+  "global.edit": "Uredi",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Sada ste povezani s internetom. ",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Postavke",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Pošalji",
   "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.yes": "Yes",
   "import.headline": "Uvezite svoje Franc 4 servise. ",
   "import.notSupportedHeadline": "Franc 5 trenutno ne podržava taj servis",
   "import.skip.label": "Želim ručno dodati ove usluge",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "O aplikaciji",
-  "menu.app.announcement": "What's new?",
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Potraži ažuriranja",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Postavke",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Uredi",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Prijavite se na Vaš račun",
   "password.link.signup": "Stvorite besplatan račun",
   "password.noUser": "Ne postoji ni jedan korisnik s tom e-mail adresom",
-  "password.submit.label": "Pošalji",
   "password.successInfo": "Molimo Vas da provjerite svoju e-mail adresu",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Obuhvati i beta verzije",
   "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",
@@ -251,7 +256,6 @@
   "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.headline": "Postavke",
   "settings.app.headlineAdvanced": "Napredne alatke",
   "settings.app.headlineAppearance": "Izgled",
   "settings.app.headlineGeneral": "Općenito",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Korisnički račun",
   "settings.navigation.availableServices": "Dostupne usluge",
   "settings.navigation.logout": "Odjava",
-  "settings.navigation.settings": "Postavke",
   "settings.navigation.supportFerdi": "O aplikaciji",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Vaše usluge",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Ugasi obavijesti i zvuk",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Postavke",
   "sidebar.unmuteApp": "Omogući obavijesti i zvuk",
   "signup.email.label": "Vaša e-adresa:",
   "signup.emailDuplicate": "Već postoji korisnik s tom e-mail adresom",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Onemogući obavijesti",
   "tabs.item.disableService": "Onemogući servis",
-  "tabs.item.edit": "Uredi",
   "tabs.item.enableAudio": "Omogućite zvuk",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Omogućite obavijesti",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index b542fcddf..84c8496b8 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Egyéni szerver",
   "changeserver.headline": "Szerver megváltoztatása",
   "changeserver.label": "Szerver",
-  "changeserver.submit": "Küldés",
   "changeserver.urlError": "Adjon meg egy érvényes URL-t",
   "changeserver.warning": "A Ferdi által kínált extra beállítások nem kerülnek mentésre",
   "connectionLostBanner.cta": "Szolgáltatás újraindítása",
   "connectionLostBanner.informationLink": "Mi történt?",
   "connectionLostBanner.message": "Ja ne! Ferdi nem tud kapcsolodni {name}-hez.",
-  "feature.announcements.changelog.headline": "Ferdi {version} változásai",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Hibakeresési napló publikálása",
   "feature.nightlyBuilds.activate": "Aktiválás",
-  "feature.nightlyBuilds.cancel": "Mégsem",
   "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": "Nightly verziók",
   "feature.publishDebugInfo.error": "Hiba történt a hibakeresési napló publikálása közben. Kérem próbálja meg később.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Keresés...",
   "feature.quickSwitch.title": "Gyorsváltó",
   "global.api.unhealthy": "Nem lehet csatlakozni a Ferdi online szolgáltatáshoz",
+  "global.cancel": "Mégsem",
+  "global.edit": "Szerkesztés",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Nincs hálózati kapcsolat.",
+  "global.ok": "Ok",
+  "global.quit": "Kilépés",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Beállítások",
   "global.spellchecker.useDefault": "Rendszer alapbeállítás használata ({default})",
   "global.spellchecking.autodetect": "Automatikus nyelvdetektálás",
   "global.spellchecking.autodetect.short": "Automatikus",
   "global.spellchecking.language": "Helyesírás-ellenőrző nyelve",
+  "global.submit": "Küldés",
   "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.yes": "Yes",
   "import.headline": "Importáld szolgáltatásaidat a Ferdi 4-ből",
   "import.notSupportedHeadline": "Még nem támogatott szolgáltatások a Ferdi 5-ben",
   "import.skip.label": "Manuálisan szeretném hozzáadni a szolgáltatásokat",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Tennivalók sáv bezárása",
   "menu.Todoss.openTodosDrawer": "Tennivalók sáv kinyitása",
   "menu.app.about": "Névjegy",
-  "menu.app.announcement": "Mi újság?",
   "menu.app.autohideMenuBar": "Menüsáv automatikus elrejtése",
   "menu.app.checkForUpdates": "Frissítések keresése",
   "menu.app.hide": "Elrejt",
   "menu.app.hideOthers": "Többi elrejtése",
-  "menu.app.quit": "Kilépés",
-  "menu.app.settings": "Beállítások",
   "menu.app.unhide": "Megjelenít",
   "menu.edit": "Szerkesztés",
   "menu.edit.copy": "Másolás",
@@ -147,7 +152,6 @@
   "password.link.login": "Jelentkezz be a fiókodba",
   "password.link.signup": "Új fiók létrehozása",
   "password.noUser": "Nem található felhasználó a megadott email címmel",
-  "password.submit.label": "Küldés",
   "password.successInfo": "Ellenőrizd az email fiókodat",
   "pricing.features.accountSync": "Fiók szinkronizálás",
   "pricing.features.customWebsites": "Egyéni weboldalak megadása",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Béta verziók keresése",
   "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": "Sötét mód engedélyezése",
   "settings.app.form.enableGPUAcceleration": "Hardveres gyorsítás engedélyezése",
@@ -251,7 +256,6 @@
   "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.headline": "Beállítások",
   "settings.app.headlineAdvanced": "Haladó",
   "settings.app.headlineAppearance": "Megjelenés",
   "settings.app.headlineGeneral": "Általános",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Fiók",
   "settings.navigation.availableServices": "Elérhető szolgáltatások",
   "settings.navigation.logout": "Kijelentkezés",
-  "settings.navigation.settings": "Beállítások",
   "settings.navigation.supportFerdi": "Névjegy",
   "settings.navigation.team": "Csapat kezelése",
   "settings.navigation.yourServices": "Szolgáltatásaid",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Értesítések és hangok letiltása",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Munkaterület panel kinyitása",
-  "sidebar.settings": "Beállítások",
   "sidebar.unmuteApp": "Értesítések és hangok engedélyezése",
   "signup.email.label": "Email cím",
   "signup.emailDuplicate": "Ezzel az e-mail címmel már létezik felhasználó",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Sötét mód kikapcsolása",
   "tabs.item.disableNotifications": "Értesítések letiltása",
   "tabs.item.disableService": "Szolgáltatás letiltása",
-  "tabs.item.edit": "Szerkesztés",
   "tabs.item.enableAudio": "Hang engedélyezése",
   "tabs.item.enableDarkMode": "Sötét mód bekapcsolása",
   "tabs.item.enableNotification": "Értesítések engedélyezése",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 330fb8122..7a716a00c 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Server khusus",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Kirim",
   "changeserver.urlError": "Isi URL yang valid",
   "changeserver.warning": "Pengaturan tambahan dari Ferdi tidak akan tersimpan",
   "connectionLostBanner.cta": "Muat ulang Layanan",
   "connectionLostBanner.informationLink": "Ada apa ini?",
   "connectionLostBanner.message": "Yah! Ferdi terputus dari {name}.",
-  "feature.announcements.changelog.headline": "Perubahan dalam Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Terbitkan informasi debug",
   "feature.nightlyBuilds.activate": "Mengaktifkan",
-  "feature.nightlyBuilds.cancel": "Batalkan",
   "feature.nightlyBuilds.info": "Nightly builds adalah versi eksperimen dari Ferdi yang mungkin berisi fitur-fitur yang masih kasar dan tidak lengkap. Nightly builds ini biasa digunakan untuk para developer untuk mengetes fitur-fitur terbaru mereka dan bagaimana fitur-fitur itu berjalan di versi terakhir. Jika anda tidak tahu apa yang anda lakukan, kami sarankan untuk tidak mengaktivasi nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "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.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Tidak dapat tersambung ke layanan Ferdi",
+  "global.cancel": "Batalkan",
+  "global.edit": "Edit",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Anda tidak tersambung ke internet.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Pengaturan",
   "global.spellchecker.useDefault": "Gunakan Bawaan Sistem ({default})",
   "global.spellchecking.autodetect": "Deteksi bahasa secara otomatis",
   "global.spellchecking.autodetect.short": "Otomatis",
   "global.spellchecking.language": "Periksa ejaan",
+  "global.submit": "Kirim",
   "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.yes": "Yes",
   "import.headline": "Impor layanan Ferdi 4 Anda",
   "import.notSupportedHeadline": "Layanan belum didukung di Ferdi 5",
   "import.skip.label": "Saya ingin menambahkan layanan secara manual",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "Tentang Ferdi",
-  "menu.app.announcement": "Yang baru",
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Periksa versi baru",
   "menu.app.hide": "Sembunyikan",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Pengaturan",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Masuk ke akun Anda",
   "password.link.signup": "Buat akun gratis",
   "password.noUser": "Tidak ditemukan pengguna dengan email tersebut",
-  "password.submit.label": "Kirim",
   "password.successInfo": "Periksa email Anda",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Sertakan versi beta",
   "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": "Aktifkan Akselerasi GPU",
@@ -251,7 +256,6 @@
   "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.headline": "Pengaturan",
   "settings.app.headlineAdvanced": "Tingkat Lanjut",
   "settings.app.headlineAppearance": "Tampilan",
   "settings.app.headlineGeneral": "Umum",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Akun",
   "settings.navigation.availableServices": "Layanan tersedia",
   "settings.navigation.logout": "Keluar",
-  "settings.navigation.settings": "Pengaturan",
   "settings.navigation.supportFerdi": "Tentang Ferdi",
   "settings.navigation.team": "Kelola Tim",
   "settings.navigation.yourServices": "Layanan Anda",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Nonaktifkan pemberitahuan & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Buka laci ruang kerja",
-  "sidebar.settings": "Pengaturan",
   "sidebar.unmuteApp": "Aktifkan pemberitahuan",
   "signup.email.label": "Alamat email",
   "signup.emailDuplicate": "Pengguna dengan alamat email ini sudah ada",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Nonaktifkan pemberitahuan",
   "tabs.item.disableService": "Nonaktifkan layanan",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Aktifkan audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktifkan pemberitahuan",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 163f62b21..d5539aa30 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Server personalizzato",
   "changeserver.headline": "Cambia Server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Invia",
   "changeserver.urlError": "Inserisci un URL valido",
   "changeserver.warning": "Le impostazioni extra offerte da Ferdi non verranno salvate",
   "connectionLostBanner.cta": "Ricarica Servizio",
   "connectionLostBanner.informationLink": "Cos'è successo?",
   "connectionLostBanner.message": "Oh no! Ferdi ha perso la connessione con {name}.",
-  "feature.announcements.changelog.headline": "Modifiche in Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Pubblica informazioni di debug",
   "feature.nightlyBuilds.activate": "Attivato",
-  "feature.nightlyBuilds.cancel": "Annulla",
   "feature.nightlyBuilds.info": "Le 'Nightly Builds' sono versioni sperimentali di Ferdi che possono contenere funzionalità incomplete o non perfettamente funzionanti. Queste versioni sono principalmente usate dagli sviluppatori per effettuare dei test sulle nuove caratteristiche e verificare come si integrano nella versione finale di Ferdi. Se non sei sicuro di quello che stai facendo, ti consigliamo di non attivare le 'Nightly Builds'.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "Si è verificato un errore durante il tentativo di pubblicare le informazioni di debug. Riprova più tardi o vedi la console per maggiori informazioni.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Cerca...",
   "feature.quickSwitch.title": "Cambio Veloce",
   "global.api.unhealthy": "Impossibile connettersi ai servizi online di Ferdi",
+  "global.cancel": "Annulla",
+  "global.edit": "Modifica",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Non sei connesso a Internet.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Impostazioni",
   "global.spellchecker.useDefault": "Usa le impostazioni predefinite di sistema ({default})",
   "global.spellchecking.autodetect": "Rileva automaticamente la lingua",
   "global.spellchecking.autodetect.short": "Automatico",
   "global.spellchecking.language": "Lingua per controllo ortografico",
+  "global.submit": "Invia",
   "global.userAgentHelp": "Usa 'https://whatmyuseragent.com/' (per scoprire) o 'https://developers.whatismybrowser.com/useragents/explore/' (per scegliere) il tuo user agent desiderato e copialo qui.",
   "global.userAgentPref": "User Agent",
+  "global.yes": "Yes",
   "import.headline": "Importa i servizi di Ferdi 4",
   "import.notSupportedHeadline": "Servizi non ancora supportati in Ferdi 5",
   "import.skip.label": "Voglio aggiungere i servizi manualmente",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Chiudi il menu delle attività",
   "menu.Todoss.openTodosDrawer": "Apri il menu delle attività",
   "menu.app.about": "Info su Ferdi",
-  "menu.app.announcement": "Cosa c'è di nuovo?",
   "menu.app.autohideMenuBar": "Nascondi automaticamente la barra del menù",
   "menu.app.checkForUpdates": "Controlla aggiornamenti",
   "menu.app.hide": "Nascondi",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Impostazioni",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Modifica",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Accedi al tuo account",
   "password.link.signup": "Crea un account gratuito",
   "password.noUser": "Non è stato trovato nessun utente con questo indirizzo email",
-  "password.submit.label": "Invia",
   "password.successInfo": "Per favore controlla la tua email",
   "pricing.features.accountSync": "Sincronizzazione account",
   "pricing.features.customWebsites": "Aggiungi siti web personalizzati",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Includi versioni beta",
   "settings.app.form.clipboardNotifications": "Non mostrare notifiche per eventi dagli appunti",
   "settings.app.form.closeToSystemTray": "Chiudi Ferdi nell'area di notifica",
+  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
   "settings.app.form.customTodoServer": "Server Todo personalizzato",
   "settings.app.form.darkMode": "Attiva modalità scura",
   "settings.app.form.enableGPUAcceleration": "Attiva Accelerazione GPU",
@@ -251,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Consenti l'utilizzo di TouchID per sbloccare Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Impostazioni",
   "settings.app.headlineAdvanced": "Avanzate",
   "settings.app.headlineAppearance": "Aspetto",
   "settings.app.headlineGeneral": "Generale",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Servizi disponibili",
   "settings.navigation.logout": "Esci",
-  "settings.navigation.settings": "Impostazioni",
   "settings.navigation.supportFerdi": "Info su Ferdi",
   "settings.navigation.team": "Gestisci il Team",
   "settings.navigation.yourServices": "I tuoi servizi",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Disattiva notifiche e audio",
   "sidebar.openTodosDrawer": "Apri le Attività Ferdi",
   "sidebar.openWorkspaceDrawer": "Apri il menu dei workspace",
-  "sidebar.settings": "Impostazioni",
   "sidebar.unmuteApp": "Attiva notifiche e audio",
   "signup.email.label": "Indirizzo email",
   "signup.emailDuplicate": "Esiste già un utente con lo stesso indirizzo email",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disattiva notifiche",
   "tabs.item.disableService": "Disattiva servizio",
-  "tabs.item.edit": "Modifica",
   "tabs.item.enableAudio": "Attiva audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Attiva le notifiche",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index bb9157717..118a2fb8e 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "独自サーバー",
   "changeserver.headline": "サーバーの変更",
   "changeserver.label": "サーバー",
-  "changeserver.submit": "送信",
   "changeserver.urlError": "有効なURLを入力してください。",
   "changeserver.warning": "Ferdiの追加設定は保存されません",
   "connectionLostBanner.cta": "サービスをリロードする",
   "connectionLostBanner.informationLink": "何が起きましたか？",
   "connectionLostBanner.message": "{name}への接続が切断されました。",
-  "feature.announcements.changelog.headline": "Ferdi {version}の変更点",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "デバッグ情報の記録",
   "feature.nightlyBuilds.activate": "有効化",
-  "feature.nightlyBuilds.cancel": "キャンセル",
   "feature.nightlyBuilds.info": "Nightlyビルドは未検証や未完成の機能が含まれる非常に実験的なバージョンです。このバージョンは、主に新機能のテストや最新ビルドでの検証を行う開発者が使用するものです。これを理解していない方は、Nightlyビルドを有効化しないことをおすすめします。",
   "feature.nightlyBuilds.title": "Nightlyビルド",
   "feature.publishDebugInfo.error": "デバッグ情報の公開中にエラーが発生しました。後でもう一度試すか、コンソールを表示して詳細な情報を確認します。",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "検索...",
   "feature.quickSwitch.title": "クイックスイッチ",
   "global.api.unhealthy": "Ferdiのオンラインサービスに接続できません。",
+  "global.cancel": "キャンセル",
+  "global.edit": "編集",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "インターネットに接続されていません。",
+  "global.ok": "Ok",
+  "global.quit": "終了",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "設定",
   "global.spellchecker.useDefault": "システムデフォルトを使用する({default})",
   "global.spellchecking.autodetect": "言語を自動的に検出する",
   "global.spellchecking.autodetect.short": "自動",
   "global.spellchecking.language": "スペルチェックする言語",
+  "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": "ユーザーエージェント",
+  "global.yes": "Yes",
   "import.headline": "Ferdi 4のサービスをインポートして下さい",
   "import.notSupportedHeadline": "Ferdi 5ではこのサービスにまだ対応していません",
   "import.skip.label": "手動でサービスを追加する",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "ToDoのドロワーを閉じる",
   "menu.Todoss.openTodosDrawer": "ToDoのドロワーを開く",
   "menu.app.about": "バージョン情報",
-  "menu.app.announcement": "新機能",
   "menu.app.autohideMenuBar": "メニューバーを自動的に隠す",
   "menu.app.checkForUpdates": "更新の確認",
   "menu.app.hide": "隠す",
   "menu.app.hideOthers": "他を非表示",
-  "menu.app.quit": "終了",
-  "menu.app.settings": "設定",
   "menu.app.unhide": "再表示",
   "menu.edit": "編集",
   "menu.edit.copy": "コピー",
@@ -147,7 +152,6 @@
   "password.link.login": "サインイン",
   "password.link.signup": "無料アカウントを作成",
   "password.noUser": "このメールアドレスはまだ登録されていません",
-  "password.submit.label": "送信",
   "password.successInfo": "メールを確認して下さい",
   "pricing.features.accountSync": "アカウントの同期",
   "pricing.features.customWebsites": "カスタムサイトを追加",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Betaバージョンを含める",
   "settings.app.form.clipboardNotifications": "クリップボードイベントの通知を表示しない",
   "settings.app.form.closeToSystemTray": "Ferdiをシステムトレイに閉じる",
+  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
   "settings.app.form.customTodoServer": "カスタムToDoサーバー",
   "settings.app.form.darkMode": "ダークモードを有効にする",
   "settings.app.form.enableGPUAcceleration": "GPUアクセラレーションを有効にする",
@@ -251,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Touch IDを使用してFerdiのロックを解除する",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "起動方法",
-  "settings.app.headline": "設定",
   "settings.app.headlineAdvanced": "詳細",
   "settings.app.headlineAppearance": "表示スタイル",
   "settings.app.headlineGeneral": "一般",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "アカウント",
   "settings.navigation.availableServices": "利用可能なサービス",
   "settings.navigation.logout": "ログアウト",
-  "settings.navigation.settings": "設定",
   "settings.navigation.supportFerdi": "バージョン情報",
   "settings.navigation.team": "チームを管理",
   "settings.navigation.yourServices": "利用中のサービス",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "通知とオーディオを無効化",
   "sidebar.openTodosDrawer": "Ferdi ToDoを開く",
   "sidebar.openWorkspaceDrawer": "ワークスペースドロワーを開く",
-  "sidebar.settings": "設定",
   "sidebar.unmuteApp": "通知とオーディオを有効化",
   "signup.email.label": "メールアドレス",
   "signup.emailDuplicate": "このメールアドレスは既に登録されています",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "ダークモードを無効にする",
   "tabs.item.disableNotifications": "通知を無効にする",
   "tabs.item.disableService": "サービスを無効にする",
-  "tabs.item.edit": "編集",
   "tabs.item.enableAudio": "オーディオを有効にする",
   "tabs.item.enableDarkMode": "ダークモードを有効にする",
   "tabs.item.enableNotification": "通知を有効にする",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index ed74ed22b..cc5a04aff 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "კერძო სერვერი",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "დადასტურება",
   "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": "Changes in Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "გაუქმება",
   "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": "Nightly Builds",
   "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.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Ferdi-ის ონლაინ სერვისთან დაკავშირება ვერ მოხერხდა",
+  "global.cancel": "გაუქმება",
+  "global.edit": "რედაქტირება",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "თქვენ არ ხართ ინტერნეტთან დაკავშირებული.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "პარამეტრები",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "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.yes": "Yes",
   "import.headline": "შემოიტანე Ferdi 4-ის სერვისები",
   "import.notSupportedHeadline": "სერვისები ჯერ არ არის მხარდაჭერილი Ferdi 5-ში",
   "import.skip.label": "I want to add services manually",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "Ferdi-ის შესახებ",
-  "menu.app.announcement": "What's new?",
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "განახლებების შემოწმება",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "პარამეტრები",
   "menu.app.unhide": "Unhide",
   "menu.edit": "რედაქტირება",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "შედით თქვენს ანგარიშში",
   "password.link.signup": "ანგარიშის შექმნა",
   "password.noUser": "მომხმარებელი მითითებული მეილით ვერ მოიძებნა",
-  "password.submit.label": "დადასტურება",
   "password.successInfo": "გთხოვთ შეამოწმეთ მეილი",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "ჩართეთ ბეტა ვერსიები",
   "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",
@@ -251,7 +256,6 @@
   "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.headline": "პარამეტრები",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "მთავარი",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "ანგარიში",
   "settings.navigation.availableServices": "ხელმისაწვდომი სერვისები",
   "settings.navigation.logout": "გასვლა",
-  "settings.navigation.settings": "პარამეტრები",
   "settings.navigation.supportFerdi": "Ferdi-ის შესახებ",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "თქვენი სერვისები",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "პარამეტრები",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "მეილი",
   "signup.emailDuplicate": "მომხმარებელი ამ მეილით უკვე არსებობს",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "შეტყობინებების გამორთვა",
   "tabs.item.disableService": "სერვისის გაუქმება",
-  "tabs.item.edit": "რედაქტირება",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "შეტყობინებების ჩართვა",
diff --git a/src/i18n/locales/kk.json b/src/i18n/locales/kk.json
index 462ca8543..9bb874e43 100644
--- a/src/i18n/locales/kk.json
+++ b/src/i18n/locales/kk.json
@@ -13,12 +13,16 @@
   "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.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.edit": "Edit",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
+  "global.quit": "Quit",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Submit",
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
@@ -51,8 +55,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -109,7 +111,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
@@ -178,7 +179,6 @@
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -196,7 +196,6 @@
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.inviteFriends": "Invite Friends",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
   "settings.navigation.yourWorkspaces": "Your workspaces",
@@ -302,7 +301,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -319,7 +317,6 @@
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index 573bcce19..dfbfd63a3 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "사용자 정의 서버",
   "changeserver.headline": "서버 번경",
   "changeserver.label": "서버",
-  "changeserver.submit": "제출",
   "changeserver.urlError": "유효한 URL을 입력하세요",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "서비스 재시작",
   "connectionLostBanner.informationLink": "무슨 일인가요?",
   "connectionLostBanner.message": "오 저런! Ferdi가 {name} 과 연결이 끊겼습니다.",
-  "feature.announcements.changelog.headline": "Ferdi {version} 변경점",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "디버깅 정보 공개",
   "feature.nightlyBuilds.activate": "활성화",
-  "feature.nightlyBuilds.cancel": "취소",
   "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": "나이틀리 빌드",
   "feature.publishDebugInfo.error": "디버그 정보를 공개하는데 오류가 발생했습니다. 조금 뒤에 다시 시도하거나 콘솔을 통해 정보를 확인하십시오.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "검색...",
   "feature.quickSwitch.title": "빠른 검색",
   "global.api.unhealthy": "Ferdi 온라인 서비스에 연결할 수 없습니다.",
+  "global.cancel": "취소",
+  "global.edit": "편집",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "인터넷에 연결할 수 없습니다.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "설정",
   "global.spellchecker.useDefault": "시스템 기본 사용 ({default})",
   "global.spellchecking.autodetect": "언어 자동 탐색",
   "global.spellchecking.autodetect.short": "자동",
   "global.spellchecking.language": "철자 검사",
+  "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.yes": "Yes",
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Ferdi 5에서 아직 지원되지 않는 서비스입니다.",
   "import.skip.label": "수동으로 서비스 추가",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Todos 서랍 닫기",
   "menu.Todoss.openTodosDrawer": "Todos 서랍 열기",
   "menu.app.about": "Ferdi에 대해",
-  "menu.app.announcement": "변경 사항",
   "menu.app.autohideMenuBar": "메뉴바 자동 감춤",
   "menu.app.checkForUpdates": "업데이트 확인",
   "menu.app.hide": "숨기기",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "설정",
   "menu.app.unhide": "Unhide",
   "menu.edit": "편집",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "계정에 로그인하세요.",
   "password.link.signup": "무료 계정 생성",
   "password.noUser": "해당 이메일을 사용하는 유저를 찾을 수 없습니다.",
-  "password.submit.label": "제출",
   "password.successInfo": "이메일을 확인해 주세요.",
   "pricing.features.accountSync": "계정 동기화",
   "pricing.features.customWebsites": "사용자 지정 웹사이트 추가",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "베타 버전 포함",
   "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
   "settings.app.form.closeToSystemTray": "Ferdi 시스템 트레이로 닫기",
+  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
   "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "다크 모드 활성화",
   "settings.app.form.enableGPUAcceleration": "GPU 가속 사용",
@@ -251,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "TouchID로 Ferdi 여는 것을 허용",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "설정",
   "settings.app.headlineAdvanced": "고급",
   "settings.app.headlineAppearance": "모양",
   "settings.app.headlineGeneral": "일반",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "계정",
   "settings.navigation.availableServices": "사용가능 한 서비스",
   "settings.navigation.logout": "로그아웃",
-  "settings.navigation.settings": "설정",
   "settings.navigation.supportFerdi": "Ferdi에 대해",
   "settings.navigation.team": "팀 관리",
   "settings.navigation.yourServices": "서비스",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "알림 및 알림 소리 비활성화",
   "sidebar.openTodosDrawer": "Ferdi Todos 열기",
   "sidebar.openWorkspaceDrawer": "작업영역 서랍 열기",
-  "sidebar.settings": "설정",
   "sidebar.unmuteApp": "알림과 오디오 활성화",
   "signup.email.label": "이메일 주소",
   "signup.emailDuplicate": "해당 이메일을 가진 사용자가 이미 존재합니다",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "알림 비활성화",
   "tabs.item.disableService": "서비스 비활성화",
-  "tabs.item.edit": "편집",
   "tabs.item.enableAudio": "오디오 활성화",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "알림 허용",
diff --git a/src/i18n/locales/ms.json b/src/i18n/locales/ms.json
index 6f92bf4de..86e2aa9c5 100644
--- a/src/i18n/locales/ms.json
+++ b/src/i18n/locales/ms.json
@@ -13,12 +13,16 @@
   "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.shareFranz.text": "Beritahu rakan anda betapa hebatnya Ferdi dan bantu kami menyebarkan maklumat ini",
   "global.api.unhealthy": "Tidak dapat bersambung ke perkhidmatan dalam talian Ferdi",
+  "global.edit": "Ubahsuai",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Anda tidak disambungkan ke internet.",
+  "global.quit": "Keluar",
+  "global.settings": "Tetapan",
   "global.spellchecker.useDefault": "Gunakan System Default ({default})",
   "global.spellchecking.autodetect": "Kesan bahasa secara automatik",
   "global.spellchecking.autodetect.short": "Automatik",
   "global.spellchecking.language": "Bahasa untuk semakan ejaan",
+  "global.submit": "Hantar",
   "import.headline": "Import perkhidmatan Ferdi 4 anda",
   "import.notSupportedHeadline": "Perkhidmatan belum disokong dalam Ferdi 5",
   "import.skip.label": "Saya mahu menambah perkhidmatan secara manual",
@@ -51,8 +55,6 @@
   "menu.app.checkForUpdates": "Semak untuk kemaskini",
   "menu.app.hide": "Sorokkan",
   "menu.app.hideOthers": "Sorokkan yang lain-lain",
-  "menu.app.quit": "Keluar",
-  "menu.app.settings": "Tetapan",
   "menu.app.unhide": "Nyahsorok",
   "menu.edit": "Ubahsuai",
   "menu.edit.copy": "Salin",
@@ -109,7 +111,6 @@
   "password.link.login": "Log masuk akaun kamu",
   "password.link.signup": "Buka akaun baru percuma",
   "password.noUser": "Tiada pengguna dengan alamat e-mel tersebut dijumpai",
-  "password.submit.label": "Hantar",
   "password.successInfo": "Sila semak e-mel anda",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
@@ -178,7 +179,6 @@
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.headline": "Tetapan",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -196,7 +196,6 @@
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.inviteFriends": "Invite Friends",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Tetapan",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
   "settings.navigation.yourWorkspaces": "Your workspaces",
@@ -302,7 +301,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Tetapan",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -319,7 +317,6 @@
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Ubahsuai",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
diff --git a/src/i18n/locales/nb.json b/src/i18n/locales/nb.json
index c2f9f0e53..38bba58b2 100644
--- a/src/i18n/locales/nb.json
+++ b/src/i18n/locales/nb.json
@@ -1,144 +1,142 @@
 {
   "global.api.unhealthy": "Kan ikke koble til Ferdi' tjenester",
+  "global.edit": "Rediger",
   "global.notConnectedToTheInternet": "Du er ikke koblet til internett.",
-  "welcome.signupButton": "Opprett en gratis konto",
-  "welcome.loginButton": "Logg inn til din konto",
-  "welcome.slogan": "Teksting som funker for deg",
-  "login.headline": "Logg inn",
+  "global.settings": "Innstillinger",
+  "global.submit": "Send inn",
+  "import.headline": "Importer dine Ferdi 4 tjenester",
+  "import.notSupportedHeadline": "Tjenester ikke enda støttet i Ferdi 5",
+  "import.skip.label": "Jeg vil legge til en tjeneste manuelt",
+  "import.submit.label": "Importer tjenester",
+  "infobar.buttonInstallUpdate": "Restart & installer oppdatering",
+  "infobar.buttonReloadServices": "Oppdater tjenester",
+  "infobar.requiredRequestsFailed": "Kunne ikke laste tjenester og brukerinformasjon",
+  "infobar.servicesUpdated": "Dine tjenester er oppdatert.",
+  "infobar.updateAvailable": "En ny oppdatering for Ferdi er tilgjengelig.",
+  "invite.email.label": "Email adresse",
+  "invite.headline.friends": "Inviter 3 av dine venner eller kolleger",
+  "invite.name.label": "Navn",
+  "invite.skip.label": "Jeg vil gjøre dette senere",
+  "invite.submit.label": "Send invitasjoner",
   "login.email.label": "Email adresse",
+  "login.headline": "Logg inn",
+  "login.invalidCredentials": "Ugyldig email eller passord",
+  "login.link.password": "Reset passord",
+  "login.link.signup": "Opprett en gratis konto",
   "login.password.label": "Passord",
+  "login.serverLogout": "Din økt utløpte, vennligst logg inn igjen.",
   "login.submit.label": "Logg inn",
-  "login.invalidCredentials": "Ugyldig email eller passord",
   "login.tokenExpired": "Din økt utløpte, vennligst logg inn igjen.",
-  "login.serverLogout": "Din økt utløpte, vennligst logg inn igjen.",
-  "login.link.signup": "Opprett en gratis konto",
-  "login.link.password": "Reset passord",
-  "password.headline": "Reset passord",
   "password.email.label": "Email adresse",
-  "password.submit.label": "Send inn",
+  "password.headline": "Reset passord",
+  "password.link.login": "Logg inn til din konto",
+  "password.link.signup": "Opprett en gratis konto",
   "password.noUser": "Ingen bruker med den emailen finnes",
   "password.successInfo": "Vennligst sjekk din email",
-  "password.link.signup": "Opprett en gratis konto",
-  "password.link.login": "Logg inn til din konto",
-  "signup.headline": "Registrer deg",
-  "signup.firstname.label": "Fornavn",
-  "signup.lastname.label": "Etternavn",
-  "signup.email.label": "Email adresse",
-  "signup.company.label": "Firma",
-  "signup.password.label": "Passord",
-  "signup.submit.label": "Opprett konto",
-  "signup.link.login": "Har du allerede en konto? Logg inn",
-  "signup.emailDuplicate": "En konto med den epost adresse eksiterer allerede",
-  "signup.legal.info": "Ved å opprette en Ferdi konto aksepterer du",
-  "signup.legal.terms": "Vilkår for bruk",
-  "signup.legal.privacy": "Personvern",
   "pricing.headline": "Støtt Ferdi",
-  "pricing.support.label": "Velg din støtteplan",
-  "pricing.submit.label": "Jeg vil støtte utviklingen av Ferdi",
   "pricing.link.skipPayment": "Jeg vil ikke støtte utviklingen av Ferdi.",
-  "import.headline": "Importer dine Ferdi 4 tjenester",
-  "import.notSupportedHeadline": "Tjenester ikke enda støttet i Ferdi 5",
-  "import.submit.label": "Importer tjenester",
-  "import.skip.label": "Jeg vil legge til en tjeneste manuelt",
-  "invite.submit.label": "Send invitasjoner",
-  "invite.headline.friends": "Inviter 3 av dine venner eller kolleger",
-  "invite.name.label": "Navn",
-  "invite.email.label": "Email adresse",
-  "invite.skip.label": "Jeg vil gjøre dette senere",
-  "infobar.servicesUpdated": "Dine tjenester er oppdatert.",
-  "infobar.updateAvailable": "En ny oppdatering for Ferdi er tilgjengelig.",
-  "infobar.buttonReloadServices": "Oppdater tjenester",
-  "infobar.buttonInstallUpdate": "Restart & installer oppdatering",
-  "infobar.requiredRequestsFailed": "Kunne ikke laste tjenester og brukerinformasjon",
-  "sidebar.settings": "Innstillinger",
-  "sidebar.addNewService": "Legg til ny tjeneste",
-  "services.welcome": "Velkommen til Ferdi",
+  "pricing.submit.label": "Jeg vil støtte utviklingen av Ferdi",
+  "pricing.support.label": "Velg din støtteplan",
   "services.getStarted": "Kom i gang",
-  "settings.account.headline": "Konto",
-  "settings.account.headlineUpgrade": "Oppgrader din konto og støtt Ferdi",
+  "services.welcome": "Velkommen til Ferdi",
+  "settings.account.account.editButton": "Rediger konto",
   "settings.account.accountType.basic": "Enkel Konto",
   "settings.account.accountType.premium": "Premium Konto",
-  "settings.account.account.editButton": "Rediger konto",
-  "settings.account.userInfoRequestFailed": "Kunne ikke laste brukerinformasjon",
-  "settings.account.tryReloadUserInfoRequest": "Prøv igjen",
-  "settings.account.headlineProfile": "Oppdater profil",
+  "settings.account.buttonSave": "Oppdater profil",
+  "settings.account.headline": "Konto",
   "settings.account.headlineAccount": "Kontoinformasjon",
   "settings.account.headlinePassword": "Endre passord",
-  "settings.account.successInfo": "Dine endringer er lagret",
-  "settings.account.buttonSave": "Oppdater profil",
-  "settings.account.mining.thankyou": "Takk for at du støtter Ferdi med din prosessorkraft.",
+  "settings.account.headlineProfile": "Oppdater profil",
+  "settings.account.headlineUpgrade": "Oppgrader din konto og støtt Ferdi",
   "settings.account.mining.active": "Du utfører nå {hashes} beregninger per sekund.",
-  "settings.account.mining.moreInformation": "Få mer informasjon",
   "settings.account.mining.cancel": "Avbryt mining",
-  "settings.navigation.availableServices": "Tilgjengelige tjenester",
-  "settings.navigation.yourServices": "Dine tjenester",
+  "settings.account.mining.moreInformation": "Få mer informasjon",
+  "settings.account.mining.thankyou": "Takk for at du støtter Ferdi med din prosessorkraft.",
+  "settings.account.successInfo": "Dine endringer er lagret",
+  "settings.account.tryReloadUserInfoRequest": "Prøv igjen",
+  "settings.account.userInfoRequestFailed": "Kunne ikke laste brukerinformasjon",
+  "settings.app.buttonInstallUpdate": "Restart & installer oppdatering",
+  "settings.app.buttonSearchForUpdate": "Se etter oppdateringer",
+  "settings.app.currentVersion": "Gjeldende versjon:",
+  "settings.app.form.autoLaunchInBackground": "Åpne i bakgrunnen",
+  "settings.app.form.autoLaunchOnStart": "Start Ferdi ved oppstart",
+  "settings.app.form.beta": "Inkluder beta versjoner",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
+  "settings.app.form.enableSystemTray": "Vis Ferdi i systemfeltet",
+  "settings.app.form.language": "Språk",
+  "settings.app.form.minimizeToSystemTray": "Minimer Ferdi til systemfeltet",
+  "settings.app.form.runInBackground": "Behold Ferdi i bakgrunnen når du lukker vinduet",
+  "settings.app.headlineGeneral": "Genelert",
+  "settings.app.headlineLanguage": "Språk",
+  "settings.app.headlineUpdates": "Oppdateringer",
+  "settings.app.updateStatusAvailable": "Oppdatering tilgjengelig, laster ned...",
+  "settings.app.updateStatusSearching": "Søker etter en oppdatering",
+  "settings.app.updateStatusUpToDate": "Du bruker siste versjon av Ferdi",
   "settings.navigation.account": "Konto",
-  "settings.navigation.settings": "Innstillinger",
+  "settings.navigation.availableServices": "Tilgjengelige tjenester",
   "settings.navigation.logout": "Logg ut",
-  "settings.recipes.headline": "Tilgjengelige tjenester",
+  "settings.navigation.yourServices": "Dine tjenester",
   "settings.recipes.all": "Alle tjenester",
   "settings.recipes.dev": "Utvikling",
+  "settings.recipes.headline": "Tilgjengelige tjenester",
   "settings.recipes.nothingFound": "Beklager, men ingen tjeneste samsvarer med søkeordet ditt.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Tjenesten ble lagt til",
-  "settings.service.form.saveButton": "Lagre tjeneste",
-  "settings.service.form.deleteButton": "Slett tjeneste",
-  "settings.service.form.availableServices": "Tilgjengelige tjenester",
-  "settings.service.form.yourServices": "Dine tjenester",
+  "settings.service.error.goBack": "Tilbake til tjenester",
+  "settings.service.error.headline": "Error",
+  "settings.service.error.message": "Kunne ikke laste tjeneste oppskrift.",
   "settings.service.form.addServiceHeadline": "Legg til {name}",
-  "settings.service.form.editServiceHeadline": "Rediger {name}",
-  "settings.service.form.tabHosted": "Hosted",
-  "settings.service.form.tabOnPremise": "Selv hosted ⭐️",
-  "settings.service.form.customUrlValidationError": "Kunne ikke validere egendefinert {name} server.",
+  "settings.service.form.availableServices": "Tilgjengelige tjenester",
+  "settings.service.form.customUrl": "Egendefinert server",
   "settings.service.form.customUrlPremiumInfo": "For å legge til selvhost-baserte tjenester trenger du en Ferdi Premium konto.",
   "settings.service.form.customUrlUpgradeAccount": "Oppgrader din konto",
+  "settings.service.form.customUrlValidationError": "Kunne ikke validere egendefinert {name} server.",
+  "settings.service.form.deleteButton": "Slett tjeneste",
+  "settings.service.form.editServiceHeadline": "Rediger {name}",
+  "settings.service.form.enableNotification": "Slå på varsler",
+  "settings.service.form.enableService": "Slå på tjeneste",
   "settings.service.form.indirectMessageInfo": "Du vil bli varslet om alle nye meldinger i en kanal, ikke bare @brukernavn, @kanal, @here, ...",
-  "settings.service.error.headline": "Error",
-  "settings.service.error.goBack": "Tilbake til tjenester",
-  "settings.service.error.message": "Kunne ikke laste tjeneste oppskrift.",
-  "settings.services.tooltip.isDisabled": "Tjenesten er deaktivert",
-  "settings.services.tooltip.notificationsDisabled": "Varsler er deaktivert",
+  "settings.service.form.indirectMessages": "Vis merke for alle nye meldinger",
+  "settings.service.form.name": "Navn",
+  "settings.service.form.saveButton": "Lagre tjeneste",
+  "settings.service.form.tabHosted": "Hosted",
+  "settings.service.form.tabOnPremise": "Selv hosted ⭐️",
+  "settings.service.form.team": "Lag",
+  "settings.service.form.yourServices": "Dine tjenester",
+  "settings.services.deletedInfo": "Tjenester har blitt slettet",
+  "settings.services.discoverServices": "Oppdag tjenester",
   "settings.services.headline": "Dine tjenester",
   "settings.services.noServicesAdded": "Du har ikke lagt til noen tjenester enda.",
-  "settings.services.discoverServices": "Oppdag tjenester",
+  "settings.services.tooltip.isDisabled": "Tjenesten er deaktivert",
+  "settings.services.tooltip.notificationsDisabled": "Varsler er deaktivert",
   "settings.services.updatedInfo": "Dine endringer er lagret",
-  "settings.services.deletedInfo": "Tjenester har blitt slettet",
-  "settings.app.headline": "Innstillinger",
-  "settings.app.headlineGeneral": "Genelert",
-  "settings.app.headlineLanguage": "Språk",
-  "settings.app.headlineUpdates": "Oppdateringer",
-  "settings.app.buttonSearchForUpdate": "Se etter oppdateringer",
-  "settings.app.buttonInstallUpdate": "Restart & installer oppdatering",
-  "settings.app.updateStatusSearching": "Søker etter en oppdatering",
-  "settings.app.updateStatusAvailable": "Oppdatering tilgjengelig, laster ned...",
-  "settings.app.updateStatusUpToDate": "Du bruker siste versjon av Ferdi",
-  "settings.app.form.autoLaunchOnStart": "Start Ferdi ved oppstart",
-  "settings.app.form.autoLaunchInBackground": "Åpne i bakgrunnen",
-  "settings.app.form.enableSystemTray": "Vis Ferdi i systemfeltet",
-  "settings.app.form.minimizeToSystemTray": "Minimer Ferdi til systemfeltet",
-  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
-  "settings.app.form.runInBackground": "Behold Ferdi i bakgrunnen når du lukker vinduet",
-  "settings.app.form.language": "Språk",
-  "settings.app.form.beta": "Inkluder beta versjoner",
-  "settings.app.currentVersion": "Gjeldende versjon:",
-  "settings.service.form.name": "Navn",
-  "settings.service.form.enableService": "Slå på tjeneste",
-  "settings.service.form.enableNotification": "Slå på varsler",
-  "settings.service.form.team": "Lag",
-  "settings.service.form.customUrl": "Egendefinert server",
-  "settings.service.form.indirectMessages": "Vis merke for alle nye meldinger",
+  "settings.user.form.accountType.company": "Firma",
+  "settings.user.form.accountType.individual": "Individuell",
+  "settings.user.form.accountType.label": "Konto type",
+  "settings.user.form.accountType.non-profit": "Non-Profit",
+  "settings.user.form.currentPassword": "Gjeldende passord",
+  "settings.user.form.email": "Email",
   "settings.user.form.firstname": "Fornavn",
   "settings.user.form.lastname": "Etternavn",
-  "settings.user.form.email": "Email",
-  "settings.user.form.currentPassword": "Gjeldende passord",
   "settings.user.form.newPassword": "Nytt passord",
-  "settings.user.form.accountType.label": "Konto type",
-  "settings.user.form.accountType.individual": "Individuell",
-  "settings.user.form.accountType.non-profit": "Non-Profit",
-  "settings.user.form.accountType.company": "Firma",
-  "tabs.item.reload": "Reload",
-  "tabs.item.edit": "Rediger",
+  "sidebar.addNewService": "Legg til ny tjeneste",
+  "signup.company.label": "Firma",
+  "signup.email.label": "Email adresse",
+  "signup.emailDuplicate": "En konto med den epost adresse eksiterer allerede",
+  "signup.firstname.label": "Fornavn",
+  "signup.headline": "Registrer deg",
+  "signup.lastname.label": "Etternavn",
+  "signup.legal.info": "Ved å opprette en Ferdi konto aksepterer du",
+  "signup.legal.privacy": "Personvern",
+  "signup.legal.terms": "Vilkår for bruk",
+  "signup.link.login": "Har du allerede en konto? Logg inn",
+  "signup.password.label": "Passord",
+  "signup.submit.label": "Opprett konto",
+  "tabs.item.deleteService": "Slett tjeneste",
   "tabs.item.disableNotifications": "Deaktiver varsler",
-  "tabs.item.enableNotification": "Aktiver varsler",
   "tabs.item.disableService": "Deaktiver tjeneste",
-  "tabs.item.deleteService": "Slett tjeneste"
+  "tabs.item.enableNotification": "Aktiver varsler",
+  "tabs.item.reload": "Reload",
+  "welcome.loginButton": "Logg inn til din konto",
+  "welcome.signupButton": "Opprett en gratis konto",
+  "welcome.slogan": "Teksting som funker for deg"
 }
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index e38a06004..b9ca228ba 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Aangepaste server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Verzenden",
   "changeserver.urlError": "Enter a valid URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Service Herladen",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
-  "feature.announcements.changelog.headline": "Wijzigingen in Ferdi {versie}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Annuleren",
   "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": "Nightly Builds",
   "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.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Kan geen verbinding maken met de Ferdi services",
+  "global.cancel": "Annuleren",
+  "global.edit": "Bewerken",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Je hebt geen internet verbinding.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Instellingen",
   "global.spellchecker.useDefault": "Gebruik Systeemstandaard ({default})",
   "global.spellchecking.autodetect": "Taal automatisch herkennen",
   "global.spellchecking.autodetect.short": "Automatisch",
   "global.spellchecking.language": "Taal spellingscontrole",
+  "global.submit": "Verzenden",
   "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.yes": "Yes",
   "import.headline": "Importeer je Ferdi 4 services",
   "import.notSupportedHeadline": "De volgende services worden nog niet ondersteund in Ferdi 5",
   "import.skip.label": "Ik wil services handmatig toevoegen",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "Over Ferdi",
-  "menu.app.announcement": "Wat is er nieuw?",
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Controleer op updates",
   "menu.app.hide": "Verbergen",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Instellingen",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Bewerken",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Log in op je account",
   "password.link.signup": "Maak een gratis account aan",
   "password.noUser": "Geen gebruiker gevonden met dat e-mailadres",
-  "password.submit.label": "Verzenden",
   "password.successInfo": "Controleer alsjeblieft je e-mail",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Inclusief beta versies",
   "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": "GPU Acceleratie Activeren",
@@ -251,7 +256,6 @@
   "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.headline": "Instellingen",
   "settings.app.headlineAdvanced": "Geavanceerd",
   "settings.app.headlineAppearance": "Weergave",
   "settings.app.headlineGeneral": "Algemeen",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Beschikbare services",
   "settings.navigation.logout": "Uitloggen",
-  "settings.navigation.settings": "Instellingen",
   "settings.navigation.supportFerdi": "Over Ferdi",
   "settings.navigation.team": "Beheer Team",
   "settings.navigation.yourServices": "Jouw services",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Berichten & geluid uitschakelen",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Werkruimtepagina openen",
-  "sidebar.settings": "Instellingen",
   "sidebar.unmuteApp": "Berichten & geluid inschakelen",
   "signup.email.label": "E-mailadres",
   "signup.emailDuplicate": "Er bestaat al een gebruiker met dat e-mailadres",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Notificaties uitschakelen",
   "tabs.item.disableService": "Service uitschakelen",
-  "tabs.item.edit": "Bewerken",
   "tabs.item.enableAudio": "Audio inschakelen",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Notificaties aanzetten",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 35359f542..eac72627f 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Aangepaste server",
   "changeserver.headline": "Server wijzigen",
   "changeserver.label": "Server",
-  "changeserver.submit": "Verzenden",
   "changeserver.urlError": "Vul een geldige URL in",
   "changeserver.warning": "Extra instellingen van Ferdi worden niet opgeslagen",
   "connectionLostBanner.cta": "Een service opnieuw laden",
   "connectionLostBanner.informationLink": "Wat gebeurde er?",
   "connectionLostBanner.message": "Oh nee! Ferdi heeft de verbinding met {name} verloren.",
-  "feature.announcements.changelog.headline": "Wijzigingen in Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Foutopsporingsinformatie publiceren",
   "feature.nightlyBuilds.activate": "Activeren",
-  "feature.nightlyBuilds.cancel": "Annuleer",
   "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": "Nachtelijke builds",
   "feature.publishDebugInfo.error": "Er is een fout opgetreden tijdens het publiceren van de debug informatie. Probeer het later opnieuw of bekijk de console voor meer informatie.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Zoeken...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Kan geen verbinding maken met de Ferdi-services.",
+  "global.cancel": "Annuleer",
+  "global.edit": "Bewerk",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "U bent niet verbonden met het internet.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Instellingen",
   "global.spellchecker.useDefault": "Gebruik systeemstandaard ({default})",
   "global.spellchecking.autodetect": "Taal automatisch herkennen",
   "global.spellchecking.autodetect.short": "Automatisch",
   "global.spellchecking.language": "Taal voor spellingcontrole",
+  "global.submit": "Verzenden",
   "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.yes": "Yes",
   "import.headline": "Importeer uw Ferdi 4-services",
   "import.notSupportedHeadline": "Services die (nog) niet ondersteund worden in Ferdi 5",
   "import.skip.label": "Ik wil diensten handmatig toevoegen",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "Over Ferdi",
-  "menu.app.announcement": "Wat is nieuw?",
   "menu.app.autohideMenuBar": "Menubalk automatisch verbergen",
   "menu.app.checkForUpdates": "Controleer op updates",
   "menu.app.hide": "Verbergen",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Instellingen",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Bewerk",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Log in op je account",
   "password.link.signup": "Maak een gratis account aan",
   "password.noUser": "Geen gebruiker bekend met dat e-mailadres",
-  "password.submit.label": "Verzenden",
   "password.successInfo": "Controleer je e-mail",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Inclusief bètaversies",
   "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": "Schakel videokaart-acceleratie in ",
@@ -251,7 +256,6 @@
   "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.headline": "Instellingen",
   "settings.app.headlineAdvanced": "Geavanceerd",
   "settings.app.headlineAppearance": "Weergave",
   "settings.app.headlineGeneral": "Algemeen",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Beschikbare services",
   "settings.navigation.logout": "Uitloggen",
-  "settings.navigation.settings": "Instellingen",
   "settings.navigation.supportFerdi": "Over Ferdi",
   "settings.navigation.team": "Beheer Team",
   "settings.navigation.yourServices": "Jouw services",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Berichten & geluid uitschakelen",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Werkruimtepagina openen",
-  "sidebar.settings": "Instellingen",
   "sidebar.unmuteApp": "Berichten & geluid inschakelen",
   "signup.email.label": "E-mailadres",
   "signup.emailDuplicate": "Er bestaat al een gebruiker met dat e-mailadres",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Meldingen uitschakelen",
   "tabs.item.disableService": "Service uitschakelen",
-  "tabs.item.edit": "Bewerk",
   "tabs.item.enableAudio": "Audio inschakelen",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Meldingen inschakelen",
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index ea5d4465a..548cba3ce 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Egendefinert tjener",
   "changeserver.headline": "Bytt tjener",
   "changeserver.label": "Tjener",
-  "changeserver.submit": "Send",
   "changeserver.urlError": "Angi en gyldig nettadresse",
   "changeserver.warning": "Ekstra innstillinger som tilbys av Ferdi vil ikke bli lagret",
   "connectionLostBanner.cta": "Last inn tjenesten på nytt",
   "connectionLostBanner.informationLink": "Hva skjedde?",
   "connectionLostBanner.message": "Å nei! Ferdi mistet forbindelsen til {name}.",
-  "feature.announcements.changelog.headline": "Endringer i Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Publiser feilsøkingsinformasjon",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Avbryt",
   "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": "Nightly Builds",
   "feature.publishDebugInfo.error": "Det oppstod en feil under forsøket på å publisere feilsøkingsinformasjonen. Prøv igjen senere eller se i konsollet for ytterligere informasjon.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Søk...",
   "feature.quickSwitch.title": "Hurtigbytte",
   "global.api.unhealthy": "Kan ikke koble til Ferdi online-tjenester",
+  "global.cancel": "Avbryt",
+  "global.edit": "Rediger",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Du er ikke koblet til Internett.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Innstillinger",
   "global.spellchecker.useDefault": "Bruk systemstandarden ({default})",
   "global.spellchecking.autodetect": "Oppdag språk automatisk",
   "global.spellchecking.autodetect.short": "Automatisk",
   "global.spellchecking.language": "Språk for stavekontroll",
+  "global.submit": "Send",
   "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.yes": "Yes",
   "import.headline": "Importer Ferdi 4-tjenestene dine",
   "import.notSupportedHeadline": "Tjenester som ikke støttes enda i Ferdi 5",
   "import.skip.label": "Jeg ønsker å legge til tjenester manuelt",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Lukk skuff for gjøremål",
   "menu.Todoss.openTodosDrawer": "Åpne skuff for gjøremål",
   "menu.app.about": "Om Ferdi",
-  "menu.app.announcement": "Hva er nytt?",
   "menu.app.autohideMenuBar": "Skjul menylinjen automatisk",
   "menu.app.checkForUpdates": "Se etter oppdateringer",
   "menu.app.hide": "Skjul",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Innstillinger",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Rediger",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Logg inn på kontoen din",
   "password.link.signup": "Opprett en gratis konto",
   "password.noUser": "Ingen bruker med den e-postadressen ble funnet",
-  "password.submit.label": "Send",
   "password.successInfo": "Vennligst sjekk e-posten din",
   "pricing.features.accountSync": "Konto synkronisering",
   "pricing.features.customWebsites": "Legg til egendefinerte nettsteder",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Inkluder betaversjoner",
   "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": "Egendefinerte gjøremål-tjener",
   "settings.app.form.darkMode": "Aktiver mørkt tema",
   "settings.app.form.enableGPUAcceleration": "Aktiver GPU-akselerasjon",
@@ -251,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Tillat å bruke TouchID for å låse opp Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Innstillinger",
   "settings.app.headlineAdvanced": "Avansert",
   "settings.app.headlineAppearance": "Utseende",
   "settings.app.headlineGeneral": "Generelt",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Konto",
   "settings.navigation.availableServices": "Tilgjengelige tjenester",
   "settings.navigation.logout": "Logg ut",
-  "settings.navigation.settings": "Innstillinger",
   "settings.navigation.supportFerdi": "Om Ferdi",
   "settings.navigation.team": "Administrere Team",
   "settings.navigation.yourServices": "Dine tjenester",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Deaktiver varsler og lyd",
   "sidebar.openTodosDrawer": "Åpne Ferdi gjøremål",
   "sidebar.openWorkspaceDrawer": "Åpne skuff for arbeidsområder",
-  "sidebar.settings": "Innstillinger",
   "sidebar.unmuteApp": "Aktiver varsler og lyd",
   "signup.email.label": "E-postadresse",
   "signup.emailDuplicate": "Det finnes allerede en bruker med den e-postadressen",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Deaktiver varslinger",
   "tabs.item.disableService": "Deaktiver tjeneste",
-  "tabs.item.edit": "Rediger",
   "tabs.item.enableAudio": "Aktiver lyd",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktiver varsler",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 2757914e5..39b72e367 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Spersonalizowany serwer",
   "changeserver.headline": "Zmień serwer",
   "changeserver.label": "Serwer",
-  "changeserver.submit": "Wyślij",
   "changeserver.urlError": "Wprowadź prawidłowy adres URL",
   "changeserver.warning": "Dodatkowe ustawienia oferowane przez Ferdi nie zostaną zapisane",
   "connectionLostBanner.cta": "Przeładuj usługę",
   "connectionLostBanner.informationLink": "Co się stało?",
   "connectionLostBanner.message": "O nie! Ferdi stracił połączenie z {name}.",
-  "feature.announcements.changelog.headline": "Co nowego w Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Opublikuj dane diagnostyczne",
   "feature.nightlyBuilds.activate": "Aktywuj",
-  "feature.nightlyBuilds.cancel": "Anuluj",
   "feature.nightlyBuilds.info": "Kompilacje testowe to wysoce eksperymentalne wersje Ferdi, które mogą zawierać niedopracowane lub nieukończone funkcje. Te kompilacje są przewidziane głównie dla programistów testujących nowe funkcje będące w opracowaniu oraz ostateczne działanie ukończonej kompilacji. Jeśli nie masz pewności co do tej funkcji, zalecamy nie włączać wersji testowych.",
   "feature.nightlyBuilds.title": "Kompilacje testowe",
   "feature.publishDebugInfo.error": "Wystąpił błąd podczas publikowania informacji o debugowaniu. Spróbuj ponownie później lub sprawdź konsolę po więcej informacji.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Szukaj...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nie można połączyć się z usługami Ferdi online",
+  "global.cancel": "Anuluj",
+  "global.edit": "Edytuj",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Nie masz połączenia z Internetem.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Ustawienia",
   "global.spellchecker.useDefault": "Użyj domyślnego dla systemu ({default})",
   "global.spellchecking.autodetect": "Automatycznie wykryj język",
   "global.spellchecking.autodetect.short": "Automatycznie",
   "global.spellchecking.language": "Język sprawdzania pisowni",
+  "global.submit": "Wyślij",
   "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.yes": "Yes",
   "import.headline": "Importuj usługi Ferdi 4",
   "import.notSupportedHeadline": "Usługi, które nie są jeszcze obsługiwane w Ferdi 5",
   "import.skip.label": "Chcę dodać usługi samodzielnie",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Zamknij zakładkę Lista zadań",
   "menu.Todoss.openTodosDrawer": "Otwórz zakładkę Lista zadań",
   "menu.app.about": "O Ferdi",
-  "menu.app.announcement": "Co słychać?",
   "menu.app.autohideMenuBar": "Automatycznie ukrywaj pasek menu",
   "menu.app.checkForUpdates": "Sprawdź aktualizacje",
   "menu.app.hide": "Ukryj",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Ustawienia",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edytuj",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Zaloguj się na swoje konto",
   "password.link.signup": "Załóż darmowe konto",
   "password.noUser": "Nie znaleziono użytkownika z takim adresem email",
-  "password.submit.label": "Wyślij",
   "password.successInfo": "Proszę sprawdzić swój email",
   "pricing.features.accountSync": "Synchronizacja konta",
   "pricing.features.customWebsites": "Dodawanie dowolnych stron internetowych",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Uwzględnij wersje beta",
   "settings.app.form.clipboardNotifications": "Nie wyświetlaj powiadomień dla schowka",
   "settings.app.form.closeToSystemTray": "Zminimalizuj Ferdi do paska zadań",
+  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
   "settings.app.form.customTodoServer": "Własny serwer listy zadań",
   "settings.app.form.darkMode": "Włącz tryb ciemny",
   "settings.app.form.enableGPUAcceleration": "Włącz akcelerację GPU",
@@ -251,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Zezwól na odblokowanie Ferdi przez Touch ID",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Ustawienia",
   "settings.app.headlineAdvanced": "Zaawansowane",
   "settings.app.headlineAppearance": "Wygląd",
   "settings.app.headlineGeneral": "Ogólne",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Konto",
   "settings.navigation.availableServices": "Dostępne usługi",
   "settings.navigation.logout": "Wyloguj",
-  "settings.navigation.settings": "Ustawienia",
   "settings.navigation.supportFerdi": "O Ferdi",
   "settings.navigation.team": "Zarządzaj Zespołem",
   "settings.navigation.yourServices": "Twoje usługi",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Wyłącz powiadomienia i dźwięki",
   "sidebar.openTodosDrawer": "Otwórz Listę zadań Ferdi",
   "sidebar.openWorkspaceDrawer": "Otwórz edytor obszaru roboczego",
-  "sidebar.settings": "Ustawienia",
   "sidebar.unmuteApp": "Włącz powiadomienia i dźwięki",
   "signup.email.label": "Adres email",
   "signup.emailDuplicate": "Użytkownik z takim adresem email już istnieje",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Wyłącz powiadomienia",
   "tabs.item.disableService": "Wyłącz usługę",
-  "tabs.item.edit": "Edytuj",
   "tabs.item.enableAudio": "Włącz dźwięk",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktywuj powiadomienia",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index fa76e582a..7760834a4 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Servidor personalizado",
   "changeserver.headline": "Alterar servidor",
   "changeserver.label": "Servidor",
-  "changeserver.submit": "Confirmar",
   "changeserver.urlError": "Informe uma URL válida",
   "changeserver.warning": "As configurações extras oferecidas pelo Ferdi não serão salvas",
   "connectionLostBanner.cta": "Recarregar serviço",
   "connectionLostBanner.informationLink": "O que aconteceu?",
   "connectionLostBanner.message": "Ah não! Ferdi perdeu a conexão com {name}.",
-  "feature.announcements.changelog.headline": "Mudanças no Ferdi {version}",
+  "feature.basicAuth.signIn": "Acessar",
   "feature.debugger.title": "Publicar informações de depuração",
   "feature.nightlyBuilds.activate": "Ativar",
-  "feature.nightlyBuilds.cancel": "Cancelar",
   "feature.nightlyBuilds.info": "Versões noturnas são versões do Ferdi altamente experimentais que podem conter funcionalidades não finalizadas ou não concluídas. Essas compilações noturnas são usadas principalmente por desenvolvedores para testar seus recursos recém-desenvolvidos e como eles irão se comportar na versão final. Se você não sabe o que está fazendo, sugerimos não ativar versões noturnas.",
   "feature.nightlyBuilds.title": "Versões noturnas",
   "feature.publishDebugInfo.error": "Ocorreu um erro ao tentar publicar as informações de depuração. Por favor, tente novamente mais tarde ou verifique o console para mais informações.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Localizar...",
   "feature.quickSwitch.title": "Troca Rápida",
   "global.api.unhealthy": "Não foi possível estabelecer ligação aos serviços do Ferdi",
+  "global.cancel": "Cancelar",
+  "global.edit": "Editar",
+  "global.no": "Não",
   "global.notConnectedToTheInternet": "Você não está conectado à internet.",
+  "global.ok": "Ok",
+  "global.quit": "Sair",
+  "global.quitConfirmation": "Tem certeza que deseja sair do Ferdi?",
+  "global.save": "Salvar",
+  "global.settings": "Configurações",
   "global.spellchecker.useDefault": "Utilizar o Padrão do Sistema ({default})",
   "global.spellchecking.autodetect": "Detectar a idioma automaticamente",
   "global.spellchecking.autodetect.short": "Automático",
   "global.spellchecking.language": "Idioma para correção ortográfica",
+  "global.submit": "Enviar",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (para descobrir) ou 'https://developers.whatismybrowser.com/useragents/explore/' (para escolher) o agente de usuário desejado e copie e cole aqui.",
   "global.userAgentPref": "User Agent",
+  "global.yes": "Sim",
   "import.headline": "Importar os seus serviços do Ferdi 4",
   "import.notSupportedHeadline": "Estes serviços ainda não são suportados pelo Ferdi 5",
   "import.skip.label": "Eu quero adicionar serviços manualmente",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Fechar Tarefas",
   "menu.Todoss.openTodosDrawer": "Abrir Tarefas",
   "menu.app.about": "Sobre o Ferdi",
-  "menu.app.announcement": "O que há de novo?",
   "menu.app.autohideMenuBar": "Auto-ocultar barra de menu",
   "menu.app.checkForUpdates": "Procurar atualizações",
   "menu.app.hide": "Ocultar",
   "menu.app.hideOthers": "Ocultar outros",
-  "menu.app.quit": "Sair",
-  "menu.app.settings": "Configurações",
   "menu.app.unhide": "Reexibir",
   "menu.edit": "Editar",
   "menu.edit.copy": "Copiar",
@@ -147,7 +152,6 @@
   "password.link.login": "Iniciar sessão",
   "password.link.signup": "Criar uma conta gratuita",
   "password.noUser": "Não existe nenhuma conta associada a esse endereço de e-mail",
-  "password.submit.label": "Confirmar",
   "password.successInfo": "Por favor, verifique seu e-mail",
   "pricing.features.accountSync": "Sincronização da conta",
   "pricing.features.customWebsites": "Adicionar Websites Personalizados",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Incluir versões instáveis (beta)",
   "settings.app.form.clipboardNotifications": "Não exibir notificações para eventos da área de transferência",
   "settings.app.form.closeToSystemTray": "Fechar o Ferdi para a barra do sistema",
+  "settings.app.form.confirmOnQuit": "Exigir confirmação ao sair do Ferdi",
   "settings.app.form.customTodoServer": "Servidor de Tarefas Personalizado",
   "settings.app.form.darkMode": "Habilitar modo noturno",
   "settings.app.form.enableGPUAcceleration": "Ativar Aceleração de GPU",
@@ -249,9 +254,8 @@
   "settings.app.form.startMinimized": "Iniciar minimizado",
   "settings.app.form.universalDarkMode": "Habilitar modo noturno universal",
   "settings.app.form.useTouchIdToUnlock": "Permitir usar TouchID para desbloquear Ferdi",
-  "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.useVerticalStyle": "Usar estilo horizontal",
   "settings.app.form.wakeUpStrategy": "Estratégia de despertar",
-  "settings.app.headline": "Configurações",
   "settings.app.headlineAdvanced": "Avançado",
   "settings.app.headlineAppearance": "Aparência",
   "settings.app.headlineGeneral": "Geral",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Conta",
   "settings.navigation.availableServices": "Serviços disponíveis",
   "settings.navigation.logout": "Terminar sessão",
-  "settings.navigation.settings": "Configurações",
   "settings.navigation.supportFerdi": "Sobre o Ferdi",
   "settings.navigation.team": "Gerenciar equipes",
   "settings.navigation.yourServices": "Seus serviços",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Desativar notificações e áudio",
   "sidebar.openTodosDrawer": "Abrir as Tarefas",
   "sidebar.openWorkspaceDrawer": "Abrir a janela da Área de trabalho",
-  "sidebar.settings": "Configurações",
   "sidebar.unmuteApp": "Ativar notificações e áudio",
   "signup.email.label": "Endereço de e-mail",
   "signup.emailDuplicate": "Já existe uma conta associada a este endereço de email",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Desativar o modo escuro",
   "tabs.item.disableNotifications": "Desativar notificações",
   "tabs.item.disableService": "Desativar serviço",
-  "tabs.item.edit": "Editar",
   "tabs.item.enableAudio": "Ativar áudio",
   "tabs.item.enableDarkMode": "Ativar o modo escuro",
   "tabs.item.enableNotification": "Ativar notificações",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 9bea37357..da431f4e3 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Servidor personalizado",
   "changeserver.headline": "Alterar servidor",
   "changeserver.label": "Servidor",
-  "changeserver.submit": "Enviar",
   "changeserver.urlError": "Introduza um URL válido",
   "changeserver.warning": "As configurações extras oferecidas pelo Ferdi não serão gravadas",
   "connectionLostBanner.cta": "Reiniciar serviço",
   "connectionLostBanner.informationLink": "O que aconteceu?",
   "connectionLostBanner.message": "Oh não! O Ferdi perdeu a ligação com {name}.",
-  "feature.announcements.changelog.headline": "Alterações no Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Publicar informações de depuração",
   "feature.nightlyBuilds.activate": "Activar",
-  "feature.nightlyBuilds.cancel": "Cancelar",
   "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": "Nightly Builds",
   "feature.publishDebugInfo.error": "Houve um erro ao tentar publicar as informações de depuração. Por favor, tente novamente mais tarde ou visualize a consola para mais informações.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "A procurar...",
   "feature.quickSwitch.title": "Troca Rápida",
   "global.api.unhealthy": "Não é possível ligar aos serviços online de Ferdi",
+  "global.cancel": "Cancelar",
+  "global.edit": "Editar",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Não está ligado à internet.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Configurações",
   "global.spellchecker.useDefault": "Use o padrão de sistema ({default})",
   "global.spellchecking.autodetect": "Detectar idioma automaticamente",
   "global.spellchecking.autodetect.short": "Automático",
   "global.spellchecking.language": "Idioma para corrector ortográfico",
+  "global.submit": "Enviar",
   "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.yes": "Yes",
   "import.headline": "Importe os seus serviços do Ferdi 4",
   "import.notSupportedHeadline": "Serviços ainda não são suportados por Ferdi 5",
   "import.skip.label": "Quero adicionar serviços manualmente",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Fechar a barra de Tarefas",
   "menu.Todoss.openTodosDrawer": "Abrir a barra de Tarefas",
   "menu.app.about": "Acerca de Ferdi",
-  "menu.app.announcement": "O que há de novo?",
   "menu.app.autohideMenuBar": "Ocultar barra de menu automaticamente",
   "menu.app.checkForUpdates": "Procurar atualizações",
   "menu.app.hide": "Ocultar",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Configurações",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Editar",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Entrar na sua conta",
   "password.link.signup": "Criar uma conta gratuita",
   "password.noUser": "Não foi encontrado nenhum utilizador com este e-mail",
-  "password.submit.label": "Enviar",
   "password.successInfo": "Por favor, verifique o seu e-mail",
   "pricing.features.accountSync": "Sincronização de conta",
   "pricing.features.customWebsites": "Adicionar Websites Personalizados",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Incluir versões beta",
   "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": "Servidor Personalizado de Tarefas",
   "settings.app.form.darkMode": "Ativar modo noturno",
   "settings.app.form.enableGPUAcceleration": "Ativar Aceleração de GPU",
@@ -251,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Permite usar o TouchID para desbloquear Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Configurações",
   "settings.app.headlineAdvanced": "Avançado",
   "settings.app.headlineAppearance": "Aparência",
   "settings.app.headlineGeneral": "Geral",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Conta",
   "settings.navigation.availableServices": "Serviços disponíveis",
   "settings.navigation.logout": "Sair",
-  "settings.navigation.settings": "Configurações",
   "settings.navigation.supportFerdi": "Acerca de Ferdi",
   "settings.navigation.team": "Gerir Equipa",
   "settings.navigation.yourServices": "Os seus serviços",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Desativar notificações e áudio",
   "sidebar.openTodosDrawer": "Abrir Tarefas Ferdi",
   "sidebar.openWorkspaceDrawer": "Abrir a barra lateral da área de trabalho",
-  "sidebar.settings": "Configurações",
   "sidebar.unmuteApp": "Ativar notificações e áudio",
   "signup.email.label": "Endereço de E-mail",
   "signup.emailDuplicate": "Já existe um utilizador com este endereço de e-mail",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Desativar notificações",
   "tabs.item.disableService": "Desativar serviço",
-  "tabs.item.edit": "Editar",
   "tabs.item.enableAudio": "Ativar áudio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Ativar notificações",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index 855576db4..6e2ee4c19 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Submit",
   "changeserver.urlError": "Introduceți un URL valid",
   "changeserver.warning": "Setările suplimentare oferite de Ferdi nu vor fi salvate",
   "connectionLostBanner.cta": "Reload Service",
   "connectionLostBanner.informationLink": "Ce s-a întâmplat?",
   "connectionLostBanner.message": "Oh nu! Ferdi a pierdut conexiunea cu {name}.",
-  "feature.announcements.changelog.headline": "Modificări în Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activare",
-  "feature.nightlyBuilds.cancel": "Cancel",
   "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": "Nightly Builds",
   "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.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Căutare...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nu se pot conecta la Ferdi servicii online",
+  "global.cancel": "Cancel",
+  "global.edit": "Edit",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Nu ești conectat la internet.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Settings",
   "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.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.yes": "Yes",
   "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",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "About Ferdi",
-  "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.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Include beta versions",
   "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",
@@ -251,7 +256,6 @@
   "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.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.supportFerdi": "About Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 78654554b..4a7222914 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Пользовательский сервер",
   "changeserver.headline": "Изменить сервер",
   "changeserver.label": "Сервер",
-  "changeserver.submit": "Принять",
   "changeserver.urlError": "Введите допустимый URL-адрес",
   "changeserver.warning": "Дополнительные настройки, предлагаемые Ферди, не будут сохранены",
   "connectionLostBanner.cta": "Перезапустить сервис",
   "connectionLostBanner.informationLink": "Что случилось?",
   "connectionLostBanner.message": "О нет! Ферди потерял связь с {name}.",
-  "feature.announcements.changelog.headline": "Изменения в версии Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Опубликовать отладочную информацию",
   "feature.nightlyBuilds.activate": "Активировать",
-  "feature.nightlyBuilds.cancel": "Отмена",
   "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": "Nightly Builds",
   "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.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Поиск...",
   "feature.quickSwitch.title": "Быстрое переключение",
   "global.api.unhealthy": "Невозможно подключиться к онлайн-сервисам Ferdi",
+  "global.cancel": "Отмена",
+  "global.edit": "Правка",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Вы не подключены к сети Интернет",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Настройки",
   "global.spellchecker.useDefault": "Использовать системные параметры по умолчанию ({default})",
   "global.spellchecking.autodetect": "Найти язык автоматически",
   "global.spellchecking.autodetect.short": "Авто",
   "global.spellchecking.language": "Проверка правописания",
+  "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.yes": "Yes",
   "import.headline": "Импортировать ваши сервисы из Ferdi 4",
   "import.notSupportedHeadline": "Сервисы пока ещё не поддерживаются в Ferdi 5",
   "import.skip.label": "Я хочу добавить сервисы вручную",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Закрыть панель задач Todos",
   "menu.Todoss.openTodosDrawer": "Закрыть панель задач Todos",
   "menu.app.about": "О Ferdi",
-  "menu.app.announcement": "Что нового?",
   "menu.app.autohideMenuBar": "Автоматически скрывать панель",
   "menu.app.checkForUpdates": "Проверить обновления",
   "menu.app.hide": "Скрыть",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Настройки",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Правка",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Вход",
   "password.link.signup": "Создать бесплатный аккаунт",
   "password.noUser": "Не найдено пользователя с таким адресом электронной почты",
-  "password.submit.label": "Принять",
   "password.successInfo": "Проверьте вашу электронную почту",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Добавить пользовательские веб-сайты",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Включая бета версии",
   "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": "Включить ускорение GPU",
@@ -251,7 +256,6 @@
   "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.headline": "Настройки",
   "settings.app.headlineAdvanced": "Дополнительно",
   "settings.app.headlineAppearance": "Внешний вид",
   "settings.app.headlineGeneral": "Общие",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Аккаунт",
   "settings.navigation.availableServices": "Доступные сервисы",
   "settings.navigation.logout": "Выход",
-  "settings.navigation.settings": "Настройки",
   "settings.navigation.supportFerdi": "О Ferdi",
   "settings.navigation.team": "Управление Командой",
   "settings.navigation.yourServices": "Ваши сервисы",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Отключить уведомления и звук",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Открыть меню окружений",
-  "sidebar.settings": "Настройки",
   "sidebar.unmuteApp": "Включить уведомления и звук",
   "signup.email.label": "Адрес электронной почты",
   "signup.emailDuplicate": "Пользователь с таким адресом электронной почты уже существует",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Отключить уведомления",
   "tabs.item.disableService": "Отключить сервис",
-  "tabs.item.edit": "Правка",
   "tabs.item.enableAudio": "Включить звук",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Включить уведомления",
diff --git a/src/i18n/locales/si.json b/src/i18n/locales/si.json
index 940864fa0..9ebf7f9e5 100644
--- a/src/i18n/locales/si.json
+++ b/src/i18n/locales/si.json
@@ -13,12 +13,16 @@
   "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.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
   "global.api.unhealthy": "ෆ්රාන්ස් මාර්ගගත සේවාවන් වෙත සම්බන්ධ වීමට නොහැක.",
+  "global.edit": "Edit",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "ඔබ අන්තර්ජාලයට සම්බන්ධ වී නැත.",
+  "global.quit": "Quit",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "යවන්න",
   "import.headline": "ඔබගේ ෆ්රාන්ස් සේවාවන් නැවත ඇතුලත් කරගන්න.",
   "import.notSupportedHeadline": "සේවාවන් සඳහා ෆ්රාන්ස් 5 හි තවමත් පහසුකම් සලසා නැත.",
   "import.skip.label": "සේවාවන් මවිසින් ඇතුලත් කල යුතුය. ",
@@ -51,8 +55,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -109,7 +111,6 @@
   "password.link.login": "ඔබේ ගිණුමට ඇතුල් වන්න ",
   "password.link.signup": "නව නොමිල ගිණුමක් අරඹන්න ",
   "password.noUser": "එම විද්‍යුත් තැපැල් ලිපිනය යටතේ කිසිදු පරිශීලකයෙක් නොමැත ",
-  "password.submit.label": "යවන්න",
   "password.successInfo": "කරුණාකර ඔබේ විද්‍යුත් තැපෑල පිරික්සන්න",
   "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
@@ -179,7 +180,6 @@
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -197,7 +197,6 @@
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.inviteFriends": "Invite Friends",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
   "settings.navigation.yourWorkspaces": "Your workspaces",
@@ -304,7 +303,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -321,7 +319,6 @@
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index d41ab866c..7e84088d1 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Vlastný server",
   "changeserver.headline": "Zmeniť server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Odoslať",
   "changeserver.urlError": "Zadajte platnú adresu URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Obnoviť službu",
   "connectionLostBanner.informationLink": "Čo sa stalo?",
   "connectionLostBanner.message": "Oh nie! Ferdi stratil pripojenie k {name}.",
-  "feature.announcements.changelog.headline": "Zmeny vo Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Zverejniť informácie ladenia",
   "feature.nightlyBuilds.activate": "Aktivovať",
-  "feature.nightlyBuilds.cancel": "Zrušiť",
   "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.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Hľadať...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nedá sa pripojiť k online službám Ferdi",
+  "global.cancel": "Zrušiť",
+  "global.edit": "Upraviť",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Nie ste pripojení k internetu.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "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": "Odoslať",
   "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.yes": "Yes",
   "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",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "O aplikácii",
-  "menu.app.announcement": "Čo je nové?",
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Skontrolovať aktualizácie",
   "menu.app.hide": "Skryť",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Nastavenia",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Upraviť",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Prihlásiť sa do vášho účtu",
   "password.link.signup": "Vytvoriť používateľský účet zdarma",
   "password.noUser": "Používateľ s touto e-mailovou adresou nebol nájdený",
-  "password.submit.label": "Odoslať",
   "password.successInfo": "Skontrolujte prosím váš e-mail",
   "pricing.features.accountSync": "Synchronizácia účtu",
   "pricing.features.customWebsites": "Pridať vlastnú webstránku",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Vrátane beta verzií",
   "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": "Zapnúť GPU zrýchlenie",
@@ -251,7 +256,6 @@
   "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.headline": "Nastavenia",
   "settings.app.headlineAdvanced": "Pokročilé",
   "settings.app.headlineAppearance": "Vzhľad",
   "settings.app.headlineGeneral": "Všeobecné",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Účet",
   "settings.navigation.availableServices": "Dostupné služby",
   "settings.navigation.logout": "Odhlásiť sa",
-  "settings.navigation.settings": "Nastavenia",
   "settings.navigation.supportFerdi": "O aplikácii",
   "settings.navigation.team": "Spravovať tím",
   "settings.navigation.yourServices": "Vaše služby",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Vypnúť upozornenia a zvuky",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Otvoriť workspace záložku",
-  "sidebar.settings": "Nastavenia",
   "sidebar.unmuteApp": "Povoliť oznámenia a zvuky",
   "signup.email.label": "E-mailová adresa",
   "signup.emailDuplicate": "Používateľ s touto e-mailovou adresou už jestvuje",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Zakázať oznámenia",
   "tabs.item.disableService": "Vypnúť službu",
-  "tabs.item.edit": "Upraviť",
   "tabs.item.enableAudio": "Zapnúť zvuk",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Povoliť oznámenia",
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index ff3ed1486..2c145d6f4 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Submit",
   "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": "Changes in Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Cancel",
   "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": "Nightly Builds",
   "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.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
+  "global.edit": "Edit",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "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.yes": "Yes",
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "About Ferdi",
-  "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.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Include beta versions",
   "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",
@@ -251,7 +256,6 @@
   "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.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.supportFerdi": "About Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
diff --git a/src/i18n/locales/sq.json b/src/i18n/locales/sq.json
index fd1cbf1fd..59f77fbb1 100644
--- a/src/i18n/locales/sq.json
+++ b/src/i18n/locales/sq.json
@@ -13,12 +13,16 @@
   "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.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.edit": "Edit",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
+  "global.quit": "Quit",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Submit",
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
@@ -51,8 +55,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -109,7 +111,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
@@ -179,7 +180,6 @@
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -197,7 +197,6 @@
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.inviteFriends": "Invite Friends",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
   "settings.navigation.yourWorkspaces": "Your workspaces",
@@ -304,7 +303,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -321,7 +319,6 @@
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 6eca2d9c2..8ee9417f6 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Prilagođen server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Сервер",
-  "changeserver.submit": "Pošalji",
   "changeserver.urlError": "Унесите исправан URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Поново учирај услугу",
   "connectionLostBanner.informationLink": "Шта се десило?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
-  "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Активирај",
-  "feature.nightlyBuilds.cancel": "Odustani",
   "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": "Nightly Builds",
   "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.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nije moguće pristupiti Ferdi-ovim on-line servisima. ",
+  "global.cancel": "Odustani",
+  "global.edit": "Uredi",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Niste povezani sa serverom.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Postavke",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Аутоматски",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Pošalji",
   "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.yes": "Yes",
   "import.headline": "Uvezite svoje Ferdi 4 servise",
   "import.notSupportedHeadline": "Servis trenutno nije podržan u Ferdi 5",
   "import.skip.label": "Желим да додам услуге ручно",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "O Francu",
-  "menu.app.announcement": "What's new?",
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Potraži ažuriranja",
   "menu.app.hide": "Sakrij",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Postavke",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Uredi",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Prijavite se na Vaš račun",
   "password.link.signup": "Stvorite besplatan račun",
   "password.noUser": "Ne postoji ni jedan korisnik s tom e-mail adresom",
-  "password.submit.label": "Pošalji",
   "password.successInfo": "Molimo Vas da provjerite vašu e-mail adresu",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Obuhvati i beta verzije",
   "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": "Омогући убрзање графичке јединице",
@@ -251,7 +256,6 @@
   "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.headline": "Postavke",
   "settings.app.headlineAdvanced": "Napredne alatke",
   "settings.app.headlineAppearance": "Izgled",
   "settings.app.headlineGeneral": "Općenito",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Korisnički nalog",
   "settings.navigation.availableServices": "Dostupne usluge",
   "settings.navigation.logout": "Odjava",
-  "settings.navigation.settings": "Postavke",
   "settings.navigation.supportFerdi": "O Francu",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Vaše usluge",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Онемогући обавештења и звукове",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Postavke",
   "sidebar.unmuteApp": "Искључи обавештења и звукове",
   "signup.email.label": "Vaša e-adresa",
   "signup.emailDuplicate": "Već postoji korisnik s tom e-mail adresom",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Onemogući obavijesti",
   "tabs.item.disableService": "Onemogući servis",
-  "tabs.item.edit": "Uredi",
   "tabs.item.enableAudio": "Omogućite zvuk",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Omogućite obavijesti",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index f6dfdd4ad..87b92e398 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Anpassad server",
   "changeserver.headline": "Byt server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Skicka",
   "changeserver.urlError": "Ange en giltig URL",
   "changeserver.warning": "Extra inställningar från Ferdi kommer inte sparas",
   "connectionLostBanner.cta": "Ladda om tjänst",
   "connectionLostBanner.informationLink": "Vad hände?",
   "connectionLostBanner.message": "Åh nej! Ferdi förlorade anslutningen till {name}.",
-  "feature.announcements.changelog.headline": "Ändringar i Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Skicka felsökningsinformation",
   "feature.nightlyBuilds.activate": "Aktivera",
-  "feature.nightlyBuilds.cancel": "Avbryt",
   "feature.nightlyBuilds.info": "Nattliga kompileringar är väldigt experimentella versioner av Ferdi som kan innehålla ofärdiga och ännu ej testade funktioner. Nattliga kompilering är i första hand tänkt för utvecklare för att kunna testa hur nya funktioner fungerar och presterar. Är du osäker på vad detta innebär rekommenderas du att inte aktivera nattliga kompileringar.",
   "feature.nightlyBuilds.title": "Nattlig kompilering",
   "feature.publishDebugInfo.error": "Ett fel uppstod när felsökningsinformationen skulle skickas. Försök igen senare eller se konsolen för mer information.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Sök...",
   "feature.quickSwitch.title": "Snabbväxling",
   "global.api.unhealthy": "Kan inte ansluta till Ferdis onlinetjänster",
+  "global.cancel": "Avbryt",
+  "global.edit": "Redigera",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Du är inte ansluten till Internet.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Inställningar",
   "global.spellchecker.useDefault": "Använd systemstandard ({default})",
   "global.spellchecking.autodetect": "Identifiera språk automatiskt",
   "global.spellchecking.autodetect.short": "Automatisk",
   "global.spellchecking.language": "Rättstavningsspråk",
+  "global.submit": "Skicka",
   "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.yes": "Yes",
   "import.headline": "Importera dina Ferdi 4-tjänster",
   "import.notSupportedHeadline": "Tjänster som ännu inte stöds i Ferdi 5",
   "import.skip.label": "Jag vill lägga till tjänster manuellt",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Stäng Todos-lådan",
   "menu.Todoss.openTodosDrawer": "Öppna Todos-lådan",
   "menu.app.about": "Om Ferdi",
-  "menu.app.announcement": "Vad nytt har hänt?",
   "menu.app.autohideMenuBar": "Dölj menyraden automatiskt",
   "menu.app.checkForUpdates": "Sök efter uppdateringar",
   "menu.app.hide": "Dölj",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Inställningar",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Redigera",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Logga in på ditt konto",
   "password.link.signup": "Skapa ett gratis konto",
   "password.noUser": "Ingen användare med den e-postadressen hittades",
-  "password.submit.label": "Skicka",
   "password.successInfo": "Vänligen kontrollera din e-post",
   "pricing.features.accountSync": "Synkronisering av konto",
   "pricing.features.customWebsites": "Lägg till egna webbplatser",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Inkludera betaversioner",
   "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": "Anpassad Todo-server",
   "settings.app.form.darkMode": "Aktivera mörkt läge",
   "settings.app.form.enableGPUAcceleration": "Aktivera GPU-hårdvaruacceleration",
@@ -251,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Tillåt att TouchID används för att låsa upp Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Inställningar",
   "settings.app.headlineAdvanced": "Avancerat",
   "settings.app.headlineAppearance": "Utseende",
   "settings.app.headlineGeneral": "Allmänt",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Konto",
   "settings.navigation.availableServices": "Tillgängliga tjänster",
   "settings.navigation.logout": "Logga ut",
-  "settings.navigation.settings": "Inställningar",
   "settings.navigation.supportFerdi": "Om Ferdi",
   "settings.navigation.team": "Hantera grupp",
   "settings.navigation.yourServices": "Dina tjänster",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Inaktivera notifikationer och ljud",
   "sidebar.openTodosDrawer": "Öppna Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Öppna arbetsytan",
-  "sidebar.settings": "Inställningar",
   "sidebar.unmuteApp": "Aktivera aviseringar och ljud",
   "signup.email.label": "E-postadress",
   "signup.emailDuplicate": "En användare med den e-postadressen finns redan",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Inaktivera aviseringar",
   "tabs.item.disableService": "Inaktivera tjänst",
-  "tabs.item.edit": "Redigera",
   "tabs.item.enableAudio": "Aktivera ljud",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktivera aviseringar",
diff --git a/src/i18n/locales/te.json b/src/i18n/locales/te.json
new file mode 100644
index 000000000..be9bbb961
--- /dev/null
+++ b/src/i18n/locales/te.json
@@ -0,0 +1,465 @@
+{
+  "app.errorHandler.action": "Reload",
+  "app.errorHandler.headline": "Something went wrong",
+  "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.basicAuth.signIn": "Sign In",
+  "feature.debugger.title": "Publish debugging information",
+  "feature.nightlyBuilds.activate": "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": "Nightly Builds",
+  "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.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.privacy": "Privacy policy",
+  "feature.publishDebugInfo.publish": "Accept and publish",
+  "feature.publishDebugInfo.published": "Your debug log was published and is now availible at",
+  "feature.publishDebugInfo.terms": "Terms of service",
+  "feature.publishDebugInfo.title": "Publish debug information",
+  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
+  "feature.quickSwitch.search": "Search...",
+  "feature.quickSwitch.title": "QuickSwitch",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
+  "global.edit": "Edit",
+  "global.no": "No",
+  "global.notConnectedToTheInternet": "You are not connected to the internet.",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Settings",
+  "global.spellchecker.useDefault": "Use System Default ({default})",
+  "global.spellchecking.autodetect": "Detect language automatically",
+  "global.spellchecking.autodetect.short": "Automatic",
+  "global.spellchecking.language": "Spell checking language",
+  "global.submit": "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.yes": "Yes",
+  "import.headline": "Import your Ferdi 4 services",
+  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
+  "import.skip.label": "I want to add services manually",
+  "import.submit.label": "Import services",
+  "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.buttonInstallUpdate": "Restart & install update",
+  "infobar.buttonReloadServices": "Reload services",
+  "infobar.hide": "Hide",
+  "infobar.requiredRequestsFailed": "Could not load services and user information",
+  "infobar.servicesUpdated": "Your services have been updated.",
+  "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.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.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": "About Ferdi",
+  "menu.app.autohideMenuBar": "Auto-hide menu bar",
+  "menu.app.checkForUpdates": "Check for updates",
+  "menu.app.hide": "Hide",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.unhide": "Unhide",
+  "menu.edit": "Edit",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
+  "menu.edit.delete": "Delete",
+  "menu.edit.emojiSymbols": "Emoji & Symbols",
+  "menu.edit.findInPage": "Find in Page",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "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.file": "File",
+  "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.importExportData": "Import/Export Configuration Data",
+  "menu.help.learnMore": "Learn More",
+  "menu.help.privacy": "Privacy Statement",
+  "menu.help.publishDebugInfo": "Publish Debug Information",
+  "menu.help.support": "Support",
+  "menu.help.tos": "Terms of Service",
+  "menu.services": "Services",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service",
+  "menu.services.goHome": "Home",
+  "menu.services.setNextServiceActive": "Activate next service",
+  "menu.todos": "Todos",
+  "menu.todos.enableTodos": "Enable Todos",
+  "menu.view": "View",
+  "menu.view.back": "Back",
+  "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": "Actual Size",
+  "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",
+  "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
+  "menu.workspaces": "Workspaces",
+  "menu.workspaces.addNewWorkspace": "Add New Workspace...",
+  "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
+  "menu.workspaces.defaultWorkspace": "All services",
+  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
+  "password.email.label": "Email address",
+  "password.headline": "Reset password",
+  "password.link.login": "Sign in to your account",
+  "password.link.signup": "Create a free account",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Please check your email",
+  "pricing.features.accountSync": "Account Synchronisation",
+  "pricing.features.customWebsites": "Add Custom Websites",
+  "pricing.features.desktopNotifications": "Desktop Notifications",
+  "pricing.features.onPremise": "On-premise & other Hosted Services",
+  "pricing.features.recipes": "Choose from more than 70 Services",
+  "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.workspaces": "Workspaces",
+  "service.crashHandler.action": "Reload {name}",
+  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
+  "service.crashHandler.headline": "Oh no!",
+  "service.crashHandler.text": "{name} has caused an error.",
+  "service.disabledHandler.action": "Enable {name}",
+  "service.disabledHandler.headline": "{name} is disabled",
+  "service.errorHandler.action": "Reload {name}",
+  "service.errorHandler.editAction": "Edit {name}",
+  "service.errorHandler.headline": "Oh no!",
+  "service.errorHandler.message": "Error",
+  "service.errorHandler.text": "{name} has failed to load.",
+  "service.webviewLoader.loading": "Loading {service}",
+  "services.getStarted": "Get started",
+  "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.",
+  "settings.account.buttonSave": "Update profile",
+  "settings.account.deleteAccount": "Delete account",
+  "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": "Account",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
+  "settings.account.headlineProfile": "Update profile",
+  "settings.account.successInfo": "Your changes have been saved",
+  "settings.account.tryReloadServices": "Try again",
+  "settings.account.tryReloadUserInfoRequest": "Try again",
+  "settings.account.userInfoRequestFailed": "Could not load user information",
+  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
+  "settings.app.buttonClearAllCache": "Clear cache",
+  "settings.app.buttonInstallUpdate": "Restart & install update",
+  "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder",
+  "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.cacheNotCleared": "Couldn't clear all cache",
+  "settings.app.closeSettings": "Close settings",
+  "settings.app.currentVersion": "Current version:",
+  "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": "Open in background",
+  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
+  "settings.app.form.automaticUpdates": "Enable updates",
+  "settings.app.form.beta": "Include beta versions",
+  "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.enableLock": "Enable Password Lock",
+  "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.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": "From",
+  "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.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": "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.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.",
+  "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.openDevDocs": "Developer Documentation",
+  "settings.recipes.customService.openFolder": "Open folder",
+  "settings.recipes.headline": "Available services",
+  "settings.recipes.missingService": "Missing a service?",
+  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
+  "settings.recipes.servicesSuccessfulAddedInfo": "Service 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.customUrl": "Custom server",
+  "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.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": "Enable notifications",
+  "settings.service.form.enableService": "Enable service",
+  "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.icon": "Custom 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": "Name",
+  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
+  "settings.service.form.openUserCss": "Open user.css",
+  "settings.service.form.openUserJs": "Open user.js",
+  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy 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.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.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.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",
+  "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.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.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.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": "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": "Add new service",
+  "sidebar.closeTodosDrawer": "Close Ferdi Todos",
+  "sidebar.closeWorkspaceDrawer": "Close workspace drawer",
+  "sidebar.lockFerdi": "Lock Ferdi",
+  "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.headline": "Sign up",
+  "signup.lastname.label": "Last Name",
+  "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": "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.disableDarkMode": "Disable Dark mode",
+  "tabs.item.disableNotifications": "Disable notifications",
+  "tabs.item.disableService": "Disable service",
+  "tabs.item.enableAudio": "Enable audio",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
+  "tabs.item.enableNotification": "Enable notifications",
+  "tabs.item.enableService": "Enable service",
+  "tabs.item.hibernateService": "Hibernate service",
+  "tabs.item.reload": "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.forward": "Forward",
+  "webControls.goHome": "Home",
+  "webControls.openInBrowser": "Open in Browser",
+  "webControls.reload": "Reload",
+  "welcome.loginButton": "Login to your account",
+  "welcome.signupButton": "Create a free account",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
+  "workspaceDrawer.allServices": "All services",
+  "workspaceDrawer.headline": "Workspaces",
+  "workspaceDrawer.item.contextMenuEdit": "edit",
+  "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",
+  "workspaces.switchingIndicator.switchingTo": "Switching to"
+}
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index f1094a69d..3b91dfad0 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Özel sunucu",
   "changeserver.headline": "Sunucuyu değiştir",
   "changeserver.label": "Sunucu",
-  "changeserver.submit": "Gönder",
   "changeserver.urlError": "Geçerli bir URL girin",
   "changeserver.warning": "Ferdi'nin sunduğu ekstra ayarlar kaydedilmeyecektir",
   "connectionLostBanner.cta": "Servisi Tekrar Yükle",
   "connectionLostBanner.informationLink": "Ne oldu?",
   "connectionLostBanner.message": "Nayır, nolamaz! Ferdi {name} ile bağlantısını yitirdi.",
-  "feature.announcements.changelog.headline": "Ferdi {version} Sürümündeki Değişiklikler",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Hata ayıklama bilgisini yayımla",
   "feature.nightlyBuilds.activate": "Etkinleştir",
-  "feature.nightlyBuilds.cancel": "İptal",
   "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": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Ara...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Ferdi hizmetlerine şu anda erişilemiyor",
+  "global.cancel": "İptal",
+  "global.edit": "Düzenle",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "İnternete bağlı değilsiniz.",
+  "global.ok": "Ok",
+  "global.quit": "Çık",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Ayarlar",
   "global.spellchecker.useDefault": "Sistem Dilini Kullan ({default})",
   "global.spellchecking.autodetect": "Dili otomatik tespit et",
   "global.spellchecking.autodetect.short": "Otomatik",
   "global.spellchecking.language": "İmla kontrol dili",
+  "global.submit": "Gönder",
   "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.yes": "Yes",
   "import.headline": "Ferdi 4 servislerinizi içeri aktarın",
   "import.notSupportedHeadline": "Henüz Ferdi 5'te desteklenmeyen servisler",
   "import.skip.label": "Servisleri kendim eklemek istiyorum",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Yapılacaklar çekmecesini kapat",
   "menu.Todoss.openTodosDrawer": "Yapılacaklar çekmecesini aç",
   "menu.app.about": "Ferdi Hakkında",
-  "menu.app.announcement": "Neler yeni?",
   "menu.app.autohideMenuBar": "Menü çubuğunu otomatik otomatik olarak gizle",
   "menu.app.checkForUpdates": "Güncellemeleri kontrol et",
   "menu.app.hide": "Gizle",
   "menu.app.hideOthers": "Diğerlerini Gizle",
-  "menu.app.quit": "Çık",
-  "menu.app.settings": "Ayarlar",
   "menu.app.unhide": "Göster",
   "menu.edit": "Düzenle",
   "menu.edit.copy": "Kopyala",
@@ -147,7 +152,6 @@
   "password.link.login": "Hesabına giriş yap",
   "password.link.signup": "Ücretsiz hesap oluştur",
   "password.noUser": "Bu e-posta adresinde bir kullanıcı bulunamadı",
-  "password.submit.label": "Gönder",
   "password.successInfo": "E-postanızı kontrol ediniz",
   "pricing.features.accountSync": "Hesap Eşitleme",
   "pricing.features.customWebsites": "Özel Siteler Ekle",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Beta versiyonları dahil et",
   "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": "Grafik İşlemci Ünitesi (GPU) Hızlandırıcısını Aktif et",
@@ -251,7 +256,6 @@
   "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.headline": "Ayarlar",
   "settings.app.headlineAdvanced": "Gelişmiş",
   "settings.app.headlineAppearance": "Görünüm",
   "settings.app.headlineGeneral": "Genel",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Hesap",
   "settings.navigation.availableServices": "Mevcut servisler",
   "settings.navigation.logout": "Çıkış",
-  "settings.navigation.settings": "Ayarlar",
   "settings.navigation.supportFerdi": "Ferdi Hakkında",
   "settings.navigation.team": "Ekibini Yönet",
   "settings.navigation.yourServices": "Servislerin",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Bildirimleri ve sesli uyarıları kapat",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Çalışma alanı çekmecesini aç",
-  "sidebar.settings": "Ayarlar",
   "sidebar.unmuteApp": "Bildirimleri ve sesli uyarıları etkinleştir",
   "signup.email.label": "E-posta adresi",
   "signup.emailDuplicate": "Bu email adresine sahip bir kullanıcı zaten mevcut",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Bildirimleri devre dışı bırak",
   "tabs.item.disableService": "Servisi devre dışı bırak",
-  "tabs.item.edit": "Düzenle",
   "tabs.item.enableAudio": "Sesi etkinleştirin",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Bildirimleri etkinleştir",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 69c62629c..b4f1fb66c 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -4,18 +4,16 @@
   "changeserver.customServerLabel": "Користувацький сервер",
   "changeserver.headline": "Змінити сервер",
   "changeserver.label": "Сервер",
-  "changeserver.submit": "Подати",
-  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.urlError": "Введіть дійсний URL",
   "changeserver.warning": "Додаткові налаштування, запропоновані Ферді не будуть збережені",
   "connectionLostBanner.cta": "Перезавантажити сервіс",
   "connectionLostBanner.informationLink": "Що трапилось?",
   "connectionLostBanner.message": "О ні! Ферді втратив з'єднання з {name}.",
-  "feature.announcements.changelog.headline": "Зміни у Ferdi {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Опублікувати інформацію для налагодження",
-  "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Відмінити",
-  "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": "Nightly Builds",
+  "feature.nightlyBuilds.activate": "Активувати",
+  "feature.nightlyBuilds.info": "Нічні збірки - це високоекспериментальні версії Ferdi, що можуть містити \"неполіровані\" або незавершені функції. Нічні збірки в основному використовуються розробниками, щоб перевірити свої нові функції та те, як вони будуть працювати в фінальній версії. Якщо ви не знаєте, що ви робите, то радимо не активувати нічні збірки.",
+  "feature.nightlyBuilds.title": "Нічні збірки",
   "feature.publishDebugInfo.error": "Сталася помилка під час спроби опублікувати інформацію для налагодження. Будь ласка, спробуйте ще раз пізніше або перегляньте консоль для отримання додаткової інформації.",
   "feature.publishDebugInfo.info": "Публікація інформації для налагодження допоможе нам знайти проблеми та помилки у Fredi. Публікуючи вашу зневаджувальну інформацію, ви приймаєте політику конфіденційності Ferdi Debugger та умови використання",
   "feature.publishDebugInfo.privacy": "Політика конфіденційності",
@@ -25,15 +23,25 @@
   "feature.publishDebugInfo.title": "Опублікувати інформацію для налагодження",
   "feature.quickSwitch.info": "Виберіть сервіс за допомогою TAB, стрілок ↑ та ↓. Натисніть ENTER, щоб відкрити.",
   "feature.quickSwitch.search": "Пошук...",
-  "feature.quickSwitch.title": "QuickSwitch",
+  "feature.quickSwitch.title": "Швидке перемикання",
   "global.api.unhealthy": "Не можливо підключитись до онлайн сервісів Ferdi",
+  "global.cancel": "Відмінити",
+  "global.edit": "Редагувати",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Ви не підключені до Інтернету.",
+  "global.ok": "Ok",
+  "global.quit": "Вийти",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Налаштування",
   "global.spellchecker.useDefault": "Використовувати системні параметри за змовчуванням ({default})",
-  "global.spellchecking.autodetect": "Detect language automatically",
-  "global.spellchecking.autodetect.short": "Automatic",
+  "global.spellchecking.autodetect": "Автоматично визначати мову",
+  "global.spellchecking.autodetect.short": "Автоматично",
   "global.spellchecking.language": "Мова перевірки правопису",
+  "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": "Ідентифікатор браузера",
+  "global.yes": "Yes",
   "import.headline": "Імпортувати ваші сервіси з Ferdi 4",
   "import.notSupportedHeadline": "Наразі сервіси не підтримуються у Ferdi 5",
   "import.skip.label": "Я бажаю додати сервіс вручну",
@@ -46,7 +54,7 @@
   "infobar.requiredRequestsFailed": "Не вдалося завантажити сервіси та інформацію користувача",
   "infobar.servicesUpdated": "Ваші сервіси було оновлено.",
   "infobar.updateAvailable": "Нове оновлення для Ferdi доступне.",
-  "infobox.dismiss": "Dismiss",
+  "infobox.dismiss": "Відхилити",
   "invite.email.label": "Email адреса",
   "invite.headline.friends": "Запросіть 3-х ваших друзів або колег",
   "invite.name.label": "Ім'я",
@@ -76,48 +84,45 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "Про Ferdi",
-  "menu.app.announcement": "Що нового?",
   "menu.app.autohideMenuBar": "Автоматично приховувати меню",
   "menu.app.checkForUpdates": "Перевірити наявність оновлень",
   "menu.app.hide": "Приховати",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Налаштування",
-  "menu.app.unhide": "Unhide",
+  "menu.app.unhide": "Показати",
   "menu.edit": "Редагувати",
-  "menu.edit.copy": "Copy",
-  "menu.edit.cut": "Cut",
+  "menu.edit.copy": "Копіювати",
+  "menu.edit.cut": "Вирізати",
   "menu.edit.delete": "Видалити",
   "menu.edit.emojiSymbols": "Емодзі та символи",
   "menu.edit.findInPage": "Знайти на сторінці",
-  "menu.edit.paste": "Paste",
-  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
-  "menu.edit.redo": "Redo",
-  "menu.edit.selectAll": "Select All",
+  "menu.edit.paste": "Вставити",
+  "menu.edit.pasteAndMatchStyle": "Вставити з дотриманням стилю",
+  "menu.edit.redo": "Повторити",
+  "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": "Your Debug Information has been copied to your clipboard.",
+  "menu.help.debugInfoCopiedBody": "Інформацію для відлагодження було скопійовано до буфера обміну.",
   "menu.help.debugInfoCopiedHeadline": "Інформація для відладки",
-  "menu.help.importExportData": "Import/Export Configuration Data",
+  "menu.help.importExportData": "Імпорт/експорт даних конфігурації",
   "menu.help.learnMore": "Докладніше",
   "menu.help.privacy": "Заява про конфіденційність",
-  "menu.help.publishDebugInfo": "Publish Debug Information",
+  "menu.help.publishDebugInfo": "Опублікувати інформацію для налагодження",
   "menu.help.support": "Підтримка",
   "menu.help.tos": "Умови використання",
   "menu.services": "Служби",
-  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.activatePreviousService": "Активувати попередню службу",
+  "menu.services.addNewService": "Додати новий сервіс",
   "menu.services.goHome": "Головна",
   "menu.services.setNextServiceActive": "Активувати наступний сервіс",
-  "menu.todos": "Todos",
-  "menu.todos.enableTodos": "Enable Todos",
+  "menu.todos": "Завдання",
+  "menu.todos.enableTodos": "Увімкнути Завдання",
   "menu.view": "Вигляд",
   "menu.view.back": "Назад",
   "menu.view.forward": "Вперед",
@@ -147,7 +152,6 @@
   "password.link.login": "Увійти до вашого акаунту",
   "password.link.signup": "Створити безплатний акаунт",
   "password.noUser": "Не знайдено жодного користувача з цією email адресою",
-  "password.submit.label": "Подати",
   "password.successInfo": "Будь ласка, перевірте ваш email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Включити бета-версії",
   "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": "Ввімкнути прискорення GPU",
@@ -251,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Дозволити використання TouchID для розблокування Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Налаштування",
   "settings.app.headlineAdvanced": "Додаткові налаштування",
   "settings.app.headlineAppearance": "Вигляд",
   "settings.app.headlineGeneral": "Загальні",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Акаунт",
   "settings.navigation.availableServices": "Доступні сервіси",
   "settings.navigation.logout": "Вийти",
-  "settings.navigation.settings": "Налаштування",
   "settings.navigation.supportFerdi": "Про Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Ваші сервіси",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Вимкнути сповіщення та звуки",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Налаштування",
   "sidebar.unmuteApp": "Увімкнути сповіщення та звуки",
   "signup.email.label": "Email адреса",
   "signup.emailDuplicate": "Користувач із цією email адресою вже існує",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Вимкнути сповіщення",
   "tabs.item.disableService": "Вимкнути сервіс",
-  "tabs.item.edit": "Редагувати",
   "tabs.item.enableAudio": "Увімкнути звук",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Увімкнути сповіщення",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index b860ad8c8..0bf52bf1d 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Máy chủ tùy chỉnh",
   "changeserver.headline": "Thay đổi máy chủ",
   "changeserver.label": "Máy chủ",
-  "changeserver.submit": "Gửi",
   "changeserver.urlError": "Nhập địa chỉ web",
   "changeserver.warning": "Cài đặt mở rộng sẽ không được lưu lại",
   "connectionLostBanner.cta": "Tải lại dịch vụ",
   "connectionLostBanner.informationLink": "Điều gì đã xảy ra?",
   "connectionLostBanner.message": "Mất kết nối tới {name}.",
-  "feature.announcements.changelog.headline": "Những thay đổi trong phiên bản {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Gửi thông tin gỡ lỗi",
   "feature.nightlyBuilds.activate": "Kích hoạt",
-  "feature.nightlyBuilds.cancel": "Hủy",
   "feature.nightlyBuilds.info": "Các bản Nightly là các phiên bản Ferdi mang tính thử nghiệm có thể chứa các tính năng chưa được hoàn thiện. Các bản Nightly chủ yếu được các nhà phát triển sử dụng để kiểm tra các tính năng mới được phát triển của họ và cách chúng sẽ hoạt động trong bản dựng cuối cùng. Nếu bạn không biết mình đang làm gì, chúng tôi khuyên bạn không nên kích hoạt các bản dựng hàng đêm.",
   "feature.nightlyBuilds.title": "Phiên bản Nightly",
   "feature.publishDebugInfo.error": "Đã xảy ra lỗi khi cố gắng xuất bản thông tin gỡ lỗi. Vui lòng thử lại sau hoặc xem bảng điều khiển để biết thêm thông tin.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "Tìm kiếm...",
   "feature.quickSwitch.title": "Chuyển đổi nhanh",
   "global.api.unhealthy": "Không thể kết nối đến máy chủ trực tuyến của Ferdi",
+  "global.cancel": "Hủy",
+  "global.edit": "Chỉnh sửa",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "Bạn không kết nối với Internet.",
+  "global.ok": "Ok",
+  "global.quit": "Thoát",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "Các thiết lập",
   "global.spellchecker.useDefault": "Dùng mặc định hệ thống ({default})",
   "global.spellchecking.autodetect": "Tự động phát hiện ngôn ngữ",
   "global.spellchecking.autodetect.short": "Tự động",
   "global.spellchecking.language": "Ngôn ngữ kiểm tra chính tả",
+  "global.submit": "Gửi",
   "global.userAgentHelp": "Sử dụng 'https://whatmyuseragent.com/' (để khám phá) hoặc 'https://developers.whatismybrowser.com/useragents/explore/' (để chọn) tác nhân người dùng mong muốn của bạn và sao chép-dán nó vào đây.",
   "global.userAgentPref": "Tác nhân Người dùng",
+  "global.yes": "Yes",
   "import.headline": "Nhập các dịch vụ Ferdi 4 của bạn",
   "import.notSupportedHeadline": "Các dịch vụ chưa được hỗ trợ trong Ferdi 5",
   "import.skip.label": "Tôi muốn thêm dịch vụ theo cách thủ công",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Đóng mục Việc cần làm",
   "menu.Todoss.openTodosDrawer": "Mở mục Việc cần làm",
   "menu.app.about": "Giới thiệu về phần mềm Ferdi",
-  "menu.app.announcement": "Có gì mới?",
   "menu.app.autohideMenuBar": "Tự động ẩn thanh Menu",
   "menu.app.checkForUpdates": "Kiểm tra cập nhật",
   "menu.app.hide": "Ẩn",
   "menu.app.hideOthers": "Ẩn các mục khác",
-  "menu.app.quit": "Thoát",
-  "menu.app.settings": "Các thiết lập",
   "menu.app.unhide": "Bỏ ẩn",
   "menu.edit": "Chỉnh sửa",
   "menu.edit.copy": "Sao chép",
@@ -147,7 +152,6 @@
   "password.link.login": "Đăng nhập Tài khoản",
   "password.link.signup": "Tạo tài khoản miễn phí",
   "password.noUser": "Không tìm thấy người dùng được đăng ký với địa chỉ e-mail này",
-  "password.submit.label": "Gửi",
   "password.successInfo": "Vui lòng kiểm tra hộp thư của bạn",
   "pricing.features.accountSync": "Đồng bộ hóa Tài khoản",
   "pricing.features.customWebsites": "Thêm Trang web tùy chỉnh",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Bao gồm phiên bản thử nghiệp",
   "settings.app.form.clipboardNotifications": "Không hiển thị thông báo cho các sự kiện khay nhớ tạm",
   "settings.app.form.closeToSystemTray": "Thu nhỏ Ferdi xuống khay hệ thống",
+  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
   "settings.app.form.customTodoServer": "Tùy chỉnh Server Todo",
   "settings.app.form.darkMode": "Cho phép Chế độ nền tối",
   "settings.app.form.enableGPUAcceleration": "Bật Tăng tốc GPU",
@@ -251,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Cho phép sử dụng TouchID để mở khóa Ferdi",
   "settings.app.form.useVerticalStyle": "Sử dụng kiểu ngang",
   "settings.app.form.wakeUpStrategy": "Chiến lược đánh thức",
-  "settings.app.headline": "Các thiết lập",
   "settings.app.headlineAdvanced": "Nâng cao",
   "settings.app.headlineAppearance": "Giao diện",
   "settings.app.headlineGeneral": "Chung",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Tài khoản",
   "settings.navigation.availableServices": "Các dịch vụ có sẵn",
   "settings.navigation.logout": "Đăng xuất",
-  "settings.navigation.settings": "Các thiết lập",
   "settings.navigation.supportFerdi": "Giới thiệu về phần mềm Ferdi",
   "settings.navigation.team": "Quản lý Nhóm",
   "settings.navigation.yourServices": "Dịch vụ của bạn",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Tắt thông báo và âm thanh",
   "sidebar.openTodosDrawer": "Mở Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Mở không gian làm việc",
-  "sidebar.settings": "Các thiết lập",
   "sidebar.unmuteApp": "Bật thông báo và âm thanh",
   "signup.email.label": "Địa chỉ E-mail",
   "signup.emailDuplicate": "Một người dùng với địa chỉ email đó đã tồn tại",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Vô hiệu hóa chế độ tối",
   "tabs.item.disableNotifications": "Vô hiệu hóa thông báo",
   "tabs.item.disableService": "Vô hiệu hóa dịch vụ",
-  "tabs.item.edit": "Chỉnh sửa",
   "tabs.item.enableAudio": "Cho phép âm thanh",
   "tabs.item.enableDarkMode": "Kích hoạt chế độ tối",
   "tabs.item.enableNotification": "Kích hoạt thông báo",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 057d86253..632127f4d 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -21,12 +21,16 @@
   "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.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.edit": "Edit",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
+  "global.quit": "Quit",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Submit",
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
@@ -69,8 +73,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -131,7 +133,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
@@ -197,6 +198,7 @@
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
   "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -210,7 +212,6 @@
   "settings.app.form.language": "Language",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
-  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
@@ -226,7 +227,6 @@
   "settings.app.form.startMinimized": "Start minimized in tray",
   "settings.app.form.todoServer": "Todo Server",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -255,7 +255,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.supportFerdi": "Support Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -369,7 +368,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -386,7 +384,6 @@
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
diff --git a/src/i18n/locales/zh-HANS.json b/src/i18n/locales/zh-HANS.json
index b7de29eb5..a214e551c 100644
--- a/src/i18n/locales/zh-HANS.json
+++ b/src/i18n/locales/zh-HANS.json
@@ -13,12 +13,16 @@
   "feature.shareFranz.shareText.twitter": "我已经为Ferdi添加了{count}个服务！在www.getferdi.com/cc @FerdiMessenger上获得适用于WhatsApp，Messenger，Slack，Skype和co的免费应用程序",
   "feature.shareFranz.text": "告诉你的朋友和同事Ferdi有多棒并且帮助我们传播Ferdi。",
   "global.api.unhealthy": "无法连接Ferdi在线服务",
+  "global.edit": "编辑",
   "global.franzProRequired": "需要 Ferdi 专业版。",
   "global.notConnectedToTheInternet": "没有网络服务",
+  "global.quit": "退出",
+  "global.settings": "设置",
   "global.spellchecker.useDefault": "使用系统默认设置({default})",
   "global.spellchecking.autodetect": "自动检测语言",
   "global.spellchecking.autodetect.short": "自动",
   "global.spellchecking.language": "语言拼写检查",
+  "global.submit": "提交",
   "import.headline": "导入自定义Ferdi 4服务",
   "import.notSupportedHeadline": "Ferdi 5 目前不支持此项服务",
   "import.skip.label": "手动添加服务",
@@ -51,8 +55,6 @@
   "menu.app.checkForUpdates": "检查更新",
   "menu.app.hide": "隐藏",
   "menu.app.hideOthers": "隐藏其它",
-  "menu.app.quit": "退出",
-  "menu.app.settings": "设置",
   "menu.app.unhide": "显示",
   "menu.edit": "编辑",
   "menu.edit.copy": "复制",
@@ -109,7 +111,6 @@
   "password.link.login": "登录到您的帐户",
   "password.link.signup": "创建一个免费账户",
   "password.noUser": "该邮箱尚未注册",
-  "password.submit.label": "提交",
   "password.successInfo": "请检查您的 email 邮箱",
   "premiumFeature.button.upgradeAccount": "升级账户",
   "pricing.features.accountSync": "帐户同步",
@@ -179,7 +180,6 @@
   "settings.app.form.runInBackground": "关闭窗口时保持 Ferdi 在后台运行",
   "settings.app.form.showDisabledServices": "显示已禁用的服务标签页",
   "settings.app.form.showMessagesBadgesWhenMuted": "在通知被禁用时显示未读消息提示。",
-  "settings.app.headline": "设置",
   "settings.app.headlineAdvanced": "高级",
   "settings.app.headlineAppearance": "外观",
   "settings.app.headlineGeneral": "通用",
@@ -197,7 +197,6 @@
   "settings.navigation.availableServices": "可用的服务",
   "settings.navigation.inviteFriends": "邀请朋友",
   "settings.navigation.logout": "退出账户",
-  "settings.navigation.settings": "设置",
   "settings.navigation.team": "管理团队",
   "settings.navigation.yourServices": "您的服务",
   "settings.navigation.yourWorkspaces": "你的工作组",
@@ -304,7 +303,6 @@
   "sidebar.muteApp": "关闭通知和声音提醒",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "打开工作组列表",
-  "sidebar.settings": "设置",
   "sidebar.unmuteApp": "开启通知和声音提醒",
   "signup.email.label": "电子邮件",
   "signup.emailDuplicate": "此邮箱已被注册",
@@ -321,7 +319,6 @@
   "tabs.item.disableAudio": "禁止声音",
   "tabs.item.disableNotifications": "停止通知",
   "tabs.item.disableService": "停用服务",
-  "tabs.item.edit": "编辑",
   "tabs.item.enableAudio": "启用声音",
   "tabs.item.enableNotification": "启用通知",
   "tabs.item.enableService": "启用服务",
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index ff96a4107..22a0b6771 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "切換服務器",
   "changeserver.label": "伺服器",
-  "changeserver.submit": "送出",
   "changeserver.urlError": "Enter a valid URL",
   "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": "Ferdi 有了更新 {version}",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "發布除錯訊息",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "取消",
   "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": "Nightly Builds",
   "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.",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "搜尋...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "無法連接到Ferdi網路服務",
+  "global.cancel": "取消",
+  "global.edit": "編輯",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "您未連上網際網路",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "設置",
   "global.spellchecker.useDefault": "使用系統預設值({default})",
   "global.spellchecking.autodetect": "自動檢測語言",
   "global.spellchecking.autodetect.short": "自動",
   "global.spellchecking.language": "拼字檢查語言",
+  "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.yes": "Yes",
   "import.headline": "匯入您的 Ferdi 4 服務",
   "import.notSupportedHeadline": "此服務不被 Ferdi 5 支持",
   "import.skip.label": "我想手動匯入",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "關於 Ferdi",
-  "menu.app.announcement": "最新消息!",
   "menu.app.autohideMenuBar": "自動隱藏功能表列",
   "menu.app.checkForUpdates": "檢查更新",
   "menu.app.hide": "隱藏",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "設置",
   "menu.app.unhide": "Unhide",
   "menu.edit": "編輯",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "登入您的帳戶",
   "password.link.signup": "建立一個免費帳戶",
   "password.noUser": "此電子郵件帳戶不存在",
-  "password.submit.label": "送出",
   "password.successInfo": "請重新確認您的電子郵件信箱",
   "pricing.features.accountSync": "帳號同步",
   "pricing.features.customWebsites": "添加自訂網站",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "包含開發中版本",
   "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": "啟用夜間模式",
   "settings.app.form.enableGPUAcceleration": "開啟顯示卡（GPU）加速",
@@ -251,7 +256,6 @@
   "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.headline": "設置",
   "settings.app.headlineAdvanced": "高級設置",
   "settings.app.headlineAppearance": "外觀",
   "settings.app.headlineGeneral": "一般",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "帳戶",
   "settings.navigation.availableServices": "可用服務",
   "settings.navigation.logout": "登出",
-  "settings.navigation.settings": "設置",
   "settings.navigation.supportFerdi": "關於 Ferdi",
   "settings.navigation.team": "管理團隊",
   "settings.navigation.yourServices": "您的服務",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "停用通知",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "打開工作區",
-  "sidebar.settings": "設置",
   "sidebar.unmuteApp": "啟用通知",
   "signup.email.label": "電子郵件信箱",
   "signup.emailDuplicate": "此電子郵件信箱已被註冊",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "停用通知",
   "tabs.item.disableService": "停用服務",
-  "tabs.item.edit": "編輯",
   "tabs.item.enableAudio": "啟用音效",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "啟用通知",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index d2b86d5ef..c8e0e698a 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -10,12 +10,16 @@
   "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.shareFranz.text": "告訴所有朋友和同事Ferdi有多棒！",
   "global.api.unhealthy": "無法連線至 Ferdi 的伺服器",
+  "global.edit": "編輯",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "你沒有連上網路。",
+  "global.quit": "結束",
+  "global.settings": "設定",
   "global.spellchecker.useDefault": "使用系統預設 ({default})",
   "global.spellchecking.autodetect": "自動偵測語言",
   "global.spellchecking.autodetect.short": "自動的",
   "global.spellchecking.language": "拼字檢查語言",
+  "global.submit": "送出",
   "import.headline": "匯入 Ferdi 4 的服務",
   "import.notSupportedHeadline": "Ferdi 5 尚未支援此服務",
   "import.skip.label": "手動添加服務",
@@ -48,8 +52,6 @@
   "menu.app.checkForUpdates": "檢查更新",
   "menu.app.hide": "隱藏",
   "menu.app.hideOthers": "隱藏其他",
-  "menu.app.quit": "結束",
-  "menu.app.settings": "設定",
   "menu.app.unhide": "顯示",
   "menu.edit": "編輯",
   "menu.edit.copy": "拷貝",
@@ -104,7 +106,6 @@
   "password.link.login": "登入您的帳號",
   "password.link.signup": "建立免費帳號",
   "password.noUser": "找不到該電子郵件地址的用戶",
-  "password.submit.label": "送出",
   "password.successInfo": "請檢查您的電子郵件",
   "premiumFeature.button.upgradeAccount": "升級帳號",
   "pricing.features.adFree": "Forever ad-free",
@@ -157,6 +158,7 @@
   "settings.app.form.autoLaunchInBackground": "在背景開啟",
   "settings.app.form.autoLaunchOnStart": "開機時啟動 Ferdi",
   "settings.app.form.beta": "包含測試版",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.darkMode": "加入黑暗面",
   "settings.app.form.enableGPUAcceleration": "啟用 GPU 加速",
   "settings.app.form.enableSpellchecking": "啟用拼字檢查",
@@ -165,11 +167,9 @@
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "語言",
   "settings.app.form.minimizeToSystemTray": "最小化 Ferdi 到系統列",
-  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.runInBackground": "當關閉視窗時，保持 Ferdi 在背景運作",
   "settings.app.form.showDisabledServices": "顯示停用的服務標籤",
   "settings.app.form.showMessagesBadgesWhenMuted": "當通知關閉時，標記未讀的訊息",
-  "settings.app.headline": "設定",
   "settings.app.headlineAdvanced": "進階",
   "settings.app.headlineAppearance": "外觀",
   "settings.app.headlineGeneral": "一般",
@@ -187,7 +187,6 @@
   "settings.navigation.availableServices": "可使用的服務",
   "settings.navigation.inviteFriends": "邀請朋友",
   "settings.navigation.logout": "登出",
-  "settings.navigation.settings": "設定",
   "settings.navigation.team": "管理團隊",
   "settings.navigation.yourServices": "您的服務",
   "settings.navigation.yourWorkspaces": "所有工作區",
@@ -289,7 +288,6 @@
   "sidebar.muteApp": "關閉通知和通知音效",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "打開工作空間",
-  "sidebar.settings": "設定",
   "sidebar.unmuteApp": "開啟通知和通知音效",
   "signup.email.label": "電子郵件地址",
   "signup.emailDuplicate": "該使用者的電子郵件位址已存在",
@@ -306,7 +304,6 @@
   "tabs.item.disableAudio": "停用音訊",
   "tabs.item.disableNotifications": "停用通知",
   "tabs.item.disableService": "關閉服務",
-  "tabs.item.edit": "編輯",
   "tabs.item.enableAudio": "啟用音訊",
   "tabs.item.enableNotification": "啟用通知",
   "tabs.item.enableService": "啟用服務",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index de9d937e3..fa30d636a 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -4,16 +4,14 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "服务器：",
-  "changeserver.submit": "Submit",
   "changeserver.urlError": "输入有效的URL",
   "changeserver.warning": "Ferdi提供的额外设置将不会被保存",
   "connectionLostBanner.cta": "重新加载服务",
   "connectionLostBanner.informationLink": "发生了什么？",
   "connectionLostBanner.message": "哦不！Ferdi失去了与 {name} 的连接。",
-  "feature.announcements.changelog.headline": "Ferdi的变化",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "发布调试信息",
   "feature.nightlyBuilds.activate": "激活",
-  "feature.nightlyBuilds.cancel": "取消",
   "feature.nightlyBuilds.info": "每夜版(Nightly builds) 是Ferdi的实验性版本，可能包含未完善或未完成的功能。这些每夜版主要由开发人员来测试他们新开发的功能及它们在最终版本的的表现。如果您不知道自己在做什么，我们建议您不要激活每夜版。",
   "feature.nightlyBuilds.title": "每夜版",
   "feature.publishDebugInfo.error": "发布调试信息时出错。请稍后再试或查看控制台以获取更多信息。",
@@ -27,13 +25,23 @@
   "feature.quickSwitch.search": "搜索...",
   "feature.quickSwitch.title": "快速切换",
   "global.api.unhealthy": "无法链接到 Ferdi 在线服务",
+  "global.cancel": "取消",
+  "global.edit": "编辑",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "您没有连接到互联网。",
+  "global.ok": "Ok",
+  "global.quit": "Quit",
+  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.save": "Save",
+  "global.settings": "设置",
   "global.spellchecker.useDefault": "使用系统默认值 ({default})",
   "global.spellchecking.autodetect": "自动检测语言",
   "global.spellchecking.autodetect.short": "自动",
   "global.spellchecking.language": "拼写检查语言",
+  "global.submit": "Submit",
   "global.userAgentHelp": "使用 'https://whatmyuseragent.com/' (以发现)或 'https://developers.whatismybrowser.com/useragents/explore/' (以选择) 你所需要的用户代理并复制粘贴到这里。",
   "global.userAgentPref": "浏览器标识（用户代理）",
+  "global.yes": "Yes",
   "import.headline": "导入你的 Ferdi 4 服务",
   "import.notSupportedHeadline": "Ferdi 5尚未支持的服务",
   "import.skip.label": "我想手动添加服务",
@@ -76,13 +84,10 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "About Ferdi",
-  "menu.app.announcement": "新功能",
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "隐藏",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "设置",
   "menu.app.unhide": "Unhide",
   "menu.edit": "编辑",
   "menu.edit.copy": "Copy",
@@ -147,7 +152,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
@@ -214,6 +218,7 @@
   "settings.app.form.beta": "Include beta versions",
   "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",
@@ -251,7 +256,6 @@
   "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.headline": "设置",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -281,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "设置",
   "settings.navigation.supportFerdi": "About Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -414,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "设置",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "电子邮箱地址",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -433,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "编辑",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
diff --git a/src/i18n/messages/src/components/AppUpdateInfoBar.json b/src/i18n/messages/src/components/AppUpdateInfoBar.json
index da801b548..b99eaff67 100644
--- a/src/i18n/messages/src/components/AppUpdateInfoBar.json
+++ b/src/i18n/messages/src/components/AppUpdateInfoBar.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!A new update for Ferdi is available.",
     "file": "src/components/AppUpdateInfoBar.js",
     "start": {
-      "line": 9,
+      "line": 10,
       "column": 19
     },
     "end": {
-      "line": 12,
+      "line": 13,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Changelog",
     "file": "src/components/AppUpdateInfoBar.js",
     "start": {
-      "line": 13,
+      "line": 14,
       "column": 13
     },
     "end": {
-      "line": 16,
+      "line": 17,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Restart & install update",
     "file": "src/components/AppUpdateInfoBar.js",
     "start": {
-      "line": 17,
+      "line": 18,
       "column": 23
     },
     "end": {
-      "line": 20,
+      "line": 21,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/auth/ChangeServer.json b/src/i18n/messages/src/components/auth/ChangeServer.json
index c8f74a3c0..87e0b5857 100644
--- a/src/i18n/messages/src/components/auth/ChangeServer.json
+++ b/src/i18n/messages/src/components/auth/ChangeServer.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Change server",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 14,
+      "line": 15,
       "column": 12
     },
     "end": {
-      "line": 17,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Server",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 18,
+      "line": 19,
       "column": 9
     },
     "end": {
-      "line": 21,
+      "line": 22,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Extra settings offered by Ferdi will not be saved",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 22,
+      "line": 23,
       "column": 11
     },
     "end": {
-      "line": 25,
+      "line": 26,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Custom server",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 26,
+      "line": 27,
       "column": 21
     },
     "end": {
-      "line": 29,
+      "line": 30,
       "column": 3
     }
   },
@@ -56,24 +56,11 @@
     "defaultMessage": "!!!Enter a valid URL",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 30,
+      "line": 31,
       "column": 12
     },
     "end": {
-      "line": 33,
-      "column": 3
-    }
-  },
-  {
-    "id": "changeserver.submit",
-    "defaultMessage": "!!!Submit",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
       "line": 34,
-      "column": 10
-    },
-    "end": {
-      "line": 37,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/auth/Password.json b/src/i18n/messages/src/components/auth/Password.json
index f335b3acb..336ba42ef 100644
--- a/src/i18n/messages/src/components/auth/Password.json
+++ b/src/i18n/messages/src/components/auth/Password.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Forgot password",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 14,
+      "line": 15,
       "column": 12
     },
     "end": {
-      "line": 17,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,24 +17,11 @@
     "defaultMessage": "!!!Email address",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 18,
+      "line": 19,
       "column": 14
     },
     "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.submit.label",
-    "defaultMessage": "!!!Submit",
-    "file": "src/components/auth/Password.js",
-    "start": {
       "line": 22,
-      "column": 21
-    },
-    "end": {
-      "line": 25,
       "column": 3
     }
   },
@@ -43,11 +30,11 @@
     "defaultMessage": "!!!Your new password was sent to your email address",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 26,
+      "line": 23,
       "column": 15
     },
     "end": {
-      "line": 29,
+      "line": 26,
       "column": 3
     }
   },
@@ -56,11 +43,11 @@
     "defaultMessage": "!!!No user affiliated with that email address",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 30,
+      "line": 27,
       "column": 10
     },
     "end": {
-      "line": 33,
+      "line": 30,
       "column": 3
     }
   },
@@ -69,11 +56,11 @@
     "defaultMessage": "!!!Create a free account",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 34,
+      "line": 31,
       "column": 14
     },
     "end": {
-      "line": 37,
+      "line": 34,
       "column": 3
     }
   },
@@ -82,11 +69,11 @@
     "defaultMessage": "!!!Sign in to your account",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 38,
+      "line": 35,
       "column": 13
     },
     "end": {
-      "line": 41,
+      "line": 38,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/auth/SetupAssistant.json b/src/i18n/messages/src/components/auth/SetupAssistant.json
index f950228b7..108adab26 100644
--- a/src/i18n/messages/src/components/auth/SetupAssistant.json
+++ b/src/i18n/messages/src/components/auth/SetupAssistant.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Let's get started",
     "file": "src/components/auth/SetupAssistant.js",
     "start": {
-      "line": 19,
+      "line": 20,
       "column": 12
     },
     "end": {
-      "line": 22,
+      "line": 23,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Choose from our most used services and get back on top of your messaging now.",
     "file": "src/components/auth/SetupAssistant.js",
     "start": {
-      "line": 23,
+      "line": 24,
       "column": 15
     },
     "end": {
-      "line": 27,
+      "line": 28,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Let's go",
     "file": "src/components/auth/SetupAssistant.js",
     "start": {
-      "line": 28,
+      "line": 29,
       "column": 21
     },
     "end": {
-      "line": 31,
+      "line": 32,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Invitations sent successfully",
     "file": "src/components/auth/SetupAssistant.js",
     "start": {
-      "line": 32,
+      "line": 33,
       "column": 21
     },
     "end": {
-      "line": 35,
+      "line": 36,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json
index f16baea32..9bc435f12 100644
--- a/src/i18n/messages/src/components/layout/Sidebar.json
+++ b/src/i18n/messages/src/components/layout/Sidebar.json
@@ -1,27 +1,14 @@
 [
   {
-    "id": "sidebar.settings",
-    "defaultMessage": "!!!Settings",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 17,
-      "column": 12
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
     "id": "sidebar.addNewService",
     "defaultMessage": "!!!Add new service",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 21,
+      "line": 18,
       "column": 17
     },
     "end": {
-      "line": 24,
+      "line": 21,
       "column": 3
     }
   },
@@ -30,11 +17,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 25,
+      "line": 22,
       "column": 8
     },
     "end": {
-      "line": 28,
+      "line": 25,
       "column": 3
     }
   },
@@ -43,11 +30,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 29,
+      "line": 26,
       "column": 10
     },
     "end": {
-      "line": 32,
+      "line": 29,
       "column": 3
     }
   },
@@ -56,11 +43,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 33,
+      "line": 30,
       "column": 23
     },
     "end": {
-      "line": 36,
+      "line": 33,
       "column": 3
     }
   },
@@ -69,37 +56,37 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 37,
+      "line": 34,
       "column": 24
     },
     "end": {
-      "line": 40,
+      "line": 37,
       "column": 3
     }
   },
   {
     "id": "sidebar.openTodosDrawer",
-    "defaultMessage": "!!!Open Franz Todos",
+    "defaultMessage": "!!!Open Ferdi Todos",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 41,
+      "line": 38,
       "column": 19
     },
     "end": {
-      "line": 44,
+      "line": 41,
       "column": 3
     }
   },
   {
     "id": "sidebar.closeTodosDrawer",
-    "defaultMessage": "!!!Close Franz Todos",
+    "defaultMessage": "!!!Close Ferdi Todos",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 45,
+      "line": 42,
       "column": 20
     },
     "end": {
-      "line": 48,
+      "line": 45,
       "column": 3
     }
   },
@@ -108,11 +95,11 @@
     "defaultMessage": "!!!Lock Ferdi",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 49,
+      "line": 46,
       "column": 13
     },
     "end": {
-      "line": 52,
+      "line": 49,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/services/tabs/TabItem.json b/src/i18n/messages/src/components/services/tabs/TabItem.json
index 92ff6fb14..de854f1e1 100644
--- a/src/i18n/messages/src/components/services/tabs/TabItem.json
+++ b/src/i18n/messages/src/components/services/tabs/TabItem.json
@@ -4,24 +4,11 @@
     "defaultMessage": "!!!Reload",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 20,
+      "line": 21,
       "column": 10
     },
     "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.edit",
-    "defaultMessage": "!!!Edit",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
       "line": 24,
-      "column": 8
-    },
-    "end": {
-      "line": 27,
       "column": 3
     }
   },
@@ -30,11 +17,11 @@
     "defaultMessage": "!!!Disable notifications",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 28,
+      "line": 25,
       "column": 24
     },
     "end": {
-      "line": 31,
+      "line": 28,
       "column": 3
     }
   },
@@ -43,11 +30,11 @@
     "defaultMessage": "!!!Enable notifications",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 32,
+      "line": 29,
       "column": 23
     },
     "end": {
-      "line": 35,
+      "line": 32,
       "column": 3
     }
   },
@@ -56,11 +43,11 @@
     "defaultMessage": "!!!Disable audio",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 36,
+      "line": 33,
       "column": 16
     },
     "end": {
-      "line": 39,
+      "line": 36,
       "column": 3
     }
   },
@@ -69,11 +56,11 @@
     "defaultMessage": "!!!Enable audio",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 40,
+      "line": 37,
       "column": 15
     },
     "end": {
-      "line": 43,
+      "line": 40,
       "column": 3
     }
   },
@@ -82,11 +69,11 @@
     "defaultMessage": "!!!Enable Dark mode",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 44,
+      "line": 41,
       "column": 18
     },
     "end": {
-      "line": 47,
+      "line": 44,
       "column": 3
     }
   },
@@ -95,11 +82,11 @@
     "defaultMessage": "!!!Disable Dark mode",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 48,
+      "line": 45,
       "column": 19
     },
     "end": {
-      "line": 51,
+      "line": 48,
       "column": 3
     }
   },
@@ -108,11 +95,11 @@
     "defaultMessage": "!!!Disable Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 52,
+      "line": 49,
       "column": 18
     },
     "end": {
-      "line": 55,
+      "line": 52,
       "column": 3
     }
   },
@@ -121,11 +108,11 @@
     "defaultMessage": "!!!Enable Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 56,
+      "line": 53,
       "column": 17
     },
     "end": {
-      "line": 59,
+      "line": 56,
       "column": 3
     }
   },
@@ -134,11 +121,11 @@
     "defaultMessage": "!!!Hibernate Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 60,
+      "line": 57,
       "column": 20
     },
     "end": {
-      "line": 63,
+      "line": 60,
       "column": 3
     }
   },
@@ -147,11 +134,11 @@
     "defaultMessage": "!!!Wake Up Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 64,
+      "line": 61,
       "column": 17
     },
     "end": {
-      "line": 67,
+      "line": 64,
       "column": 3
     }
   },
@@ -160,11 +147,11 @@
     "defaultMessage": "!!!Delete Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 68,
+      "line": 65,
       "column": 17
     },
     "end": {
-      "line": 71,
+      "line": 68,
       "column": 3
     }
   },
@@ -173,11 +160,11 @@
     "defaultMessage": "!!!Do you really want to delete the {serviceName} service?",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 72,
+      "line": 69,
       "column": 24
     },
     "end": {
-      "line": 76,
+      "line": 73,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
index 705b7cee3..2029ad7af 100644
--- a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
+++ b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Available services",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 15,
+      "line": 16,
       "column": 21
     },
     "end": {
-      "line": 18,
+      "line": 19,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Your services",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 19,
+      "line": 20,
       "column": 16
     },
     "end": {
-      "line": 22,
+      "line": 23,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Your workspaces",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 23,
+      "line": 24,
       "column": 18
     },
     "end": {
-      "line": 26,
+      "line": 27,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Account",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 27,
+      "line": 28,
       "column": 11
     },
     "end": {
-      "line": 30,
+      "line": 31,
       "column": 3
     }
   },
@@ -56,24 +56,11 @@
     "defaultMessage": "!!!Manage Team",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 31,
+      "line": 32,
       "column": 8
     },
     "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.settings",
-    "defaultMessage": "!!!Settings",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
       "line": 35,
-      "column": 12
-    },
-    "end": {
-      "line": 38,
       "column": 3
     }
   },
@@ -82,11 +69,11 @@
     "defaultMessage": "!!!About Ferdi",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 39,
+      "line": 36,
       "column": 16
     },
     "end": {
-      "line": 42,
+      "line": 39,
       "column": 3
     }
   },
@@ -95,11 +82,11 @@
     "defaultMessage": "!!!Logout",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 43,
+      "line": 40,
       "column": 10
     },
     "end": {
-      "line": 46,
+      "line": 43,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index da1581864..c281ebff3 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -1,27 +1,14 @@
 [
   {
-    "id": "settings.app.headline",
-    "defaultMessage": "!!!Settings",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 21,
-      "column": 12
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
     "id": "settings.app.headlineGeneral",
     "defaultMessage": "!!!General",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 25,
+      "line": 21,
       "column": 19
     },
     "end": {
-      "line": 28,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,11 +17,11 @@
     "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 29,
+      "line": 25,
       "column": 14
     },
     "end": {
-      "line": 32,
+      "line": 28,
       "column": 3
     }
   },
@@ -43,11 +30,11 @@
     "defaultMessage": "!!!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.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 33,
+      "line": 29,
       "column": 17
     },
     "end": {
-      "line": 36,
+      "line": 32,
       "column": 3
     }
   },
@@ -56,11 +43,11 @@
     "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 37,
+      "line": 33,
       "column": 22
     },
     "end": {
-      "line": 40,
+      "line": 36,
       "column": 3
     }
   },
@@ -69,11 +56,11 @@
     "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 41,
+      "line": 37,
       "column": 18
     },
     "end": {
-      "line": 44,
+      "line": 40,
       "column": 3
     }
   },
@@ -82,11 +69,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 45,
+      "line": 41,
       "column": 18
     },
     "end": {
-      "line": 48,
+      "line": 44,
       "column": 3
     }
   },
@@ -95,11 +82,11 @@
     "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 49,
+      "line": 45,
       "column": 22
     },
     "end": {
-      "line": 52,
+      "line": 48,
       "column": 3
     }
   },
@@ -108,11 +95,11 @@
     "defaultMessage": "!!!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}.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 53,
+      "line": 49,
       "column": 12
     },
     "end": {
-      "line": 56,
+      "line": 52,
       "column": 3
     }
   },
@@ -121,11 +108,11 @@
     "defaultMessage": "!!!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.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 57,
+      "line": 53,
       "column": 24
     },
     "end": {
-      "line": 60,
+      "line": 56,
       "column": 3
     }
   },
@@ -134,11 +121,11 @@
     "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 61,
+      "line": 57,
       "column": 20
     },
     "end": {
-      "line": 64,
+      "line": 60,
       "column": 3
     }
   },
@@ -147,11 +134,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 65,
+      "line": 61,
       "column": 20
     },
     "end": {
-      "line": 68,
+      "line": 64,
       "column": 3
     }
   },
@@ -160,11 +147,11 @@
     "defaultMessage": "!!!Updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 69,
+      "line": 65,
       "column": 19
     },
     "end": {
-      "line": 72,
+      "line": 68,
       "column": 3
     }
   },
@@ -173,11 +160,11 @@
     "defaultMessage": "!!!Appearance",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 73,
+      "line": 69,
       "column": 22
     },
     "end": {
-      "line": 76,
+      "line": 72,
       "column": 3
     }
   },
@@ -186,11 +173,11 @@
     "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 77,
+      "line": 73,
       "column": 25
     },
     "end": {
-      "line": 80,
+      "line": 76,
       "column": 3
     }
   },
@@ -199,11 +186,11 @@
     "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 81,
+      "line": 77,
       "column": 19
     },
     "end": {
-      "line": 84,
+      "line": 80,
       "column": 3
     }
   },
@@ -212,11 +199,11 @@
     "defaultMessage": "!!!Privacy",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 85,
+      "line": 81,
       "column": 19
     },
     "end": {
-      "line": 88,
+      "line": 84,
       "column": 3
     }
   },
@@ -225,11 +212,11 @@
     "defaultMessage": "!!!Advanced",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 89,
+      "line": 85,
       "column": 20
     },
     "end": {
-      "line": 92,
+      "line": 88,
       "column": 3
     }
   },
@@ -238,11 +225,11 @@
     "defaultMessage": "!!!Help us to translate Ferdi into your language.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 93,
+      "line": 89,
       "column": 19
     },
     "end": {
-      "line": 96,
+      "line": 92,
       "column": 3
     }
   },
@@ -251,11 +238,11 @@
     "defaultMessage": "!!!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.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 97,
+      "line": 93,
       "column": 28
     },
     "end": {
-      "line": 100,
+      "line": 96,
       "column": 3
     }
   },
@@ -264,11 +251,11 @@
     "defaultMessage": "!!!Cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 101,
+      "line": 97,
       "column": 20
     },
     "end": {
-      "line": 104,
+      "line": 100,
       "column": 3
     }
   },
@@ -277,11 +264,11 @@
     "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 105,
+      "line": 101,
       "column": 13
     },
     "end": {
-      "line": 108,
+      "line": 104,
       "column": 3
     }
   },
@@ -290,11 +277,11 @@
     "defaultMessage": "!!!Couldn't clear all cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 109,
+      "line": 105,
       "column": 19
     },
     "end": {
-      "line": 112,
+      "line": 108,
       "column": 3
     }
   },
@@ -303,11 +290,11 @@
     "defaultMessage": "!!!Clear cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 113,
+      "line": 109,
       "column": 23
     },
     "end": {
-      "line": 116,
+      "line": 112,
       "column": 3
     }
   },
@@ -316,11 +303,11 @@
     "defaultMessage": "!!!Ferdi Profile",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 117,
+      "line": 113,
       "column": 27
     },
     "end": {
-      "line": 120,
+      "line": 116,
       "column": 3
     }
   },
@@ -329,11 +316,11 @@
     "defaultMessage": "!!!Open Profile folder",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 121,
+      "line": 117,
       "column": 32
     },
     "end": {
-      "line": 124,
+      "line": 120,
       "column": 3
     }
   },
@@ -342,11 +329,11 @@
     "defaultMessage": "!!!Open Service Recipes folder",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 125,
+      "line": 121,
       "column": 39
     },
     "end": {
-      "line": 128,
+      "line": 124,
       "column": 3
     }
   },
@@ -355,11 +342,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 129,
+      "line": 125,
       "column": 25
     },
     "end": {
-      "line": 132,
+      "line": 128,
       "column": 3
     }
   },
@@ -368,11 +355,11 @@
     "defaultMessage": "!!!Restart & install update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 133,
+      "line": 129,
       "column": 23
     },
     "end": {
-      "line": 136,
+      "line": 132,
       "column": 3
     }
   },
@@ -381,11 +368,11 @@
     "defaultMessage": "!!!Is searching for update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 137,
+      "line": 133,
       "column": 25
     },
     "end": {
-      "line": 140,
+      "line": 136,
       "column": 3
     }
   },
@@ -394,11 +381,11 @@
     "defaultMessage": "!!!Update available, downloading...",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 141,
+      "line": 137,
       "column": 25
     },
     "end": {
-      "line": 144,
+      "line": 140,
       "column": 3
     }
   },
@@ -407,11 +394,11 @@
     "defaultMessage": "!!!You are using the latest version of Ferdi",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 145,
+      "line": 141,
       "column": 24
     },
     "end": {
-      "line": 148,
+      "line": 144,
       "column": 3
     }
   },
@@ -420,11 +407,11 @@
     "defaultMessage": "!!!Current version:",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 149,
+      "line": 145,
       "column": 18
     },
     "end": {
-      "line": 152,
+      "line": 148,
       "column": 3
     }
   },
@@ -433,11 +420,11 @@
     "defaultMessage": "!!!Changes require restart",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 153,
+      "line": 149,
       "column": 22
     },
     "end": {
-      "line": 156,
+      "line": 152,
       "column": 3
     }
   },
@@ -446,11 +433,11 @@
     "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 157,
+      "line": 153,
       "column": 22
     },
     "end": {
-      "line": 160,
+      "line": 156,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 9a4a8de64..b0087e5dd 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -52,15 +52,28 @@
     }
   },
   {
+    "id": "settings.app.form.confirmOnQuit",
+    "defaultMessage": "!!!Confirm when quitting Ferdi",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 48,
+      "column": 17
+    },
+    "end": {
+      "line": 51,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.app.form.enableSystemTray",
     "defaultMessage": "!!!Always show Ferdi in System Tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 48,
+      "line": 52,
       "column": 20
     },
     "end": {
-      "line": 51,
+      "line": 55,
       "column": 3
     }
   },
@@ -69,11 +82,11 @@
     "defaultMessage": "!!!Always show Ferdi in Menu Bar",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 52,
+      "line": 56,
       "column": 17
     },
     "end": {
-      "line": 55,
+      "line": 59,
       "column": 3
     }
   },
@@ -82,11 +95,11 @@
     "defaultMessage": "!!!Reload Ferdi after system resume",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 56,
+      "line": 60,
       "column": 21
     },
     "end": {
-      "line": 59,
+      "line": 63,
       "column": 3
     }
   },
@@ -95,11 +108,11 @@
     "defaultMessage": "!!!Minimize Ferdi to system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 60,
+      "line": 64,
       "column": 24
     },
     "end": {
-      "line": 63,
+      "line": 67,
       "column": 3
     }
   },
@@ -108,11 +121,11 @@
     "defaultMessage": "!!!Close Ferdi to system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 64,
+      "line": 68,
       "column": 21
     },
     "end": {
-      "line": 67,
+      "line": 71,
       "column": 3
     }
   },
@@ -121,11 +134,11 @@
     "defaultMessage": "!!!Don't show message content in notifications",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 68,
+      "line": 72,
       "column": 24
     },
     "end": {
-      "line": 71,
+      "line": 75,
       "column": 3
     }
   },
@@ -134,11 +147,11 @@
     "defaultMessage": "!!!Don't show notifications for clipboard events",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 72,
+      "line": 76,
       "column": 26
     },
     "end": {
-      "line": 75,
+      "line": 79,
       "column": 3
     }
   },
@@ -147,11 +160,11 @@
     "defaultMessage": "!!!Notify TaskBar/Dock on new message",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 76,
+      "line": 80,
       "column": 26
     },
     "end": {
-      "line": 79,
+      "line": 83,
       "column": 3
     }
   },
@@ -160,11 +173,11 @@
     "defaultMessage": "!!!Navigation bar behaviour",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 80,
+      "line": 84,
       "column": 26
     },
     "end": {
-      "line": 83,
+      "line": 87,
       "column": 3
     }
   },
@@ -173,11 +186,11 @@
     "defaultMessage": "!!!Search engine",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 84,
+      "line": 88,
       "column": 16
     },
     "end": {
-      "line": 87,
+      "line": 91,
       "column": 3
     }
   },
@@ -186,11 +199,11 @@
     "defaultMessage": "!!!Send telemetry data",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 88,
+      "line": 92,
       "column": 10
     },
     "end": {
-      "line": 91,
+      "line": 95,
       "column": 3
     }
   },
@@ -199,11 +212,11 @@
     "defaultMessage": "!!!Keep services in hibernation on startup",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 92,
+      "line": 96,
       "column": 22
     },
     "end": {
-      "line": 95,
+      "line": 99,
       "column": 3
     }
   },
@@ -212,11 +225,11 @@
     "defaultMessage": "!!!Hibernation strategy",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 96,
+      "line": 100,
       "column": 23
     },
     "end": {
-      "line": 99,
+      "line": 103,
       "column": 3
     }
   },
@@ -225,11 +238,11 @@
     "defaultMessage": "!!!Wake up strategy",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 100,
+      "line": 104,
       "column": 18
     },
     "end": {
-      "line": 103,
+      "line": 107,
       "column": 3
     }
   },
@@ -238,11 +251,11 @@
     "defaultMessage": "!!!Todo Server",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 104,
+      "line": 108,
       "column": 24
     },
     "end": {
-      "line": 107,
+      "line": 111,
       "column": 3
     }
   },
@@ -251,11 +264,11 @@
     "defaultMessage": "!!!Custom TodoServer",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 108,
+      "line": 112,
       "column": 20
     },
     "end": {
-      "line": 111,
+      "line": 115,
       "column": 3
     }
   },
@@ -264,11 +277,11 @@
     "defaultMessage": "!!!Enable Password Lock",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 112,
+      "line": 116,
       "column": 14
     },
     "end": {
-      "line": 115,
+      "line": 119,
       "column": 3
     }
   },
@@ -277,11 +290,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 116,
+      "line": 120,
       "column": 16
     },
     "end": {
-      "line": 119,
+      "line": 123,
       "column": 3
     }
   },
@@ -290,11 +303,11 @@
     "defaultMessage": "!!!Allow using Touch ID to unlock",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 120,
+      "line": 124,
       "column": 22
     },
     "end": {
-      "line": 123,
+      "line": 127,
       "column": 3
     }
   },
@@ -303,11 +316,11 @@
     "defaultMessage": "!!!Lock after inactivity",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 124,
+      "line": 128,
       "column": 18
     },
     "end": {
-      "line": 127,
+      "line": 131,
       "column": 3
     }
   },
@@ -316,11 +329,11 @@
     "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 128,
+      "line": 132,
       "column": 23
     },
     "end": {
-      "line": 131,
+      "line": 135,
       "column": 3
     }
   },
@@ -329,11 +342,11 @@
     "defaultMessage": "!!!From",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 132,
+      "line": 136,
       "column": 21
     },
     "end": {
-      "line": 135,
+      "line": 139,
       "column": 3
     }
   },
@@ -342,11 +355,11 @@
     "defaultMessage": "!!!To",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 136,
+      "line": 140,
       "column": 19
     },
     "end": {
-      "line": 139,
+      "line": 143,
       "column": 3
     }
   },
@@ -355,11 +368,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 140,
+      "line": 144,
       "column": 12
     },
     "end": {
-      "line": 143,
+      "line": 147,
       "column": 3
     }
   },
@@ -368,11 +381,11 @@
     "defaultMessage": "!!!Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 144,
+      "line": 148,
       "column": 12
     },
     "end": {
-      "line": 147,
+      "line": 151,
       "column": 3
     }
   },
@@ -381,11 +394,11 @@
     "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 148,
+      "line": 152,
       "column": 21
     },
     "end": {
-      "line": 151,
+      "line": 155,
       "column": 3
     }
   },
@@ -394,11 +407,11 @@
     "defaultMessage": "!!!Enable universal Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 152,
+      "line": 156,
       "column": 21
     },
     "end": {
-      "line": 155,
+      "line": 159,
       "column": 3
     }
   },
@@ -407,11 +420,11 @@
     "defaultMessage": "!!!Sidebar width",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 156,
+      "line": 160,
       "column": 22
     },
     "end": {
-      "line": 159,
+      "line": 163,
       "column": 3
     }
   },
@@ -420,11 +433,11 @@
     "defaultMessage": "!!!Service icon size",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 160,
+      "line": 164,
       "column": 12
     },
     "end": {
-      "line": 163,
+      "line": 167,
       "column": 3
     }
   },
@@ -433,11 +446,11 @@
     "defaultMessage": "!!!Use horizontal style",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 164,
+      "line": 168,
       "column": 20
     },
     "end": {
-      "line": 167,
+      "line": 171,
       "column": 3
     }
   },
@@ -446,11 +459,11 @@
     "defaultMessage": "!!!Always show workspace drawer",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 168,
+      "line": 172,
       "column": 24
     },
     "end": {
-      "line": 171,
+      "line": 175,
       "column": 3
     }
   },
@@ -459,11 +472,11 @@
     "defaultMessage": "!!!Accent color",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 172,
+      "line": 176,
       "column": 15
     },
     "end": {
-      "line": 175,
+      "line": 179,
       "column": 3
     }
   },
@@ -472,11 +485,11 @@
     "defaultMessage": "!!!Display disabled services tabs",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 176,
+      "line": 180,
       "column": 24
     },
     "end": {
-      "line": 179,
+      "line": 183,
       "column": 3
     }
   },
@@ -485,11 +498,11 @@
     "defaultMessage": "!!!Show unread message badge when notifications are disabled",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 180,
+      "line": 184,
       "column": 29
     },
     "end": {
-      "line": 183,
+      "line": 187,
       "column": 3
     }
   },
@@ -498,11 +511,11 @@
     "defaultMessage": "!!!Show draggable area on window",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 184,
+      "line": 188,
       "column": 16
     },
     "end": {
-      "line": 187,
+      "line": 191,
       "column": 3
     }
   },
@@ -511,11 +524,11 @@
     "defaultMessage": "!!!Enable spell checking",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 188,
+      "line": 192,
       "column": 23
     },
     "end": {
-      "line": 191,
+      "line": 195,
       "column": 3
     }
   },
@@ -524,11 +537,11 @@
     "defaultMessage": "!!!Enable GPU Acceleration",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 192,
+      "line": 196,
       "column": 25
     },
     "end": {
-      "line": 195,
+      "line": 199,
       "column": 3
     }
   },
@@ -537,11 +550,11 @@
     "defaultMessage": "!!!Include beta versions",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 196,
+      "line": 200,
       "column": 8
     },
     "end": {
-      "line": 199,
+      "line": 203,
       "column": 3
     }
   },
@@ -550,11 +563,11 @@
     "defaultMessage": "!!!Enable updates",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 200,
+      "line": 204,
       "column": 20
     },
     "end": {
-      "line": 203,
+      "line": 207,
       "column": 3
     }
   },
@@ -563,11 +576,11 @@
     "defaultMessage": "!!!Enable Franz Todos",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 204,
+      "line": 208,
       "column": 15
     },
     "end": {
-      "line": 207,
+      "line": 211,
       "column": 3
     }
   },
@@ -576,11 +589,11 @@
     "defaultMessage": "!!!Keep all workspaces loaded",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 208,
+      "line": 212,
       "column": 27
     },
     "end": {
-      "line": 211,
+      "line": 215,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json b/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json
deleted file mode 100644
index 6b94ff792..000000000
--- a/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "feature.announcements.changelog.headline",
-    "defaultMessage": "!!!Changes in Ferdi {version}",
-    "file": "src/features/announcements/components/AnnouncementScreen.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/basicAuth/Component.json b/src/i18n/messages/src/features/basicAuth/Component.json
new file mode 100644
index 000000000..fea1b0838
--- /dev/null
+++ b/src/i18n/messages/src/features/basicAuth/Component.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": "feature.basicAuth.signIn",
+    "defaultMessage": "!!!Sign In",
+    "file": "src/features/basicAuth/Component.js",
+    "start": {
+      "line": 24,
+      "column": 10
+    },
+    "end": {
+      "line": 27,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/nightlyBuilds/Component.json b/src/i18n/messages/src/features/nightlyBuilds/Component.json
index 084079635..0b2eab354 100644
--- a/src/i18n/messages/src/features/nightlyBuilds/Component.json
+++ b/src/i18n/messages/src/features/nightlyBuilds/Component.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Nightly Builds",
     "file": "src/features/nightlyBuilds/Component.js",
     "start": {
-      "line": 16,
+      "line": 17,
       "column": 9
     },
     "end": {
-      "line": 19,
+      "line": 20,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!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.",
     "file": "src/features/nightlyBuilds/Component.js",
     "start": {
-      "line": 20,
+      "line": 21,
       "column": 8
     },
     "end": {
-      "line": 23,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,24 +30,11 @@
     "defaultMessage": "!!!Activate",
     "file": "src/features/nightlyBuilds/Component.js",
     "start": {
-      "line": 24,
+      "line": 25,
       "column": 12
     },
     "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.nightlyBuilds.cancel",
-    "defaultMessage": "!!!Cancel",
-    "file": "src/features/nightlyBuilds/Component.js",
-    "start": {
       "line": 28,
-      "column": 10
-    },
-    "end": {
-      "line": 31,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/i18n/globalMessages.json b/src/i18n/messages/src/i18n/globalMessages.json
index ed2bfa092..bc1ec7397 100644
--- a/src/i18n/messages/src/i18n/globalMessages.json
+++ b/src/i18n/messages/src/i18n/globalMessages.json
@@ -102,5 +102,135 @@
       "line": 35,
       "column": 3
     }
+  },
+  {
+    "id": "global.yes",
+    "defaultMessage": "!!!Yes",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 36,
+      "column": 7
+    },
+    "end": {
+      "line": 39,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.no",
+    "defaultMessage": "!!!No",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 40,
+      "column": 6
+    },
+    "end": {
+      "line": 43,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.ok",
+    "defaultMessage": "!!!Ok",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 44,
+      "column": 6
+    },
+    "end": {
+      "line": 47,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.cancel",
+    "defaultMessage": "!!!Cancel",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 48,
+      "column": 10
+    },
+    "end": {
+      "line": 51,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.save",
+    "defaultMessage": "!!!Save",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 52,
+      "column": 8
+    },
+    "end": {
+      "line": 55,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.submit",
+    "defaultMessage": "!!!Submit",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 56,
+      "column": 10
+    },
+    "end": {
+      "line": 59,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.quit",
+    "defaultMessage": "!!!Quit",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 60,
+      "column": 8
+    },
+    "end": {
+      "line": 63,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.quitConfirmation",
+    "defaultMessage": "!!!Do you really want to quit Ferdi?",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 64,
+      "column": 20
+    },
+    "end": {
+      "line": 68,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.settings",
+    "defaultMessage": "!!!Settings",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 69,
+      "column": 12
+    },
+    "end": {
+      "line": 72,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.edit",
+    "defaultMessage": "!!!Edit",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 73,
+      "column": 8
+    },
+    "end": {
+      "line": 76,
+      "column": 3
+    }
   }
 ]
\ No newline at end of file
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index 373c3a64b..947ce8b6a 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Edit",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 19,
+      "line": 33,
       "column": 8
     },
     "end": {
-      "line": 22,
+      "line": 36,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Undo",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 23,
+      "line": 37,
       "column": 8
     },
     "end": {
-      "line": 26,
+      "line": 40,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Redo",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 27,
+      "line": 41,
       "column": 8
     },
     "end": {
-      "line": 30,
+      "line": 44,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Cut",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 31,
+      "line": 45,
       "column": 7
     },
     "end": {
-      "line": 34,
+      "line": 48,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Copy",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 35,
+      "line": 49,
       "column": 8
     },
     "end": {
-      "line": 38,
+      "line": 52,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Paste",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 39,
+      "line": 53,
       "column": 9
     },
     "end": {
-      "line": 42,
+      "line": 56,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Paste And Match Style",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 43,
+      "line": 57,
       "column": 22
     },
     "end": {
-      "line": 46,
+      "line": 60,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Delete",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 47,
+      "line": 61,
       "column": 10
     },
     "end": {
-      "line": 50,
+      "line": 64,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Select All",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 51,
+      "line": 65,
       "column": 13
     },
     "end": {
-      "line": 54,
+      "line": 68,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Find in Page",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 55,
+      "line": 69,
       "column": 14
     },
     "end": {
-      "line": 58,
+      "line": 72,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Speech",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 59,
+      "line": 73,
       "column": 10
     },
     "end": {
-      "line": 62,
+      "line": 76,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Start Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 63,
+      "line": 77,
       "column": 17
     },
     "end": {
-      "line": 66,
+      "line": 80,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Stop Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 67,
+      "line": 81,
       "column": 16
     },
     "end": {
-      "line": 70,
+      "line": 84,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Start Dictation",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 71,
+      "line": 85,
       "column": 18
     },
     "end": {
-      "line": 74,
+      "line": 88,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!Emoji & Symbols",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 75,
+      "line": 89,
       "column": 16
     },
     "end": {
-      "line": 78,
+      "line": 92,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Open Quick Switch",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 79,
+      "line": 93,
       "column": 19
     },
     "end": {
-      "line": 82,
+      "line": 96,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!Back",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 83,
+      "line": 97,
       "column": 8
     },
     "end": {
-      "line": 86,
+      "line": 100,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!Forward",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 87,
+      "line": 101,
       "column": 11
     },
     "end": {
-      "line": 90,
+      "line": 104,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Actual Size",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 91,
+      "line": 105,
       "column": 13
     },
     "end": {
-      "line": 94,
+      "line": 108,
       "column": 3
     }
   },
@@ -251,11 +251,11 @@
     "defaultMessage": "!!!Zoom In",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 95,
+      "line": 109,
       "column": 10
     },
     "end": {
-      "line": 98,
+      "line": 112,
       "column": 3
     }
   },
@@ -264,11 +264,11 @@
     "defaultMessage": "!!!Zoom Out",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 99,
+      "line": 113,
       "column": 11
     },
     "end": {
-      "line": 102,
+      "line": 116,
       "column": 3
     }
   },
@@ -277,11 +277,11 @@
     "defaultMessage": "!!!Toggle Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 103,
+      "line": 117,
       "column": 20
     },
     "end": {
-      "line": 106,
+      "line": 120,
       "column": 3
     }
   },
@@ -290,11 +290,11 @@
     "defaultMessage": "!!!Toggle Dark Mode",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 107,
+      "line": 121,
       "column": 18
     },
     "end": {
-      "line": 110,
+      "line": 124,
       "column": 3
     }
   },
@@ -303,11 +303,11 @@
     "defaultMessage": "!!!Toggle Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 111,
+      "line": 125,
       "column": 18
     },
     "end": {
-      "line": 114,
+      "line": 128,
       "column": 3
     }
   },
@@ -316,11 +316,11 @@
     "defaultMessage": "!!!Toggle Todos Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 115,
+      "line": 129,
       "column": 23
     },
     "end": {
-      "line": 118,
+      "line": 132,
       "column": 3
     }
   },
@@ -329,11 +329,11 @@
     "defaultMessage": "!!!Toggle Service Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 119,
+      "line": 133,
       "column": 25
     },
     "end": {
-      "line": 122,
+      "line": 136,
       "column": 3
     }
   },
@@ -342,11 +342,11 @@
     "defaultMessage": "!!!Reload Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 123,
+      "line": 137,
       "column": 17
     },
     "end": {
-      "line": 126,
+      "line": 140,
       "column": 3
     }
   },
@@ -355,11 +355,11 @@
     "defaultMessage": "!!!Reload Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 127,
+      "line": 141,
       "column": 15
     },
     "end": {
-      "line": 130,
+      "line": 144,
       "column": 3
     }
   },
@@ -368,11 +368,11 @@
     "defaultMessage": "!!!Lock Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 131,
+      "line": 145,
       "column": 13
     },
     "end": {
-      "line": 134,
+      "line": 148,
       "column": 3
     }
   },
@@ -381,11 +381,11 @@
     "defaultMessage": "!!!Reload ToDos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 135,
+      "line": 149,
       "column": 15
     },
     "end": {
-      "line": 138,
+      "line": 152,
       "column": 3
     }
   },
@@ -394,11 +394,11 @@
     "defaultMessage": "!!!Minimize",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 139,
+      "line": 153,
       "column": 12
     },
     "end": {
-      "line": 142,
+      "line": 156,
       "column": 3
     }
   },
@@ -407,11 +407,11 @@
     "defaultMessage": "!!!Close",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 143,
+      "line": 157,
       "column": 9
     },
     "end": {
-      "line": 146,
+      "line": 160,
       "column": 3
     }
   },
@@ -420,11 +420,11 @@
     "defaultMessage": "!!!Learn More",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 147,
+      "line": 161,
       "column": 13
     },
     "end": {
-      "line": 150,
+      "line": 164,
       "column": 3
     }
   },
@@ -433,11 +433,11 @@
     "defaultMessage": "!!!Changelog",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 151,
+      "line": 165,
       "column": 13
     },
     "end": {
-      "line": 154,
+      "line": 168,
       "column": 3
     }
   },
@@ -446,11 +446,11 @@
     "defaultMessage": "!!!Import/Export Configuration Data",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 155,
+      "line": 169,
       "column": 20
     },
     "end": {
-      "line": 158,
+      "line": 172,
       "column": 3
     }
   },
@@ -459,11 +459,11 @@
     "defaultMessage": "!!!Support",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 159,
+      "line": 173,
       "column": 11
     },
     "end": {
-      "line": 162,
+      "line": 176,
       "column": 3
     }
   },
@@ -472,11 +472,11 @@
     "defaultMessage": "!!!Copy Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 163,
+      "line": 177,
       "column": 13
     },
     "end": {
-      "line": 166,
+      "line": 180,
       "column": 3
     }
   },
@@ -485,11 +485,11 @@
     "defaultMessage": "!!!Publish Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 167,
+      "line": 181,
       "column": 20
     },
     "end": {
-      "line": 170,
+      "line": 184,
       "column": 3
     }
   },
@@ -498,11 +498,11 @@
     "defaultMessage": "!!!Ferdi Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 171,
+      "line": 185,
       "column": 27
     },
     "end": {
-      "line": 174,
+      "line": 188,
       "column": 3
     }
   },
@@ -511,11 +511,11 @@
     "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 175,
+      "line": 189,
       "column": 23
     },
     "end": {
-      "line": 178,
+      "line": 193,
       "column": 3
     }
   },
@@ -524,11 +524,11 @@
     "defaultMessage": "!!!Unlock with Touch ID",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 179,
+      "line": 194,
       "column": 11
     },
     "end": {
-      "line": 182,
+      "line": 197,
       "column": 3
     }
   },
@@ -537,11 +537,11 @@
     "defaultMessage": "!!!unlock via Touch ID",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 183,
+      "line": 198,
       "column": 17
     },
     "end": {
-      "line": 186,
+      "line": 201,
       "column": 3
     }
   },
@@ -550,11 +550,11 @@
     "defaultMessage": "!!!Terms of Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 187,
+      "line": 202,
       "column": 7
     },
     "end": {
-      "line": 190,
+      "line": 205,
       "column": 3
     }
   },
@@ -563,11 +563,11 @@
     "defaultMessage": "!!!Privacy Statement",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 191,
+      "line": 206,
       "column": 11
     },
     "end": {
-      "line": 194,
+      "line": 209,
       "column": 3
     }
   },
@@ -576,11 +576,11 @@
     "defaultMessage": "!!!File",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 195,
+      "line": 210,
       "column": 8
     },
     "end": {
-      "line": 198,
+      "line": 213,
       "column": 3
     }
   },
@@ -589,11 +589,11 @@
     "defaultMessage": "!!!View",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 199,
+      "line": 214,
       "column": 8
     },
     "end": {
-      "line": 202,
+      "line": 217,
       "column": 3
     }
   },
@@ -602,11 +602,11 @@
     "defaultMessage": "!!!Services",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 203,
+      "line": 218,
       "column": 12
     },
     "end": {
-      "line": 206,
+      "line": 221,
       "column": 3
     }
   },
@@ -615,11 +615,11 @@
     "defaultMessage": "!!!Window",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 207,
+      "line": 222,
       "column": 10
     },
     "end": {
-      "line": 210,
+      "line": 225,
       "column": 3
     }
   },
@@ -628,11 +628,11 @@
     "defaultMessage": "!!!Help",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 211,
+      "line": 226,
       "column": 8
     },
     "end": {
-      "line": 214,
+      "line": 229,
       "column": 3
     }
   },
@@ -641,37 +641,11 @@
     "defaultMessage": "!!!About Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 215,
+      "line": 230,
       "column": 9
     },
     "end": {
-      "line": 218,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.announcement",
-    "defaultMessage": "!!!What's new?",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 219,
-      "column": 16
-    },
-    "end": {
-      "line": 222,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.settings",
-    "defaultMessage": "!!!Settings",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 223,
-      "column": 12
-    },
-    "end": {
-      "line": 226,
+      "line": 233,
       "column": 3
     }
   },
@@ -680,11 +654,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 227,
+      "line": 234,
       "column": 19
     },
     "end": {
-      "line": 230,
+      "line": 237,
       "column": 3
     }
   },
@@ -693,11 +667,11 @@
     "defaultMessage": "!!!Hide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 231,
+      "line": 238,
       "column": 8
     },
     "end": {
-      "line": 234,
+      "line": 241,
       "column": 3
     }
   },
@@ -706,11 +680,11 @@
     "defaultMessage": "!!!Hide Others",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 235,
+      "line": 242,
       "column": 14
     },
     "end": {
-      "line": 238,
+      "line": 245,
       "column": 3
     }
   },
@@ -719,11 +693,11 @@
     "defaultMessage": "!!!Unhide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 239,
+      "line": 246,
       "column": 10
     },
     "end": {
-      "line": 242,
+      "line": 249,
       "column": 3
     }
   },
@@ -732,24 +706,11 @@
     "defaultMessage": "!!!Auto-hide menu bar",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 243,
+      "line": 250,
       "column": 19
     },
     "end": {
-      "line": 246,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.quit",
-    "defaultMessage": "!!!Quit",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 247,
-      "column": 8
-    },
-    "end": {
-      "line": 250,
+      "line": 253,
       "column": 3
     }
   },
@@ -758,11 +719,11 @@
     "defaultMessage": "!!!Add New Service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 251,
+      "line": 254,
       "column": 17
     },
     "end": {
-      "line": 254,
+      "line": 257,
       "column": 3
     }
   },
@@ -771,11 +732,11 @@
     "defaultMessage": "!!!Add New Workspace...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 255,
+      "line": 258,
       "column": 19
     },
     "end": {
-      "line": 258,
+      "line": 261,
       "column": 3
     }
   },
@@ -784,11 +745,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 259,
+      "line": 262,
       "column": 23
     },
     "end": {
-      "line": 262,
+      "line": 265,
       "column": 3
     }
   },
@@ -797,11 +758,11 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 263,
+      "line": 266,
       "column": 24
     },
     "end": {
-      "line": 266,
+      "line": 269,
       "column": 3
     }
   },
@@ -810,11 +771,11 @@
     "defaultMessage": "!!!Activate next service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 267,
+      "line": 270,
       "column": 23
     },
     "end": {
-      "line": 270,
+      "line": 273,
       "column": 3
     }
   },
@@ -823,11 +784,11 @@
     "defaultMessage": "!!!Activate previous service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 271,
+      "line": 274,
       "column": 27
     },
     "end": {
-      "line": 274,
+      "line": 277,
       "column": 3
     }
   },
@@ -836,11 +797,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 275,
+      "line": 278,
       "column": 11
     },
     "end": {
-      "line": 278,
+      "line": 281,
       "column": 3
     }
   },
@@ -849,11 +810,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 279,
+      "line": 282,
       "column": 13
     },
     "end": {
-      "line": 282,
+      "line": 285,
       "column": 3
     }
   },
@@ -862,11 +823,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 283,
+      "line": 286,
       "column": 14
     },
     "end": {
-      "line": 286,
+      "line": 289,
       "column": 3
     }
   },
@@ -875,11 +836,11 @@
     "defaultMessage": "!!!Default",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 287,
+      "line": 290,
       "column": 20
     },
     "end": {
-      "line": 290,
+      "line": 293,
       "column": 3
     }
   },
@@ -888,11 +849,11 @@
     "defaultMessage": "!!!Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 291,
+      "line": 294,
       "column": 9
     },
     "end": {
-      "line": 294,
+      "line": 297,
       "column": 3
     }
   },
@@ -901,11 +862,11 @@
     "defaultMessage": "!!!Open Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 295,
+      "line": 298,
       "column": 19
     },
     "end": {
-      "line": 298,
+      "line": 301,
       "column": 3
     }
   },
@@ -914,11 +875,11 @@
     "defaultMessage": "!!!Close Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 299,
+      "line": 302,
       "column": 20
     },
     "end": {
-      "line": 302,
+      "line": 305,
       "column": 3
     }
   },
@@ -927,11 +888,11 @@
     "defaultMessage": "!!!Enable Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 303,
+      "line": 306,
       "column": 15
     },
     "end": {
-      "line": 306,
+      "line": 309,
       "column": 3
     }
   },
@@ -940,11 +901,11 @@
     "defaultMessage": "!!!Home",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 307,
+      "line": 310,
       "column": 17
     },
     "end": {
-      "line": 310,
+      "line": 313,
       "column": 3
     }
   }
diff --git a/src/index.js b/src/index.js
index d2b0f56f4..ae75865c6 100644
--- a/src/index.js
+++ b/src/index.js
@@ -280,6 +280,11 @@ const createWindow = () => {
           debug('Skip taskbar: true');
           mainWindow.setSkipTaskbar(true);
         }
+      } else if (isMac && mainWindow.isFullScreen()) {
+        debug('Window: leaveFullScreen and hide');
+        mainWindow.once('show', () => mainWindow.setFullScreen(true));
+        mainWindow.once('leave-full-screen', () => mainWindow.hide());
+        mainWindow.setFullScreen(false);
       } else {
         debug('Window: hide');
         mainWindow.hide();
@@ -465,7 +470,7 @@ ipcMain.on('open-browser-window', (e, { url, serviceId }) => {
 ipcMain.on(
   'modifyRequestHeaders',
   (e, { modifiedRequestHeaders, serviceId }) => {
-    debug('Received modifyRequestHeaders', modifiedRequestHeaders, serviceId);
+    debug(`Received modifyRequestHeaders ${modifiedRequestHeaders} for serviceId ${serviceId}`);
     modifiedRequestHeaders.forEach(headerFilterSet => {
       const { headers, requestFilters } = headerFilterSet;
       session
@@ -483,6 +488,24 @@ ipcMain.on(
   },
 );
 
+ipcMain.on(
+  'knownCertificateHosts',
+  (e, { knownHosts, serviceId }) => {
+    debug(`Received knownCertificateHosts ${knownHosts} for serviceId ${serviceId}`);
+    session
+      .fromPartition(`persist:service-${serviceId}`)
+      .setCertificateVerifyProc((request, callback) => {
+        // To know more about these callbacks: https://www.electronjs.org/docs/api/session#sessetcertificateverifyprocproc
+        const { hostname } = request;
+        if (knownHosts.find(item => item.includes(hostname)).length > 0) {
+          callback(0);
+        } else {
+          callback(-2);
+        }
+      });
+  },
+);
+
 ipcMain.on('feature-basic-auth-cancel', () => {
   debug('Cancel basic auth');
 
diff --git a/src/internal-server/app/Controllers/Http/StaticController.js b/src/internal-server/app/Controllers/Http/StaticController.js
index 28c5389a9..33e0e52d9 100644
--- a/src/internal-server/app/Controllers/Http/StaticController.js
+++ b/src/internal-server/app/Controllers/Http/StaticController.js
@@ -7,25 +7,14 @@ import { DEFAULT_FEATURES_CONFIG } from '../../../../config';
 // TODO: This endpoint and associated code needs to be remoeved as cleanup
 class StaticController {
   // Enable all features
-  features({
-    response,
-  }) {
+  features({ response }) {
     return response.send(DEFAULT_FEATURES_CONFIG);
   }
 
   // Return an empty array
-  emptyArray({
-    response,
-  }) {
+  emptyArray({ response }) {
     return response.send([]);
   }
-
-  // Show announcements
-  announcement({
-    response,
-  }) {
-    return response.send({});
-  }
 }
 
 export default StaticController;
diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js
index 57aea6fc1..994dcc0dc 100644
--- a/src/internal-server/app/Controllers/Http/UserController.js
+++ b/src/internal-server/app/Controllers/Http/UserController.js
@@ -30,6 +30,19 @@ const apiRequest = (url, route, method, auth) => new Promise((resolve, reject) =
 
 const LOGIN_SUCCESS_TOKEN = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJGZXJkaSBJbnRlcm5hbCBTZXJ2ZXIiLCJpYXQiOjE1NzEwNDAyMTUsImV4cCI6MjUzMzk1NDE3ODQ0LCJhdWQiOiJnZXRmZXJkaS5jb20iLCJzdWIiOiJmZXJkaUBsb2NhbGhvc3QiLCJ1c2VySWQiOiIxIn0.9_TWFGp6HROv8Yg82Rt6i1-95jqWym40a-HmgrdMC6M';
 
+const DEFAULT_USER_DATA = {
+  accountType: 'individual',
+  beta: false,
+  email: '',
+  emailValidated: true,
+  features: {},
+  firstname: 'Ferdi',
+  id: '82c1cf9d-ab58-4da2-b55e-aaa41d2142d8',
+  isSubscriptionOwner: true,
+  lastname: 'Application',
+  locale: DEFAULT_APP_SETTINGS.fallbackLocale,
+};
+
 class UserController {
   // Register a new user
   async signup({
@@ -83,16 +96,7 @@ class UserController {
     const settings = typeof user.settings === 'string' ? JSON.parse(user.settings) : user.settings;
 
     return response.send({
-      accountType: 'individual',
-      beta: false,
-      email: '',
-      emailValidated: true,
-      features: {},
-      firstname: 'Ferdi',
-      id: '82c1cf9d-ab58-4da2-b55e-aaa41d2142d8',
-      isSubscriptionOwner: true,
-      lastname: 'Application',
-      locale: DEFAULT_APP_SETTINGS.fallbackLocale,
+      ...DEFAULT_USER_DATA,
       ...settings || {},
     });
   }
@@ -118,16 +122,7 @@ class UserController {
 
     return response.send({
       data: {
-        accountType: 'individual',
-        beta: false,
-        email: '',
-        emailValidated: true,
-        features: {},
-        firstname: 'Ferdi',
-        id: '82c1cf9d-ab58-4da2-b55e-aaa41d2142d8',
-        isSubscriptionOwner: true,
-        lastname: 'Application',
-        locale: DEFAULT_APP_SETTINGS.fallbackLocale,
+        ...DEFAULT_USER_DATA,
         ...newSettings,
       },
       status: [
@@ -216,20 +211,7 @@ class UserController {
       const services = await apiRequest(server, 'me/services', 'GET', token);
 
       for (const service of services) {
-        // Get new, unused uuid
-        let serviceId;
-        do {
-          serviceId = uuid();
-        } while ((await Service.query().where('serviceId', serviceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
-
-        await Service.create({ // eslint-disable-line no-await-in-loop
-          serviceId,
-          name: service.name,
-          recipeId: service.recipeId,
-          settings: JSON.stringify(service),
-        });
-
-        serviceIdTranslation[service.id] = serviceId;
+        await this._createAndCacheService(service, serviceIdTranslation); // eslint-disable-line no-await-in-loop
       }
     } catch (e) {
       const errorMessage = `Could not import your services into our system.\nError: ${e}`;
@@ -241,20 +223,7 @@ class UserController {
       const workspaces = await apiRequest(server, 'workspace', 'GET', token);
 
       for (const workspace of workspaces) {
-        let workspaceId;
-        do {
-          workspaceId = uuid();
-        } while ((await Workspace.query().where('workspaceId', workspaceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
-
-        const services = workspace.services.map(service => serviceIdTranslation[service]);
-
-        await Workspace.create({ // eslint-disable-line no-await-in-loop
-          workspaceId,
-          name: workspace.name,
-          order: workspace.order,
-          services: JSON.stringify(services),
-          data: JSON.stringify({}),
-        });
+        await this._createWorkspace(workspace, serviceIdTranslation); // eslint-disable-line no-await-in-loop
       }
     } catch (e) {
       const errorMessage = `Could not import your workspaces into our system.\nError: ${e}`;
@@ -313,20 +282,7 @@ class UserController {
     // Import services
     try {
       for (const service of file.services) {
-        // Get new, unused uuid
-        let serviceId;
-        do {
-          serviceId = uuid();
-        } while ((await Service.query().where('serviceId', serviceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
-
-        await Service.create({ // eslint-disable-line no-await-in-loop
-          serviceId,
-          name: service.name,
-          recipeId: service.recipeId,
-          settings: JSON.stringify(service.settings),
-        });
-
-        serviceIdTranslation[service.id] = serviceId;
+        await this._createAndCacheService(service, serviceIdTranslation); // eslint-disable-line no-await-in-loop
       }
     } catch (e) {
       const errorMessage = `Could not import your services into our system.\nError: ${e}`;
@@ -336,22 +292,7 @@ class UserController {
     // Import workspaces
     try {
       for (const workspace of file.workspaces) {
-        let workspaceId;
-        do {
-          workspaceId = uuid();
-        } while ((await Workspace.query().where('workspaceId', workspaceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
-
-        const services = (workspace.services && typeof (workspace.services) === 'object') ?
-          workspace.services.map((service) => serviceIdTranslation[service]) :
-          [];
-
-        await Workspace.create({ // eslint-disable-line no-await-in-loop
-          workspaceId,
-          name: workspace.name,
-          order: workspace.order,
-          services: JSON.stringify(services),
-          data: JSON.stringify(workspace.data),
-        });
+        await this._createWorkspace(workspace, serviceIdTranslation); // eslint-disable-line no-await-in-loop
       }
     } catch (e) {
       const errorMessage = `Could not import your workspaces into our system.\nError: ${e}`;
@@ -360,6 +301,53 @@ class UserController {
 
     return response.send('Your account has been imported.');
   }
+
+  async _createWorkspace(workspace, serviceIdTranslation) {
+    let newWorkspaceId;
+    do {
+      newWorkspaceId = uuid();
+    } while ((await Workspace.query().where('workspaceId', newWorkspaceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
+
+    if (workspace.services && typeof (workspace.services) === 'string' && workspace.services.length > 0) {
+      workspace.services = JSON.parse(workspace.services);
+    }
+    const services = (workspace.services && typeof (workspace.services) === 'object') ?
+      workspace.services.map(oldServiceId => serviceIdTranslation[oldServiceId]) :
+      [];
+    if (workspace.data && typeof (workspace.data) === 'string' && workspace.data.length > 0) {
+      workspace.data = JSON.parse(workspace.data);
+    }
+
+    await Workspace.create({
+      workspaceId: newWorkspaceId,
+      name: workspace.name,
+      order: workspace.order,
+      services: JSON.stringify(services),
+      data: JSON.stringify(workspace.data || {}),
+    });
+  }
+
+  async _createAndCacheService(service, serviceIdTranslation) {
+    // Get new, unused uuid
+    let newServiceId;
+    do {
+      newServiceId = uuid();
+    } while ((await Service.query().where('serviceId', newServiceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
+
+    // store the old serviceId as the key for future lookup
+    serviceIdTranslation[service.serviceId] = newServiceId;
+
+    if (service.settings && typeof (service.settings) === 'string' && service.settings.length > 0) {
+      service.settings = JSON.parse(service.settings);
+    }
+
+    await Service.create({
+      serviceId: newServiceId,
+      name: service.name,
+      recipeId: service.recipeId,
+      settings: JSON.stringify(service.settings || {}),
+    });
+  }
 }
 
 module.exports = UserController;
diff --git a/src/internal-server/app/Controllers/Http/WorkspaceController.js b/src/internal-server/app/Controllers/Http/WorkspaceController.js
index 4189fbcdd..773312a0b 100644
--- a/src/internal-server/app/Controllers/Http/WorkspaceController.js
+++ b/src/internal-server/app/Controllers/Http/WorkspaceController.js
@@ -32,10 +32,12 @@ class WorkspaceController {
     } while ((await Workspace.query().where('workspaceId', workspaceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
 
     const order = (await Workspace.all()).rows.length;
+    const name = data.name;
+    delete data.name;
 
     await Workspace.create({
       workspaceId,
-      name: data.name,
+      name,
       order,
       services: JSON.stringify([]),
       data: JSON.stringify(data),
@@ -43,7 +45,7 @@ class WorkspaceController {
 
     return response.send({
       userId: 1,
-      name: data.name,
+      name,
       id: workspaceId,
       order,
       workspaces: [],
diff --git a/src/internal-server/start/routes.js b/src/internal-server/start/routes.js
index b32b094ee..e75380ccd 100644
--- a/src/internal-server/start/routes.js
+++ b/src/internal-server/start/routes.js
@@ -25,12 +25,12 @@ const OnlyAllowFerdi = async ({ request, response }, next) => {
 };
 
 // Health: Returning if all systems function correctly
-Route.get('health', ({
-  response,
-}) => response.send({
-  api: 'success',
-  db: 'success',
-})).middleware(OnlyAllowFerdi);
+Route.get('health', ({ response }) =>
+  response.send({
+    api: 'success',
+    db: 'success',
+  }),
+).middleware(OnlyAllowFerdi);
 
 // API is grouped under '/v1/' route
 Route.group(() => {
@@ -67,8 +67,9 @@ Route.group(() => {
   Route.get('features/:mode?', 'StaticController.features');
   Route.get('services', 'StaticController.emptyArray');
   Route.get('news', 'StaticController.emptyArray');
-  Route.get('announcements/:version', 'StaticController.announcement');
-}).prefix(API_VERSION).middleware(OnlyAllowFerdi);
+})
+  .prefix(API_VERSION)
+  .middleware(OnlyAllowFerdi);
 
 Route.group(() => {
   Route.get('icon/:id', 'ServiceController.icon');
diff --git a/src/jsUtils.ts b/src/jsUtils.ts
new file mode 100644
index 000000000..b1baad7c5
--- /dev/null
+++ b/src/jsUtils.ts
@@ -0,0 +1,3 @@
+export const ifUndefinedString = (source: string | undefined | null, defaultValue: string): string => (source !== undefined && source !== null ? source : defaultValue);
+export const ifUndefinedBoolean = (source: boolean | undefined | null, defaultValue: boolean): boolean => Boolean(source !== undefined && source !== null ? source : defaultValue);
+export const ifUndefinedNumber = (source: number | undefined | null, defaultValue: number): number => Number(source !== undefined && source !== null ? source : defaultValue);
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 5a99299c5..2c24b696b 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -2,18 +2,32 @@ import { clipboard } from 'electron';
 import { app, Menu, dialog, systemPreferences } from '@electron/remote';
 import { autorun, observable } from 'mobx';
 import { defineMessages } from 'react-intl';
-import { CUSTOM_WEBSITE_RECIPE_ID, GITHUB_FERDI_URL, LIVE_API_FERDI_WEBSITE } from '../config';
 import {
-  cmdOrCtrlShortcutKey, altKey, shiftKey, settingsShortcutKey, isLinux, isMac, aboutAppDetails, lockFerdiShortcutKey, todosToggleShortcutKey, workspaceToggleShortcutKey, addNewServiceShortcutKey, muteFerdiShortcutKey,
+  CUSTOM_WEBSITE_RECIPE_ID,
+  GITHUB_FERDI_URL,
+  LIVE_API_FERDI_WEBSITE,
+} from '../config';
+import {
+  cmdOrCtrlShortcutKey,
+  altKey,
+  shiftKey,
+  settingsShortcutKey,
+  isLinux,
+  isMac,
+  aboutAppDetails,
+  lockFerdiShortcutKey,
+  todosToggleShortcutKey,
+  workspaceToggleShortcutKey,
+  addNewServiceShortcutKey,
+  muteFerdiShortcutKey,
 } from '../environment';
-import { announcementsStore } from '../features/announcements';
-import { announcementActions } from '../features/announcements/actions';
 import { todosStore } from '../features/todos';
 import { todoActions } from '../features/todos/actions';
 import { workspaceActions } from '../features/workspaces/actions';
 import { workspaceStore } from '../features/workspaces/index';
 import apiBase, { termsBase } from '../api/apiBase';
 import { openExternalUrl } from '../helpers/url-helpers';
+import globalMessages from '../i18n/globalMessages';
 
 const menuItems = defineMessages({
   edit: {
@@ -174,7 +188,8 @@ const menuItems = defineMessages({
   },
   debugInfoCopiedBody: {
     id: 'menu.help.debugInfoCopiedBody',
-    defaultMessage: '!!!Your Debug Information has been copied to your clipboard.',
+    defaultMessage:
+      '!!!Your Debug Information has been copied to your clipboard.',
   },
   touchId: {
     id: 'locked.touchId',
@@ -216,14 +231,6 @@ const menuItems = defineMessages({
     id: 'menu.app.about',
     defaultMessage: '!!!About Ferdi',
   },
-  announcement: {
-    id: 'menu.app.announcement',
-    defaultMessage: '!!!What\'s new?',
-  },
-  settings: {
-    id: 'menu.app.settings',
-    defaultMessage: '!!!Settings',
-  },
   checkForUpdates: {
     id: 'menu.app.checkForUpdates',
     defaultMessage: '!!!Check for updates',
@@ -244,10 +251,6 @@ const menuItems = defineMessages({
     id: 'menu.app.autohideMenuBar',
     defaultMessage: '!!!Auto-hide menu bar',
   },
-  quit: {
-    id: 'menu.app.quit',
-    defaultMessage: '!!!Quit',
-  },
   addNewService: {
     id: 'menu.services.addNewService',
     defaultMessage: '!!!Add New Service...',
@@ -310,8 +313,8 @@ const menuItems = defineMessages({
   },
 });
 
-function getActiveWebview() {
-  return window.ferdi.stores.services.active.webview;
+function getActiveService() {
+  return window.ferdi.stores.services.active;
 }
 
 const _titleBarTemplateFactory = (intl, locked) => [
@@ -349,9 +352,6 @@ const _titleBarTemplateFactory = (intl, locked) => [
         label: intl.formatMessage(menuItems.pasteAndMatchStyle),
         accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+V`, // Override the accelerator since this adds new key combo in macos
         role: 'pasteAndMatchStyle',
-        click() {
-          getActiveWebview().pasteAndMatchStyle();
-        },
       },
       {
         label: intl.formatMessage(menuItems.delete),
@@ -386,18 +386,18 @@ const _titleBarTemplateFactory = (intl, locked) => [
         label: intl.formatMessage(menuItems.findInPage),
         accelerator: `${cmdOrCtrlShortcutKey()}+F`,
         click() {
+          const service = getActiveService();
           // Check if there is a service active
-          if (!window.ferdi.stores.services.active) return;
+          if (service) {
+            // Focus webview so find in page popup gets focused
+            service.webview.focus();
 
-          // Focus webview so find in page popup gets focused
-          window.ferdi.stores.services.active.webview.focus();
-
-          const currentService = window.ferdi.stores.services.active.id;
-          window.ferdi.actions.service.sendIPCMessage({
-            serviceId: currentService,
-            channel: 'find-in-page',
-            args: {},
-          });
+            window.ferdi.actions.service.sendIPCMessage({
+              serviceId: service.id,
+              channel: 'find-in-page',
+              args: {},
+            });
+          }
         },
       },
       {
@@ -407,14 +407,14 @@ const _titleBarTemplateFactory = (intl, locked) => [
         label: intl.formatMessage(menuItems.back),
         accelerator: `${cmdOrCtrlShortcutKey()}+Left`,
         click() {
-          getActiveWebview().goBack();
+          getActiveService().webview.goBack();
         },
       },
       {
         label: intl.formatMessage(menuItems.forward),
         accelerator: `${cmdOrCtrlShortcutKey()}+Right`,
         click() {
-          getActiveWebview().goForward();
+          getActiveService().webview.goForward();
         },
       },
       {
@@ -423,17 +423,15 @@ const _titleBarTemplateFactory = (intl, locked) => [
       {
         label: intl.formatMessage(menuItems.resetZoom),
         accelerator: `${cmdOrCtrlShortcutKey()}+0`,
-        role: 'resetZoom',
         click() {
-          getActiveWebview().setZoomLevel(0);
+          getActiveService().webview.setZoomLevel(0);
         },
       },
       {
         label: intl.formatMessage(menuItems.zoomIn),
         accelerator: `${cmdOrCtrlShortcutKey()}+plus`,
-        role: 'zoomIn',
         click() {
-          const activeService = getActiveWebview();
+          const activeService = getActiveService().webview;
           const level = activeService.getZoomLevel();
 
           // level 9 =~ +300% and setZoomLevel wouldnt zoom in further
@@ -443,9 +441,8 @@ const _titleBarTemplateFactory = (intl, locked) => [
       {
         label: intl.formatMessage(menuItems.zoomOut),
         accelerator: `${cmdOrCtrlShortcutKey()}+-`,
-        role: 'zoomOut',
         click() {
-          const activeService = getActiveWebview();
+          const activeService = getActiveService().webview;
           const level = activeService.getZoomLevel();
 
           // level -9 =~ -50% and setZoomLevel wouldnt zoom out further
@@ -513,44 +510,49 @@ const _titleBarTemplateFactory = (intl, locked) => [
     submenu: [
       {
         label: intl.formatMessage(menuItems.learnMore),
-        click() { openExternalUrl(LIVE_API_FERDI_WEBSITE, true); },
+        click() {
+          openExternalUrl(LIVE_API_FERDI_WEBSITE, true);
+        },
       },
       {
         label: intl.formatMessage(menuItems.changelog),
-        click() { openExternalUrl(`${GITHUB_FERDI_URL}/ferdi/blob/develop/CHANGELOG.md`, true); },
+        click() {
+          openExternalUrl(
+            `${GITHUB_FERDI_URL}/ferdi/blob/develop/CHANGELOG.md`,
+            true,
+          );
+        },
       },
       {
         label: intl.formatMessage(menuItems.importExportData),
-        click() { openExternalUrl(apiBase(false), true); },
-        enabled: !locked,
-      },
-      {
-        type: 'separator',
-      },
-      {
-        label: intl.formatMessage(menuItems.announcement),
-        click: () => {
-          announcementActions.show();
+        click() {
+          openExternalUrl(apiBase(false), true);
         },
-        enabled: !locked && window.ferdi.stores.user.isLoggedIn && announcementsStore.areNewsAvailable,
+        enabled: !locked,
       },
       {
         type: 'separator',
       },
       {
         label: intl.formatMessage(menuItems.support),
-        click() { openExternalUrl(`${LIVE_API_FERDI_WEBSITE}/contact`, true); },
+        click() {
+          openExternalUrl(`${LIVE_API_FERDI_WEBSITE}/contact`, true);
+        },
       },
       {
         type: 'separator',
       },
       {
         label: intl.formatMessage(menuItems.tos),
-        click() { openExternalUrl(`${termsBase()}/terms`, true); },
+        click() {
+          openExternalUrl(`${termsBase()}/terms`, true);
+        },
       },
       {
         label: intl.formatMessage(menuItems.privacy),
-        click() { openExternalUrl(`${termsBase()}/privacy`, true); },
+        click() {
+          openExternalUrl(`${termsBase()}/privacy`, true);
+        },
       },
     ],
   },
@@ -590,6 +592,23 @@ export default class FranzMenu {
     const tpl = _titleBarTemplateFactory(intl, this.stores.settings.app.locked);
     const { actions } = this;
 
+    // TODO: Extract this into a reusable component and remove the duplications
+    const quitApp = () => {
+      const yesButtonIndex = 0;
+      let selection = yesButtonIndex;
+      if (window.ferdi.stores.settings.app.confirmOnQuit) {
+        selection = dialog.showMessageBoxSync(app.mainWindow, {
+          type: 'question',
+          message: intl.formatMessage(globalMessages.quit),
+          detail: intl.formatMessage(globalMessages.quitConfirmation),
+          buttons: [intl.formatMessage(globalMessages.yes), intl.formatMessage(globalMessages.no)],
+        });
+      }
+      if (selection === yesButtonIndex) {
+        app.quit();
+      }
+    };
+
     if (!isMac) {
       tpl[1].submenu.push({
         label: intl.formatMessage(menuItems.autohideMenuBar),
@@ -599,7 +618,8 @@ export default class FranzMenu {
           window.ferdi.actions.settings.update({
             type: 'app',
             data: {
-              autohideMenuBar: !window.ferdi.stores.settings.app.autohideMenuBar,
+              autohideMenuBar:
+                !window.ferdi.stores.settings.app.autohideMenuBar,
             },
           });
         },
@@ -607,22 +627,28 @@ export default class FranzMenu {
     }
 
     if (!this.stores.settings.app.locked) {
-      tpl[1].submenu.push({
-        type: 'separator',
-      }, {
-        label: intl.formatMessage(menuItems.toggleDevTools),
-        accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+I`,
-        click: (menuItem, browserWindow) => {
-          browserWindow.webContents.toggleDevTools();
+      tpl[1].submenu.push(
+        {
+          type: 'separator',
         },
-      }, {
-        label: intl.formatMessage(menuItems.toggleServiceDevTools),
-        accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+${altKey()}+I`,
-        click: () => {
-          this.actions.service.openDevToolsForActiveService();
+        {
+          label: intl.formatMessage(menuItems.toggleDevTools),
+          accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+I`,
+          click: (menuItem, browserWindow) => {
+            browserWindow.webContents.toggleDevTools();
+          },
         },
-        enabled: this.stores.user.isLoggedIn && this.stores.services.enabled.length > 0,
-      });
+        {
+          label: intl.formatMessage(menuItems.toggleServiceDevTools),
+          accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+${altKey()}+I`,
+          click: () => {
+            this.actions.service.openDevToolsForActiveService();
+          },
+          enabled:
+            this.stores.user.isLoggedIn &&
+            this.stores.services.enabled.length > 0,
+        },
+      );
 
       if (this.stores.features.features.isTodosEnabled) {
         tpl[1].submenu.push({
@@ -635,49 +661,58 @@ export default class FranzMenu {
         });
       }
 
-      tpl[1].submenu.unshift({
-        label: intl.formatMessage(menuItems.reloadService),
-        id: 'reloadService', // TODO: needed?
-        accelerator: `${cmdOrCtrlShortcutKey()}+R`,
-        click: () => {
-          if (this.stores.user.isLoggedIn
-          && this.stores.services.enabled.length > 0) {
-            if (this.stores.services.active.recipe.id === CUSTOM_WEBSITE_RECIPE_ID) {
-              this.stores.services.active.webview.reload();
+      tpl[1].submenu.unshift(
+        {
+          label: intl.formatMessage(menuItems.reloadService),
+          accelerator: `${cmdOrCtrlShortcutKey()}+R`,
+          click: () => {
+            if (
+              this.stores.user.isLoggedIn &&
+              this.stores.services.enabled.length > 0
+            ) {
+              if (getActiveService().recipe.id === CUSTOM_WEBSITE_RECIPE_ID) {
+                getActiveService().webview.reload();
+              } else {
+                this.actions.service.reloadActive();
+              }
             } else {
-              this.actions.service.reloadActive();
+              window.location.reload();
             }
-          } else {
+          },
+        },
+        {
+          label: intl.formatMessage(menuItems.reloadFerdi),
+          accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+R`,
+          click: () => {
             window.location.reload();
-          }
+          },
         },
-      }, {
-        label: intl.formatMessage(menuItems.reloadFerdi),
-        accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+R`,
-        click: () => {
-          window.location.reload();
+        {
+          label: intl.formatMessage(menuItems.reloadTodos),
+          accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+${altKey()}+R`,
+          click: () => {
+            this.actions.todos.reload();
+          },
         },
-      }, {
-        label: intl.formatMessage(menuItems.reloadTodos),
-        accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+${altKey()}+R`,
-        click: () => {
-          this.actions.todos.reload();
+        {
+          type: 'separator',
         },
-      }, {
-        type: 'separator',
-      }, {
-        label: intl.formatMessage(menuItems.lockFerdi),
-        accelerator: `${lockFerdiShortcutKey()}`,
-        enabled: this.stores.user.isLoggedIn && this.stores.settings.app.lockingFeatureEnabled,
-        click() {
-          actions.settings.update({
-            type: 'app',
-            data: {
-              locked: true,
-            },
-          });
+        {
+          label: intl.formatMessage(menuItems.lockFerdi),
+          accelerator: `${lockFerdiShortcutKey()}`,
+          enabled:
+            this.stores.user.isLoggedIn &&
+            this.stores.settings.app.lockingFeatureEnabled,
+          click() {
+            actions.settings.update({
+              type: 'app',
+              data: {
+                locked: true,
+              },
+            });
+          },
         },
-      });
+      );
 
       if (serviceTpl.length > 0) {
         tpl[2].submenu = serviceTpl;
@@ -691,26 +726,34 @@ export default class FranzMenu {
         tpl[4].submenu = this.todosMenu();
       }
     } else {
-      const touchIdEnabled = isMac ? (this.stores.settings.app.useTouchIdToUnlock && systemPreferences.canPromptTouchID()) : false;
+      const touchIdEnabled = isMac
+        ? this.stores.settings.app.useTouchIdToUnlock &&
+          systemPreferences.canPromptTouchID()
+        : false;
 
-      tpl[0].submenu.unshift({
-        label: intl.formatMessage(menuItems.touchId),
-        accelerator: `${lockFerdiShortcutKey()}`,
-        visible: touchIdEnabled,
-        click() {
-          systemPreferences.promptTouchID(intl.formatMessage(menuItems.touchIdPrompt)).then(() => {
-            actions.settings.update({
-              type: 'app',
-              data: {
-                locked: false,
-              },
-            });
-          });
+      tpl[0].submenu.unshift(
+        {
+          label: intl.formatMessage(menuItems.touchId),
+          accelerator: `${lockFerdiShortcutKey()}`,
+          visible: touchIdEnabled,
+          click() {
+            systemPreferences
+              .promptTouchID(intl.formatMessage(menuItems.touchIdPrompt))
+              .then(() => {
+                actions.settings.update({
+                  type: 'app',
+                  data: {
+                    locked: false,
+                  },
+                });
+              });
+          },
         },
-      }, {
-        type: 'separator',
-        visible: touchIdEnabled,
-      });
+        {
+          type: 'separator',
+          visible: touchIdEnabled,
+        },
+      );
     }
 
     tpl.unshift({
@@ -725,7 +768,7 @@ export default class FranzMenu {
           type: 'separator',
         },
         {
-          label: intl.formatMessage(menuItems.settings),
+          label: intl.formatMessage(globalMessages.settings),
           accelerator: `${settingsShortcutKey()}`,
           click: () => {
             this.actions.ui.openSettings({ path: 'app' });
@@ -768,18 +811,15 @@ export default class FranzMenu {
           type: 'separator',
         },
         {
-          label: intl.formatMessage(menuItems.quit),
-          role: 'quit',
-          click() {
-            app.quit();
-          },
+          label: intl.formatMessage(globalMessages.quit),
+          accelerator: `${cmdOrCtrlShortcutKey()}+Q`,
+          click: quitApp,
         },
       ],
     });
 
     const about = {
       label: intl.formatMessage(menuItems.about),
-      role: 'about',
       click: () => {
         dialog.showMessageBox({
           type: 'info',
@@ -829,18 +869,18 @@ export default class FranzMenu {
           type: 'separator',
         },
         {
-          label: intl.formatMessage(menuItems.quit),
-          role: 'quit',
+          label: intl.formatMessage(globalMessages.quit),
           accelerator: `${cmdOrCtrlShortcutKey()}+Q`,
-          click() {
-            app.quit();
-          },
+          click: quitApp,
         },
       ];
 
-      tpl[tpl.length - 1].submenu.push({
-        type: 'separator',
-      }, about);
+      tpl[tpl.length - 1].submenu.push(
+        {
+          type: 'separator',
+        },
+        about,
+      );
     }
 
     if (!this.stores.settings.app.locked) {
@@ -856,9 +896,12 @@ export default class FranzMenu {
         tpl[5].submenu = this.todosMenu();
       }
 
-      tpl[tpl.length - 1].submenu.push({
-        type: 'separator',
-      }, ...this.debugMenu());
+      tpl[tpl.length - 1].submenu.push(
+        {
+          type: 'separator',
+        },
+        ...this.debugMenu(),
+      );
     }
     this.currentTemplate = tpl;
     const menu = Menu.buildFromTemplate(tpl);
@@ -872,73 +915,95 @@ export default class FranzMenu {
     const menu = [];
     const cmdAltShortcutsVisibile = !isLinux;
 
-    menu.push({
-      label: intl.formatMessage(menuItems.addNewService),
-      accelerator: `${addNewServiceShortcutKey()}`,
-      click: () => {
-        this.actions.ui.openSettings({ path: 'recipes' });
+    menu.push(
+      {
+        label: intl.formatMessage(menuItems.addNewService),
+        accelerator: `${addNewServiceShortcutKey()}`,
+        click: () => {
+          this.actions.ui.openSettings({ path: 'recipes' });
+        },
       },
-    }, {
-      type: 'separator',
-    }, {
-      label: intl.formatMessage(menuItems.activateNextService),
-      accelerator: `${cmdOrCtrlShortcutKey()}+tab`,
-      click: () => this.actions.service.setActiveNext(),
-      visible: !cmdAltShortcutsVisibile,
-    }, {
-      label: intl.formatMessage(menuItems.activateNextService),
-      accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+right`,
-      click: () => this.actions.service.setActiveNext(),
-      visible: cmdAltShortcutsVisibile,
-    }, {
-      label: intl.formatMessage(menuItems.activatePreviousService),
-      accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+tab`,
-      click: () => this.actions.service.setActivePrev(),
-      visible: !cmdAltShortcutsVisibile,
-    }, {
-      label: intl.formatMessage(menuItems.activatePreviousService),
-      accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+left`,
-      click: () => this.actions.service.setActivePrev(),
-      visible: cmdAltShortcutsVisibile,
-    }, {
-      label: intl.formatMessage(
-        settings.all.app.isAppMuted ? menuItems.unmuteApp : menuItems.muteApp,
-      ).replace('&', '&&'),
-      accelerator: `${muteFerdiShortcutKey()}`,
-      click: () => this.actions.app.toggleMuteApp(),
-    }, {
-      type: 'separator',
-    });
-
-    services.allDisplayed.forEach((service, i) => (menu.push({
-      label: this._getServiceName(service),
-      accelerator: i < 9 ? `${cmdOrCtrlShortcutKey()}+${i + 1}` : null,
-      type: 'radio',
-      checked: service.isActive,
-      click: () => {
-        this.actions.service.setActive({ serviceId: service.id });
-
-        if (isMac && i === 0) {
-          app.mainWindow.restore();
-        }
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(menuItems.activateNextService),
+        accelerator: `${cmdOrCtrlShortcutKey()}+tab`,
+        click: () => this.actions.service.setActiveNext(),
+        visible: !cmdAltShortcutsVisibile,
+      },
+      {
+        label: intl.formatMessage(menuItems.activateNextService),
+        accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+right`,
+        click: () => this.actions.service.setActiveNext(),
+        visible: cmdAltShortcutsVisibile,
+      },
+      {
+        label: intl.formatMessage(menuItems.activatePreviousService),
+        accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+tab`,
+        click: () => this.actions.service.setActivePrev(),
+        visible: !cmdAltShortcutsVisibile,
+      },
+      {
+        label: intl.formatMessage(menuItems.activatePreviousService),
+        accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+left`,
+        click: () => this.actions.service.setActivePrev(),
+        visible: cmdAltShortcutsVisibile,
+      },
+      {
+        label: intl
+          .formatMessage(
+            settings.all.app.isAppMuted
+              ? menuItems.unmuteApp
+              : menuItems.muteApp,
+          )
+          .replace('&', '&&'),
+        accelerator: `${muteFerdiShortcutKey()}`,
+        click: () => this.actions.app.toggleMuteApp(),
+      },
+      {
+        type: 'separator',
       },
-    })));
+    );
 
-    if (services.active && services.active.recipe.id === CUSTOM_WEBSITE_RECIPE_ID) {
+    services.allDisplayed.forEach((service, i) =>
       menu.push({
-        type: 'separator',
-      }, {
-        label: intl.formatMessage(menuItems.serviceGoHome),
-        accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+H`,
-        click: () => this.actions.service.reloadActive(),
-      });
+        label: this._getServiceName(service),
+        accelerator: i < 9 ? `${cmdOrCtrlShortcutKey()}+${i + 1}` : null,
+        type: 'radio',
+        checked: service.isActive,
+        click: () => {
+          this.actions.service.setActive({ serviceId: service.id });
+
+          if (isMac && i === 0) {
+            app.mainWindow.restore();
+          }
+        },
+      }),
+    );
+
+    if (
+      services.active &&
+      services.active.recipe.id === CUSTOM_WEBSITE_RECIPE_ID
+    ) {
+      menu.push(
+        {
+          type: 'separator',
+        },
+        {
+          label: intl.formatMessage(menuItems.serviceGoHome),
+          accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+H`,
+          click: () => this.actions.service.reloadActive(),
+        },
+      );
     }
 
     return menu;
   }
 
   workspacesMenu() {
-    const { workspaces, activeWorkspace, isWorkspaceDrawerOpen } = workspaceStore;
+    const { workspaces, activeWorkspace, isWorkspaceDrawerOpen } =
+      workspaceStore;
     const { intl } = window.ferdi;
     const menu = [];
 
@@ -954,9 +1019,9 @@ export default class FranzMenu {
 
     // Open workspace drawer:
     if (!this.stores.settings.app.alwaysShowWorkspaces) {
-      const drawerLabel = (
-        isWorkspaceDrawerOpen ? menuItems.closeWorkspaceDrawer : menuItems.openWorkspaceDrawer
-      );
+      const drawerLabel = isWorkspaceDrawerOpen
+        ? menuItems.closeWorkspaceDrawer
+        : menuItems.openWorkspaceDrawer;
       menu.push({
         label: intl.formatMessage(drawerLabel),
         accelerator: `${workspaceToggleShortcutKey()}`,
@@ -983,15 +1048,18 @@ export default class FranzMenu {
     });
 
     // Workspace items
-    workspaces.forEach((workspace, i) => menu.push({
-      label: workspace.name,
-      accelerator: i < 9 ? `${cmdOrCtrlShortcutKey()}+${altKey()}+${i + 1}` : null,
-      type: 'radio',
-      checked: activeWorkspace ? workspace.id === activeWorkspace.id : false,
-      click: () => {
-        workspaceActions.activate({ workspace });
-      },
-    }));
+    workspaces.forEach((workspace, i) =>
+      menu.push({
+        label: workspace.name,
+        accelerator:
+          i < 9 ? `${cmdOrCtrlShortcutKey()}+${altKey()}+${i + 1}` : null,
+        type: 'radio',
+        checked: activeWorkspace ? workspace.id === activeWorkspace.id : false,
+        click: () => {
+          workspaceActions.activate({ workspace });
+        },
+      }),
+    );
 
     return menu;
   }
@@ -1001,7 +1069,9 @@ export default class FranzMenu {
     const { intl } = window.ferdi;
     const menu = [];
 
-    const drawerLabel = isTodosPanelVisible ? menuItems.closeTodosDrawer : menuItems.openTodosDrawer;
+    const drawerLabel = isTodosPanelVisible
+      ? menuItems.closeTodosDrawer
+      : menuItems.openTodosDrawer;
 
     menu.push({
       label: intl.formatMessage(drawerLabel),
@@ -1013,14 +1083,17 @@ export default class FranzMenu {
     });
 
     if (!isFeatureEnabledByUser) {
-      menu.push({
-        type: 'separator',
-      }, {
-        label: intl.formatMessage(menuItems.enableTodos),
-        click: () => {
-          todoActions.toggleTodosFeatureVisibility();
+      menu.push(
+        {
+          type: 'separator',
         },
-      });
+        {
+          label: intl.formatMessage(menuItems.enableTodos),
+          click: () => {
+            todoActions.toggleTodosFeatureVisibility();
+          },
+        },
+      );
     }
 
     return menu;
@@ -1029,28 +1102,31 @@ export default class FranzMenu {
   debugMenu() {
     const { intl } = window.ferdi;
 
-    return [{
-      label: intl.formatMessage(menuItems.debugInfo),
-      click: () => {
-        const { debugInfo } = this.stores.app;
+    return [
+      {
+        label: intl.formatMessage(menuItems.debugInfo),
+        click: () => {
+          const { debugInfo } = this.stores.app;
 
-        clipboard.write({
-          text: JSON.stringify(debugInfo),
-        });
+          clipboard.write({
+            text: JSON.stringify(debugInfo),
+          });
 
-        this.actions.app.notify({
-          title: intl.formatMessage(menuItems.debugInfoCopiedHeadline),
-          options: {
-            body: intl.formatMessage(menuItems.debugInfoCopiedBody),
-          },
-        });
+          this.actions.app.notify({
+            title: intl.formatMessage(menuItems.debugInfoCopiedHeadline),
+            options: {
+              body: intl.formatMessage(menuItems.debugInfoCopiedBody),
+            },
+          });
+        },
       },
-    }, {
-      label: intl.formatMessage(menuItems.publishDebugInfo),
-      click: () => {
-        window.ferdi.features.publishDebugInfo.state.isModalVisible = true;
+      {
+        label: intl.formatMessage(menuItems.publishDebugInfo),
+        click: () => {
+          window.ferdi.features.publishDebugInfo.state.isModalVisible = true;
+        },
       },
-    }];
+    ];
   }
 
   _getServiceName(service) {
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index f5970f7e7..c897d597a 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -1,5 +1,5 @@
 import {
-  app, Menu, nativeImage, nativeTheme, systemPreferences, Tray, ipcMain,
+  app, Menu, nativeImage, nativeTheme, systemPreferences, Tray, ipcMain, dialog,
 } from 'electron';
 import { join } from 'path';
 import macosVersion from 'macos-version';
@@ -43,9 +43,7 @@ export default class TrayIcon {
     },
     {
       label: 'Quit Ferdi',
-      click() {
-        app.quit();
-      },
+      click: this.quitApp,
     },
   ];
 
@@ -178,4 +176,22 @@ export default class TrayIcon {
       __dirname, '..', 'assets', 'images', type, platform, `${asset}.${FILE_EXTENSION}`,
     ));
   }
+
+  // TODO: Extract this into a reusable component and remove the duplications
+  quitApp = () => {
+    const yesButtonIndex = 0;
+    let selection = yesButtonIndex;
+    if (window.ferdi.stores.settings.app.confirmOnQuit) {
+      selection = dialog.showMessageBoxSync(app.mainWindow, {
+        // TODO: Externalize strings
+        type: 'question',
+        message: 'Quit',
+        detail: 'Do you really want to quit Ferdi?',
+        buttons: ['Yes', 'No'],
+      });
+    }
+    if (selection === yesButtonIndex) {
+      app.quit();
+    }
+  };
 }
diff --git a/src/models/News.ts b/src/models/News.ts
index 3db812937..a6ff86dda 100644
--- a/src/models/News.ts
+++ b/src/models/News.ts
@@ -1,5 +1,7 @@
 // @flow
 
+import { ifUndefinedString, ifUndefinedBoolean } from '../jsUtils';
+
 interface INews {
   id: string;
   message: string;
@@ -17,13 +19,17 @@ export default class News {
   sticky: boolean = false;
 
   constructor(data: INews) {
+    if (!data) {
+      throw Error('News config not valid');
+    }
+
     if (!data.id) {
       throw Error('News requires Id');
     }
 
     this.id = data.id;
-    this.message = data.message || this.message;
-    this.type = data.type || this.type;
-    this.sticky = data.sticky !== undefined ? data.sticky : this.sticky;
+    this.message = ifUndefinedString(data.message, this.message);
+    this.type = ifUndefinedString(data.type, this.type);
+    this.sticky = ifUndefinedBoolean(data.sticky, this.sticky);
   }
 }
diff --git a/src/models/RecipePreview.ts b/src/models/RecipePreview.ts
index 351ecf765..4d2cc8450 100644
--- a/src/models/RecipePreview.ts
+++ b/src/models/RecipePreview.ts
@@ -1,5 +1,13 @@
 // @flow
 
+interface IRecipePreview {
+  id: string;
+  name: string;
+  icon: string;
+  featured: boolean;
+  aliases: string[];
+}
+
 export default class RecipePreview {
   id: string = '';
 
@@ -11,9 +19,13 @@ export default class RecipePreview {
 
   aliases: string[] = [];
 
-  constructor(data: { id: any; }) {
+  constructor(data: IRecipePreview) {
+    if (!data) {
+      throw Error('RecipePreview config not valid');
+    }
+
     if (!data.id) {
-      throw Error('RecipePreview requires Id');
+      throw Error(`RecipePreview '${data.name}' requires Id`);
     }
 
     Object.assign(this, data);
diff --git a/src/models/Service.js b/src/models/Service.js
index 4b78b9a40..4ee054b2b 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -8,6 +8,7 @@ import { todosStore } from '../features/todos';
 import { isValidExternalURL } from '../helpers/url-helpers';
 import UserAgent from './UserAgent';
 import { DEFAULT_SERVICE_ORDER } from '../config';
+import { ifUndefinedString, ifUndefinedBoolean, ifUndefinedNumber } from '../jsUtils';
 
 const debug = require('debug')('Ferdi:Service');
 
@@ -101,47 +102,30 @@ export default class Service {
       throw Error('Service recipe not valid');
     }
 
-    this.userAgentModel = new UserAgent(recipe.overrideUserAgent);
-
-    this.id = data.id || this.id;
-    this.name = data.name || this.name;
-    this.team = data.team || this.team;
-    this.customUrl = data.customUrl || this.customUrl;
-    // this.customIconUrl = data.customIconUrl || this.customIconUrl;
-    this.iconUrl = data.iconUrl || this.iconUrl;
-
-    this.order = data.order !== undefined
-      ? data.order : this.order;
-
-    this.isEnabled = data.isEnabled !== undefined
-      ? data.isEnabled : this.isEnabled;
-
-    this.isNotificationEnabled = data.isNotificationEnabled !== undefined
-      ? data.isNotificationEnabled : this.isNotificationEnabled;
-
-    this.isBadgeEnabled = data.isBadgeEnabled !== undefined
-      ? data.isBadgeEnabled : this.isBadgeEnabled;
-
-    this.isIndirectMessageBadgeEnabled = data.isIndirectMessageBadgeEnabled !== undefined
-      ? data.isIndirectMessageBadgeEnabled : this.isIndirectMessageBadgeEnabled;
-
-    this.isMuted = data.isMuted !== undefined ? data.isMuted : this.isMuted;
-
-    this.isDarkModeEnabled = data.isDarkModeEnabled !== undefined ? data.isDarkModeEnabled : this.isDarkModeEnabled;
-
-    this.darkReaderSettings = data.darkReaderSettings !== undefined ? data.darkReaderSettings : this.darkReaderSettings;
-
-    this.hasCustomUploadedIcon = data.hasCustomIcon !== undefined ? data.hasCustomIcon : this.hasCustomUploadedIcon;
-
-    this.proxy = data.proxy !== undefined ? data.proxy : this.proxy;
-
-    this.spellcheckerLanguage = data.spellcheckerLanguage !== undefined ? data.spellcheckerLanguage : this.spellcheckerLanguage;
-
-    this.userAgentPref = data.userAgentPref !== undefined ? data.userAgentPref : this.userAgentPref;
+    this.recipe = recipe;
 
-    this.isHibernationEnabled = data.isHibernationEnabled !== undefined ? data.isHibernationEnabled : this.isHibernationEnabled;
+    this.userAgentModel = new UserAgent(recipe.overrideUserAgent);
 
-    this.recipe = recipe;
+    this.id = ifUndefinedString(data.id, this.id);
+    this.name = ifUndefinedString(data.name, this.name);
+    this.team = ifUndefinedString(data.team, this.team);
+    this.customUrl = ifUndefinedString(data.customUrl, this.customUrl);
+    // this.customIconUrl = ifUndefinedString(data.customIconUrl, this.customIconUrl);
+    this.iconUrl = ifUndefinedString(data.iconUrl, this.iconUrl);
+
+    this.order = ifUndefinedNumber(data.order, this.order);
+    this.isEnabled = ifUndefinedBoolean(data.isEnabled, this.isEnabled);
+    this.isNotificationEnabled = ifUndefinedBoolean(data.isNotificationEnabled, this.isNotificationEnabled);
+    this.isBadgeEnabled = ifUndefinedBoolean(data.isBadgeEnabled, this.isBadgeEnabled);
+    this.isIndirectMessageBadgeEnabled = ifUndefinedBoolean(data.isIndirectMessageBadgeEnabled, this.isIndirectMessageBadgeEnabled);
+    this.isMuted = ifUndefinedBoolean(data.isMuted, this.isMuted);
+    this.isDarkModeEnabled = ifUndefinedBoolean(data.isDarkModeEnabled, this.isDarkModeEnabled);
+    this.darkReaderSettings = ifUndefinedString(data.darkReaderSettings, this.darkReaderSettings);
+    this.hasCustomUploadedIcon = ifUndefinedBoolean(data.hasCustomIcon, this.hasCustomUploadedIcon);
+    this.proxy = ifUndefinedString(data.proxy, this.proxy);
+    this.spellcheckerLanguage = ifUndefinedString(data.spellcheckerLanguage, this.spellcheckerLanguage);
+    this.userAgentPref = ifUndefinedString(data.userAgentPref, this.userAgentPref);
+    this.isHibernationEnabled = ifUndefinedBoolean(data.isHibernationEnabled, this.isHibernationEnabled);
 
     // Check if "Hibernate on Startup" is enabled and hibernate all services except active one
     const { hibernateOnStartup } = window.ferdi.stores.settings.app;
@@ -261,7 +245,7 @@ export default class Service {
 
     this.userAgentModel.setWebviewReference(this.webview);
 
-    // If the recipe has implemented modifyRequestHeaders,
+    // If the recipe has implemented 'modifyRequestHeaders',
     // Send those headers to ipcMain so that it can be set in session
     if (typeof this.recipe.modifyRequestHeaders === 'function') {
       const modifiedRequestHeaders = this.recipe.modifyRequestHeaders();
@@ -274,6 +258,18 @@ export default class Service {
       debug(this.name, 'modifyRequestHeaders is not defined in the recipe');
     }
 
+    // if the recipe has implemented 'knownCertificateHosts'
+    if (typeof this.recipe.knownCertificateHosts === 'function') {
+      const knownHosts = this.recipe.knownCertificateHosts();
+      debug(this.name, 'knownCertificateHosts', knownHosts);
+      ipcRenderer.send('knownCertificateHosts', {
+        knownHosts,
+        serviceId: this.id,
+      });
+    } else {
+      debug(this.name, 'knownCertificateHosts is not defined in the recipe');
+    }
+
     this.webview.addEventListener('ipc-message', async (e) => {
       if (e.channel === 'inject-js-unsafe') {
         await Promise.all(e.args.map((script) => this.webview.executeJavaScript(`"use strict"; (() => { ${script} })();`)));
diff --git a/src/models/User.ts b/src/models/User.ts
index 771d11955..54a6838df 100644
--- a/src/models/User.ts
+++ b/src/models/User.ts
@@ -42,6 +42,10 @@ export default class User {
   @observable team = {};
 
   constructor(data: IUser) {
+    if (!data) {
+      throw Error('User config not valid');
+    }
+
     if (!data.id) {
       throw Error('User requires Id');
     }
diff --git a/src/routes.js b/src/routes.js
index d67ccee13..4d32a59e0 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -1,9 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
-import {
-  Router, Route, IndexRedirect,
-} from 'react-router';
+import { Router, Route, IndexRedirect } from 'react-router';
 
 import AppLayoutContainer from './containers/layout/AppLayoutContainer';
 import SettingsWindow from './containers/settings/SettingsWindow';
@@ -29,38 +27,39 @@ import AuthLayoutContainer from './containers/auth/AuthLayoutContainer';
 import WorkspacesScreen from './features/workspaces/containers/WorkspacesScreen';
 import EditWorkspaceScreen from './features/workspaces/containers/EditWorkspaceScreen';
 import { WORKSPACES_ROUTES } from './features/workspaces/constants';
-import AnnouncementScreen from './features/announcements/components/AnnouncementScreen';
-import { ANNOUNCEMENTS_ROUTES } from './features/announcements/constants';
 
 import SettingsStore from './stores/SettingsStore';
 
-export default @inject('stores', 'actions') @observer class Routes extends Component {
+export default
+@inject('stores', 'actions')
+@observer
+class Routes extends Component {
   render() {
-    const {
-      locked,
-      lockingFeatureEnabled,
-    } = this.props.stores.settings.app;
+    const { locked } = this.props.stores.settings.app;
 
     const { history } = this.props;
 
-    if (lockingFeatureEnabled && locked) {
-      return (
-        <LockedScreen />
-      );
+    if (locked) {
+      return <LockedScreen />;
     }
 
     return (
       <Router history={history}>
         <Route path="/" component={AppLayoutContainer}>
-          <Route path={ANNOUNCEMENTS_ROUTES.TARGET} component={AnnouncementScreen} />
           <Route path="/settings" component={SettingsWindow}>
             <IndexRedirect to="/settings/recipes" />
             <Route path="/settings/recipes" component={RecipesScreen} />
             <Route path="/settings/recipes/:filter" component={RecipesScreen} />
             <Route path="/settings/services" component={ServicesScreen} />
-            <Route path="/settings/services/:action/:id" component={EditServiceScreen} />
+            <Route
+              path="/settings/services/:action/:id"
+              component={EditServiceScreen}
+            />
             <Route path={WORKSPACES_ROUTES.ROOT} component={WorkspacesScreen} />
-            <Route path={WORKSPACES_ROUTES.EDIT} component={EditWorkspaceScreen} />
+            <Route
+              path={WORKSPACES_ROUTES.EDIT}
+              component={EditWorkspaceScreen}
+            />
             <Route path="/settings/user" component={AccountScreen} />
             <Route path="/settings/user/edit" component={EditUserScreen} />
             <Route path="/settings/team" component={TeamScreen} />
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index cb8c71268..469e7519e 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -48,7 +48,8 @@ const autoLauncher = new AutoLaunch({
   path: executablePath,
 });
 
-const CATALINA_NOTIFICATION_HACK_KEY = '_temp_askedForCatalinaNotificationPermissions';
+const CATALINA_NOTIFICATION_HACK_KEY =
+  '_temp_askedForCatalinaNotificationPermissions';
 
 export default class AppStore extends Store {
   updateStatusTypes = {
@@ -92,8 +93,6 @@ export default class AppStore extends Store {
 
   @observable isFocused = true;
 
-  @observable nextAppReleaseVersion = null;
-
   dictionaries = [];
 
   fetchDataInterval = null;
@@ -175,7 +174,6 @@ export default class AppStore extends Store {
     ipcRenderer.on('autoUpdate', (event, data) => {
       if (data.available) {
         this.updateStatus = this.updateStatusTypes.AVAILABLE;
-        this.nextAppReleaseVersion = data.version;
         if (isMac) {
           app.dock.bounce();
         }
@@ -236,8 +234,8 @@ export default class AppStore extends Store {
       this.actions.service.resetLastPollTimer();
 
       if (
-        this.timeSuspensionStart.add(10, 'm').isBefore(moment())
-        && this.stores.settings.app.get('reloadAfterResume')
+        this.timeSuspensionStart.add(10, 'm').isBefore(moment()) &&
+        this.stores.settings.app.get('reloadAfterResume')
       ) {
         debug('Reloading services, user info and features');
 
@@ -283,15 +281,15 @@ export default class AppStore extends Store {
       ferdi: {
         version: ferdiVersion,
         electron: electronVersion,
-        installedRecipes: this.stores.recipes.all.map((recipe) => ({
+        installedRecipes: this.stores.recipes.all.map(recipe => ({
           id: recipe.id,
           version: recipe.version,
         })),
-        devRecipes: this.stores.recipePreviews.dev.map((recipe) => ({
+        devRecipes: this.stores.recipePreviews.dev.map(recipe => ({
           id: recipe.id,
           version: recipe.version,
         })),
-        services: this.stores.services.all.map((service) => ({
+        services: this.stores.services.all.map(service => ({
           id: service.id,
           recipe: service.recipe.id,
           isAttached: service.isAttached,
@@ -302,7 +300,7 @@ export default class AppStore extends Store {
           isDarkModeEnabled: service.isDarkModeEnabled,
         })),
         messages: this.stores.globalError.messages,
-        workspaces: this.stores.workspaces.workspaces.map((workspace) => ({
+        workspaces: this.stores.workspaces.workspaces.map(workspace => ({
           id: workspace.id,
           services: workspace.services,
         })),
@@ -315,9 +313,7 @@ export default class AppStore extends Store {
   }
 
   // Actions
-  @action _notify({
-    title, options, notificationId, serviceId = null,
-  }) {
+  @action _notify({ title, options, notificationId, serviceId = null }) {
     if (this.stores.settings.all.app.isAppMuted) return;
 
     // TODO: is there a simple way to use blobs for notifications without storing them on disk?
@@ -359,8 +355,8 @@ export default class AppStore extends Store {
     if (indicator === 0 && unreadIndirectMessageCount !== 0) {
       indicator = '•';
     } else if (
-      unreadDirectMessageCount === 0
-      && unreadIndirectMessageCount === 0
+      unreadDirectMessageCount === 0 &&
+      unreadIndirectMessageCount === 0
     ) {
       indicator = 0;
     } else {
@@ -441,22 +437,25 @@ export default class AppStore extends Store {
     const clearAppCache = this.clearAppCacheRequest.execute();
     const allServiceIds = await getServiceIdsFromPartitions();
     const allOrphanedServiceIds = allServiceIds.filter(
-      (id) => !this.stores.services.all.find(
-        (s) => id.replace('service-', '') === s.id,
-      ),
+      id =>
+        !this.stores.services.all.find(
+          s => id.replace('service-', '') === s.id,
+        ),
     );
 
     try {
       await Promise.all(
-        allOrphanedServiceIds.map((id) => removeServicePartitionDirectory(id)),
+        allOrphanedServiceIds.map(id => removeServicePartitionDirectory(id)),
       );
     } catch (ex) {
       console.log('Error while deleting service partition directory - ', ex);
     }
     await Promise.all(
-      this.stores.services.all.map((s) => this.actions.service.clearCache({
-        serviceId: s.id,
-      })),
+      this.stores.services.all.map(s =>
+        this.actions.service.clearCache({
+          serviceId: s.id,
+        }),
+      ),
     );
 
     await clearAppCache._promise;
@@ -488,9 +487,9 @@ export default class AppStore extends Store {
     }
 
     if (
-      locale
-      && Object.prototype.hasOwnProperty.call(locales, locale)
-      && locale !== this.locale
+      locale &&
+      Object.prototype.hasOwnProperty.call(locales, locale) &&
+      locale !== this.locale
     ) {
       this.locale = locale;
     } else if (!locale) {
@@ -568,8 +567,8 @@ export default class AppStore extends Store {
     const dnd = await ipcRenderer.invoke('get-dnd');
     debug('Do not disturb mode is', dnd);
     if (
-      dnd !== this.stores.settings.all.app.isAppMuted
-      && !this.isSystemMuteOverridden
+      dnd !== this.stores.settings.all.app.isAppMuted &&
+      !this.isSystemMuteOverridden
     ) {
       this.actions.app.muteApp({
         isMuted: dnd,
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 0dff2fda2..1d50dd714 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -1,8 +1,4 @@
-import {
-  computed,
-  observable,
-  runInAction,
-} from 'mobx';
+import { computed, observable, runInAction } from 'mobx';
 
 import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
@@ -13,7 +9,6 @@ import workspaces from '../features/workspaces';
 import quickSwitch from '../features/quickSwitch';
 import nightlyBuilds from '../features/nightlyBuilds';
 import publishDebugInfo from '../features/publishDebugInfo';
-import announcements from '../features/announcements';
 import settingsWS from '../features/settingsWS';
 import communityRecipes from '../features/communityRecipes';
 import todos from '../features/todos';
@@ -22,11 +17,17 @@ import appearance from '../features/appearance';
 import { DEFAULT_FEATURES_CONFIG } from '../config';
 
 export default class FeaturesStore extends Store {
-  @observable defaultFeaturesRequest = new CachedRequest(this.api.features, 'default');
+  @observable defaultFeaturesRequest = new CachedRequest(
+    this.api.features,
+    'default',
+  );
 
-  @observable featuresRequest = new CachedRequest(this.api.features, 'features');
+  @observable featuresRequest = new CachedRequest(
+    this.api.features,
+    'features',
+  );
 
-  @observable features = ({ ...DEFAULT_FEATURES_CONFIG });
+  @observable features = { ...DEFAULT_FEATURES_CONFIG };
 
   async setup() {
     this.registerReactions([
@@ -39,7 +40,9 @@ export default class FeaturesStore extends Store {
   }
 
   @computed get anonymousFeatures() {
-    return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG;
+    return (
+      this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG
+    );
   }
 
   _updateFeatures = () => {
@@ -72,7 +75,6 @@ export default class FeaturesStore extends Store {
     quickSwitch(this.stores, this.actions);
     nightlyBuilds(this.stores, this.actions);
     publishDebugInfo(this.stores, this.actions);
-    announcements(this.stores, this.actions);
     settingsWS(this.stores, this.actions);
     communityRecipes(this.stores, this.actions);
     todos(this.stores, this.actions);
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 8598c6234..75bc71388 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -603,8 +603,12 @@ export default class ServicesStore extends Store {
   }
 
   @action _blurActive() {
-    if (!this.active) return;
-    this.active.isActive = false;
+    const service = this.active;
+    if (service) {
+      service.isActive = false;
+    } else {
+      debug('No service is active');
+    }
   }
 
   @action _setActiveNext() {
@@ -678,6 +682,8 @@ export default class ServicesStore extends Store {
       const service = this.active;
       if (service) {
         this._focusService({ serviceId: service.id });
+      } else {
+        debug('No service is active');
       }
     } else {
       this.allServicesRequest.invalidate();
@@ -846,12 +852,13 @@ export default class ServicesStore extends Store {
   }
 
   @action _reloadActive() {
-    if (this.active) {
-      const service = this.one(this.active.id);
-
+    const service = this.active;
+    if (service) {
       this._reload({
         serviceId: service.id,
       });
+    } else {
+      debug('No service is active');
     }
   }
 
@@ -910,7 +917,6 @@ export default class ServicesStore extends Store {
 
   @action _toggleNotifications({ serviceId }) {
     const service = this.one(serviceId);
-    service.isNotificationEnabled = !service.isNotificationEnabled;
 
     this.actions.service.updateService({
       serviceId,
@@ -923,7 +929,6 @@ export default class ServicesStore extends Store {
 
   @action _toggleAudio({ serviceId }) {
     const service = this.one(serviceId);
-    service.isMuted = !service.isMuted;
 
     this.actions.service.updateService({
       serviceId,
@@ -936,7 +941,6 @@ export default class ServicesStore extends Store {
 
   @action _toggleDarkMode({ serviceId }) {
     const service = this.one(serviceId);
-    service.isDarkModeEnabled = !service.isDarkModeEnabled;
 
     this.actions.service.updateService({
       serviceId,
@@ -1018,12 +1022,13 @@ export default class ServicesStore extends Store {
     if (service) {
       this.actions.service.focusService({ serviceId: service.id });
       document.title = `Ferdi - ${service.name}`;
+    } else {
+      debug('No service is active');
     }
   }
 
   _saveActiveService() {
     const service = this.active;
-
     if (service) {
       this.actions.settings.update({
         type: 'service',
@@ -1031,6 +1036,8 @@ export default class ServicesStore extends Store {
           activeService: service.id,
         },
       });
+    } else {
+      debug('No service is active');
     }
   }
 
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index f551e1e49..9aade974c 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -65,7 +65,7 @@ export default class SettingsStore extends Store {
     // Inactivity lock timer
     let inactivityTimer;
     getCurrentWindow().on('blur', () => {
-      if (this.all.app.inactivityLock !== 0) {
+      if (this.all.app.lockingFeatureEnabled && this.all.app.inactivityLock !== 0) {
         inactivityTimer = setTimeout(() => {
           this.actions.settings.update({
             type: 'app',
diff --git a/src/stores/index.ts b/src/stores/index.ts
index e980f2c5b..4cd4e92ea 100644
--- a/src/stores/index.ts
+++ b/src/stores/index.ts
@@ -10,7 +10,6 @@ import NewsStore from './NewsStore';
 import RequestStore from './RequestStore';
 import GlobalErrorStore from './GlobalErrorStore';
 import { workspaceStore } from '../features/workspaces';
-import { announcementsStore } from '../features/announcements';
 import { communityRecipesStore } from '../features/communityRecipes';
 import { todosStore } from '../features/todos';
 
@@ -30,13 +29,12 @@ export default (api, actions, router) => {
     requests: new RequestStore(stores, api, actions),
     globalError: new GlobalErrorStore(stores, api, actions),
     workspaces: workspaceStore,
-    announcements: announcementsStore,
     communityRecipes: communityRecipesStore,
     todos: todosStore,
   });
 
   // Initialize all stores
-  Object.keys(stores).forEach((name) => {
+  Object.keys(stores).forEach(name => {
     if (stores[name] && stores[name].initialize) {
       stores[name].initialize();
     }
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 1981c8731..a3ae4513f 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -1,5 +1,6 @@
 /* eslint-disable import/first */
-import { contextBridge, ipcRenderer } from 'electron';
+import { contextBridge, desktopCapturer, ipcRenderer } from 'electron';
+import { BrowserWindow, getCurrentWebContents } from '@electron/remote';
 import { join } from 'path';
 import { autorun, computed, observable } from 'mobx';
 import { pathExistsSync, readFileSync } from 'fs-extra';
@@ -22,6 +23,7 @@ import RecipeWebview from './lib/RecipeWebview';
 import Userscript from './lib/Userscript';
 
 import { BadgeHandler } from './badge';
+import { SessionHandler } from './sessionHandler';
 import contextMenu from './contextMenu';
 import {
   injectDarkModeStyle,
@@ -49,6 +51,8 @@ const debug = require('debug')('Ferdi:Plugin');
 
 const badgeHandler = new BadgeHandler();
 
+const sessionHandler = new SessionHandler();
+
 const notificationsHandler = new NotificationsHandler();
 
 // Patching window.open
@@ -106,7 +110,16 @@ contextBridge.exposeInMainWorld('ferdi', {
     badgeHandler.safeParseInt(text),
   displayNotification: (title, options) =>
     notificationsHandler.displayNotification(title, options),
+  clearStorageData: (storageLocations) =>
+    sessionHandler.clearStorageData(storageLocations),
+  releaseServiceWorkers: () =>
+    sessionHandler.releaseServiceWorkers(),
   getDisplayMediaSelector,
+  getCurrentWebContents,
+  BrowserWindow,
+  ipcRenderer,
+  // TODO: When the discord recipe is changed to use the screenshare.js, this can be removed
+  desktopCapturer,
 });
 
 ipcRenderer.sendToHost(
@@ -316,7 +329,7 @@ class RecipeController {
       );
       const darkModeExists = pathExistsSync(darkModeStyle);
 
-      debug('darkmode.css exists? ', darkModeExists ? 'Yes' : 'No');
+      debug('darkmode.css exists? ', darkModeExists);
 
       // Check if recipe has a custom dark mode handler
       if (this.recipe && this.recipe.darkModeHandler) {
diff --git a/src/webview/sessionHandler.ts b/src/webview/sessionHandler.ts
new file mode 100644
index 000000000..6a7e62ac5
--- /dev/null
+++ b/src/webview/sessionHandler.ts
@@ -0,0 +1,28 @@
+import { getCurrentWebContents } from '@electron/remote';
+
+const debug = require('debug')('Ferdi:Plugin:SessionHandler');
+
+export class SessionHandler {
+  clearStorageData(storageLocations: string[]) {
+    try {
+      debug('Clearing storageLocations:', storageLocations);
+      const { session } = getCurrentWebContents();
+      session.flushStorageData();
+      session.clearStorageData({ storages: storageLocations });
+    } catch (err) {
+      debug(err);
+    }
+  }
+
+  async releaseServiceWorkers() {
+    try {
+      const registrations = await window.navigator.serviceWorker.getRegistrations();
+      registrations.forEach(r => {
+        r.unregister();
+        debug('ServiceWorker unregistered');
+      });
+    } catch (err) {
+      debug(err);
+    }
+  }
+}
diff --git a/src/webview/spellchecker.ts b/src/webview/spellchecker.ts
index aa9a2350f..30b4ef075 100644
--- a/src/webview/spellchecker.ts
+++ b/src/webview/spellchecker.ts
@@ -4,8 +4,8 @@ import { DEFAULT_APP_SETTINGS, isMac } from '../environment';
 
 const debug = require('debug')('Ferdi:spellchecker');
 
-const webContents = getCurrentWebContents();
-const [defaultLocale] = webContents.session.getSpellCheckerLanguages();
+const { session } = getCurrentWebContents();
+const [defaultLocale] = session.getSpellCheckerLanguages();
 debug('Spellchecker default locale is', defaultLocale);
 
 export function getSpellcheckerLocaleByFuzzyIdentifier(identifier: string) {
@@ -31,5 +31,5 @@ export function switchDict(locale: string) {
 
   locales.push(defaultLocale, DEFAULT_APP_SETTINGS.fallbackLocale);
 
-  webContents.session.setSpellCheckerLanguages(locales);
+  session.setSpellCheckerLanguages(locales);
 }