396 files changed, 8204 insertions, 20914 deletions

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 552b8cb93..1457084cb 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -974,7 +974,8 @@
       "profile": "https://www.ekino.com",
       "contributions": [
         "code",
-        "bug"
+        "bug",
+        "userTesting"
       ]
     },
     {
@@ -985,6 +986,15 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "niutech",
+      "name": "niu tech",
+      "avatar_url": "https://avatars.githubusercontent.com/u/384997?v=4",
+      "profile": "http://niute.ch",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 16,
diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index 47811e7be..000000000
--- a/.eslintrc
+++ /dev/null
@@ -1,163 +0,0 @@
-{
-  "root": true,
-  "parser": "@babel/eslint-parser",
-  "extends": "eslint-config-airbnb",
-  "plugins": [
-    "jest"
-  ],
-  "overrides": [
-    {
-      "files": [
-        "**/*.ts",
-        "**/*.tsx"
-      ],
-      "env": {
-        "browser": true,
-        "es6": true,
-        "node": true
-      },
-      "extends": [
-        "airbnb-typescript"
-      ],
-      "parser": "@typescript-eslint/parser",
-      "parserOptions": {
-        "ecmaFeatures": {
-          "jsx": true
-        },
-        "ecmaVersion": 2018,
-        "sourceType": "module",
-        "project": "./tsconfig.json"
-      },
-      "plugins": [
-        "@typescript-eslint"
-      ],
-      "rules": {
-        // eslint
-        "arrow-parens": 0,
-        "array-callback-return": 1,
-        "class-methods-use-this": 0,
-        "consistent-return": 0,
-        "implicit-arrow-linebreak": 0,
-        "linebreak-style": 0,
-        "max-len": 0,
-        "no-confusing-arrow": 0,
-        "no-console": 0,
-        "no-param-reassign": 0,
-        "no-return-assign": 1,
-        "no-underscore-dangle": 0,
-        "no-use-before-define": 0,
-        "prefer-destructuring": 1,
-        "object-curly-newline": 0,
-        "operator-linebreak": 0,
-        // @typescript-eslint
-        "@typescript-eslint/indent": 0,
-        "@typescript-eslint/no-shadow": 0,
-        "@typescript-eslint/no-unused-expressions": 0,
-        // eslint-plugin-import
-        "import/extensions": 0,
-        "import/no-cycle": 1,
-        "import/no-extraneous-dependencies": 0,
-        "import/no-unresolved": 0,
-        "import/prefer-default-export": 0,
-        // eslint-plugin-react
-        "react/destructuring-assignment": 0,
-        "react/button-has-type": 0,
-        "react/forbid-prop-types": 0,
-        "react/jsx-curly-newline": 0,
-        "react/jsx-no-bind": 0,
-        "react/jsx-no-target-blank": 0,
-        "react/jsx-props-no-spreading": 0,
-        "react/no-deprecated": 1,
-        "react/no-array-index-key": 0,
-        "react/prefer-stateless-function": 0,
-        "react/sort-comp": 0,
-        "react/state-in-constructor": 0,
-        "react/static-property-placement": 0,
-        //  eslint-plugin-jsx-a11y
-        "jsx-a11y/click-events-have-key-events": 1,
-        "jsx-a11y/mouse-events-have-key-events": 1,
-        "jsx-a11y/label-has-for": [
-          2,
-          {
-            "components": [
-              "Label"
-            ],
-            "required": {
-              "every": [
-                "id"
-              ]
-            },
-            "allowChildren": false
-          }
-        ],
-        "jsx-a11y/no-static-element-interactions": 0,
-        "jsx-a11y/no-noninteractive-element-interactions": 1
-      }
-    }
-  ],
-  "settings": {
-    "react": {
-      "pragma": "React", // Pragma to use, default to "React"
-      "version": "detect" // React version. "detect" automatically picks the version you have installed.
-    }
-  },
-  "globals": {
-    "window": true,
-    "document": true,
-    "FormData": true,
-    "localStorage": true,
-    "navigator": true,
-    "Element": true,
-    "use": true,
-    "FileReader": true
-  },
-  "env": {
-    "jest/globals": true
-  },
-  "rules": {
-    // eslint
-    "arrow-parens": 0,
-    "class-methods-use-this": 0,
-    "consistent-return": 1,
-    "implicit-arrow-linebreak": 0,
-    "function-paren-newline": 0,
-    "max-len": 0,
-    "no-await-in-loop": 1,
-    "no-console": [
-      1,
-      {
-        "allow": [
-          "warn",
-          "error"
-        ]
-      }
-    ],
-    "no-param-reassign": 1,
-    "no-restricted-syntax": 0,
-    "no-underscore-dangle": 0,
-    "operator-linebreak": 0,
-    "prefer-destructuring": 1,
-    "object-curly-newline": 0,
-    // eslint-plugin-import
-    "import/extensions": 1,
-    "import/prefer-default-export": 0,
-    "import/no-extraneous-dependencies": 0, // various false positives, re-enable at some point
-    "import/no-unresolved": 1,
-    // eslint-plugin-react
-    "react/forbid-prop-types": 1,
-    "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,
-    "react/static-property-placement": 0,
-    "react/state-in-constructor": 1,
-    "react/sort-comp": 0,
-    //  eslint-plugin-jsx-a11y
-    "jsx-a11y/click-events-have-key-events": 1,
-    "jsx-a11y/no-static-element-interactions": 1,
-    "jsx-a11y/no-noninteractive-element-interactions": 1
-  }
-}
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 000000000..057631708
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,186 @@
+module.exports = {
+  root: true,
+  parser: '@babel/eslint-parser',
+  parserOptions: {
+    ecmaFeatures: {
+      jsx: true,
+    },
+    ecmaVersion: 2018,
+    sourceType: 'module',
+    project: './tsconfig.json',
+  },
+  extends: ['eslint-config-airbnb', 'plugin:unicorn/recommended'],
+  plugins: ['jest'],
+  settings: {
+    react: {
+      pragma: 'React', // Pragma to use, default to "React"
+      version: 'detect', // React version. "detect" automatically picks the version you have installed.
+    },
+  },
+  globals: {
+    window: true,
+    document: true,
+    FormData: true,
+    localStorage: true,
+    navigator: true,
+    Element: true,
+    use: true,
+    FileReader: true,
+  },
+  env: {
+    browser: true,
+    es6: true,
+    node: true,
+    jest: true,
+  },
+  overrides: [
+    {
+      files: ['**/*.ts', '**/*.tsx'],
+      extends: ['airbnb-typescript', 'plugin:unicorn/recommended'],
+      parser: '@typescript-eslint/parser',
+      plugins: ['@typescript-eslint'],
+      rules: {
+        // eslint
+        'arrow-parens': 0,
+        'array-callback-return': 1,
+        'class-methods-use-this': 0,
+        'consistent-return': 0,
+        'function-paren-newline': 0,
+        'implicit-arrow-linebreak': 0,
+        'linebreak-style': 0,
+        'max-len': 0,
+        'no-confusing-arrow': 0,
+        'no-console': 0,
+        'no-param-reassign': 0,
+        'no-restricted-syntax': 0,
+        'no-return-assign': 1,
+        'no-underscore-dangle': 0,
+        'no-use-before-define': 0,
+        'prefer-destructuring': 1,
+        'object-curly-newline': 0,
+        'operator-linebreak': 0,
+        // @typescript-eslint
+        '@typescript-eslint/indent': 0,
+        '@typescript-eslint/no-shadow': 0,
+        '@typescript-eslint/no-unused-expressions': 0,
+        // eslint-plugin-import
+        'import/extensions': 0,
+        'import/no-cycle': 1,
+        'import/no-extraneous-dependencies': 0,
+        'import/no-unresolved': 0,
+        'import/prefer-default-export': 0,
+        // eslint-plugin-react
+        'react/destructuring-assignment': 0,
+        'react/button-has-type': 0,
+        'react/forbid-prop-types': 0,
+        'react/jsx-curly-newline': 0,
+        'react/jsx-no-bind': 0,
+        'react/jsx-no-target-blank': 0,
+        'react/jsx-props-no-spreading': 0,
+        'react/no-deprecated': 1,
+        'react/no-array-index-key': 0,
+        'react/prefer-stateless-function': 0,
+        'react/sort-comp': 0,
+        'react/state-in-constructor': 0,
+        'react/static-property-placement': 0,
+        //  eslint-plugin-jsx-a11y
+        'jsx-a11y/click-events-have-key-events': 1,
+        'jsx-a11y/mouse-events-have-key-events': 1,
+        'jsx-a11y/label-has-for': [
+          2,
+          {
+            components: ['Label'],
+            required: {
+              every: ['id'],
+            },
+            allowChildren: false,
+          },
+        ],
+        'jsx-a11y/no-static-element-interactions': 0,
+        'jsx-a11y/no-noninteractive-element-interactions': 1,
+        //  eslint-plugin-unicorn
+        'unicorn/filename-case': 0,
+        'unicorn/no-null': 0,
+        'unicorn/no-useless-undefined': 0,
+        'unicorn/prefer-module': 0,
+        'unicorn/prevent-abbreviations': 0,
+        'unicorn/prefer-node-protocol': 0,
+        'unicorn/import-style': [
+          2,
+          {
+            styles: {
+              path: {
+                named: true,
+              },
+            },
+          },
+        ],
+        'unicorn/consistent-destructuring': 0,
+      },
+    },
+  ],
+  rules: {
+    // eslint
+    'arrow-parens': 0,
+    'class-methods-use-this': 0,
+    'consistent-return': 1,
+    'implicit-arrow-linebreak': 0,
+    indent: 0,
+    'function-paren-newline': 0,
+    'linebreak-style': 0,
+    'max-len': 0,
+    'no-await-in-loop': 1,
+    'no-console': [
+      1,
+      {
+        allow: ['warn', 'error'],
+      },
+    ],
+    'no-param-reassign': 1,
+    'no-restricted-syntax': 0,
+    'no-underscore-dangle': 0,
+    'operator-linebreak': 0,
+    'prefer-destructuring': 1,
+    'object-curly-newline': 0,
+    // eslint-plugin-import
+    'import/extensions': 0,
+    'import/prefer-default-export': 0,
+    'import/no-extraneous-dependencies': 0, // various false positives, re-enable at some point
+    'import/no-unresolved': 0,
+    // eslint-plugin-react
+    'react/forbid-prop-types': 1,
+    '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,
+    'react/prop-types': 0,
+    'react/static-property-placement': 0,
+    'react/state-in-constructor': 1,
+    'react/sort-comp': 0,
+    //  eslint-plugin-jsx-a11y
+    'jsx-a11y/click-events-have-key-events': 1,
+    'jsx-a11y/no-static-element-interactions': 1,
+    'jsx-a11y/no-noninteractive-element-interactions': 1,
+    //  eslint-plugin-unicorn
+    'unicorn/filename-case': 0,
+    'unicorn/no-null': 0,
+    'unicorn/no-useless-undefined': 0,
+    'unicorn/prefer-module': 0,
+    'unicorn/prevent-abbreviations': 0,
+    'unicorn/prefer-node-protocol': 0,
+    'unicorn/import-style': [
+      2,
+      {
+        styles: {
+          path: {
+            named: true,
+          },
+        },
+      },
+    ],
+    'unicorn/consistent-destructuring': 0,
+  },
+};
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index cad16ecae..020d6ff58 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -3,7 +3,7 @@ name: Bug report
 about: Create a report to help us improve
 ---
 <!--
-Please remember that if you are logging a bug for some service that has *stopped working*, please log the bug at https://github.com/getferdi/recipes/issue
+Please remember that if you are logging a bug for some service that has *stopped working*, please log the bug at https://github.com/getferdi/recipes/issues
 Please remember to read the self-help documentation at https://github.com/getferdi/ferdi#troubleshooting-recipes-self-help - in case it helps you unblock yourself.
 
 Please fill our form below, this way we can analyse and fix the problem as fast as possible.
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml
index d41ded354..eafa6645e 100644
--- a/.github/workflows/dependency-updates.yml
+++ b/.github/workflows/dependency-updates.yml
@@ -55,7 +55,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v2.0.1
         with:
-          version: 6.14.7
+          version: 6.16.0
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml
index e3e504731..062243659 100644
--- a/.github/workflows/ferdi-builds.yml
+++ b/.github/workflows/ferdi-builds.yml
@@ -46,6 +46,7 @@ jobs:
           ref: nightly
           submodules: recursive
           fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging
+          # ssh-key: ${{ secrets.FERDI_PUBLISH_TOKEN }}
       - 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]')) }}
@@ -57,12 +58,18 @@ jobs:
           MANUAL_REBUILD="${{ github.event_name == 'workflow_dispatch' }}"
           VERSION_BUMP="${{ contains(github.event.inputs.message, '[version bump]') }}"
           if [ $CHANGES_COUNT -gt 0 ] || [[ $MANUAL_REBUILD == "true" && $VERSION_BUMP == "true" ]]; then
-            # Do the version bump in the 'develop' branch ONLY if there were other changes coming from the 'develop' branch
+            # Do the version bump in the 'develop' branch ONLY if
+            #   there were other changes coming from the 'develop' branch (or)
+            #   this is a manual trigger with the key-phrase
             git checkout develop
             TAG_NAME=$(npm version -m "%s [skip ci]" prerelease --preid=nightly)
             git push origin develop --no-verify
             git tag -f $TAG_NAME
             git push origin --tags --no-verify
+            # Also tag the submodule so as to help identify which changes went into which nightly release
+            # TODO: Not working due to cross-repo access issues by the github-action bot
+            # git -C recipes tag -f $TAG_NAME
+            # git -C recipes push origin --tags --no-verify
 
             git checkout nightly
           fi
@@ -83,7 +90,7 @@ jobs:
     name: 'macos ${{ github.event.inputs.message }}'
     needs: check_updates
     if: ${{ (needs.check_updates.outputs.should_run != 'false') && (github.event_name != 'workflow_dispatch' || (github.event_name == 'workflow_dispatch' && (contains(github.event.inputs.message, '[macOS]') || (!contains(github.event.inputs.message, '[macOS]') && !contains(github.event.inputs.message, '[Linux]') && !contains(github.event.inputs.message, '[Windows]'))))) }}
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
       - name: Set env vars
         run: |
@@ -142,21 +149,15 @@ jobs:
         uses: actions/setup-node@v2
         with:
           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
+          version: 6.16.0
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
           npm ls -g node-gyp@8.1.0 || npm i -g node-gyp@8.1.0
           npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0
-      - name: Fix corrupted node cache
-        run: npm cache clean --force
       - name: Install node dependencies recursively
         run: npx lerna bootstrap
       - name: Package recipes
@@ -170,7 +171,7 @@ jobs:
         shell: bash
       - name: Build Ferdi with publish for 'nightly' branch
         if: ${{ env.GIT_BRANCH_NAME == 'nightly' }}
-        run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=nightlies
+        run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }}
         shell: bash
         env:
           GH_TOKEN: ${{ secrets.FERDI_PUBLISH_TOKEN }}
@@ -255,14 +256,12 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v2.0.1
         with:
-          version: 6.14.7
+          version: 6.16.0
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
           npm ls -g node-gyp@8.1.0 || npm i -g node-gyp@8.1.0
           npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0
-      - name: Fix corrupted node cache
-        run: npm cache clean --force
       - name: Install node dependencies recursively
         run: npx lerna bootstrap
       - name: Figure out used package.json version
@@ -286,7 +285,7 @@ jobs:
         run: |
           sudo snap install snapcraft --classic
           echo "$SNAPCRAFT_LOGIN" | snapcraft login --with -
-          npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=nightlies -c.snap.publish.provider=snapStore -c.snap.publish.repo=nightlies -c.snap.publish.channels=edge
+          npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.snap.publish.provider=snapStore -c.snap.publish.repo=nightlies -c.snap.publish.channels=edge
           snapcraft logout
         shell: bash
       - name: Build Ferdi with publish for 'release' beta branch
@@ -382,16 +381,13 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v2.0.1
         with:
-          version: 6.14.7
+          version: 6.16.0
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
           npm ls -g node-gyp@8.1.0 || npm i -g node-gyp@8.1.0
           npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0
         shell: bash
-      - name: Fix corrupted node cache
-        run: npm cache clean --force
-        shell: bash
       - name: Install node dependencies recursively
         run: npx lerna bootstrap
         shell: bash
@@ -408,7 +404,7 @@ jobs:
         shell: bash
       - name: Build Ferdi with publish for 'nightly' branch
         if: ${{ env.GIT_BRANCH_NAME == 'nightly' }}
-        run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=nightlies
+        run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }}
         shell: bash
         env:
           GH_TOKEN: ${{ secrets.FERDI_PUBLISH_TOKEN }}
diff --git a/.github/workflows/ferdi-first-time-contributor.yml b/.github/workflows/ferdi-first-time-contributor.yml
deleted file mode 100644
index 7a1382a03..000000000
--- a/.github/workflows/ferdi-first-time-contributor.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copied from: https://awesomeopensource.com/project/actions/github-script?categoryPage=7
-
-name: Welcome first time contributors
-
-on: pull_request
-
-jobs:
-  welcome:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v4
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            // Get a list of all issues created by the PR opener
-            // See: https://octokit.github.io/rest.js/#pagination
-            const creator = context.payload.sender.login
-            const opts = github.issues.listForRepo.endpoint.merge({
-              ...context.issue,
-              creator,
-              state: 'all'
-            })
-            const issues = await github.paginate(opts)
-
-            for (const issue of issues) {
-              if (issue.number === context.issue.number) {
-                continue
-              }
-
-              if (issue.pull_request) {
-                return // Creator is already a contributor.
-              }
-            }
-
-            await github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Welcome, ${ creator }! Thanks for contributing to Ferdi!`
-            })
diff --git a/@types/index.d.ts b/@types/index.d.ts
new file mode 100644
index 000000000..4bfdb28fc
--- /dev/null
+++ b/@types/index.d.ts
@@ -0,0 +1,21 @@
+declare global {
+  interface Window {
+    ferdi: any;
+  }
+
+  namespace NodeJS {
+    interface ProcessEnv {
+      GITHUB_AUTH_TOKEN: string;
+      NODE_ENV: 'development' | 'production';
+      FERDI_APPDATA_DIR?: string;
+      PORTABLE_EXECUTABLE_DIR?: string;
+      ELECTRON_IS_DEV?: string;
+      APPDATA?: string;
+    }
+  }
+}
+/**
+ * Workaround to make TS recognize this file as a module.
+ * https://fettblog.eu/typescript-augmenting-global-lib-dom/
+ */
+export {};
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbf167d69..0171c3b5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,83 @@
+# [v5.6.3-nightly.12](https://github.com/getferdi/ferdi/compare/v5.6.3-nightly.10...v5.6.3-nightly.12) (2021-09-24)
+
+### Services
+
+- Update 'skype' and 'discord' to properly relinquish window object for image overlay 💖 @vraravam
+- Allow services to delineate favorites vs non-favorites in unread counts (eg Outlook) (getferdi/recipes#721) 💖 @vraravam
+
+# [v5.6.3-nightly.10](https://github.com/getferdi/ferdi/compare/v5.6.3-nightly.9...v5.6.3-nightly.10) (2021-09-22)
+
+### Services
+
+- Added `stackoverflow-chat` Recipe (getferdi/recipes#718) 💖 @vraravam
+- Allow self-hosted option for kimai-cloud service 💖 @vraravam
+- Remove call to 'clearStorageData' so that MS Teams can remember login creds across Ferdi restarts 💖 @vraravam
+
+# [v5.6.3-nightly.9](https://github.com/getferdi/ferdi/compare/v5.6.3-nightly.8...v5.6.3-nightly.9) (2021-09-21)
+
+### Bug fixes
+
+- Remove extra validation for `serviceUrl` for github since the url doesn't seem to be valid any more. (getferdi/recipes#715) 💖 @vraravam
+
+### Under the hood
+
+- Removed more references to `@electron/remote` from the codebase (#1968) 💖 @kris7t, @vraravam
+
+# [v5.6.3-nightly.8](https://github.com/getferdi/ferdi/compare/v5.6.3-nightly.7...v5.6.3-nightly.8) (2021-09-20)
+
+### Under the hood
+
+- Removed more references to `@electron/remote` from the codebase (#1967) 💖 #kris7t, @vraravam
+
+# [v5.6.3-nightly.7](https://github.com/getferdi/ferdi/compare/v5.6.3-nightly.4...v5.6.3-nightly.7) (2021-09-19)
+
+### Services
+
+- Added Pipefy Recipe (#711) 💖 @TanZng
+
+### Bug fixes
+
+- Fix images opening in browser instead of in Discord (#712) 💖 @briankendall
+- Fix accent color customization (#1963) (#1965) 💖 @kris7t
+
+### Under the hood
+
+- Progressing towards converting the whole code base from JS to TS (#1959) 💖 @mhatvan
+- Improved context isolation for sandboxing services (#1964) 💖 @kris7t
+
+# [v5.6.3-nightly.4](https://github.com/getferdi/ferdi/compare/v5.6.3-nightly.3...v5.6.3-nightly.4) (2021-09-16)
+
+### Features
+
+- Ferdi now support Split View Mode (#1926) 💖 @niutech
+
+### Bug fixes
+
+- Fix images opening in browser instead of in Discord (getferdi/recipes#712) 💖 @briankendall
+
+# [v5.6.3-nightly.3](https://github.com/getferdi/ferdi/compare/v5.6.3-nightly.2...v5.6.3-nightly.3) (2021-09-15)
+
+### Under the hood
+
+- Defensive programming to avoid javascript error for unread badges 💖 @vraravam
+- Progressing towards converting the whole code base from JS to TS (#1930) (#1934) 💖 @mhatvan
+- Translation updates and fixes 💖 @vraravam @mhatvan
+
+# [v5.6.3-nightly.2](https://github.com/getferdi/ferdi/compare/v5.6.2...v5.6.3-nightly.2) (2021-09-14)
+
+### Features
+
+- Upgrade to [electron 13.4.0](https://github.com/electron/electron/releases/tag/v13.4.0) 💖 @vraravam
+
+### Bug fixes
+
+- Revert "refactor: reuse method from the core electron framework for the `About` box (fixes #1928, #1929) 💖 @vraravam
+
+### Under the hood
+
+- chore: upgrade intl dependencies (#1920) 💖 @mhatvan
+- chore: update various defaultMessages (#1925) 💖 @mhatvan
+
 # [v5.6.2](https://github.com/getferdi/ferdi/compare/v5.6.1...v5.6.2) (2021-09-13)
 
 This is a hotfix for the 5.6.1 release, along with a couple of changes that were made over the weekend
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e0c5014a8..76ad5266b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -67,6 +67,8 @@ node -v
 v14.17.6
 npm -v
 6.14.13
+pnpm -v
+6.16.0
 ```
 
 _Note:_ You can choose any package manager to manage multiple versions of `node` and `npm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [asdf](https://github.com/asdf-vm/asdf).
diff --git a/Dockerfile b/Dockerfile
index d3589005b..cb3053708 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,14 +16,17 @@ RUN apt-get update -y \
 
 WORKDIR /usr/src/ferdi
 
-RUN npm i -g pnpm@6.14.7 \
-  && npm i -g node-gyp@8.1.0 \
-  && npm i -g lerna@4.0.0
+RUN npm i -g pnpm@6.16.0 \
+  && npm ls -g node-gyp@8.1.0 || npm i -g node-gyp@8.1.0 \
+  && npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0
 
-COPY . .
+COPY package*.json .
+COPY lerna.json .
+
+RUN npm i \
+  && npx lerna bootstrap
 
-# 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
+COPY . .
 
 WORKDIR /usr/src/ferdi/recipes
 
diff --git a/README.md b/README.md
index d101347d9..52163017a 100644
--- a/README.md
+++ b/README.md
@@ -14,12 +14,13 @@
 <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-99-default.svg?logo=github' alt='Contributors'/></a>
+<a href='#contributors-'><img src='https://img.shields.io/badge/contributors-100-default.svg?logo=github' alt='Contributors'/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 <a href="#backers-via-opencollective"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective"></a>
 <a href="#sponsors-via-opencollective"><img alt="Open Collective sponsors" src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective"></a>
 <a href="https://github.com/getferdi/ferdi/actions/workflows/ferdi-builds.yml"><img alt="Build Status" src="https://github.com/getferdi/ferdi/actions/workflows/ferdi-builds.yml/badge.svg?branch=develop&event=push"></a>
-<a href="https://gitter.im/getferdi/community?utm_source=share-link&utm_medium=link&utm_campaign=share-link"><img alt="Gitter Chat Room" src="https://img.shields.io/gitter/room/getferdi/community"></a>
+<a href="https://gitter.im/getferdi/community"><img alt="Gitter Chat Room" src="https://img.shields.io/gitter/room/getferdi/community"></a>
+<a href="https://chat.stackoverflow.com/rooms/237341/ferdi"><img alt="Stackoverflow Chat Room" src="https://img.shields.io/badge/stackoverflow--chat-ferdi-blue"></a>
 </p>
 
 🤴� Hard-fork of [Franz](https://github.com/meetfranz/franz), adding awesome features and removing unwanted ones.
@@ -60,7 +61,7 @@
 
 ## What is Ferdi?
 
-Ferdi is a desktop app that helps you organize how you use your favourite apps by combining them into one application. It is based on Franz - a software already used by thousands of people - with the difference that Ferdi gives you many additional features and doesn't restrict its usage! Ferdi is compatible with your existing Franz account so you can continue right where you left off. Find out more about Ferdi and its features on [getferdi.com](https://getferdi.com).
+Ferdi is a desktop app that helps you organize how you use your favourite apps by combining them into one application. It is based on Franz - a software already used by thousands of people - with the difference that Ferdi gives you many additional features and doesn't restrict its usage! Furthermore, Ferdi is compatible with your existing Franz account, so you can continue right where you left off. Please find out more about Ferdi and its features on [getferdi.com](https://getferdi.com).
 
 ## Features
 
@@ -99,7 +100,7 @@ Ferdi is a desktop app that helps you organize how you use your favourite apps b
 
 ### Download Ferdi
 
-You can download Ferdi for Windows, Mac and Linux on [Ferdi's download page](https://getferdi.com/download) or you can find all variants in the [latest stable release](https://github.com/getferdi/ferdi/releases/latest) assets and [all the other release here](https://github.com/getferdi/ferdi/releases).
+You can download Ferdi for Windows, Mac and Linux on [Ferdi's download page](https://getferdi.com/download) or you can find all variants in the [latest stable release](https://github.com/getferdi/ferdi/releases/latest) assets and [all the other releases here](https://github.com/getferdi/ferdi/releases).
 
 ### Or use Chocolatey (Windows only)
 
@@ -135,7 +136,7 @@ Ferdi has three separate AUR packages you can use:
 - **[ferdi-bin](https://aur.archlinux.org/packages/ferdi-bin/)**: Uses the latest Fedora release and extracts it to Arch. Use this version if you are having trouble with the `ferdi` package.
 - **[ferdi-git](https://aur.archlinux.org/packages/ferdi-git/)**: Uses your system electron version to run the latest commit from the develop branch and may be unstable but may also give you features that are not yet available in other versions. Please only use `ferdi-git` if you accept these risks.
 
-If you use an AUR Helper e.g. yay, simply install it via `yay -S ferdi`.
+If you use an AUR Helper, e.g. yay, install it via `yay -S ferdi`.
 
 ## What makes Ferdi different from Franz?
 
@@ -226,7 +227,7 @@ If you use an AUR Helper e.g. yay, simply install it via `yay -S ferdi`.
 
 ### Adds internal changes
 
-- [x] Upgrades to Electron 13.3.0
+- [x] Upgrades to Electron 15.1.1
 - [x] Switches to [`electron-spellchecker`](https://github.com/electron-userland/electron-spellchecker) to improve application size
 - [x] Minifies build files to improve app size
 - [x] Adds "npm run prepare-code" command for development to lint and beautify code
@@ -244,7 +245,7 @@ We welcome all contributors. Please read the [contributing guidelines](CONTRIBUT
 
 ## Nightly releases
 
-Nightly releases are automatically triggered every day ([details](https://github.com/getferdi/ferdi/pull/990)) and available in [getferdi/nightlies](https://github.com/getferdi/nightlies/releases). Maintainers still need to manually publish the draft releases as pre-releases for now.
+Nightly releases are automatically triggered every day ([details](https://github.com/getferdi/ferdi/pull/990)) and available in [getferdi/ferdi](https://github.com/getferdi/ferdi/releases). Maintainers still need to verify and manually publish the draft releases as pre-releases for now.
 
 ## Troubleshooting recipes (self-help)
 
@@ -386,8 +387,9 @@ 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://www.ekino.com' title='Sadetdin EYILI: code, bug, userTesting'><img src='https://avatars.githubusercontent.com/u/5607440?v=4' alt='sad270' style='border-radius:42px;width:42px;height:42px;'/></a></td>
     <td align="center"><a href='https://github.com/Tsakatac' title='Tsakatac: bug'><img src='https://avatars.githubusercontent.com/u/89021195?v=4' alt='Tsakatac' style='border-radius:42px;width:42px;height:42px;'/></a></td>
+    <td align="center"><a href='http://niute.ch' title='niu tech: code'><img src='https://avatars.githubusercontent.com/u/384997?v=4' alt='niutech' style='border-radius:42px;width:42px;height:42px;'/></a></td>
   </tr>
 </table>
 
diff --git a/babel.config.json b/babel.config.json
index 034e51ce5..d24207a8c 100644
--- a/babel.config.json
+++ b/babel.config.json
@@ -1,8 +1,5 @@
 {
-  "babelrcRoots": [
-    ".",
-    "packages/*"
-  ],
+  "babelrcRoots": [".", "packages/*"],
   "presets": [
     [
       "@babel/preset-env",
@@ -31,11 +28,10 @@
     "@babel/proposal-throw-expressions",
     "@babel/syntax-dynamic-import",
     [
-      "react-intl",
+      "formatjs",
       {
-        "messagesDir": "./src/i18n/messages/",
-        "enforceDescriptions": false,
-        "extractSourceLocation": true
+        "idInterpolationPattern": "[sha512:contenthash:base64:6]",
+        "ast": true
       }
     ],
     [
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 21b2e3d3b..d5fb607d9 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -33,7 +33,7 @@ const getTargetEnv = isDevBuild ? 'development' : 'production';
 const tsProject = ts.createProject('tsconfig.json');
 
 const styleConfig = Object.keys(rawStyleConfig).map(key => {
-  const isHex = /^#[0-9A-F]{6}$/i.test(rawStyleConfig[key]);
+  const isHex = /^#[\da-f]{6}$/i.test(rawStyleConfig[key]);
   return {
     [`$raw_${kebabCase(key)}`]: isHex
       ? hexRgb(rawStyleConfig[key], { format: 'array' }).splice(0, 3).join(',')
@@ -79,7 +79,7 @@ const paths = {
     ],
   },
   typescripts: {
-    src: 'src/**/*.ts',
+    src: ['src/**/*.ts', 'src/**/*.tsx'],
     dest: 'build/',
     watch: [
       'src/**/*.ts',
@@ -151,7 +151,7 @@ export function mvLernaPackages() {
 
 export function mvPostinstallScript() {
   return gulp
-    .src(['./scripts/postinstall.js'])
+    .src(['./scripts/postinstall.ts'])
     .pipe(gulp.dest(`${paths.dest}/scripts`));
 }
 
@@ -227,7 +227,7 @@ 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(
       babel({
diff --git a/package-lock.json b/package-lock.json
index 8ccf1f666..38d026e51 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ferdi",
-  "version": "5.6.2",
+  "version": "5.6.3-nightly.25",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -57,6 +57,13 @@
         "ms": "^2.1.1",
         "resetable": "^1.0.3",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+        }
       }
     },
     "@adonisjs/bodyparser": {
@@ -243,6 +250,11 @@
             "jsonfile": "^4.0.0",
             "universalify": "^0.1.0"
           }
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
         }
       }
     },
@@ -257,6 +269,13 @@
         "node-csp": "^1.0.1",
         "node-guard": "^1.0.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+        }
       }
     },
     "@adonisjs/validator": {
@@ -2319,6 +2338,21 @@
         }
       }
     },
+    "@cspotcode/source-map-consumer": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz",
+      "integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==",
+      "dev": true
+    },
+    "@cspotcode/source-map-support": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.6.1.tgz",
+      "integrity": "sha512-DX3Z+T5dt1ockmPdobJS/FAsQPW4V4SrWEhD2iYQT2Cb2tQsiMnYxrcUH9By/Z3B+v0S5LMBkQtV/XOBbpLEOg==",
+      "dev": true,
+      "requires": {
+        "@cspotcode/source-map-consumer": "0.8.0"
+      }
+    },
     "@dabh/diagnostics": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz",
@@ -2488,6 +2522,233 @@
         }
       }
     },
+    "@formatjs/cli": {
+      "version": "4.2.33",
+      "resolved": "https://registry.npmjs.org/@formatjs/cli/-/cli-4.2.33.tgz",
+      "integrity": "sha512-4Lg+KZ5QhXgF6+zjHyZlxMG8I0D3m3PZyrj3hRl97vdZ6rAWKVFWw8fkTO/iyhUCP2iC47Eh9r+ZTgGARX9Teg==",
+      "dev": true,
+      "requires": {
+        "@formatjs/icu-messageformat-parser": "2.0.11",
+        "@formatjs/ts-transformer": "3.4.10",
+        "@types/estree": "^0.0.50",
+        "@types/fs-extra": "^9.0.1",
+        "@types/json-stable-stringify": "^1.0.32",
+        "@types/node": "14",
+        "@vue/compiler-core": "^3.0.5",
+        "@vue/compiler-sfc": "^3.0.5",
+        "chalk": "^4.0.0",
+        "commander": "8",
+        "fast-glob": "^3.2.7",
+        "fs-extra": "10",
+        "json-stable-stringify": "^1.0.1",
+        "loud-rejection": "^2.2.0",
+        "tslib": "^2.1.0",
+        "typescript": "4"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "commander": {
+          "version": "8.2.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-8.2.0.tgz",
+          "integrity": "sha512-LLKxDvHeL91/8MIyTAD5BFMNtoIwztGPMiM/7Bl8rIPmHCZXRxmSWr91h57dpOpnQ6jIUqEWdXE/uBYMfiVZDA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "typescript": {
+          "version": "4.4.3",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz",
+          "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==",
+          "dev": true
+        }
+      }
+    },
+    "@formatjs/ecma402-abstract": {
+      "version": "1.9.8",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.9.8.tgz",
+      "integrity": "sha512-2U4n11bLmTij/k4ePCEFKJILPYwdMcJTdnKVBi+JMWBgu5O1N+XhCazlE6QXqVO1Agh2Doh0b/9Jf1mSmSVfhA==",
+      "requires": {
+        "@formatjs/intl-localematcher": "0.2.20",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@formatjs/fast-memoize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-1.2.0.tgz",
+      "integrity": "sha512-fObitP9Tlc31SKrPHgkPgQpGo4+4yXfQQITTCNH8AZdEqB7Mq4nPrjpUL/tNGN3lEeJcFxDbi0haX8HM7QvQ8w==",
+      "requires": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "@formatjs/icu-messageformat-parser": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.11.tgz",
+      "integrity": "sha512-5mWb8U8aulYGwnDZWrr+vdgn5PilvtrqQYQ1pvpgzQes/osi85TwmL2GqTGLlKIvBKD2XNA61kAqXYY95w4LWg==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.9.8",
+        "@formatjs/icu-skeleton-parser": "1.2.12",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@formatjs/icu-skeleton-parser": {
+      "version": "1.2.12",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.2.12.tgz",
+      "integrity": "sha512-DTFxWmEA02ZNW6fsYjGYSADvtrqqjCYF7DSgCmMfaaE0gLP4pCdAgOPE+lkXXU+jP8iCw/YhMT2Seyk/C5lBWg==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.9.8",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@formatjs/intl": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-1.14.1.tgz",
+      "integrity": "sha512-mtL8oBgFwTu0GHFnxaF93fk/zNzNkPzl+27Fwg5AZ88pWHWb7037dpODzoCBnaIVk4FBO5emUn/6jI9Byj8hOw==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.9.8",
+        "@formatjs/fast-memoize": "1.2.0",
+        "@formatjs/icu-messageformat-parser": "2.0.11",
+        "@formatjs/intl-displaynames": "5.2.3",
+        "@formatjs/intl-listformat": "6.3.3",
+        "intl-messageformat": "9.9.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@formatjs/intl-displaynames": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-5.2.3.tgz",
+      "integrity": "sha512-5BmhSurLbfgdeo0OBcNPPkIS8ikMMYaHe2NclxEQZqcMvrnQzNMNnUE2dDF5vZx+mkvKq77aQYzpc8RfqVsRCQ==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.9.8",
+        "@formatjs/intl-localematcher": "0.2.20",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@formatjs/intl-listformat": {
+      "version": "6.3.3",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-6.3.3.tgz",
+      "integrity": "sha512-3nzAKgVS5rePDa5HiH0OwZgAhqxLtzlMc9Pg4QgajRHSP1TqFiMmQnnn52wd3+xVTb7cjZVm3JBnTv51/MhTOg==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.9.8",
+        "@formatjs/intl-localematcher": "0.2.20",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@formatjs/intl-localematcher": {
+      "version": "0.2.20",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.20.tgz",
+      "integrity": "sha512-/Ro85goRZnCojzxOegANFYL0LaDIpdPjAukR7xMTjOtRx+3yyjR0ifGTOW3/Kjhmab3t6GnyHBYWZSudxEOxPA==",
+      "requires": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "@formatjs/ts-transformer": {
+      "version": "3.4.10",
+      "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.4.10.tgz",
+      "integrity": "sha512-5fu8x+8CtyrFe8zdwHvFsYLx9TEPjeJSODRS1ZJxkMVpTBHaNsPqsPkN1TuTk5x3+tSczxXmN1LGrAzUxNN3nQ==",
+      "dev": true,
+      "requires": {
+        "@formatjs/icu-messageformat-parser": "2.0.11",
+        "chalk": "^4.0.0",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "@hapi/hoek": {
       "version": "9.2.0",
       "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.0.tgz",
@@ -5612,14 +5873,14 @@
       }
     },
     "@mdi/font": {
-      "version": "5.9.55",
-      "resolved": "https://registry.npmjs.org/@mdi/font/-/font-5.9.55.tgz",
-      "integrity": "sha512-jswRF6q3eq8NWpWiqct6q+6Fg/I7nUhrxYJfiEM8JJpap0wVJLQdbKtyS65GdlK7S7Ytnx3TTi/bmw+tBhkGmg=="
+      "version": "6.2.95",
+      "resolved": "https://registry.npmjs.org/@mdi/font/-/font-6.2.95.tgz",
+      "integrity": "sha512-0RKkhabkFZP3ALwKqrjhdKdhydQpoydIjX6cvjIwLyjADCsE0pG68YkGY+S3qnfdErmhS4m8adwvgrAFXp2AYQ=="
     },
     "@mdi/js": {
-      "version": "4.6.95",
-      "resolved": "https://registry.npmjs.org/@mdi/js/-/js-4.6.95.tgz",
-      "integrity": "sha512-ga5GlIY/2hFQAuT5JKY21Rj+W9CnnbOp+ge6BEr/7omOiGVvsmUtetYOBOhyf8xgJ/BBtgvYHPzjZXORjh9cTg=="
+      "version": "6.2.95",
+      "resolved": "https://registry.npmjs.org/@mdi/js/-/js-6.2.95.tgz",
+      "integrity": "sha512-fbD22sEBathqVSQWcxshEtzhhRNFmMnV64z6T7DClRbQ9N5axorykt3Suv2zPzLDyiqH7UhNRu0VPvPCPDNpnQ=="
     },
     "@mdi/react": {
       "version": "1.5.0",
@@ -6386,12 +6647,30 @@
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "dev": true
     },
+    "@tsconfig/node10": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
+      "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
+      "dev": true
+    },
+    "@tsconfig/node12": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
+      "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
+      "dev": true
+    },
     "@tsconfig/node14": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
       "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
       "dev": true
     },
+    "@tsconfig/node16": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
+      "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
+      "dev": true
+    },
     "@types/babel__core": {
       "version": "7.1.15",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.15.tgz",
@@ -6414,6 +6693,15 @@
         "@babel/types": "^7.0.0"
       }
     },
+    "@types/babel__helper-plugin-utils": {
+      "version": "7.10.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__helper-plugin-utils/-/babel__helper-plugin-utils-7.10.0.tgz",
+      "integrity": "sha512-60YtHzhQ9HAkToHVV+TB4VLzBn9lrfgrsOjiJMtbv/c1jPdekBxaByd6DMsGBzROXWoIL6U3lEFvvbu69RkUoA==",
+      "dev": true,
+      "requires": {
+        "@types/babel__core": "*"
+      }
+    },
     "@types/babel__template": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
@@ -6472,6 +6760,12 @@
       "integrity": "sha512-vwNP+pzkI1ipznek2fCA4xj1kQyL9EJcfdBezD9eToe9eP2IgT3WLEBrVqiXal34LOyiAs8xCQKwugEYOKcMkw==",
       "dev": true
     },
+    "@types/estree": {
+      "version": "0.0.50",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
+      "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
+      "dev": true
+    },
     "@types/expect.js": {
       "version": "0.3.29",
       "resolved": "https://registry.npmjs.org/@types/expect.js/-/expect.js-0.3.29.tgz",
@@ -6506,6 +6800,15 @@
         "@types/node": "*"
       }
     },
+    "@types/hoist-non-react-statics": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+      "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
+      "requires": {
+        "@types/react": "*",
+        "hoist-non-react-statics": "^3.3.0"
+      }
+    },
     "@types/html-minifier-terser": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz",
@@ -6542,6 +6845,12 @@
       "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
       "dev": true
     },
+    "@types/json-stable-stringify": {
+      "version": "1.0.33",
+      "resolved": "https://registry.npmjs.org/@types/json-stable-stringify/-/json-stable-stringify-1.0.33.tgz",
+      "integrity": "sha512-qEWiQff6q2tA5gcJGWwzplQcXdJtm+0oy6IHGHzlOf3eFAkGE/FIPXZK9ofWgNSHVp8AFFI33PJJshS0ei3Gvw==",
+      "dev": true
+    },
     "@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
@@ -6554,6 +6863,12 @@
       "integrity": "sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw==",
       "dev": true
     },
+    "@types/mime-types": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz",
+      "integrity": "sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==",
+      "dev": true
+    },
     "@types/minimatch": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
@@ -6625,14 +6940,12 @@
     "@types/prop-types": {
       "version": "15.7.4",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
-      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==",
-      "dev": true
+      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
     },
     "@types/react": {
       "version": "16.14.6",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.6.tgz",
       "integrity": "sha512-Ol/aFKune+P0FSFKIgf+XbhGzYGyz0p7g5befSt4rmbzfGLaZR0q7jPew9k7d3bvrcuaL8dPy9Oz3XGZmf9n+w==",
-      "dev": true,
       "requires": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -6657,8 +6970,7 @@
     "@types/scheduler": {
       "version": "0.16.2",
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==",
-      "dev": true
+      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
     },
     "@types/semver": {
       "version": "7.3.8",
@@ -6716,9 +7028,15 @@
       }
     },
     "@types/uuid": {
-      "version": "3.4.9",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.9.tgz",
-      "integrity": "sha512-XDwyIlt/47l2kWLTzw/mtrpLdB+GPSskR2n/PIcPn+VYhVO77rGhRncIR5GPU0KRzXuqkDO+J5qqrG0Y8P6jzQ==",
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.1.tgz",
+      "integrity": "sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg==",
+      "dev": true
+    },
+    "@types/validator": {
+      "version": "13.6.3",
+      "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.6.3.tgz",
+      "integrity": "sha512-fWG42pMJOL4jKsDDZZREnXLjc3UE0R8LOJfARWYg6U966rxDT7TYejYzLnUF5cvSObGg34nd0+H2wHHU5Omdfw==",
       "dev": true
     },
     "@types/verror": {
@@ -6795,13 +7113,13 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "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==",
+      "version": "4.31.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.2.tgz",
+      "integrity": "sha512-w63SCQ4bIwWN/+3FxzpnWrDjQRXVEGiTt9tJTRptRXeFvdZc/wLiz3FQUwNQ2CVoRGI6KUWMNUj/pk63noUfcA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "4.30.0",
-        "@typescript-eslint/scope-manager": "4.30.0",
+        "@typescript-eslint/experimental-utils": "4.31.2",
+        "@typescript-eslint/scope-manager": "4.31.2",
         "debug": "^4.3.1",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.1.0",
@@ -6810,43 +7128,43 @@
       },
       "dependencies": {
         "@typescript-eslint/experimental-utils": {
-          "version": "4.30.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz",
-          "integrity": "sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==",
+          "version": "4.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.2.tgz",
+          "integrity": "sha512-3tm2T4nyA970yQ6R3JZV9l0yilE2FedYg8dcXrTar34zC9r6JB7WyBQbpIVongKPlhEMjhQ01qkwrzWy38Bk1Q==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.7",
-            "@typescript-eslint/scope-manager": "4.30.0",
-            "@typescript-eslint/types": "4.30.0",
-            "@typescript-eslint/typescript-estree": "4.30.0",
+            "@typescript-eslint/scope-manager": "4.31.2",
+            "@typescript-eslint/types": "4.31.2",
+            "@typescript-eslint/typescript-estree": "4.31.2",
             "eslint-scope": "^5.1.1",
             "eslint-utils": "^3.0.0"
           }
         },
         "@typescript-eslint/scope-manager": {
-          "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==",
+          "version": "4.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.2.tgz",
+          "integrity": "sha512-2JGwudpFoR/3Czq6mPpE8zBPYdHWFGL6lUNIGolbKQeSNv4EAiHaR5GVDQaLA0FwgcdcMtRk+SBJbFGL7+La5w==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.30.0",
-            "@typescript-eslint/visitor-keys": "4.30.0"
+            "@typescript-eslint/types": "4.31.2",
+            "@typescript-eslint/visitor-keys": "4.31.2"
           }
         },
         "@typescript-eslint/types": {
-          "version": "4.30.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.30.0.tgz",
-          "integrity": "sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==",
+          "version": "4.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.2.tgz",
+          "integrity": "sha512-kWiTTBCTKEdBGrZKwFvOlGNcAsKGJSBc8xLvSjSppFO88AqGxGNYtF36EuEYG6XZ9vT0xX8RNiHbQUKglbSi1w==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "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==",
+          "version": "4.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.2.tgz",
+          "integrity": "sha512-ieBq8U9at6PvaC7/Z6oe8D3czeW5d//Fo1xkF/s9394VR0bg/UaMYPdARiWyKX+lLEjY3w/FNZJxitMsiWv+wA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.30.0",
-            "@typescript-eslint/visitor-keys": "4.30.0",
+            "@typescript-eslint/types": "4.31.2",
+            "@typescript-eslint/visitor-keys": "4.31.2",
             "debug": "^4.3.1",
             "globby": "^11.0.3",
             "is-glob": "^4.0.1",
@@ -6855,12 +7173,12 @@
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "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==",
+          "version": "4.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.2.tgz",
+          "integrity": "sha512-PrBId7EQq2Nibns7dd/ch6S6/M4/iwLM9McbgeEbCXfxdwRUNxJ4UNreJ6Gh3fI2GNKNrWnQxKL7oCPmngKBug==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.30.0",
+            "@typescript-eslint/types": "4.31.2",
             "eslint-visitor-keys": "^2.0.0"
           }
         },
@@ -6890,41 +7208,41 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.1.tgz",
-      "integrity": "sha512-3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg==",
+      "version": "4.31.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.2.tgz",
+      "integrity": "sha512-EcdO0E7M/sv23S/rLvenHkb58l3XhuSZzKf6DBvLgHqOYdL6YFMYVtreGFWirxaU2mS1GYDby3Lyxco7X5+Vjw==",
       "dev": true,
       "requires": {
-        "@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.31.2",
+        "@typescript-eslint/types": "4.31.2",
+        "@typescript-eslint/typescript-estree": "4.31.2",
         "debug": "^4.3.1"
       },
       "dependencies": {
         "@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.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.2.tgz",
+          "integrity": "sha512-2JGwudpFoR/3Czq6mPpE8zBPYdHWFGL6lUNIGolbKQeSNv4EAiHaR5GVDQaLA0FwgcdcMtRk+SBJbFGL7+La5w==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.29.1",
-            "@typescript-eslint/visitor-keys": "4.29.1"
+            "@typescript-eslint/types": "4.31.2",
+            "@typescript-eslint/visitor-keys": "4.31.2"
           }
         },
         "@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.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.2.tgz",
+          "integrity": "sha512-kWiTTBCTKEdBGrZKwFvOlGNcAsKGJSBc8xLvSjSppFO88AqGxGNYtF36EuEYG6XZ9vT0xX8RNiHbQUKglbSi1w==",
           "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.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.2.tgz",
+          "integrity": "sha512-ieBq8U9at6PvaC7/Z6oe8D3czeW5d//Fo1xkF/s9394VR0bg/UaMYPdARiWyKX+lLEjY3w/FNZJxitMsiWv+wA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.29.1",
-            "@typescript-eslint/visitor-keys": "4.29.1",
+            "@typescript-eslint/types": "4.31.2",
+            "@typescript-eslint/visitor-keys": "4.31.2",
             "debug": "^4.3.1",
             "globby": "^11.0.3",
             "is-glob": "^4.0.1",
@@ -6933,12 +7251,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.31.2",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.2.tgz",
+          "integrity": "sha512-PrBId7EQq2Nibns7dd/ch6S6/M4/iwLM9McbgeEbCXfxdwRUNxJ4UNreJ6Gh3fI2GNKNrWnQxKL7oCPmngKBug==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.29.1",
+            "@typescript-eslint/types": "4.31.2",
             "eslint-visitor-keys": "^2.0.0"
           }
         },
@@ -7011,6 +7329,121 @@
       "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
       "dev": true
     },
+    "@vue/compiler-core": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.11.tgz",
+      "integrity": "sha512-bcbsLx5XyQg8WDDEGwmpX0BfEfv82wIs9fWFelpyVhNRGMaABvUTalYINyfhVT+jOqNaD4JBhJiVKd/8TmsHWg==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.15.0",
+        "@babel/types": "^7.15.0",
+        "@vue/shared": "3.2.11",
+        "estree-walker": "^2.0.2",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "@vue/compiler-dom": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.11.tgz",
+      "integrity": "sha512-DNvhUHI/1Hn0/+ZYDYGAuDGasUm+XHKC3FE4GqkNCTO/fcLaJMRg/7eT1m1lkc7jPffUwwfh1rZru5mwzOjrNw==",
+      "dev": true,
+      "requires": {
+        "@vue/compiler-core": "3.2.11",
+        "@vue/shared": "3.2.11"
+      }
+    },
+    "@vue/compiler-sfc": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.11.tgz",
+      "integrity": "sha512-cUIaS8mgJrQ6yucj2AupWAwBRITK3W/a8wCOn9g5fJGtOl8h4APY8vN3lzP8HIJDyEeRF3I8SfRhL+oX97kSnw==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.15.0",
+        "@babel/types": "^7.15.0",
+        "@types/estree": "^0.0.48",
+        "@vue/compiler-core": "3.2.11",
+        "@vue/compiler-dom": "3.2.11",
+        "@vue/compiler-ssr": "3.2.11",
+        "@vue/ref-transform": "3.2.11",
+        "@vue/shared": "3.2.11",
+        "consolidate": "^0.16.0",
+        "estree-walker": "^2.0.2",
+        "hash-sum": "^2.0.0",
+        "lru-cache": "^5.1.1",
+        "magic-string": "^0.25.7",
+        "merge-source-map": "^1.1.0",
+        "postcss": "^8.1.10",
+        "postcss-modules": "^4.0.0",
+        "postcss-selector-parser": "^6.0.4",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "@types/estree": {
+          "version": "0.0.48",
+          "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.48.tgz",
+          "integrity": "sha512-LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
+        }
+      }
+    },
+    "@vue/compiler-ssr": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.11.tgz",
+      "integrity": "sha512-+ptAdUlFDij+Z0VGCbRRkxQlNev5LkbZAntvkxrFjc08CTMhZmiV4Js48n2hAmuSXaKNEpmGkDGU26c/vf1+xw==",
+      "dev": true,
+      "requires": {
+        "@vue/compiler-dom": "3.2.11",
+        "@vue/shared": "3.2.11"
+      }
+    },
+    "@vue/ref-transform": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.11.tgz",
+      "integrity": "sha512-7rX0YsfYb7+1PeKPME1tQyUQcQgt0sIXRRnPD1Vw8Zs2KIo90YLy9CrvwalcRCxGw0ScsjBEhVjJtWIT79TElg==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.15.0",
+        "@vue/compiler-core": "3.2.11",
+        "@vue/shared": "3.2.11",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.25.7"
+      }
+    },
+    "@vue/shared": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.11.tgz",
+      "integrity": "sha512-ovfXAsSsCvV9JVceWjkqC/7OF5HbgLOtCWjCIosmPGG8lxbPuavhIxRH1dTx4Dg9xLgRTNLvI3pVxG4ItQZekg==",
+      "dev": true
+    },
     "@webassemblyjs/ast": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
@@ -8028,6 +8461,12 @@
         }
       }
     },
+    "arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
+    },
     "argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -8105,6 +8544,12 @@
       "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
       "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8="
     },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "dev": true
+    },
     "array-flatten": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
@@ -8543,6 +8988,86 @@
         "object.assign": "^4.1.0"
       }
     },
+    "babel-plugin-formatjs": {
+      "version": "10.3.8",
+      "resolved": "https://registry.npmjs.org/babel-plugin-formatjs/-/babel-plugin-formatjs-10.3.8.tgz",
+      "integrity": "sha512-pLryt/Q5zmoQWRrybzwiaZ9i0M9I1JJwshHqOuyxn+MlqcxArp2N0E7/X9fhIC1X9yEdDV0zfGbY00J+krmZzQ==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-jsx": "7",
+        "@babel/traverse": "7",
+        "@babel/types": "^7.12.11",
+        "@formatjs/icu-messageformat-parser": "2.0.11",
+        "@formatjs/ts-transformer": "3.4.10",
+        "@types/babel__core": "^7.1.7",
+        "@types/babel__helper-plugin-utils": "^7.10.0",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@formatjs/ts-transformer": {
+          "version": "3.4.10",
+          "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.4.10.tgz",
+          "integrity": "sha512-5fu8x+8CtyrFe8zdwHvFsYLx9TEPjeJSODRS1ZJxkMVpTBHaNsPqsPkN1TuTk5x3+tSczxXmN1LGrAzUxNN3nQ==",
+          "dev": true,
+          "requires": {
+            "@formatjs/icu-messageformat-parser": "2.0.11",
+            "chalk": "^4.0.0",
+            "tslib": "^2.1.0"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "babel-plugin-istanbul": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
@@ -8606,38 +9131,6 @@
         "@babel/helper-define-polyfill-provider": "^0.2.2"
       }
     },
-    "babel-plugin-react-intl": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-react-intl/-/babel-plugin-react-intl-3.5.1.tgz",
-      "integrity": "sha512-1jlEJCSmLaJM4tjIKpu64UZ833COCHmwR77bFJDOye+zlwf80uR1b8p41l4tClx1QsrfI+qV6w/5AiPYQgaMUQ==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.4.5",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@types/babel__core": "^7.1.2",
-        "fs-extra": "^8.0.1",
-        "intl-messageformat-parser": "^1.8.1"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "intl-messageformat-parser": {
-          "version": "1.8.1",
-          "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.8.1.tgz",
-          "integrity": "sha512-IMSCKVf0USrM/959vj3xac7s8f87sc+80Y/ipBzdKy4ifBv5Gsj2tZ41EAaURVg01QU71fYr77uA8Meh6kELbg==",
-          "dev": true
-        }
-      }
-    },
     "babel-preset-current-node-syntax": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
@@ -9422,6 +9915,12 @@
         "sax": "^1.2.4"
       }
     },
+    "builtin-modules": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
+      "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
+      "dev": true
+    },
     "builtin-status-codes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
@@ -9698,9 +10197,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001256",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001256.tgz",
-      "integrity": "sha512-QirrvMLmB4txNnxiaG/xbm6FSzv9LqOZ3Jp9VtCYb3oPIfCHpr/oGn38pFq0udwlkctvXQgPthaXqJ76DaYGnA==",
+      "version": "1.0.30001264",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001264.tgz",
+      "integrity": "sha512-Ftfqqfcs/ePiUmyaySsQ4PUsdcYyXG2rfoBVsk3iY1ahHaJEw65vfb7Suzqm+cEkwwPIv/XWkg27iCpRavH4zA==",
       "dev": true
     },
     "caseless": {
@@ -9921,6 +10420,31 @@
         "node-addon-api": "*",
         "rimraf": "^2.4.0",
         "underscore": "^1.6.0"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "requires": {
+            "glob": "^7.1.3"
+          },
+          "dependencies": {
+            "glob": {
+              "version": "7.1.7",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+              "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            }
+          }
+        }
       }
     },
     "clean-css": {
@@ -9940,6 +10464,15 @@
         }
       }
     },
+    "clean-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz",
+      "integrity": "sha1-jffHquUf02h06PjQW5GAvBGj/tc=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
     "clean-stack": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
@@ -10807,6 +11340,15 @@
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
+    "consolidate": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.16.0.tgz",
+      "integrity": "sha512-Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.7.2"
+      }
+    },
     "constants-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
@@ -11282,6 +11824,31 @@
         "mkdirp": "^0.5.1",
         "rimraf": "^2.5.4",
         "run-queue": "^1.0.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.7",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+          "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "copy-descriptor": {
@@ -11440,6 +12007,12 @@
         "object-assign": "^4.1.1"
       }
     },
+    "create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true
+    },
     "cross-env": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
@@ -11546,24 +12119,6 @@
         "uid-safe": "2.1.5"
       }
     },
-    "css": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-      "requires": {
-        "inherits": "^2.0.3",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.5.2",
-        "urix": "^0.1.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
     "css-select": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
@@ -11609,6 +12164,12 @@
       "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==",
       "dev": true
     },
+    "cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true
+    },
     "csso": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
@@ -11646,6 +12207,15 @@
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
       "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw=="
     },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dev": true,
+      "requires": {
+        "array-find-index": "^1.0.1"
+      }
+    },
     "cyclist": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
@@ -12024,6 +12594,15 @@
           "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
           "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
           "dev": true
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
         }
       }
     },
@@ -12487,12 +13066,12 @@
       }
     },
     "electron": {
-      "version": "13.3.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-13.3.0.tgz",
-      "integrity": "sha512-d/BvOLDjI4i7yf9tqCuLL2fFGA2TrM/D9PyRpua+rJolG0qrwp/FohP02L0m+44kmPpofIo4l3NPwLmzyKKimA==",
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-15.1.1.tgz",
+      "integrity": "sha512-ogVGNWL38KegiqAhUdgjWoKPOufTqDb+cNIqQF/WpVxgauNjzXEk/RNEk7qlw946B/g2dHpzpHeUhi+D/4EcIg==",
       "dev": true,
       "requires": {
-        "@electron/get": "^1.0.1",
+        "@electron/get": "^1.13.0",
         "@types/node": "^14.6.2",
         "extract-zip": "^1.0.3"
       }
@@ -12688,11 +13267,6 @@
       "resolved": "https://registry.npmjs.org/electron-find/-/electron-find-1.0.7.tgz",
       "integrity": "sha512-C2FQJuk8567P2a2loBNwl5c8kwOTQVMB0capgHtPI7zKwZG16X0UxG+sNYZExQfnJ0PA+ecECA/4LcXxQa2TCA=="
     },
-    "electron-is-dev": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-1.2.0.tgz",
-      "integrity": "sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw=="
-    },
     "electron-notarize": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.1.0.tgz",
@@ -12856,13 +13430,13 @@
       }
     },
     "electron-react-titlebar": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/electron-react-titlebar/-/electron-react-titlebar-0.8.2.tgz",
-      "integrity": "sha512-Bbkaryi6JmtSuq8hAM+RNxlPhmQdE/7bdEsBasTtS+tbHHPsX0p4ilxVxKlFt23geV8kQaSq7qoZr30ixW8jtw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/electron-react-titlebar/-/electron-react-titlebar-1.0.0.tgz",
+      "integrity": "sha512-/Ilv4kYPyJ1czijKtkQ1pXgvI/UeWaHjlNRnvuimWbrDzJJhsEtRHMdbnR1MaZEqRlT5pPlCIy3VflTP6ow3rg==",
       "requires": {
-        "classnames": "^2.2.6",
-        "lodash": "^4.17.15",
-        "react-virtualized": "^9.7.6"
+        "classnames": "^2.3.1",
+        "lodash": "^4.17.21",
+        "react-virtualized": "^9.22.3"
       }
     },
     "electron-to-chromium": {
@@ -12886,15 +13460,6 @@
         "semver": "^7.3.5"
       }
     },
-    "electron-util": {
-      "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"
-      }
-    },
     "electron-window-state": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/electron-window-state/-/electron-window-state-5.0.3.tgz",
@@ -13554,15 +14119,10 @@
       }
     },
     "eslint-config-airbnb-typescript": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-12.3.1.tgz",
-      "integrity": "sha512-ql/Pe6/hppYuRp4m3iPaHJqkBB7dgeEmGPQ6X0UNmrQOfTF+dXw29/ZjU2kQ6RDoLxaxOA+Xqv07Vbef6oVTWw==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/parser": "^4.4.1",
-        "eslint-config-airbnb": "^18.2.0",
-        "eslint-config-airbnb-base": "^14.2.0"
-      }
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-14.0.0.tgz",
+      "integrity": "sha512-d2Nit2ByZARGRYK6tgSNl3nnmGZPyvsgbsKFcmm+nAhvT8VjVpifG5jI4tzObUUPb0sWw0E1oO/0pSpBD/pIuQ==",
+      "dev": true
     },
     "eslint-config-prettier": {
       "version": "8.3.0",
@@ -13850,9 +14410,9 @@
       }
     },
     "eslint-plugin-prettier": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz",
-      "integrity": "sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz",
+      "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==",
       "dev": true,
       "requires": {
         "prettier-linter-helpers": "^1.0.0"
@@ -13912,6 +14472,43 @@
       "integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==",
       "dev": true
     },
+    "eslint-plugin-unicorn": {
+      "version": "36.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-36.0.0.tgz",
+      "integrity": "sha512-xxN2vSctGWnDW6aLElm/LKIwcrmk6mdiEcW55Uv5krcrVcIFSWMmEgc/hwpemYfZacKZ5npFERGNz4aThsp1AA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.14.9",
+        "ci-info": "^3.2.0",
+        "clean-regexp": "^1.0.0",
+        "eslint-template-visitor": "^2.3.2",
+        "eslint-utils": "^3.0.0",
+        "is-builtin-module": "^3.1.0",
+        "lodash": "^4.17.21",
+        "pluralize": "^8.0.0",
+        "read-pkg-up": "^7.0.1",
+        "regexp-tree": "^0.1.23",
+        "safe-regex": "^2.1.1",
+        "semver": "^7.3.5"
+      },
+      "dependencies": {
+        "pluralize": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
+          "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
+          "dev": true
+        },
+        "safe-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-2.1.1.tgz",
+          "integrity": "sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==",
+          "dev": true,
+          "requires": {
+            "regexp-tree": "~0.1.1"
+          }
+        }
+      }
+    },
     "eslint-scope": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -13922,6 +14519,19 @@
         "estraverse": "^4.1.1"
       }
     },
+    "eslint-template-visitor": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/eslint-template-visitor/-/eslint-template-visitor-2.3.2.tgz",
+      "integrity": "sha512-3ydhqFpuV7x1M9EK52BPNj6V0Kwu0KKkcIAfpUhwHbR8ocRln/oUHgfxQupY8O1h4Qv/POHDumb/BwwNfxbtnA==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.12.16",
+        "@babel/eslint-parser": "^7.12.16",
+        "eslint-visitor-keys": "^2.0.0",
+        "esquery": "^1.3.1",
+        "multimap": "^1.1.0"
+      }
+    },
     "eslint-utils": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
@@ -14001,6 +14611,12 @@
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true
     },
+    "estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true
+    },
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@@ -15177,6 +15793,31 @@
         "inherits": "~2.0.0",
         "mkdirp": ">=0.5 0",
         "rimraf": "2"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.7",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+          "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+          "optional": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "optional": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "function-bind": {
@@ -15238,6 +15879,15 @@
         }
       }
     },
+    "generic-names": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/generic-names/-/generic-names-2.0.1.tgz",
+      "integrity": "sha512-kPCHWa1m9wGG/OwQpeweTwM/PYiQLrUIxXbt/P4Nic3LbGjCP0YwrALHW1uNLKZ0LIMg+RF+XRlj2ekT9ZlZAQ==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0"
+      }
+    },
     "gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -15566,9 +16216,9 @@
       },
       "dependencies": {
         "core-js": {
-          "version": "3.16.4",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.4.tgz",
-          "integrity": "sha512-Tq4GVE6XCjE+hcyW6hPy0ofN3hwtLudz5ZRdrlCnsnD/xkm/PWQRudzYHiKgZKUcefV6Q57fhDHjZHJP5dpfSg==",
+          "version": "3.18.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.1.tgz",
+          "integrity": "sha512-vJlUi/7YdlCZeL6fXvWNaLUPh/id12WXj3MbkMw5uOyF0PfWPBNOCNbs53YqgrvtujLNlt9JQpruyIKkUZ+PKA==",
           "dev": true,
           "optional": true
         }
@@ -16440,6 +17090,12 @@
         }
       }
     },
+    "hash-sum": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
+      "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
+      "dev": true
+    },
     "hash.js": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
@@ -16848,6 +17504,18 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
+    "icss-replace-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
+      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
+      "dev": true
+    },
+    "icss-utils": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "dev": true
+    },
     "ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -17214,30 +17882,14 @@
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
       "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="
     },
-    "intl-format-cache": {
-      "version": "2.2.9",
-      "resolved": "https://registry.npmjs.org/intl-format-cache/-/intl-format-cache-2.2.9.tgz",
-      "integrity": "sha512-Zv/u8wRpekckv0cLkwpVdABYST4hZNTDaX7reFetrYTJwxExR2VyTqQm+l0WmL0Qo8Mjb9Tf33qnfj0T7pjxdQ=="
-    },
     "intl-messageformat": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-2.2.0.tgz",
-      "integrity": "sha1-NFvNRt5jC3aDMwwuUhd/9eq0hPw=",
+      "version": "9.9.1",
+      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.9.1.tgz",
+      "integrity": "sha512-cuzS/XKHn//hvKka77JKU2dseiVY2dofQjIOZv6ZFxFt4Z9sPXnZ7KQ9Ak2r+4XBCjI04MqJ1PhKs/3X22AkfA==",
       "requires": {
-        "intl-messageformat-parser": "1.4.0"
-      }
-    },
-    "intl-messageformat-parser": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz",
-      "integrity": "sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU="
-    },
-    "intl-relativeformat": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/intl-relativeformat/-/intl-relativeformat-2.2.0.tgz",
-      "integrity": "sha512-4bV/7kSKaPEmu6ArxXf9xjv1ny74Zkwuey8Pm01NH4zggPP7JHwg2STk8Y3JdspCKRDriwIyLRfEXnj2ZLr4Bw==",
-      "requires": {
-        "intl-messageformat": "^2.0.0"
+        "@formatjs/fast-memoize": "1.2.0",
+        "@formatjs/icu-messageformat-parser": "2.0.11",
+        "tslib": "^2.1.0"
       }
     },
     "invariant": {
@@ -17348,6 +18000,15 @@
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
+    "is-builtin-module": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.1.0.tgz",
+      "integrity": "sha512-OV7JjAgOTfAFJmHZLvpSTb4qi0nIILDV1gWPYDnDJUTNFM5aGlRAhk4QcT8i7TuAleeEV5Fdkqn3t4mS+Q11fg==",
+      "dev": true,
+      "requires": {
+        "builtin-modules": "^3.0.0"
+      }
+    },
     "is-callable": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
@@ -19536,6 +20197,12 @@
             "punycode": "^2.1.1",
             "universalify": "^0.1.2"
           }
+        },
+        "ws": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
+          "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
+          "dev": true
         }
       }
     },
@@ -19930,6 +20597,11 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
         }
       }
     },
@@ -20505,6 +21177,16 @@
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
+    "loud-rejection": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-2.2.0.tgz",
+      "integrity": "sha512-S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ==",
+      "dev": true,
+      "requires": {
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.2"
+      }
+    },
     "lower-case": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
@@ -20574,6 +21256,15 @@
         }
       }
     },
+    "magic-string": {
+      "version": "0.25.7",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
+      "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+      "dev": true,
+      "requires": {
+        "sourcemap-codec": "^1.4.4"
+      }
+    },
     "make-dir": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
@@ -20710,11 +21401,6 @@
         "object-visit": "^1.0.0"
       }
     },
-    "marked": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
-      "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="
-    },
     "matchdep": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
@@ -20879,6 +21565,23 @@
       "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
       "dev": true
     },
+    "merge-source-map": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
+      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
+      "dev": true,
+      "requires": {
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
     "merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -21686,6 +22389,31 @@
         "mkdirp": "^0.5.1",
         "rimraf": "^2.5.4",
         "run-queue": "^1.0.3"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.7",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+          "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "ms": {
@@ -21709,6 +22437,12 @@
       "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
       "dev": true
     },
+    "multimap": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multimap/-/multimap-1.1.0.tgz",
+      "integrity": "sha512-0ZIR9PasPxGXmRsEF8jsDzndzHDj7tIav+JUmvIFB/WHswliFnquxECT/De7GR4yg99ky/NlRKJT82G1y271bw==",
+      "dev": true
+    },
     "multimatch": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
@@ -21880,11 +22614,6 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
-    "new-github-issue-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/new-github-issue-url/-/new-github-issue-url-0.2.1.tgz",
-      "integrity": "sha512-md4cGoxuT4T4d/HDOXbrUHkTKrp/vp+m3aOA7XXVYwNsUNMK49g3SQicTSeV5GIz/5QVGAeYRAOlyp9OvlgsYA=="
-    },
     "next-tick": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
@@ -21905,23 +22634,6 @@
         "lower-case": "^1.1.1"
       }
     },
-    "node-abi": {
-      "version": "2.30.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz",
-      "integrity": "sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==",
-      "dev": true,
-      "requires": {
-        "semver": "^5.4.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        }
-      }
-    },
     "node-addon-api": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.0.0.tgz",
@@ -22010,6 +22722,15 @@
             "path-is-absolute": "^1.0.0"
           }
         },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "optional": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
         "semver": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
@@ -22150,6 +22871,19 @@
         "tar": "^4"
       },
       "dependencies": {
+        "glob": {
+          "version": "7.1.7",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+          "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
         "nopt": {
           "version": "4.0.3",
           "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
@@ -22159,10 +22893,42 @@
             "osenv": "^0.1.4"
           }
         },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        },
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        },
+        "tar": {
+          "version": "4.4.19",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
+          "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
+          "requires": {
+            "chownr": "^1.1.4",
+            "fs-minipass": "^1.2.7",
+            "minipass": "^2.9.0",
+            "minizlib": "^1.3.3",
+            "mkdirp": "^0.5.5",
+            "safe-buffer": "^5.2.1",
+            "yallist": "^3.1.1"
+          }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
         }
       }
     },
@@ -22335,6 +23101,32 @@
             "semver": "^5.7.1",
             "tar": "^4.4.12",
             "which": "^1.3.1"
+          },
+          "dependencies": {
+            "rimraf": {
+              "version": "2.7.1",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+              "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+              "dev": true,
+              "requires": {
+                "glob": "^7.1.3"
+              }
+            },
+            "tar": {
+              "version": "4.4.19",
+              "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
+              "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
+              "dev": true,
+              "requires": {
+                "chownr": "^1.1.4",
+                "fs-minipass": "^1.2.7",
+                "minipass": "^2.9.0",
+                "minizlib": "^1.3.3",
+                "mkdirp": "^0.5.5",
+                "safe-buffer": "^5.2.1",
+                "yallist": "^3.1.1"
+              }
+            }
           }
         },
         "nopt": {
@@ -22353,11 +23145,23 @@
           "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
           "dev": true
         },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        },
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
         }
       }
     },
@@ -23619,6 +24423,84 @@
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
     },
+    "postcss": {
+      "version": "8.3.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz",
+      "integrity": "sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==",
+      "dev": true,
+      "requires": {
+        "colorette": "^1.2.2",
+        "nanoid": "^3.1.23",
+        "source-map-js": "^0.6.2"
+      }
+    },
+    "postcss-modules": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/postcss-modules/-/postcss-modules-4.2.2.tgz",
+      "integrity": "sha512-/H08MGEmaalv/OU8j6bUKi/kZr2kqGF6huAW8m9UAgOLWtpFdhA14+gPBoymtqyv+D4MLsmqaF2zvIegdCxJXg==",
+      "dev": true,
+      "requires": {
+        "generic-names": "^2.0.1",
+        "icss-replace-symbols": "^1.1.0",
+        "lodash.camelcase": "^4.3.0",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-values": "^4.0.0",
+        "string-hash": "^1.1.1"
+      }
+    },
+    "postcss-modules-extract-imports": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+      "dev": true
+    },
+    "postcss-modules-local-by-default": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
+      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
+      "dev": true,
+      "requires": {
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
+      }
+    },
+    "postcss-modules-scope": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+      "dev": true,
+      "requires": {
+        "postcss-selector-parser": "^6.0.4"
+      }
+    },
+    "postcss-modules-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "dev": true,
+      "requires": {
+        "icss-utils": "^5.0.0"
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
+      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+      "dev": true,
+      "requires": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
+      "dev": true
+    },
     "prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -24577,48 +25459,30 @@
       }
     },
     "react-intl": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.7.2.tgz",
-      "integrity": "sha512-3dcNGLqEw2FKkX+1L2WYLgjP0MVJkvWuVd1uLcnwifIQe8JQvnd9Bss4hb4Gvg/YhBIRcs4LM6C2bAgyklucjw==",
-      "requires": {
-        "hoist-non-react-statics": "^2.5.5",
-        "intl-format-cache": "^2.0.5",
-        "intl-messageformat": "^2.1.0",
-        "intl-relativeformat": "^2.1.0",
-        "invariant": "^2.1.1"
-      },
-      "dependencies": {
-        "hoist-non-react-statics": {
-          "version": "2.5.5",
-          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
-          "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
-        }
-      }
-    },
-    "react-intl-translations-manager": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/react-intl-translations-manager/-/react-intl-translations-manager-5.0.3.tgz",
-      "integrity": "sha512-EfBeugnOGFcdUbQyY9TqBMbuauQ8wm73ZqFr0UqCljhbXl7YDHQcVzclWFRkVmlUffzxitLQFhAZEVVeRNQSwA==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.3.2",
-        "glob": "^7.1.2",
-        "json-stable-stringify": "^1.0.1",
-        "mkdirp": "^0.5.1"
+      "version": "5.20.10",
+      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-5.20.10.tgz",
+      "integrity": "sha512-zy0ZQhpjkGsKcK1BFo2HbGM/q8GBVovzoXZGQ76DowR0yr6UzQuPLkrlIrObL2zxIYiDaxaz+hUJaoa2a1xqOQ==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.9.8",
+        "@formatjs/icu-messageformat-parser": "2.0.11",
+        "@formatjs/intl": "1.14.1",
+        "@formatjs/intl-displaynames": "5.2.3",
+        "@formatjs/intl-listformat": "6.3.3",
+        "@types/hoist-non-react-statics": "^3.3.1",
+        "@types/react": "17",
+        "hoist-non-react-statics": "^3.3.2",
+        "intl-messageformat": "9.9.1",
+        "tslib": "^2.1.0"
       },
       "dependencies": {
-        "glob": {
-          "version": "7.1.7",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-          "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-          "dev": true,
+        "@types/react": {
+          "version": "17.0.20",
+          "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.20.tgz",
+          "integrity": "sha512-wWZrPlihslrPpcKyCSlmIlruakxr57/buQN1RjlIeaaTWDLtJkTtRW429MoQJergvVKc4IWBpRhWw7YNh/7GVA==",
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "@types/prop-types": "*",
+            "@types/scheduler": "*",
+            "csstype": "^3.0.2"
           }
         }
       }
@@ -24809,18 +25673,6 @@
         "loose-envify": "^1.4.0",
         "prop-types": "^15.7.2",
         "react-lifecycles-compat": "^3.0.4"
-      },
-      "dependencies": {
-        "prop-types": {
-          "version": "15.7.2",
-          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-          "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-          "requires": {
-            "loose-envify": "^1.4.0",
-            "object-assign": "^4.1.1",
-            "react-is": "^16.8.1"
-          }
-        }
       }
     },
     "reactive-localstorage": {
@@ -25218,6 +26070,12 @@
         }
       }
     },
+    "regexp-tree": {
+      "version": "0.1.23",
+      "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.23.tgz",
+      "integrity": "sha512-+7HWfb4Bvu8Rs2eQTUIpX9I/PlQkYOuTNbRpKLJlQpSgwSkzFYh+pUj0gtvglnOZLKB6YgnIgRuJ2/IlpL48qw==",
+      "dev": true
+    },
     "regexp.prototype.flags": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
@@ -25410,6 +26268,11 @@
           "version": "6.5.2",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
           "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
         }
       }
     },
@@ -25567,9 +26430,10 @@
       "dev": true
     },
     "rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
       "requires": {
         "glob": "^7.1.3"
       },
@@ -25578,6 +26442,7 @@
           "version": "7.1.7",
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
           "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+          "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
             "inflight": "^1.0.4",
@@ -26522,6 +27387,12 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
     },
+    "source-map-js": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
+      "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==",
+      "dev": true
+    },
     "source-map-resolve": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
@@ -26557,6 +27428,12 @@
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="
     },
+    "sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "dev": true
+    },
     "sparkles": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
@@ -26961,6 +27838,12 @@
       "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
     },
+    "string-hash": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz",
+      "integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs=",
+      "dev": true
+    },
     "string-length": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -27295,28 +28178,57 @@
       "dev": true
     },
     "tar": {
-      "version": "4.4.18",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.18.tgz",
-      "integrity": "sha512-ZuOtqqmkV9RE1+4odd+MhBpibmCxNP6PJhH/h2OqNuotTX7/XHPZQJv2pKvWMplFH9SIZZhitehh6vBH6LO8Pg==",
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "requires": {
-        "chownr": "^1.1.4",
-        "fs-minipass": "^1.2.7",
-        "minipass": "^2.9.0",
-        "minizlib": "^1.3.3",
-        "mkdirp": "^0.5.5",
-        "safe-buffer": "^5.2.1",
-        "yallist": "^3.1.1"
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^3.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
       },
       "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        "chownr": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+          "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
+        },
+        "fs-minipass": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+          "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+          "requires": {
+            "minipass": "^3.0.0"
+          }
+        },
+        "minipass": {
+          "version": "3.1.5",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz",
+          "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "minizlib": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+          "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+          "requires": {
+            "minipass": "^3.0.0",
+            "yallist": "^4.0.0"
+          }
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
         },
         "yallist": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
@@ -27374,6 +28286,12 @@
           "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
           "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=",
           "dev": true
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+          "dev": true
         }
       }
     },
@@ -27385,6 +28303,14 @@
       "requires": {
         "temp-dir": "^2.0.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+          "dev": true
+        }
       }
     },
     "terminal-link": {
@@ -27503,6 +28429,17 @@
             "ssri": "^6.0.1",
             "unique-filename": "^1.1.1",
             "y18n": "^4.0.0"
+          },
+          "dependencies": {
+            "rimraf": {
+              "version": "2.7.1",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+              "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+              "dev": true,
+              "requires": {
+                "glob": "^7.1.3"
+              }
+            }
           }
         },
         "glob": {
@@ -27999,28 +28936,74 @@
       "requires": {
         "ts-node": "7.0.1",
         "tsconfig-paths": "^3.5.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
+        },
+        "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"
+          }
+        },
+        "yn": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz",
+          "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=",
+          "dev": true
+        }
       }
     },
     "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",
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.2.1.tgz",
+      "integrity": "sha512-hCnyOyuGmD5wHleOQX6NIjJtYVIO8bPP8F2acWkB4W06wdlkgyvJtubO/I9NkI88hCFECbsEgoLc0VNkYmcSfw==",
+      "dev": true,
+      "requires": {
+        "@cspotcode/source-map-support": "0.6.1",
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.2",
+        "acorn": "^8.4.1",
+        "acorn-walk": "^8.1.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
         "make-error": "^1.1.1",
-        "minimist": "^1.2.0",
-        "mkdirp": "^0.5.1",
-        "source-map-support": "^0.5.6",
-        "yn": "^2.0.0"
+        "yn": "3.1.1"
       },
       "dependencies": {
+        "acorn": {
+          "version": "8.5.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
+          "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
+          "dev": true
+        },
+        "acorn-walk": {
+          "version": "8.2.0",
+          "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+          "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+          "dev": true
+        },
         "diff": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-          "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+          "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
           "dev": true
         }
       }
@@ -28169,9 +29152,9 @@
       }
     },
     "typescript": {
-      "version": "3.9.10",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-      "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz",
+      "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==",
       "dev": true
     },
     "uglify-js": {
@@ -28686,9 +29669,9 @@
       "dev": true
     },
     "uuid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
     },
     "v8-compile-cache": {
       "version": "2.3.0",
@@ -28743,9 +29726,9 @@
       }
     },
     "validator": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-11.0.0.tgz",
-      "integrity": "sha512-+wnGLYqaKV2++nUv60uGzUJyJQwYVOin6pn1tgEiFCeCQO60yeu3Og9/yPccbBX574kxIcEJicogkzx6s6eyag=="
+      "version": "13.6.0",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.6.0.tgz",
+      "integrity": "sha512-gVgKbdbHgtxpRyR8K0O6oFZPhhB5tT1jeEHZR0Znr9Svg03U0+r9DXWMrnRAB+HtCStDQKlaIZm42tVsVjqtjg=="
     },
     "value-or-function": {
       "version": "3.0.0",
@@ -29719,6 +30702,12 @@
           "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
           "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
           "dev": true
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+          "dev": true
         }
       }
     },
@@ -30139,9 +31128,9 @@
       }
     },
     "ws": {
-      "version": "7.4.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
-      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.2.tgz",
+      "integrity": "sha512-Q6B6H2oc8QY3llc3cB8kVmQ6pnJWVQbP7Q5algTcIxx7YEpc0oU4NBVHlztA7Ekzfhw2r0rPducMUiCGWKQRzw=="
     },
     "xdg-basedir": {
       "version": "4.0.0",
@@ -30313,9 +31302,9 @@
       }
     },
     "yn": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz",
-      "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
       "dev": true
     },
     "yocto-queue": {
diff --git a/package.json b/package.json
index 351729726..a3d6ae2c9 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Ferdi",
   "desktopName": "ferdi.desktop",
   "appId": "com.kytwb.ferdi",
-  "version": "5.6.2",
+  "version": "5.6.3-nightly.25",
   "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": "node scripts/prepare.js",
+    "prepare": "ts-node scripts/prepare.ts",
     "start": "electron ./build",
     "start:local": "cross-env USE_LOCAL_API=1 npm start",
     "start:live": "cross-env USE_LIVE_API=1 npm start",
@@ -25,8 +25,11 @@
     "dev": "cross-env NODE_ENV=development gulp dev",
     "test": "jest",
     "test:watch": "jest --watch",
-    "lint": "eslint \"{src,scripts,packages,uidev}/**/*.{js,jsx,ts,tsx}\" --quiet --fix",
-    "manage-translations": "node ./src/i18n/manage-translations.js",
+    "lint": "eslint \"{src,scripts,packages,uidev}/**/*.{js,jsx,ts,tsx}\" --quiet",
+    "lint:fix": "npm run lint -- --fix",
+    "extract": "formatjs extract 'src/**/*.{js,ts}' --out-file temp.json --flatten --id-interpolation-pattern '[sha512:contenthash:base64:6]' --preserve-whitespace",
+    "compile": "formatjs compile 'temp.json' --out-file src/i18n/locales/en-US.json",
+    "manage-translations": "npm run extract && npm run compile && rimraf temp.json",
     "prebuild": "preval-build-info-cli && gulp build",
     "build": "electron-builder",
     "commit": "git-cz",
@@ -35,14 +38,14 @@
     "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": "node scripts/postinstall.js",
-    "apply-branding": "node ./src/i18n/apply-branding.js",
+    "postinstall": "ts-node scripts/postinstall.ts",
+    "apply-branding": "ts-node ./src/i18n/apply-branding.ts",
     "update-submodules": "git submodule update --remote --force",
     "prepare-code": "npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding",
-    "build-theme-info": "node scripts/build-theme-info.js",
-    "link-readme": "node scripts/link-readme.js",
+    "link-readme": "ts-node scripts/link-readme.ts",
     "minify-images": "./scripts/minify-images.sh",
-    "start:server": "node src/internal-server/test.js"
+    "start:server": "ts-node src/internal-server/test.ts",
+    "add-crowdin-contributors": "ts-node scripts/add-crowdin-contributors.ts"
   },
   "keywords": [],
   "author": "Amine Mouafik <amine@mouafik.fr>",
@@ -61,19 +64,17 @@
     "@adonisjs/shield": "1.0.8",
     "@adonisjs/validator": "5.0.6",
     "@electron/remote": "1.2.1",
-    "@mdi/font": "5.9.55",
-    "@mdi/js": "4.6.95",
+    "@mdi/font": "6.2.95",
+    "@mdi/js": "6.2.95",
     "@meetfranz/forms": "file:packages/forms",
     "@meetfranz/theme": "file:packages/theme",
     "@meetfranz/ui": "file:packages/ui",
     "@sentry/electron": "2.5.3",
-    "atob": "2.1.2",
     "auto-launch": "5.0.5",
     "btoa": "1.2.1",
     "classnames": "2.3.1",
     "cld": "2.7.0",
     "color": "4.0.1",
-    "css": "2.2.4",
     "csstype": "3.0.8",
     "darkreader": "4.9.34",
     "dbus-next": "0.9.2",
@@ -82,9 +83,8 @@
     "electron-dl": "3.2.1",
     "electron-fetch": "1.7.4",
     "electron-find": "1.0.7",
-    "electron-react-titlebar": "0.8.2",
+    "electron-react-titlebar": "1.0.0",
     "electron-updater": "4.3.9",
-    "electron-util": "0.17.2",
     "electron-window-state": "5.0.3",
     "fs-extra": "10.0.0",
     "jsonwebtoken": "8.5.1",
@@ -92,7 +92,6 @@
     "lodash": "4.17.21",
     "macos-notification-state": "1.3.6",
     "macos-version": "5.2.1",
-    "marked": "0.7.0",
     "mime-types": "2.1.32",
     "minimist": "1.2.5",
     "mobx": "5.15.0",
@@ -114,7 +113,7 @@
     "react-dom": "16.14.0",
     "react-dropzone": "11.3.4",
     "react-electron-web-view": "2.0.1",
-    "react-intl": "2.7.2",
+    "react-intl": "5.20.10",
     "react-jss": "8.6.1",
     "react-loader": "2.4.7",
     "react-modal": "3.14.3",
@@ -124,12 +123,12 @@
     "route-parser": "0.0.5",
     "semver": "7.3.5",
     "sqlite3": "5.0.0",
-    "tar": "4.4.18",
+    "tar": "6.1.11",
     "tslib": "2.3.1",
     "useragent-generator": "1.1.1-amkt-22079-finish.0",
-    "uuid": "3.3.3",
-    "validator": "11.0.0",
-    "ws": "7.4.6"
+    "uuid": "8.3.2",
+    "validator": "13.6.0",
+    "ws": "8.2.2"
   },
   "devDependencies": {
     "@babel/cli": "7.14.8",
@@ -146,12 +145,13 @@
     "@babel/register": "7.15.3",
     "@commitlint/cli": "13.1.0",
     "@commitlint/config-conventional": "13.1.0",
-    "@tsconfig/node14": "1.0.1",
+    "@formatjs/cli": "4.2.33",
     "@types/color": "3.0.2",
     "@types/du": "1.0.1",
     "@types/expect.js": "0.3.29",
     "@types/fs-extra": "9.0.12",
     "@types/lodash": "4.14.172",
+    "@types/mime-types": "2.1.1",
     "@types/mocha": "9.0.0",
     "@types/ms": "0.7.31",
     "@types/node": "14.17.6",
@@ -159,30 +159,32 @@
     "@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.30.0",
-    "@typescript-eslint/parser": "4.29.1",
+    "@types/uuid": "8.3.1",
+    "@types/validator": "13.6.3",
+    "@typescript-eslint/eslint-plugin": "4.31.2",
+    "@typescript-eslint/parser": "4.31.2",
     "all-contributors-cli": "6.20.0",
-    "babel-plugin-react-intl": "3.5.1",
+    "babel-plugin-formatjs": "10.3.8",
     "commitizen": "4.2.4",
     "concurrently": "6.2.1",
     "conventional-changelog-cli": "2.1.1",
     "cross-env": "7.0.3",
     "cz-conventional-changelog": "3.3.0",
     "dotenv": "10.0.0",
-    "electron": "13.3.0",
+    "electron": "15.1.1",
     "electron-builder": "22.12.1",
     "electron-notarize": "1.1.0",
     "eslint": "7.32.0",
     "eslint-config-airbnb": "18.2.1",
-    "eslint-config-airbnb-typescript": "12.3.1",
+    "eslint-config-airbnb-typescript": "14.0.0",
     "eslint-config-prettier": "8.3.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-prettier": "4.0.0",
     "eslint-plugin-react": "7.25.1",
     "eslint-plugin-react-hooks": "4.2.0",
+    "eslint-plugin-unicorn": "36.0.0",
     "expect.js": "0.3.1",
     "gulp": "4.0.2",
     "gulp-babel": "8.0.0",
@@ -202,16 +204,16 @@
     "kebab-case": "1.0.1",
     "lerna": "4.0.0",
     "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",
+    "rimraf": "3.0.2",
     "sass": "1.37.5",
     "simple-git": "2.45.0",
     "terser": "4.8.0",
     "ts-loader": "5.4.5",
     "ts-mocha": "8.0.0",
-    "typescript": "3.9.10",
+    "ts-node": "10.2.1",
+    "typescript": "4.2.4",
     "wait-on": "6.0.0",
     "webpack": "4.46.0",
     "webpack-cli": "3.3.12",
diff --git a/packages/forms/src/button/index.tsx b/packages/forms/src/button/index.tsx
index 48fb61635..c9ae47d55 100644
--- a/packages/forms/src/button/index.tsx
+++ b/packages/forms/src/button/index.tsx
@@ -227,44 +227,38 @@ class ButtonComponent extends Component<IProps> {
       </>
     );
 
-    let wrapperComponent: JSX.Element;
-
-    if (!href) {
-      wrapperComponent = (
-        <button
-          id={id}
-          type={type}
-          onClick={onClick}
-          className={classnames({
-            [`${classes.button}`]: true,
-            [`${classes[buttonType as ButtonType]}`]: true,
-            [`${classes.disabled}`]: disabled,
-            [`${className}`]: className,
-          })}
-          disabled={disabled}
-          data-type="franz-button"
-        >
-          {content}
-        </button>
-      );
-    } else {
-      wrapperComponent = (
-        <a
-          href={href}
-          target={target}
-          onClick={onClick}
-          className={classnames({
-            [`${classes.button}`]: true,
-            [`${classes[buttonType as ButtonType]}`]: true,
-            [`${className}`]: className,
-          })}
-          rel={target === '_blank' ? 'noopener' : ''}
-          data-type="franz-button"
-        >
-          {content}
-        </a>
-      );
-    }
+    const wrapperComponent = !href ? (
+      <button
+        id={id}
+        type={type}
+        onClick={onClick}
+        className={classnames({
+          [`${classes.button}`]: true,
+          [`${classes[buttonType as ButtonType]}`]: true,
+          [`${classes.disabled}`]: disabled,
+          [`${className}`]: className,
+        })}
+        disabled={disabled}
+        data-type="franz-button"
+      >
+        {content}
+      </button>
+    ) : (
+      <a
+        href={href}
+        target={target}
+        onClick={onClick}
+        className={classnames({
+          [`${classes.button}`]: true,
+          [`${classes[buttonType as ButtonType]}`]: true,
+          [`${className}`]: className,
+        })}
+        rel={target === '_blank' ? 'noopener' : ''}
+        data-type="franz-button"
+      >
+        {content}
+      </a>
+    );
 
     return wrapperComponent;
   }
diff --git a/packages/forms/src/input/scorePassword.ts b/packages/forms/src/input/scorePassword.ts
index bc30de4b8..59502e2b0 100644
--- a/packages/forms/src/input/scorePassword.ts
+++ b/packages/forms/src/input/scorePassword.ts
@@ -18,9 +18,9 @@ export function scorePasswordFunc(password: string): number {
 
   // award every unique letter until 5 repetitions
   const letters: ILetters = {};
-  for (let i = 0; i < password.length; i += 1) {
-    letters[password[i]] = (letters[password[i]] || 0) + 1;
-    score += 5.0 / letters[password[i]];
+  for (const element of password) {
+    letters[element] = (letters[element] || 0) + 1;
+    score += 5 / letters[element];
   }
 
   // bonus points for mixing it up
@@ -32,9 +32,9 @@ export function scorePasswordFunc(password: string): number {
   };
 
   let variationCount = 0;
-  Object.keys(variations).forEach(key => {
+  for (const key of Object.keys(variations)) {
     variationCount += variations[key] === true ? 1 : 0;
-  });
+  }
 
   score += (variationCount - 1) * 10;
 
diff --git a/packages/forms/src/select/index.tsx b/packages/forms/src/select/index.tsx
index d7479f63e..7806baa2a 100644
--- a/packages/forms/src/select/index.tsx
+++ b/packages/forms/src/select/index.tsx
@@ -187,10 +187,8 @@ class SelectComponent extends Component<IProps> {
   componentDidUpdate() {
     const { open } = this.state;
 
-    if (this.searchInputRef && this.searchInputRef.current) {
-      if (open) {
-        this.searchInputRef.current.focus();
-      }
+    if (this.searchInputRef && this.searchInputRef.current && open) {
+      this.searchInputRef.current.focus();
     }
   }
 
@@ -228,6 +226,7 @@ class SelectComponent extends Component<IProps> {
   }
 
   componentWillUnmount() {
+    // eslint-disable-next-line unicorn/no-invalid-remove-event-listener
     window.removeEventListener('keydown', this.arrowKeysHandler.bind(this));
   }
 
diff --git a/packages/forms/tsconfig.json b/packages/forms/tsconfig.json
index 8b9507eac..015581136 100644
--- a/packages/forms/tsconfig.json
+++ b/packages/forms/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.settings.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "lib",
     "rootDir": "src"
diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts
index 87a68cb5d..aa132c743 100644
--- a/packages/theme/src/themes/dark/index.ts
+++ b/packages/theme/src/themes/dark/index.ts
@@ -9,7 +9,7 @@ export default (brandPrimary: string) => {
   let brandPrimaryColor = color(legacyStyles.themeBrandPrimary);
   try {
     brandPrimaryColor = color(defaultStyles.brandPrimary);
-  } catch (e) {
+  } catch {
     // Ignore invalid color and fall back to default.
   }
 
diff --git a/packages/theme/tsconfig.json b/packages/theme/tsconfig.json
index 4deaa5dd7..8b4163e7f 100644
--- a/packages/theme/tsconfig.json
+++ b/packages/theme/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.settings.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "lib",
     "rootDir": "src"
diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json
index 8b9507eac..015581136 100644
--- a/packages/ui/tsconfig.json
+++ b/packages/ui/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.settings.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "lib",
     "rootDir": "src"
diff --git a/recipes b/recipes
-Subproject 9db43e100a672b6d6932ac68c0fbe503c129138
+Subproject d3841b766f9d37d557646003899f67525c5f755
diff --git a/scripts/add-crowdin-contributors.js b/scripts/add-crowdin-contributors.ts
index 05e377a94..00d12eca1 100644
--- a/scripts/add-crowdin-contributors.js
+++ b/scripts/add-crowdin-contributors.ts
@@ -1,3 +1,7 @@
+import fs from 'fs-extra';
+import path from 'path';
+import allContributors from 'all-contributors-cli';
+
 /**
  * Add CrowdIn Contributors to AllContributors list
  *
@@ -48,17 +52,13 @@ console.clear();
 console.log(JSON.stringify(members));
 
  * 3. Paste the output of the script (JSON Array) below to set 'list' to that value
- * 4. Execute this script using 'node scripts/add-crowdin-contributors.js'
+ * 4. Execute this script using 'npm run add-crowdin-contributors'
  * 5. Regenerate the README table using the CLI ('all-contributors generate')
  * Please check if the generated data is ok and no data is lost.
 */
-const list = [];
-
-const fs = require('fs-extra');
-const path = require('path');
-const allContributors = require('all-contributors-cli');
+const list: any[] = [];
 
-const infoPath = path.join(__dirname, '..', '..', '.all-contributorsrc');
+const infoPath = path.join(__dirname, '..', '.all-contributorsrc');
 
 (async () => {
   const info = await fs.readJSON(infoPath);
diff --git a/scripts/build-theme-info.js b/scripts/build-theme-info.js
deleted file mode 100644
index 4058be942..000000000
--- a/scripts/build-theme-info.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Script to get information on which selectors use the brand color.
- * This is needed to provide the accent color feature - the feature will create CSS rules
- * to overwrite the color of these selectors.
- */
-const css = require('css');
-const fs = require('fs-extra');
-const path = require('path');
-const theme = require('@meetfranz/theme');
-
-// Colors that should be replaced with the accent color
-const accentColors = [
-  theme.DEFAULT_ACCENT_COLOR.toLowerCase(),
-  '#7367f0',
-  '#5e50ee',
-];
-
-const cssFile = path.join(__dirname, '..', '..', 'build', 'styles', 'main.css');
-const outputFile = path.join(__dirname, '..', 'assets', 'themeInfo.json');
-
-// Parse and extract the rules from a CSS stylesheet file
-async function getRulesFromCssFile(file) {
-  const cssSrc = (await fs.readFile(file)).toString();
-  const cssTree = css.parse(cssSrc);
-
-  return cssTree.stylesheet.rules;
-}
-
-/**
- * Get all selectors from a list of parsed CSS rules that set any property to one of the specified
- * values.
- *
- * This function will output an object in this format:
- * {
- *  'property-name': [ array of selectors ]
- * }
- *
- * e.g.
- * {
- *  'background-color': [
- *   '.background',
- *   '.input-dark'
- *  ]
- * }
- *
- * @param {Array} rules Rules as outputted by the `css` module
- * @param {Array} values Array of values that should be searched for
- */
-function getSelectorsDeclaringValues(rules, values) {
-  const output = {};
-
-  rules.forEach((rule) => {
-    if (rule.declarations) {
-      rule.declarations.forEach((declaration) => {
-        if (declaration.type === 'declaration'
-            && values.includes(declaration.value.toLowerCase())) {
-          if (!output[declaration.property]) {
-            output[declaration.property] = [];
-          }
-          output[declaration.property] = output[declaration.property].concat(rule.selectors);
-        }
-      });
-    }
-  });
-
-  return output;
-}
-
-async function generateThemeInfo() {
-  if (!await fs.pathExists(cssFile)) {
-    console.log('Please make sure to build the project first.');
-    return;
-  }
-
-  // Read and parse css bundle
-  const rules = await getRulesFromCssFile(cssFile);
-
-  console.log(`Found ${rules.length} rules`);
-
-  // Get rules specifying the brand colors
-  const brandRules = getSelectorsDeclaringValues(rules, accentColors);
-
-  console.log(`Found ${Object.keys(brandRules).join(', ')} properties that set color to brand color`);
-
-  // Join array of declarations into a single string
-  Object.keys(brandRules).forEach((rule) => {
-    brandRules[rule] = brandRules[rule].join(', ');
-  });
-
-  // Write object with theme info to file
-  fs.writeFile(
-    outputFile,
-    JSON.stringify(brandRules),
-  );
-}
-
-generateThemeInfo();
diff --git a/scripts/link-readme.js b/scripts/link-readme.ts
index 1e47cddf8..77b384ff4 100644
--- a/scripts/link-readme.js
+++ b/scripts/link-readme.ts
@@ -6,12 +6,12 @@
  * and "@abc" => "[@abc](https://github.com/abc)"
  */
 
-const fs = require('fs-extra');
-const path = require('path');
+import fs from 'fs-extra';
+import path from 'path';
 
 console.log('Linking issues and PRs in README.md');
 
-const readmepath = path.join(__dirname, '..', '..', 'README.md');
+const readmepath = path.join(__dirname, '..', 'README.md');
 
 // Read README.md
 let readme = fs.readFileSync(readmepath, 'utf-8');
@@ -22,7 +22,7 @@ let replacements = 0;
 // Regex matches strings that don't begin with a "[", i.e. are not already linked
 // followed by a "franz#" and digits to indicate
 // a GitHub issue, and not ending with a "]"
-readme = readme.replace(/(?<!\[)franz#\d{1,}(?![\]\d])/gi, (match) => {
+readme = readme.replace(/(?<!\[)franz#\d+(?![\d\]])/gi, match => {
   const issueNr = match.replace('franz#', '');
   replacements += 1;
   return `[franz#${issueNr}](https://github.com/meetfranz/franz/issues/${issueNr})`;
@@ -31,7 +31,7 @@ readme = readme.replace(/(?<!\[)franz#\d{1,}(?![\]\d])/gi, (match) => {
 // Replace external issues
 // Regex matches strings that don't begin with a "[", followed a repo name in the format "user/repo"
 // followed by a "#" and digits to indicate a GitHub issue, and not ending with a "]"
-readme = readme.replace(/(?<!\[)\w+\/\w+#\d{1,}(?![\]\d])/gi, (match) => {
+readme = readme.replace(/(?<!\[)\w+\/\w+#\d+(?![\d\]])/gi, match => {
   const issueNr = match.replace(/\D/g, '');
   const repo = match.replace(/#\d+/g, '');
   replacements += 1;
@@ -42,7 +42,7 @@ readme = readme.replace(/(?<!\[)\w+\/\w+#\d{1,}(?![\]\d])/gi, (match) => {
 // Regex matches strings that don't begin with a "[", i.e. are not already linked and
 // don't begin with "franz", i.e. are not Franz issues, followed by a "#" and digits to indicate
 // a GitHub issue, and not ending with a "]"
-readme = readme.replace(/(?<!\[|franz)#\d{1,}(?![\]\d])/gi, (match) => {
+readme = readme.replace(/(?<!\[|franz)#\d+(?![\d\]])/gi, match => {
   const issueNr = match.replace('#', '');
   replacements += 1;
   return `[#${issueNr}](https://github.com/getferdi/ferdi/issues/${issueNr})`;
@@ -51,7 +51,7 @@ readme = readme.replace(/(?<!\[|franz)#\d{1,}(?![\]\d])/gi, (match) => {
 // Link GitHub users
 // Regex matches strings that don't begin with a "[", i.e. are not already linked
 // followed by a "@" and at least one word character and not ending with a "]"
-readme = readme.replace(/(?<!\[)@\w+(?!\])/gi, (match) => {
+readme = readme.replace(/(?<!\[)@\w+(?!])/gi, match => {
   const username = match.replace('@', '');
   replacements += 1;
   return `[@${username}](https://github.com/${username})`;
diff --git a/scripts/postinstall.js b/scripts/postinstall.ts
index 84e7492ef..4fa71c35f 100644
--- a/scripts/postinstall.js
+++ b/scripts/postinstall.ts
@@ -1,4 +1,4 @@
-const { exec } = require('child_process');
+import { exec } from 'child_process';
 
 // eslint-disable-next-line no-console
 const log = (err, stdout, stderr) => console.log(err || stdout || stderr);
diff --git a/scripts/prepare.js b/scripts/prepare.ts
index 0b4daa82b..0b4daa82b 100644
--- a/scripts/prepare.js
+++ b/scripts/prepare.ts
diff --git a/src/I18n.js b/src/I18n.js
index 13513fe73..6fb4cdc61 100644
--- a/src/I18n.js
+++ b/src/I18n.js
@@ -8,7 +8,9 @@ import translations from './i18n/translations';
 import UserStore from './stores/UserStore';
 import AppStore from './stores/AppStore';
 
-export default @inject('stores') @observer class I18N extends Component {
+@inject('stores')
+@observer
+class I18N extends Component {
   componentDidUpdate() {
     window.ferdi.menu.rebuild();
   }
@@ -19,7 +21,9 @@ export default @inject('stores') @observer class I18N extends Component {
     return (
       <IntlProvider
         {...{ locale, key: locale, messages: translations[locale] }}
-        ref={(intlProvider) => { window.ferdi.intl = intlProvider ? intlProvider.getChildContext().intl : null; }}
+        ref={intlProvider => {
+          window.ferdi.intl = intlProvider ? intlProvider.state.intl : null;
+        }}
       >
         {children}
       </IntlProvider>
@@ -34,3 +38,5 @@ I18N.wrappedComponent.propTypes = {
   }).isRequired,
   children: oneOrManyChildElements.isRequired,
 };
+
+export default I18N;
diff --git a/src/actions/app.js b/src/actions/app.ts
index e6f7f22ba..e6f7f22ba 100644
--- a/src/actions/app.js
+++ b/src/actions/app.ts
diff --git a/src/actions/index.js b/src/actions/index.ts
index aecdac675..aecdac675 100644
--- a/src/actions/index.js
+++ b/src/actions/index.ts
diff --git a/src/actions/lib/actions.js b/src/actions/lib/actions.js
deleted file mode 100644
index 7be40f1cf..000000000
--- a/src/actions/lib/actions.js
+++ /dev/null
@@ -1,27 +0,0 @@
-export const createActionsFromDefinitions = (actionDefinitions, validate) => {
-  const actions = {};
-  Object.keys(actionDefinitions).forEach((actionName) => {
-    const action = (params = {}) => {
-      const schema = actionDefinitions[actionName];
-      validate(schema, params, actionName);
-      action.notify(params);
-    };
-    actions[actionName] = action;
-    action.listeners = [];
-    action.listen = (listener) => action.listeners.push(listener);
-    action.off = (listener) => {
-      const { listeners } = action;
-      listeners.splice(listeners.indexOf(listener), 1);
-    };
-    action.notify = (params) => action.listeners.forEach((listener) => listener(params));
-  });
-  return actions;
-};
-
-export default (definitions, validate) => {
-  const newActions = {};
-  Object.keys(definitions).forEach((scopeName) => {
-    newActions[scopeName] = createActionsFromDefinitions(definitions[scopeName], validate);
-  });
-  return newActions;
-};
diff --git a/src/actions/lib/actions.ts b/src/actions/lib/actions.ts
new file mode 100644
index 000000000..412a0d895
--- /dev/null
+++ b/src/actions/lib/actions.ts
@@ -0,0 +1,34 @@
+export const createActionsFromDefinitions = (actionDefinitions, validate) => {
+  const actions = {};
+  // eslint-disable-next-line unicorn/no-array-for-each
+  Object.keys(actionDefinitions).forEach(actionName => {
+    const action = (params = {}) => {
+      const schema = actionDefinitions[actionName];
+      validate(schema, params, actionName);
+      action.notify(params);
+    };
+    actions[actionName] = action;
+    action.listeners = [];
+    action.listen = listener => action.listeners.push(listener);
+    action.off = listener => {
+      const { listeners } = action;
+      listeners.splice(listeners.indexOf(listener), 1);
+    };
+    action.notify = params =>
+      // eslint-disable-next-line unicorn/no-array-for-each
+      action.listeners.forEach(listener => listener(params));
+  });
+  return actions;
+};
+
+export default (definitions, validate) => {
+  const newActions = {};
+  // eslint-disable-next-line unicorn/no-array-for-each
+  Object.keys(definitions).forEach(scopeName => {
+    newActions[scopeName] = createActionsFromDefinitions(
+      definitions[scopeName],
+      validate,
+    );
+  });
+  return newActions;
+};
diff --git a/src/actions/news.js b/src/actions/news.ts
index db106e84f..db106e84f 100644
--- a/src/actions/news.js
+++ b/src/actions/news.ts
diff --git a/src/actions/recipe.js b/src/actions/recipe.ts
index 29b0a151f..29b0a151f 100644
--- a/src/actions/recipe.js
+++ b/src/actions/recipe.ts
diff --git a/src/actions/recipePreview.js b/src/actions/recipePreview.ts
index 36de3d844..36de3d844 100644
--- a/src/actions/recipePreview.js
+++ b/src/actions/recipePreview.ts
diff --git a/src/actions/requests.js b/src/actions/requests.ts
index 89296e7ec..89296e7ec 100644
--- a/src/actions/requests.js
+++ b/src/actions/requests.ts
diff --git a/src/actions/service.js b/src/actions/service.ts
index e56513f8f..e56513f8f 100644
--- a/src/actions/service.js
+++ b/src/actions/service.ts
diff --git a/src/actions/settings.js b/src/actions/settings.ts
index fd29b798b..fd29b798b 100644
--- a/src/actions/settings.js
+++ b/src/actions/settings.ts
diff --git a/src/actions/ui.js b/src/actions/ui.ts
index b913b430b..b913b430b 100644
--- a/src/actions/ui.js
+++ b/src/actions/ui.ts
diff --git a/src/actions/user.js b/src/actions/user.ts
index 20d27ee53..20d27ee53 100644
--- a/src/actions/user.js
+++ b/src/actions/user.ts
diff --git a/src/api/AppApi.js b/src/api/AppApi.ts
index 411c187f4..6e5e5c806 100644
--- a/src/api/AppApi.js
+++ b/src/api/AppApi.ts
@@ -1,5 +1,7 @@
 export default class AppApi {
-  constructor(server) {
+  server: any;
+
+  constructor(server: any) {
     this.server = server;
   }
 
diff --git a/src/api/FeaturesApi.js b/src/api/FeaturesApi.ts
index c66f28f5b..ccad4a189 100644
--- a/src/api/FeaturesApi.js
+++ b/src/api/FeaturesApi.ts
@@ -1,5 +1,7 @@
 export default class FeaturesApi {
-  constructor(server) {
+  server: any;
+
+  constructor(server: any) {
     this.server = server;
   }
 
diff --git a/src/api/LocalApi.js b/src/api/LocalApi.ts
index ccdedd3f5..1830369c7 100644
--- a/src/api/LocalApi.js
+++ b/src/api/LocalApi.ts
@@ -1,14 +1,18 @@
 export default class LocalApi {
-  constructor(server, local) {
+  server: any;
+
+  local: any;
+
+  constructor(server: any, local: any) {
     this.server = server;
     this.local = local;
   }
 
-  getAppSettings(type) {
+  getAppSettings(type: string) {
     return this.local.getAppSettings(type);
   }
 
-  updateAppSettings(type, data) {
+  updateAppSettings(type: string, data: any) {
     return this.local.updateAppSettings(type, data);
   }
 
diff --git a/src/api/NewsApi.js b/src/api/NewsApi.ts
index 294957511..31d3d903b 100644
--- a/src/api/NewsApi.js
+++ b/src/api/NewsApi.ts
@@ -1,5 +1,9 @@
 export default class NewsApi {
-  constructor(server, local) {
+  server: any;
+
+  local: any;
+
+  constructor(server: any, local: any) {
     this.server = server;
     this.local = local;
   }
@@ -8,7 +12,7 @@ export default class NewsApi {
     return this.server.getLatestNews();
   }
 
-  hide(id) {
+  hide(id: any) {
     return this.server.hideNews(id);
   }
 }
diff --git a/src/api/RecipePreviewsApi.js b/src/api/RecipePreviewsApi.ts
index a56fa587f..78f2a9596 100644
--- a/src/api/RecipePreviewsApi.js
+++ b/src/api/RecipePreviewsApi.ts
@@ -1,5 +1,7 @@
 export default class RecipePreviewsApi {
-  constructor(server) {
+  server: any;
+
+  constructor(server: any) {
     this.server = server;
   }
 
@@ -11,7 +13,7 @@ export default class RecipePreviewsApi {
     return this.server.getFeaturedRecipePreviews();
   }
 
-  search(needle) {
+  search(needle: string) {
     return this.server.searchRecipePreviews(needle);
   }
 }
diff --git a/src/api/RecipesApi.js b/src/api/RecipesApi.ts
index 800888b00..11d2241b5 100644
--- a/src/api/RecipesApi.js
+++ b/src/api/RecipesApi.ts
@@ -1,5 +1,7 @@
 export default class RecipesApi {
-  constructor(server) {
+  server: any;
+
+  constructor(server: any) {
     this.server = server;
   }
 
@@ -7,11 +9,11 @@ export default class RecipesApi {
     return this.server.getInstalledRecipes();
   }
 
-  install(recipeId) {
+  install(recipeId: string) {
     return this.server.getRecipePackage(recipeId);
   }
 
-  update(recipes) {
+  update(recipes: any) {
     return this.server.getRecipeUpdates(recipes);
   }
 }
diff --git a/src/api/ServicesApi.js b/src/api/ServicesApi.ts
index 85efd26a6..5bd8aa60e 100644
--- a/src/api/ServicesApi.js
+++ b/src/api/ServicesApi.ts
@@ -1,30 +1,34 @@
 export default class ServicesApi {
-  constructor(server, local) {
-    this.local = local;
+  server: any;
+
+  local: any;
+
+  constructor(server: any, local: any) {
     this.server = server;
+    this.local = local;
   }
 
   all() {
     return this.server.getServices();
   }
 
-  create(recipeId, data) {
+  create(recipeId: string, data: any) {
     return this.server.createService(recipeId, data);
   }
 
-  delete(serviceId) {
+  delete(serviceId: string) {
     return this.server.deleteService(serviceId);
   }
 
-  update(serviceId, data) {
+  update(serviceId: string, data: any) {
     return this.server.updateService(serviceId, data);
   }
 
-  reorder(data) {
+  reorder(data: any) {
     return this.server.reorderService(data);
   }
 
-  clearCache(serviceId) {
+  clearCache(serviceId: string) {
     return this.local.clearCache(serviceId);
   }
 }
diff --git a/src/api/UserApi.js b/src/api/UserApi.ts
index edfb88988..31c8acead 100644
--- a/src/api/UserApi.js
+++ b/src/api/UserApi.ts
@@ -1,12 +1,17 @@
+import { BinaryLike } from 'crypto';
 import { hash } from '../helpers/password-helpers';
 
 export default class UserApi {
-  constructor(server, local) {
+  server: any;
+
+  local: any;
+
+  constructor(server: any, local: any) {
     this.server = server;
     this.local = local;
   }
 
-  login(email, password) {
+  login(email: string, password: BinaryLike) {
     return this.server.login(email, hash(password));
   }
 
@@ -14,18 +19,18 @@ export default class UserApi {
     return this;
   }
 
-  signup(data) {
+  signup(data: { password: BinaryLike }) {
     Object.assign(data, {
       password: hash(data.password),
     });
     return this.server.signup(data);
   }
 
-  password(email) {
+  password(email: string) {
     return this.server.retrievePassword(email);
   }
 
-  invite(data) {
+  invite(data: any) {
     return this.server.inviteUser(data);
   }
 
@@ -33,7 +38,7 @@ export default class UserApi {
     return this.server.userInfo();
   }
 
-  updateInfo(data) {
+  updateInfo(data: { oldPassword: string; newPassword: string }) {
     const userData = data;
     if (userData.oldPassword && userData.newPassword) {
       userData.oldPassword = hash(userData.oldPassword);
diff --git a/src/api/apiBase.js b/src/api/apiBase.js
deleted file mode 100644
index 2fad7eb21..000000000
--- a/src/api/apiBase.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Get API base URL from store
- */
-import {
-  API_VERSION,
-} from '../environment';
-import {
-  DEV_API_FRANZ_WEBSITE,
-  LIVE_FRANZ_API,
-  LOCAL_HOSTNAME,
-  LOCAL_SERVER,
-  SERVER_NOT_LOADED,
-} from '../config';
-
-// Note: This cannot be used from the internal-server since we are not running within the context of a browser window
-const apiBase = (withVersion = true) => {
-  let url;
-
-  if (!window.ferdi
-    || !window.ferdi.stores.settings
-    || !window.ferdi.stores.settings.all
-    || !window.ferdi.stores.settings.all.app.server) {
-    // Stores have not yet been loaded - return SERVER_NOT_LOADED to force a retry when stores are loaded
-    return SERVER_NOT_LOADED;
-  }
-  if (window.ferdi.stores.settings.all.app.server === LOCAL_SERVER) {
-    // Use URL for local server
-    url = `http://${LOCAL_HOSTNAME}:${window.ferdi.stores.requests.localServerPort}`;
-  } else {
-    // Load URL from store
-    url = window.ferdi.stores.settings.all.app.server;
-  }
-
-  return withVersion ? `${url}/${API_VERSION}` : url;
-};
-
-export default apiBase;
-
-export function termsBase() {
-  // TODO: This needs to handle local vs ferdi vs franz servers
-  return window.ferdi.stores.settings.all.app.server !== LIVE_FRANZ_API ? window.ferdi.stores.settings.all.app.server : DEV_API_FRANZ_WEBSITE;
-}
diff --git a/src/api/apiBase.ts b/src/api/apiBase.ts
new file mode 100644
index 000000000..a30793848
--- /dev/null
+++ b/src/api/apiBase.ts
@@ -0,0 +1,41 @@
+/**
+ * Get API base URL from store
+ */
+import { API_VERSION } from '../environment-remote';
+import {
+  DEV_API_FRANZ_WEBSITE,
+  LIVE_FRANZ_API,
+  LOCAL_HOSTNAME,
+  LOCAL_SERVER,
+  SERVER_NOT_LOADED,
+} from '../config';
+
+// Note: This cannot be used from the internal-server since we are not running within the context of a browser window
+const apiBase = (withVersion = true) => {
+  if (
+    !(window as any).ferdi ||
+    !(window as any).ferdi.stores.settings ||
+    !(window as any).ferdi.stores.settings.all ||
+    !(window as any).ferdi.stores.settings.all.app.server
+  ) {
+    // Stores have not yet been loaded - return SERVER_NOT_LOADED to force a retry when stores are loaded
+    return SERVER_NOT_LOADED;
+  }
+  const url =
+    (window as any).ferdi.stores.settings.all.app.server === LOCAL_SERVER
+      ? `http://${LOCAL_HOSTNAME}:${
+          (window as any).ferdi.stores.requests.localServerPort
+        }`
+      : (window as any).ferdi.stores.settings.all.app.server;
+
+  return withVersion ? `${url}/${API_VERSION}` : url;
+};
+
+export default apiBase;
+
+export function termsBase() {
+  // TODO: This needs to handle local vs ferdi vs franz servers
+  return (window as any).ferdi.stores.settings.all.app.server !== LIVE_FRANZ_API
+    ? (window as any).ferdi.stores.settings.all.app.server
+    : DEV_API_FRANZ_WEBSITE;
+}
diff --git a/src/api/index.js b/src/api/index.ts
index ed6c13488..73f613da1 100644
--- a/src/api/index.js
+++ b/src/api/index.ts
@@ -7,12 +7,12 @@ import LocalApi from './LocalApi';
 import NewsApi from './NewsApi';
 import FeaturesApi from './FeaturesApi';
 
-export default (server, local) => ({
-  app: new AppApi(server, local),
+export default (server: any, local: any) => ({
+  app: new AppApi(server),
   services: new ServicesApi(server, local),
-  recipePreviews: new RecipePreviewsApi(server, local),
-  recipes: new RecipesApi(server, local),
-  features: new FeaturesApi(server, local),
+  recipePreviews: new RecipePreviewsApi(server),
+  recipes: new RecipesApi(server),
+  features: new FeaturesApi(server),
   user: new UserApi(server, local),
   local: new LocalApi(server, local),
   news: new NewsApi(server, local),
diff --git a/src/api/server/LocalApi.ts b/src/api/server/LocalApi.ts
index 71721bb0f..19eacf9ff 100644
--- a/src/api/server/LocalApi.ts
+++ b/src/api/server/LocalApi.ts
@@ -1,5 +1,4 @@
 import { ipcRenderer } from 'electron';
-import { session } from '@electron/remote';
 import du from 'du';
 
 import { getServicePartitionsDirectory } from '../../helpers/service-helpers';
@@ -8,7 +7,7 @@ const debug = require('debug')('Ferdi:LocalApi');
 
 export default class LocalApi {
   // Settings
-  getAppSettings(type: any) {
+  getAppSettings(type: string) {
     return new Promise(resolve => {
       ipcRenderer.once('appSettings', (_event, resp) => {
         debug('LocalApi::getAppSettings resolves', resp.type, resp.data);
@@ -19,7 +18,7 @@ export default class LocalApi {
     });
   }
 
-  async updateAppSettings(type: any, data: any) {
+  async updateAppSettings(type: string, data: any) {
     debug('LocalApi::updateAppSettings resolves', type, data);
     ipcRenderer.send('updateAppSettings', {
       type,
@@ -31,7 +30,7 @@ export default class LocalApi {
   async getAppCacheSize() {
     const partitionsDir = getServicePartitionsDirectory();
     return new Promise((resolve, reject) => {
-      du(partitionsDir, (err: Error | null, size?: number | undefined) => {
+      du(partitionsDir, {}, (err: Error | null, size?: number | undefined) => {
         if (err) reject(err);
 
         debug('LocalApi::getAppCacheSize resolves', size);
@@ -41,12 +40,7 @@ export default class LocalApi {
   }
 
   async clearCache(serviceId: string | null = null) {
-    const s = serviceId
-      ? session.fromPartition(`persist:service-${serviceId}`)
-      : session.defaultSession;
-
-    debug('LocalApi::clearCache resolves', serviceId || 'clearAppCache');
-    await s.clearStorageData({
+    const targetsToClear = {
       storages: [
         'appcache',
         'filesystem',
@@ -57,7 +51,8 @@ export default class LocalApi {
         'cachestorage',
       ],
       quotas: ['temporary', 'persistent', 'syncable'],
-    });
-    return s.clearCache();
+    };
+    ipcRenderer.send('clear-storage-data', { serviceId, targetsToClear });
+    return ipcRenderer.invoke('clear-cache', { serviceId });
   }
 }
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index b5042525a..e321f9372 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -1,7 +1,17 @@
+/* eslint-disable global-require */
 import { join } from 'path';
 import tar from 'tar';
-import { readdirSync, statSync, writeFileSync, copySync, ensureDirSync, pathExistsSync, readJsonSync, removeSync } from 'fs-extra';
-import { require as remoteRequire } from '@electron/remote';
+import {
+  readdirSync,
+  statSync,
+  writeFileSync,
+  copySync,
+  ensureDirSync,
+  pathExistsSync,
+  readJsonSync,
+  removeSync,
+} from 'fs-extra';
+import fetch from 'electron-fetch';
 
 import ServiceModel from '../../models/Service';
 import RecipePreviewModel from '../../models/RecipePreview';
@@ -12,7 +22,9 @@ import UserModel from '../../models/User';
 import { sleep } from '../../helpers/async-helpers';
 
 import { SERVER_NOT_LOADED } from '../../config';
-import { osArch, osPlatform, asarRecipesPath, userDataRecipesPath, userDataPath, ferdiVersion } from '../../environment';
+import { osArch, osPlatform } from '../../environment';
+import { userDataRecipesPath, userDataPath, ferdiVersion } from '../../environment-remote';
+import { asarRecipesPath } from '../../helpers/asar-helpers';
 import apiBase from '../apiBase';
 import { prepareAuthRequest, sendAuthRequest } from '../utils/auth';
 
@@ -28,8 +40,6 @@ const debug = require('debug')('Ferdi:ServerApi');
 
 module.paths.unshift(getDevRecipeDirectory(), getRecipeDirectory());
 
-const { default: fetch } = remoteRequire('electron-fetch');
-
 export default class ServerApi {
   recipePreviews = [];
 
@@ -310,22 +320,22 @@ export default class ServerApi {
   // Recipes
   async getInstalledRecipes() {
     const recipesDirectory = getRecipeDirectory();
-    const paths = readdirSync(recipesDirectory)
-      .filter(
-        file =>
-          statSync(join(recipesDirectory, file)).isDirectory() &&
-          file !== 'temp' &&
-          file !== 'dev',
-      );
+    const paths = readdirSync(recipesDirectory).filter(
+      file =>
+        statSync(join(recipesDirectory, file)).isDirectory() &&
+        file !== 'temp' &&
+        file !== 'dev',
+    );
 
     this.recipes = paths
       .map(id => {
-        // eslint-disable-next-line
+        // eslint-disable-next-line import/no-dynamic-require
         const Recipe = require(id)(RecipeModel);
         return new Recipe(loadRecipeConfig(id));
       })
       .filter(recipe => recipe.id);
 
+    // eslint-disable-next-line unicorn/prefer-spread
     this.recipes = this.recipes.concat(this._getDevRecipes());
 
     debug('StubServerApi::getInstalledRecipes resolves', this.recipes);
@@ -425,8 +435,8 @@ export default class ServerApi {
       removeSync(join(recipesDirectory, recipeId, 'recipe.tar.gz'));
 
       return id;
-    } catch (err) {
-      console.error(err);
+    } catch (error) {
+      console.error(error);
 
       return false;
     }
@@ -434,7 +444,9 @@ export default class ServerApi {
 
   // News
   async getLatestNews() {
-    const url = `${apiBase(true)}/news?platform=${osPlatform}&arch=${osArch}&version=${ferdiVersion}`;
+    const url = `${apiBase(
+      true,
+    )}/news?platform=${osPlatform}&arch=${osArch}&version=${ferdiVersion}`;
     const request = await sendAuthRequest(url);
     if (!request.ok) throw request;
     const data = await request.json();
@@ -494,7 +506,7 @@ export default class ServerApi {
         debug('ServerApi::getLegacyServices resolves', services);
         return services;
       }
-    } catch (err) {
+    } catch {
       console.error('ServerApi::getLegacyServices no config found');
     }
 
@@ -523,8 +535,8 @@ export default class ServerApi {
       }
 
       return new ServiceModel(service, recipe);
-    } catch (e) {
-      debug(e);
+    } catch (error) {
+      debug(error);
       return null;
     }
   }
@@ -559,7 +571,7 @@ export default class ServerApi {
 
         return recipe;
       }),
-    ).catch(err => console.error("Can't load recipe", err));
+    ).catch(error => console.error("Can't load recipe", error));
   }
 
   _mapRecipePreviewModel(recipes) {
@@ -567,8 +579,8 @@ export default class ServerApi {
       .map(recipe => {
         try {
           return new RecipePreviewModel(recipe);
-        } catch (e) {
-          console.error(e);
+        } catch (error) {
+          console.error(error);
           return null;
         }
       })
@@ -580,8 +592,8 @@ export default class ServerApi {
       .map(newsItem => {
         try {
           return new NewsModel(newsItem);
-        } catch (e) {
-          console.error(e);
+        } catch (error) {
+          console.error(error);
           return null;
         }
       })
@@ -591,22 +603,21 @@ export default class ServerApi {
   _getDevRecipes() {
     const recipesDirectory = getDevRecipeDirectory();
     try {
-      const paths = readdirSync(recipesDirectory)
-        .filter(
-          file =>
-            statSync(join(recipesDirectory, file)).isDirectory() &&
-            file !== 'temp',
-        );
+      const paths = readdirSync(recipesDirectory).filter(
+        file =>
+          statSync(join(recipesDirectory, file)).isDirectory() &&
+          file !== 'temp',
+      );
 
       const recipes = paths
         .map(id => {
           let Recipe;
           try {
-            // eslint-disable-next-line
+            // eslint-disable-next-line import/no-dynamic-require
             Recipe = require(id)(RecipeModel);
             return new Recipe(loadRecipeConfig(id));
-          } catch (err) {
-            console.error(err);
+          } catch (error) {
+            console.error(error);
           }
 
           return false;
@@ -624,7 +635,7 @@ export default class ServerApi {
         });
 
       return recipes;
-    } catch (err) {
+    } catch {
       debug('Could not load dev recipes');
       return false;
     }
diff --git a/src/api/utils/auth.js b/src/api/utils/auth.js
deleted file mode 100644
index e493b2962..000000000
--- a/src/api/utils/auth.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import localStorage from 'mobx-localstorage';
-import { ferdiLocale, ferdiVersion } from '../../environment';
-
-export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) => {
-  const request = Object.assign(options, {
-    mode: 'cors',
-    headers: {
-      'Content-Type': 'application/json',
-      'X-Franz-Source': 'desktop',
-      'X-Franz-Version': ferdiVersion,
-      'X-Franz-platform': process.platform,
-      'X-Franz-Timezone-Offset': new Date().getTimezoneOffset(),
-      'X-Franz-System-Locale': ferdiLocale,
-      ...options.headers,
-    },
-  });
-
-  if (auth) {
-    request.headers.Authorization = `Bearer ${localStorage.getItem('authToken')}`;
-  }
-
-  return request;
-};
-
-export const sendAuthRequest = (url, options, auth) => (
-  window.fetch(url, prepareAuthRequest(options, auth))
-);
diff --git a/src/api/utils/auth.ts b/src/api/utils/auth.ts
new file mode 100644
index 000000000..98295d1a4
--- /dev/null
+++ b/src/api/utils/auth.ts
@@ -0,0 +1,38 @@
+import localStorage from 'mobx-localstorage';
+import { ferdiLocale, ferdiVersion } from '../../environment-remote';
+
+export const prepareAuthRequest = (
+  // eslint-disable-next-line unicorn/no-object-as-default-parameter
+  options = { method: 'GET' },
+  auth = true,
+) => {
+  const request = Object.assign(options, {
+    mode: 'cors',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-Franz-Source': 'desktop',
+      'X-Franz-Version': ferdiVersion,
+      'X-Franz-platform': process.platform,
+      'X-Franz-Timezone-Offset': new Date().getTimezoneOffset(),
+      'X-Franz-System-Locale': ferdiLocale,
+      // @ts-expect-error Property 'headers' does not exist on type '{ method: string; }'.
+      ...options.headers,
+    },
+  });
+
+  if (auth) {
+    request.headers.Authorization = `Bearer ${localStorage.getItem(
+      'authToken',
+    )}`;
+  }
+
+  return request;
+};
+
+export const sendAuthRequest = (
+  url: RequestInfo,
+  options: { method: string } | undefined,
+  auth?: boolean,
+) =>
+  // @ts-expect-error Argument of type '{ method: string; } & { mode: string; headers: any; }' is not assignable to parameter of type 'RequestInit | undefined'.
+  window.fetch(url, prepareAuthRequest(options, auth));
diff --git a/src/app.js b/src/app.js
index e0d2dbc5a..8a1f99320 100644
--- a/src/app.js
+++ b/src/app.js
@@ -44,7 +44,7 @@ window.addEventListener('load', () => {
           </I18N>
         </Provider>
       );
-      render(preparedApp, document.getElementById('root'));
+      render(preparedApp, document.querySelector('#root'));
     },
   };
   window.ferdi.render();
diff --git a/src/assets/themeInfo.json b/src/assets/themeInfo.json
deleted file mode 100644
index 54e833789..000000000
--- a/src/assets/themeInfo.json
+++ /dev/null
@@ -1 +0,0 @@
-{"color":".theme__dark .app .sidebar .sidebar__button.is-muted, .theme__dark .app .sidebar .sidebar__button.is-active, .sidebar .sidebar__button.is-muted, .sidebar .sidebar__button.is-active, .tab-item.is-active, .settings .account .invoices .invoices__action button, .settings-navigation .settings-navigation__link.is-active .badge, a.link, button.link, .auth .welcome .button:hover, .auth .welcome .button__inverted, .franz-form .franz-form__radio.is-selected, .theme__dark .franz-form__button.franz-form__button--inverted, .franz-form__button.franz-form__button--inverted","border-color":".theme__dark .settings, .franz-form .franz-form__radio.is-selected","background":".settings .settings__header, .settings .settings__close, .settings-navigation .settings-navigation__link.is-active, a.button, button.button, .auth, .info-bar, .info-bar.info-bar--primary, .infobox.infobox--primary, .theme__dark .badge.badge--primary, .theme__dark, .badge.badge--primary, .content-tabs .content-tabs__tabs .content-tabs__item.is-active, #electron-app-title-bar .toolbar-dropdown:not(.open) > .toolbar-button > button:hover, #electron-app-title-bar .list-item.selected .menu-item, #electron-app-title-bar .list-item.selected:focus .menu-item, .theme__dark .quick-switch .active, .franz-form .franz-form__toggle-wrapper .franz-form__toggle.is-active .franz-form__toggle-button, .theme__dark .franz-form__button, .franz-form__button, .ferdi__fab, .franz-form .franz-form__slider-wrapper .slider::-webkit-slider-thumb","border-right-color":".settings .settings__header .separator"}
diff --git a/src/components/AppUpdateInfoBar.js b/src/components/AppUpdateInfoBar.js
index 30804262a..47b730bde 100644
--- a/src/components/AppUpdateInfoBar.js
+++ b/src/components/AppUpdateInfoBar.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import InfoBar from './ui/InfoBar';
 import { GITHUB_FERDI_URL } from '../config';
@@ -9,15 +9,15 @@ import { openExternalUrl } from '../helpers/url-helpers';
 const messages = defineMessages({
   updateAvailable: {
     id: 'infobar.updateAvailable',
-    defaultMessage: '!!!A new update for Ferdi is available.',
+    defaultMessage: 'A new update for Ferdi is available.',
   },
   changelog: {
     id: 'infobar.buttonChangelog',
-    defaultMessage: '!!!Changelog',
+    defaultMessage: 'What is new?',
   },
   buttonInstallUpdate: {
     id: 'infobar.buttonInstallUpdate',
-    defaultMessage: '!!!Restart & install update',
+    defaultMessage: 'Restart & install update',
   },
 });
 
@@ -27,12 +27,8 @@ class AppUpdateInfoBar extends Component {
     onHide: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
-    const { intl } = this.context;
+    const { intl } = this.props;
     const { onInstallUpdate, onHide } = this.props;
 
     return (
@@ -61,4 +57,4 @@ class AppUpdateInfoBar extends Component {
   }
 }
 
-export default AppUpdateInfoBar;
+export default injectIntl(AppUpdateInfoBar);
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js
index 8235932c2..17ac221a2 100644
--- a/src/components/auth/AuthLayout.js
+++ b/src/components/auth/AuthLayout.js
@@ -1,9 +1,9 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { intlShape } from 'react-intl';
-import { TitleBar } from 'electron-react-titlebar';
+import { TitleBar } from 'electron-react-titlebar/renderer';
 
+import { injectIntl } from 'react-intl';
 import Link from '../ui/Link';
 import InfoBar from '../ui/InfoBar';
 
@@ -17,7 +17,6 @@ import { isWindows } from '../../environment';
 import AppUpdateInfoBar from '../AppUpdateInfoBar';
 import { GITHUB_FERDI_URL } from '../../config';
 
-export default
 @observer
 class AuthLayout extends Component {
   static propTypes = {
@@ -36,10 +35,6 @@ class AuthLayout extends Component {
     shouldShowAppUpdateInfoBar: true,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       children,
@@ -52,7 +47,8 @@ class AuthLayout extends Component {
       installAppUpdate,
       appUpdateIsDownloaded,
     } = this.props;
-    const { intl } = this.context;
+
+    const { intl } = this.props;
 
     return (
       <>
@@ -108,3 +104,5 @@ class AuthLayout extends Component {
     );
   }
 }
+
+export default injectIntl(AuthLayout);
diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js
index 8e8a7af32..b98fb50f7 100644
--- a/src/components/auth/ChangeServer.js
+++ b/src/components/auth/ChangeServer.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import Form from '../../lib/Form';
 import Input from '../ui/Input';
 import Select from '../ui/Select';
@@ -14,56 +14,65 @@ import globalMessages from '../../i18n/globalMessages';
 const messages = defineMessages({
   headline: {
     id: 'changeserver.headline',
-    defaultMessage: '!!!Change server',
+    defaultMessage: 'Change server',
   },
   label: {
     id: 'changeserver.label',
-    defaultMessage: '!!!Server',
+    defaultMessage: 'Server',
   },
   warning: {
     id: 'changeserver.warning',
-    defaultMessage: '!!!Extra settings offered by Ferdi will not be saved',
+    defaultMessage: 'Extra settings offered by Ferdi will not be saved',
   },
   customServerLabel: {
     id: 'changeserver.customServerLabel',
-    defaultMessage: '!!!Custom server',
+    defaultMessage: 'Custom server',
   },
   urlError: {
     id: 'changeserver.urlError',
-    defaultMessage: '!!!Enter a valid URL',
+    defaultMessage: 'Enter a valid URL',
   },
 });
 
-export default @observer class ChangeServer extends Component {
+@observer
+class ChangeServer extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     server: PropTypes.string.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  ferdiServer=LIVE_FERDI_API;
+  ferdiServer = LIVE_FERDI_API;
 
-  franzServer=LIVE_FRANZ_API;
+  franzServer = LIVE_FRANZ_API;
 
-  defaultServers=[this.franzServer, this.ferdiServer];
+  defaultServers = [this.franzServer, this.ferdiServer];
 
-  form = new Form({
-    fields: {
-      server: {
-        label: this.context.intl.formatMessage(messages.label),
-        value: this.props.server,
-        options: [{ value: this.ferdiServer, label: 'Ferdi' }, { value: this.franzServer, label: 'Franz' }, { value: this.defaultServers.includes(this.props.server) ? '' : this.props.server, label: 'Custom' }],
-      },
-      customServer: {
-        label: this.context.intl.formatMessage(messages.customServerLabel),
-        value: '',
-        validators: [url, required],
+  form = new Form(
+    {
+      fields: {
+        server: {
+          label: this.props.intl.formatMessage(messages.label),
+          value: this.props.server,
+          options: [
+            { value: this.ferdiServer, label: 'Ferdi' },
+            { value: this.franzServer, label: 'Franz' },
+            {
+              value: this.defaultServers.includes(this.props.server)
+                ? ''
+                : this.props.server,
+              label: 'Custom',
+            },
+          ],
+        },
+        customServer: {
+          label: this.props.intl.formatMessage(messages.customServerLabel),
+          value: '',
+          validators: [url, required],
+        },
       },
     },
-  }, this.context.intl);
+    this.props.intl,
+  );
 
   componentDidMount() {
     if (this.defaultServers.includes(this.props.server)) {
@@ -77,13 +86,13 @@ export default @observer class ChangeServer extends Component {
   submit(e) {
     e.preventDefault();
     this.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         if (!this.defaultServers.includes(form.values().server)) {
           form.$('server').onChange(form.values().customServer);
         }
         this.props.onSubmit(form.values());
       },
-      onError: (form) => {
+      onError: form => {
         if (this.defaultServers.includes(form.values().server)) {
           this.props.onSubmit(form.values());
         }
@@ -93,23 +102,21 @@ export default @observer class ChangeServer extends Component {
 
   render() {
     const { form } = this;
-    const { intl } = this.context;
+    const { intl } = this.props;
     return (
       <div className="auth__container">
-        <form className="franz-form auth__form" onSubmit={(e) => this.submit(e)}>
+        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
           <h1>{intl.formatMessage(messages.headline)}</h1>
-          {form.$('server').value === this.franzServer
-          && (
+          {form.$('server').value === this.franzServer && (
             <Infobox type="warning">
               {intl.formatMessage(messages.warning)}
             </Infobox>
           )}
           <Select field={form.$('server')} />
-          {!this.defaultServers.includes(form.$('server').value)
-          && (
+          {!this.defaultServers.includes(form.$('server').value) && (
             <Input
               placeholder="Custom Server"
-              onChange={(e) => this.submit(e)}
+              onChange={e => this.submit(e)}
               field={form.$('customServer')}
             />
           )}
@@ -123,3 +130,5 @@ export default @observer class ChangeServer extends Component {
     );
   }
 }
+
+export default injectIntl(ChangeServer);
diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js
index 3073cad73..44cb7e791 100644
--- a/src/components/auth/Import.js
+++ b/src/components/auth/Import.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router';
 import classnames from 'classnames';
 
@@ -12,23 +12,22 @@ import Button from '../ui/Button';
 const messages = defineMessages({
   headline: {
     id: 'import.headline',
-    defaultMessage: '!!!Import your Ferdi 4 services',
+    defaultMessage: 'Import your Ferdi 4 services',
   },
   notSupportedHeadline: {
     id: 'import.notSupportedHeadline',
-    defaultMessage: '!!!Services not yet supported in Ferdi 5',
+    defaultMessage: 'Services not yet supported in Ferdi 5',
   },
   submitButtonLabel: {
     id: 'import.submit.label',
-    defaultMessage: '!!!Import {count} services',
+    defaultMessage: 'Import {count} services',
   },
   skipButtonLabel: {
     id: 'import.skip.label',
-    defaultMessage: '!!!I want to add services manually',
+    defaultMessage: 'I want to add services manually',
   },
 });
 
-export default
 @observer
 class Import extends Component {
   static propTypes = {
@@ -38,17 +37,13 @@ class Import extends Component {
     inviteRoute: PropTypes.string.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   componentDidMount() {
     const config = {
       fields: {
         import: [
           ...this.props.services
-            .filter((s) => s.recipe)
-            .map((s) => ({
+            .filter(s => s.recipe)
+            .map(s => ({
               fields: {
                 add: {
                   default: true,
@@ -60,20 +55,20 @@ class Import extends Component {
       },
     };
 
-    this.form = new Form(config, this.context.intl);
+    this.form = new Form(config, this.props.intl);
   }
 
   submit(e) {
     const { services } = this.props;
     e.preventDefault();
     this.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         const servicesImport = form
           .values()
           .import.map(
-            (value, i) => !value.add || services.filter((s) => s.recipe)[i],
+            (value, i) => !value.add || services.filter(s => s.recipe)[i],
           )
-          .filter((s) => typeof s !== 'boolean');
+          .filter(s => typeof s !== 'boolean');
 
         this.props.onSubmit({ services: servicesImport });
       },
@@ -82,18 +77,18 @@ class Import extends Component {
   }
 
   render() {
-    const { intl } = this.context;
+    const { intl } = this.props;
     const { services, isSubmitting, inviteRoute } = this.props;
 
-    const availableServices = services.filter((s) => s.recipe);
-    const unavailableServices = services.filter((s) => !s.recipe);
+    const availableServices = services.filter(s => s.recipe);
+    const unavailableServices = services.filter(s => !s.recipe);
 
     return (
       <div className="auth__scroll-container">
         <div className="auth__container auth__container--signup">
           <form
             className="franz-form auth__form"
-            onSubmit={(e) => this.submit(e)}
+            onSubmit={e => this.submit(e)}
           >
             <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
             <h1>{intl.formatMessage(messages.headline)}</h1>
@@ -107,8 +102,8 @@ class Import extends Component {
                     <td className="service-table__column-icon">
                       <img
                         src={
-                          availableServices[i].custom_icon
-                          || availableServices[i].recipe.icons.svg
+                          availableServices[i].custom_icon ||
+                          availableServices[i].recipe.icons.svg
                         }
                         className={classnames({
                           'service-table__icon': true,
@@ -133,7 +128,7 @@ class Import extends Component {
                 </strong>
                 <p>
                   {services
-                    .filter((s) => !s.recipe)
+                    .filter(s => !s.recipe)
                     .map((service, i) => (
                       <span key={service.id}>
                         {service.name !== '' ? service.name : service.service}
@@ -170,3 +165,5 @@ class Import extends Component {
     );
   }
 }
+
+export default injectIntl(Import);
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index 4b4d63a6b..df8980314 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -1,7 +1,7 @@
 import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router';
 import classnames from 'classnames';
 
@@ -15,35 +15,34 @@ import Button from '../ui/Button';
 const messages = defineMessages({
   settingsHeadline: {
     id: 'settings.invite.headline',
-    defaultMessage: '!!!Invite Friends',
+    defaultMessage: 'Invite Friends',
   },
   headline: {
     id: 'invite.headline.friends',
-    defaultMessage: '!!!Invite 3 of your friends or colleagues',
+    defaultMessage: 'Invite 3 of your friends or colleagues',
   },
   nameLabel: {
     id: 'invite.name.label',
-    defaultMessage: '!!!Name',
+    defaultMessage: 'Name',
   },
   emailLabel: {
     id: 'invite.email.label',
-    defaultMessage: '!!!Email address',
+    defaultMessage: 'Email address',
   },
   submitButtonLabel: {
     id: 'invite.submit.label',
-    defaultMessage: '!!!Send invites',
+    defaultMessage: 'Send invites',
   },
   skipButtonLabel: {
     id: 'invite.skip.label',
-    defaultMessage: '!!!I want to do this later',
+    defaultMessage: 'I want to do this later',
   },
   inviteSuccessInfo: {
     id: 'invite.successInfo',
-    defaultMessage: '!!!Invitations sent successfully',
+    defaultMessage: 'Invitations sent successfully',
   },
 });
 
-export default
 @observer
 class Invite extends Component {
   static propTypes = {
@@ -59,10 +58,6 @@ class Invite extends Component {
     isLoadingInvite: false,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = { showSuccessInfo: false };
 
   componentDidMount() {
@@ -70,11 +65,11 @@ class Invite extends Component {
       {
         fields: {
           invite: [
-            ...Array(3).fill({
+            ...Array.from({ length: 3 }).fill({
               fields: {
                 name: {
-                  label: this.context.intl.formatMessage(messages.nameLabel),
-                  placeholder: this.context.intl.formatMessage(
+                  label: this.props.intl.formatMessage(messages.nameLabel),
+                  placeholder: this.props.intl.formatMessage(
                     messages.nameLabel,
                   ),
                   onChange: () => {
@@ -83,8 +78,8 @@ class Invite extends Component {
                   // related: ['invite.0.email'], // path accepted but does not work
                 },
                 email: {
-                  label: this.context.intl.formatMessage(messages.emailLabel),
-                  placeholder: this.context.intl.formatMessage(
+                  label: this.props.intl.formatMessage(messages.emailLabel),
+                  placeholder: this.props.intl.formatMessage(
                     messages.emailLabel,
                   ),
                   onChange: () => {
@@ -97,22 +92,22 @@ class Invite extends Component {
           ],
         },
       },
-      this.context.intl,
+      this.props.intl,
     );
 
-    document.querySelector('input:first-child').focus();
+    document.querySelector('input:first-child')?.focus();
   }
 
   submit(e) {
     e.preventDefault();
 
-    this.form.submit({
-      onSuccess: (form) => {
+    this.form?.submit({
+      onSuccess: form => {
         this.props.onSubmit({ invites: form.values().invite });
 
-        this.form.clear();
+        this.form?.clear();
         // this.form.$('invite.0.name').focus(); // path accepted but does not focus ;(
-        document.querySelector('input:first-child').focus();
+        document.querySelector('input:first-child')?.focus();
         this.setState({ showSuccessInfo: true });
       },
       onError: () => {},
@@ -121,13 +116,13 @@ class Invite extends Component {
 
   render() {
     const { form } = this;
-    const { intl } = this.context;
+    const { intl } = this.props;
     const { embed, isInviteSuccessful, isLoadingInvite } = this.props;
 
     const atLeastOneEmailAddress = form
       .$('invite')
-      .map((invite) => invite.$('email').value)
-      .some((emailValue) => emailValue.trim() !== '');
+      .map(invite => invite.$('email').value)
+      .some(emailValue => emailValue.trim() !== '');
 
     const sendButtonClassName = classnames({
       auth__button: true,
@@ -148,17 +143,14 @@ class Invite extends Component {
           </Appear>
         )}
 
-        <form
-          className="franz-form auth__form"
-          onSubmit={(e) => this.submit(e)}
-        >
+        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
           {!embed && (
             <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
           )}
           <h1 className={embed && 'invite__embed'}>
             {intl.formatMessage(messages.headline)}
           </h1>
-          {form.$('invite').map((invite) => (
+          {form.$('invite').map(invite => (
             <div className="grid" key={invite.key}>
               <div className="grid__row">
                 <Input field={invite.$('name')} showLabel={false} />
@@ -193,9 +185,7 @@ class Invite extends Component {
       >
         {embed && (
           <div className="settings__header">
-            <h1>
-              {this.context.intl.formatMessage(messages.settingsHeadline)}
-            </h1>
+            <h1>{this.props.intl.formatMessage(messages.settingsHeadline)}</h1>
           </div>
         )}
         {!embed ? (
@@ -207,3 +197,5 @@ class Invite extends Component {
     );
   }
 }
+
+export default injectIntl(Invite);
diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js
index 2ad8a2409..a507ba140 100644
--- a/src/components/auth/Locked.js
+++ b/src/components/auth/Locked.js
@@ -2,7 +2,7 @@ import { systemPreferences } from '@electron/remote';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import Form from '../../lib/Form';
 import Input from '../ui/Input';
@@ -15,39 +15,41 @@ import { globalError as globalErrorPropType } from '../../prop-types';
 const messages = defineMessages({
   headline: {
     id: 'locked.headline',
-    defaultMessage: '!!!Locked',
+    defaultMessage: 'Locked',
   },
   info: {
     id: 'locked.info',
-    defaultMessage: '!!!Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.',
+    defaultMessage:
+      'Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.',
   },
   touchId: {
     id: 'locked.touchId',
-    defaultMessage: '!!!Unlock with Touch ID',
+    defaultMessage: 'Unlock with Touch ID',
   },
   touchIdPrompt: {
     id: 'locked.touchIdPrompt',
-    defaultMessage: '!!!unlock via Touch ID',
+    defaultMessage: 'unlock via Touch ID',
   },
   passwordLabel: {
     id: 'locked.password.label',
-    defaultMessage: '!!!Password',
+    defaultMessage: 'Password',
   },
   submitButtonLabel: {
     id: 'locked.submit.label',
-    defaultMessage: '!!!Unlock',
+    defaultMessage: 'Unlock',
   },
   unlockWithPassword: {
     id: 'locked.unlockWithPassword',
-    defaultMessage: '!!!Unlock with Password',
+    defaultMessage: 'Unlock with Password',
   },
   invalidCredentials: {
     id: 'locked.invalidCredentials',
-    defaultMessage: '!!!Password invalid',
+    defaultMessage: 'Password invalid',
   },
 });
 
-export default @observer class Locked extends Component {
+@observer
+class Locked extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     unlock: PropTypes.func.isRequired,
@@ -56,62 +58,57 @@ export default @observer class Locked extends Component {
     error: globalErrorPropType.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  form = new Form({
-    fields: {
-      password: {
-        label: this.context.intl.formatMessage(messages.passwordLabel),
-        value: '',
-        type: 'password',
+  form = new Form(
+    {
+      fields: {
+        password: {
+          label: this.props.intl.formatMessage(messages.passwordLabel),
+          value: '',
+          type: 'password',
+        },
       },
     },
-  }, this.context.intl);
+    this.props.intl,
+  );
 
   submit(e) {
     e.preventDefault();
     this.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         this.props.onSubmit(form.values());
       },
-      onError: () => { },
+      onError: () => {},
     });
   }
 
   touchIdUnlock() {
-    const { intl } = this.context;
+    const { intl } = this.props;
 
-    systemPreferences.promptTouchID(intl.formatMessage(messages.touchIdPrompt)).then(() => {
-      this.props.unlock();
-    });
+    systemPreferences
+      .promptTouchID(intl.formatMessage(messages.touchIdPrompt))
+      .then(() => {
+        this.props.unlock();
+      });
   }
 
   render() {
     const { form } = this;
-    const { intl } = this.context;
-    const {
-      isSubmitting,
-      error,
-      useTouchIdToUnlock,
-    } = this.props;
+    const { intl } = this.props;
+    const { isSubmitting, error, useTouchIdToUnlock } = this.props;
 
-    const touchIdEnabled = isMac ? (useTouchIdToUnlock && systemPreferences.canPromptTouchID()) : false;
-    const submitButtonLabel = touchIdEnabled ? intl.formatMessage(messages.unlockWithPassword) : intl.formatMessage(messages.submitButtonLabel);
+    const touchIdEnabled = isMac
+      ? useTouchIdToUnlock && systemPreferences.canPromptTouchID()
+      : false;
+    const submitButtonLabel = touchIdEnabled
+      ? intl.formatMessage(messages.unlockWithPassword)
+      : intl.formatMessage(messages.submitButtonLabel);
 
     return (
       <div className="auth__container">
-        <form className="franz-form auth__form" onSubmit={(e) => this.submit(e)}>
-          <img
-            src="./assets/images/logo.svg"
-            className="auth__logo"
-            alt=""
-          />
+        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
+          <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
           <h1>{intl.formatMessage(messages.headline)}</h1>
-          <Infobox type="warning">
-            {intl.formatMessage(messages.info)}
-          </Infobox>
+          <Infobox type="warning">{intl.formatMessage(messages.info)}</Infobox>
 
           {touchIdEnabled && (
             <>
@@ -125,13 +122,11 @@ export default @observer class Locked extends Component {
             </>
           )}
 
-          <Input
-            field={form.$('password')}
-            showPasswordToggle
-            focus
-          />
+          <Input field={form.$('password')} showPasswordToggle focus />
           {error.code === 'invalid-credentials' && (
-            <p className="error-message center">{intl.formatMessage(messages.invalidCredentials)}</p>
+            <p className="error-message center">
+              {intl.formatMessage(messages.invalidCredentials)}
+            </p>
           )}
           {isSubmitting ? (
             <Button
@@ -153,3 +148,5 @@ export default @observer class Locked extends Component {
     );
   }
 }
+
+export default injectIntl(Locked);
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index 9e6a8d046..2f9986858 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -2,10 +2,10 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import { LIVE_FRANZ_API } from '../../config';
-import { API_VERSION, isDevMode, useLiveAPI } from '../../environment';
+import { API_VERSION, isDevMode, useLiveAPI } from '../../environment-remote';
 import Form from '../../lib/Form';
 import { required, email } from '../../helpers/validation-helpers';
 import serverlessLogin from '../../helpers/serverless-helpers';
@@ -19,59 +19,61 @@ import { globalError as globalErrorPropType } from '../../prop-types';
 const messages = defineMessages({
   headline: {
     id: 'login.headline',
-    defaultMessage: '!!!Sign in',
+    defaultMessage: 'Sign in',
   },
   emailLabel: {
     id: 'login.email.label',
-    defaultMessage: '!!!Email address',
+    defaultMessage: 'Email address',
   },
   passwordLabel: {
     id: 'login.password.label',
-    defaultMessage: '!!!Password',
+    defaultMessage: 'Password',
   },
   submitButtonLabel: {
     id: 'login.submit.label',
-    defaultMessage: '!!!Sign in',
+    defaultMessage: 'Sign in',
   },
   invalidCredentials: {
     id: 'login.invalidCredentials',
-    defaultMessage: '!!!Email or password not valid',
+    defaultMessage: 'Email or password not valid',
   },
   customServerQuestion: {
     id: 'login.customServerQuestion',
-    defaultMessage: '!!!Using a Franz account to log in?',
+    defaultMessage: 'Using a Franz account to log in?',
   },
   customServerSuggestion: {
     id: 'login.customServerSuggestion',
-    defaultMessage: '!!!Try importing your Franz account into Ferdi',
+    defaultMessage: 'Try importing your Franz account into Ferdi',
   },
   tokenExpired: {
     id: 'login.tokenExpired',
-    defaultMessage: '!!!Your session expired, please login again.',
+    defaultMessage: 'Your session expired, please login again.',
   },
   serverLogout: {
     id: 'login.serverLogout',
-    defaultMessage: '!!!Your session expired, please login again.',
+    defaultMessage: 'Your session expired, please login again.',
   },
   signupLink: {
     id: 'login.link.signup',
-    defaultMessage: '!!!Create a free account',
+    defaultMessage: 'Create a free account',
   },
   changeServer: {
     id: 'login.changeServer',
-    defaultMessage: '!!!Change server',
+    defaultMessage: 'Change server',
   },
   serverless: {
     id: 'services.serverless',
-    defaultMessage: '!!!Use Ferdi without an Account',
+    defaultMessage: 'Use Ferdi without an Account',
   },
   passwordLink: {
     id: 'login.link.password',
-    defaultMessage: '!!!Forgot password',
+    defaultMessage: 'Reset password',
   },
 });
 
-export default @inject('actions') @observer class Login extends Component {
+@inject('actions')
+@observer
+class Login extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     isSubmitting: PropTypes.bool.isRequired,
@@ -84,35 +86,34 @@ export default @inject('actions') @observer class Login extends Component {
     actions: PropTypes.object.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  form = new Form({
-    fields: {
-      email: {
-        label: this.context.intl.formatMessage(messages.emailLabel),
-        value: '',
-        validators: [required, email],
-      },
-      password: {
-        label: this.context.intl.formatMessage(messages.passwordLabel),
-        value: '',
-        validators: [required],
-        type: 'password',
+  form = new Form(
+    {
+      fields: {
+        email: {
+          label: this.props.intl.formatMessage(messages.emailLabel),
+          value: '',
+          validators: [required, email],
+        },
+        password: {
+          label: this.props.intl.formatMessage(messages.passwordLabel),
+          value: '',
+          validators: [required],
+          type: 'password',
+        },
       },
     },
-  }, this.context.intl);
+    this.props.intl,
+  );
 
   emailField = null;
 
   submit(e) {
     e.preventDefault();
     this.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         this.props.onSubmit(form.values());
       },
-      onError: () => { },
+      onError: () => {},
     });
   }
 
@@ -122,7 +123,7 @@ export default @inject('actions') @observer class Login extends Component {
 
   render() {
     const { form } = this;
-    const { intl } = this.context;
+    const { intl } = this.props;
     const {
       isSubmitting,
       isTokenExpired,
@@ -135,42 +136,47 @@ export default @inject('actions') @observer class Login extends Component {
 
     return (
       <div className="auth__container">
-        <form className="franz-form auth__form" onSubmit={(e) => this.submit(e)}>
-          <img
-            src="./assets/images/logo.svg"
-            className="auth__logo"
-            alt=""
-          />
+        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
+          <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
           <h1>{intl.formatMessage(messages.headline)}</h1>
           {isDevMode && !useLiveAPI && (
             <Infobox type="warning">
-              In Dev Mode your data is not persistent. Please use the live app for accessing the production API.
+              In Dev Mode your data is not persistent. Please use the live app
+              for accessing the production API.
             </Infobox>
           )}
           {isTokenExpired && (
-            <p className="error-message center">{intl.formatMessage(messages.tokenExpired)}</p>
+            <p className="error-message center">
+              {intl.formatMessage(messages.tokenExpired)}
+            </p>
           )}
           {isServerLogout && (
-            <p className="error-message center">{intl.formatMessage(messages.serverLogout)}</p>
+            <p className="error-message center">
+              {intl.formatMessage(messages.serverLogout)}
+            </p>
           )}
           <Input
             field={form.$('email')}
-            ref={(element) => { this.emailField = element; }}
+            ref={element => {
+              this.emailField = element;
+            }}
             focus
           />
-          <Input
-            field={form.$('password')}
-            showPasswordToggle
-          />
+          <Input field={form.$('password')} showPasswordToggle />
           {error.code === 'invalid-credentials' && (
             <>
-              <p className="error-message center">{intl.formatMessage(messages.invalidCredentials)}</p>
-              { window.ferdi.stores.settings.all.app.server !== LIVE_FRANZ_API && (
+              <p className="error-message center">
+                {intl.formatMessage(messages.invalidCredentials)}
+              </p>
+              {window.ferdi.stores.settings.all.app.server !==
+                LIVE_FRANZ_API && (
                 <p className="error-message center">
-                    {intl.formatMessage(messages.customServerQuestion)}
-                  {' '}
+                  {intl.formatMessage(messages.customServerQuestion)}{' '}
                   <Link
-                    to={`${window.ferdi.stores.settings.all.app.server.replace(API_VERSION, '')}/import`}
+                    to={`${window.ferdi.stores.settings.all.app.server.replace(
+                      API_VERSION,
+                      '',
+                    )}/import`}
                     target="_blank"
                     style={{ cursor: 'pointer', textDecoration: 'underline' }}
                   >
@@ -197,12 +203,22 @@ export default @inject('actions') @observer class Login extends Component {
           )}
         </form>
         <div className="auth__links">
-          <Link to={changeServerRoute}>{intl.formatMessage(messages.changeServer)}</Link>
-          <a onClick={this.useLocalServer.bind(this)}>{intl.formatMessage(messages.serverless)}</a>
-          <Link to={signupRoute}>{intl.formatMessage(messages.signupLink)}</Link>
-          <Link to={passwordRoute}>{intl.formatMessage(messages.passwordLink)}</Link>
+          <Link to={changeServerRoute}>
+            {intl.formatMessage(messages.changeServer)}
+          </Link>
+          <a onClick={this.useLocalServer.bind(this)}>
+            {intl.formatMessage(messages.serverless)}
+          </a>
+          <Link to={signupRoute}>
+            {intl.formatMessage(messages.signupLink)}
+          </Link>
+          <Link to={passwordRoute}>
+            {intl.formatMessage(messages.passwordLink)}
+          </Link>
         </div>
       </div>
     );
   }
 }
+
+export default injectIntl(Login);
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js
index 1be2097bd..3e678f638 100644
--- a/src/components/auth/Password.js
+++ b/src/components/auth/Password.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import Form from '../../lib/Form';
 import { required, email } from '../../helpers/validation-helpers';
@@ -14,31 +14,32 @@ import globalMessages from '../../i18n/globalMessages';
 const messages = defineMessages({
   headline: {
     id: 'password.headline',
-    defaultMessage: '!!!Forgot password',
+    defaultMessage: 'Reset password',
   },
   emailLabel: {
     id: 'password.email.label',
-    defaultMessage: '!!!Email address',
+    defaultMessage: 'Email address',
   },
   successInfo: {
     id: 'password.successInfo',
-    defaultMessage: '!!!Your new password was sent to your email address',
+    defaultMessage: 'Your new password was sent to your email address',
   },
   noUser: {
     id: 'password.noUser',
-    defaultMessage: '!!!No user affiliated with that email address',
+    defaultMessage: 'No user with that email address was found',
   },
   signupLink: {
     id: 'password.link.signup',
-    defaultMessage: '!!!Create a free account',
+    defaultMessage: 'Create a free account',
   },
   loginLink: {
     id: 'password.link.login',
-    defaultMessage: '!!!Sign in to your account',
+    defaultMessage: 'Sign in to your account',
   },
 });
 
-export default @observer class Password extends Component {
+@observer
+class Password extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     isSubmitting: PropTypes.bool.isRequired,
@@ -47,24 +48,23 @@ export default @observer class Password extends Component {
     status: MobxPropTypes.arrayOrObservableArray.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  form = new Form({
-    fields: {
-      email: {
-        label: this.context.intl.formatMessage(messages.emailLabel),
-        value: '',
-        validators: [required, email],
+  form = new Form(
+    {
+      fields: {
+        email: {
+          label: this.props.intl.formatMessage(messages.emailLabel),
+          value: '',
+          validators: [required, email],
+        },
       },
     },
-  }, this.context.intl);
+    this.props.intl,
+  );
 
   submit(e) {
     e.preventDefault();
     this.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         this.props.onSubmit(form.values());
       },
       onError: () => {},
@@ -73,37 +73,24 @@ export default @observer class Password extends Component {
 
   render() {
     const { form } = this;
-    const { intl } = this.context;
-    const {
-      isSubmitting,
-      signupRoute,
-      loginRoute,
-      status,
-    } = this.props;
+    const { intl } = this.props;
+    const { isSubmitting, signupRoute, loginRoute, status } = this.props;
 
     return (
       <div className="auth__container">
-        <form className="franz-form auth__form" onSubmit={(e) => this.submit(e)}>
-          <img
-            src="./assets/images/logo.svg"
-            className="auth__logo"
-            alt=""
-          />
+        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
+          <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
           <h1>{intl.formatMessage(messages.headline)}</h1>
           {status.length > 0 && status.includes('sent') && (
-            <Infobox
-              type="success"
-              icon="checkbox-marked-circle-outline"
-            >
+            <Infobox type="success" icon="checkbox-marked-circle-outline">
               {intl.formatMessage(messages.successInfo)}
             </Infobox>
           )}
-          <Input
-            field={form.$('email')}
-            focus
-          />
+          <Input field={form.$('email')} focus />
           {status.length > 0 && status.includes('no-user') && (
-            <p className="error-message center">{intl.formatMessage(messages.noUser)}</p>
+            <p className="error-message center">
+              {intl.formatMessage(messages.noUser)}
+            </p>
           )}
           {isSubmitting ? (
             <Button
@@ -123,9 +110,13 @@ export default @observer class Password extends Component {
         </form>
         <div className="auth__links">
           <Link to={loginRoute}>{intl.formatMessage(messages.loginLink)}</Link>
-          <Link to={signupRoute}>{intl.formatMessage(messages.signupLink)}</Link>
+          <Link to={signupRoute}>
+            {intl.formatMessage(messages.signupLink)}
+          </Link>
         </div>
       </div>
     );
   }
 }
+
+export default injectIntl(Password);
diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js
index ded36bbe7..299c40c63 100644
--- a/src/components/auth/SetupAssistant.js
+++ b/src/components/auth/SetupAssistant.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
 
@@ -19,20 +19,20 @@ const SLACK_ID = 'slack';
 const messages = defineMessages({
   headline: {
     id: 'setupAssistant.headline',
-    defaultMessage: "!!!Let's get started",
+    defaultMessage: "Let's get started",
   },
   subHeadline: {
     id: 'setupAssistant.subheadline',
     defaultMessage:
-      '!!!Choose from our most used services and get back on top of your messaging now.',
+      'Choose from our most used services and get back on top of your messaging now.',
   },
   submitButtonLabel: {
     id: 'setupAssistant.submit.label',
-    defaultMessage: "!!!Let's go",
+    defaultMessage: "Let's go",
   },
   inviteSuccessInfo: {
     id: 'invite.successInfo',
-    defaultMessage: '!!!Invitations sent successfully',
+    defaultMessage: 'Invitations sent successfully',
   },
 });
 
@@ -145,10 +145,6 @@ class SetupAssistant extends Component {
     isInviteSuccessful: false,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     services: [
       {
@@ -189,7 +185,7 @@ class SetupAssistant extends Component {
   }
 
   render() {
-    const { intl } = this.context;
+    const { intl } = this.props;
     const {
       classes,
       isInviteSuccessful,
@@ -330,4 +326,4 @@ class SetupAssistant extends Component {
   }
 }
 
-export default SetupAssistant;
+export default injectIntl(SetupAssistant);
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 6fb41a164..816a49669 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -2,9 +2,9 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
-import { isDevMode, useLiveAPI } from '../../environment';
+import { isDevMode, useLiveAPI } from '../../environment-remote';
 import Form from '../../lib/Form';
 import { required, email, minLength } from '../../helpers/validation-helpers';
 import serverlessLogin from '../../helpers/serverless-helpers';
@@ -19,63 +19,65 @@ import { termsBase } from '../../api/apiBase';
 const messages = defineMessages({
   headline: {
     id: 'signup.headline',
-    defaultMessage: '!!!Sign up',
+    defaultMessage: 'Sign up',
   },
   firstnameLabel: {
     id: 'signup.firstname.label',
-    defaultMessage: '!!!Firstname',
+    defaultMessage: 'First Name',
   },
   lastnameLabel: {
     id: 'signup.lastname.label',
-    defaultMessage: '!!!Lastname',
+    defaultMessage: 'Last Name',
   },
   emailLabel: {
     id: 'signup.email.label',
-    defaultMessage: '!!!Email address',
+    defaultMessage: 'Email address',
   },
   // companyLabel: {
   //   id: 'signup.company.label',
-  //   defaultMessage: '!!!Company',
+  //   defaultMessage: 'Company',
   // },
   passwordLabel: {
     id: 'signup.password.label',
-    defaultMessage: '!!!Password',
+    defaultMessage: 'Password',
   },
   legalInfo: {
     id: 'signup.legal.info',
-    defaultMessage: '!!!By creating a Ferdi account you accept the',
+    defaultMessage: 'By creating a Ferdi account you accept the',
   },
   terms: {
     id: 'signup.legal.terms',
-    defaultMessage: '!!!Terms of service',
+    defaultMessage: 'Terms of service',
   },
   privacy: {
     id: 'signup.legal.privacy',
-    defaultMessage: '!!!Privacy Statement',
+    defaultMessage: 'Privacy Statement',
   },
   submitButtonLabel: {
     id: 'signup.submit.label',
-    defaultMessage: '!!!Create account',
+    defaultMessage: 'Create account',
   },
   loginLink: {
     id: 'signup.link.login',
-    defaultMessage: '!!!Already have an account, sign in?',
+    defaultMessage: 'Already have an account, sign in?',
   },
   changeServer: {
     id: 'login.changeServer',
-    defaultMessage: '!!!Change server',
+    defaultMessage: 'Change server',
   },
   serverless: {
     id: 'services.serverless',
-    defaultMessage: '!!!Use Ferdi without an Account',
+    defaultMessage: 'Use Ferdi without an Account',
   },
   emailDuplicate: {
     id: 'signup.emailDuplicate',
-    defaultMessage: '!!!A user with that email address already exists',
+    defaultMessage: 'A user with that email address already exists',
   },
 });
 
-export default @inject('actions') @observer class Signup extends Component {
+@inject('actions')
+@observer
+class Signup extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     isSubmitting: PropTypes.bool.isRequired,
@@ -85,40 +87,39 @@ export default @inject('actions') @observer class Signup extends Component {
     actions: PropTypes.object.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  form = new Form({
-    fields: {
-      firstname: {
-        label: this.context.intl.formatMessage(messages.firstnameLabel),
-        value: '',
-        validators: [required],
-      },
-      lastname: {
-        label: this.context.intl.formatMessage(messages.lastnameLabel),
-        value: '',
-        validators: [required],
-      },
-      email: {
-        label: this.context.intl.formatMessage(messages.emailLabel),
-        value: '',
-        validators: [required, email],
-      },
-      password: {
-        label: this.context.intl.formatMessage(messages.passwordLabel),
-        value: '',
-        validators: [required, minLength(6)],
-        type: 'password',
+  form = new Form(
+    {
+      fields: {
+        firstname: {
+          label: this.props.intl.formatMessage(messages.firstnameLabel),
+          value: '',
+          validators: [required],
+        },
+        lastname: {
+          label: this.props.intl.formatMessage(messages.lastnameLabel),
+          value: '',
+          validators: [required],
+        },
+        email: {
+          label: this.props.intl.formatMessage(messages.emailLabel),
+          value: '',
+          validators: [required, email],
+        },
+        password: {
+          label: this.props.intl.formatMessage(messages.passwordLabel),
+          value: '',
+          validators: [required, minLength(6)],
+          type: 'password',
+        },
       },
     },
-  }, this.context.intl);
+    this.props.intl,
+  );
 
   submit(e) {
     e.preventDefault();
     this.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         this.props.onSubmit(form.values());
       },
       onError: () => {},
@@ -131,24 +132,22 @@ export default @inject('actions') @observer class Signup extends Component {
 
   render() {
     const { form } = this;
-    const { intl } = this.context;
-    const {
-      isSubmitting, loginRoute, error, changeServerRoute,
-    } = this.props;
+    const { intl } = this.props;
+    const { isSubmitting, loginRoute, error, changeServerRoute } = this.props;
 
     return (
       <div className="auth__scroll-container">
         <div className="auth__container auth__container--signup">
-          <form className="franz-form auth__form" onSubmit={(e) => this.submit(e)}>
-            <img
-              src="./assets/images/logo.svg"
-              className="auth__logo"
-              alt=""
-            />
+          <form
+            className="franz-form auth__form"
+            onSubmit={e => this.submit(e)}
+          >
+            <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
             <h1>{intl.formatMessage(messages.headline)}</h1>
             {isDevMode && !useLiveAPI && (
               <Infobox type="warning">
-                In Dev Mode your data is not persistent. Please use the live app for accesing the production API.
+                In Dev Mode your data is not persistent. Please use the live app
+                for accesing the production API.
               </Infobox>
             )}
             <div className="grid__row">
@@ -162,7 +161,9 @@ export default @inject('actions') @observer class Signup extends Component {
               scorePassword
             />
             {error.code === 'email-duplicate' && (
-              <p className="error-message center">{intl.formatMessage(messages.emailDuplicate)}</p>
+              <p className="error-message center">
+                {intl.formatMessage(messages.emailDuplicate)}
+              </p>
             )}
             {isSubmitting ? (
               <Button
@@ -200,12 +201,20 @@ export default @inject('actions') @observer class Signup extends Component {
             </p>
           </form>
           <div className="auth__links">
-            <Link to={changeServerRoute}>{intl.formatMessage(messages.changeServer)}</Link>
-            <a onClick={this.useLocalServer.bind(this)}>{intl.formatMessage(messages.serverless)}</a>
-            <Link to={loginRoute}>{intl.formatMessage(messages.loginLink)}</Link>
+            <Link to={changeServerRoute}>
+              {intl.formatMessage(messages.changeServer)}
+            </Link>
+            <a onClick={this.useLocalServer.bind(this)}>
+              {intl.formatMessage(messages.serverless)}
+            </a>
+            <Link to={loginRoute}>
+              {intl.formatMessage(messages.loginLink)}
+            </Link>
           </div>
         </div>
       </div>
     );
   }
 }
+
+export default injectIntl(Signup);
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js
index cb522e26e..2d2e2ab28 100644
--- a/src/components/auth/Welcome.js
+++ b/src/components/auth/Welcome.js
@@ -2,7 +2,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import serverlessLogin from '../../helpers/serverless-helpers';
 
 import Link from '../ui/Link';
@@ -10,19 +10,21 @@ import Link from '../ui/Link';
 const messages = defineMessages({
   signupButton: {
     id: 'welcome.signupButton',
-    defaultMessage: '!!!Create a free account',
+    defaultMessage: 'Create a free account',
   },
   loginButton: {
     id: 'welcome.loginButton',
-    defaultMessage: '!!!Login to your account',
+    defaultMessage: 'Login to your account',
   },
   serverless: {
     id: 'services.serverless',
-    defaultMessage: '!!!Use Ferdi without an Account',
+    defaultMessage: 'Use Ferdi without an Account',
   },
 });
 
-export default @inject('actions') @observer class Login extends Component {
+@inject('actions')
+@observer
+class Login extends Component {
   static propTypes = {
     loginRoute: PropTypes.string.isRequired,
     signupRoute: PropTypes.string.isRequired,
@@ -31,27 +33,22 @@ export default @inject('actions') @observer class Login extends Component {
     actions: PropTypes.object.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   useLocalServer() {
     serverlessLogin(this.props.actions);
   }
 
   render() {
-    const { intl } = this.context;
-    const {
-      loginRoute,
-      signupRoute,
-      changeServerRoute,
-      recipes,
-    } = this.props;
+    const { intl } = this.props;
+    const { loginRoute, signupRoute, changeServerRoute, recipes } = this.props;
 
     return (
       <div className="welcome">
         <div className="welcome__content">
-          <img src="./assets/images/logo.svg" className="welcome__logo" alt="" />
+          <img
+            src="./assets/images/logo.svg"
+            className="welcome__logo"
+            alt=""
+          />
           {/* <img src="./assets/images/welcome.png" className="welcome__services" alt="" /> */}
           <div className="welcome__text">
             <h1>Ferdi</h1>
@@ -73,27 +70,21 @@ export default @inject('actions') @observer class Login extends Component {
           <br />
 
           <Link to={changeServerRoute}>
-            <span style={{
-              textAlign: 'center',
-              width: '100%',
-              cursor: 'pointer',
-            }}
+            <span
+              style={{
+                textAlign: 'center',
+                width: '100%',
+                cursor: 'pointer',
+              }}
             >
               Change server
             </span>
           </Link>
         </div>
         <div className="welcome__featured-services">
-          {recipes.map((recipe) => (
-            <div
-              key={recipe.id}
-              className="welcome__featured-service"
-            >
-              <img
-                key={recipe.id}
-                src={recipe.icons.svg}
-                alt=""
-              />
+          {recipes.map(recipe => (
+            <div key={recipe.id} className="welcome__featured-service">
+              <img key={recipe.id} src={recipe.icons.svg} alt="" />
             </div>
           ))}
         </div>
@@ -101,3 +92,5 @@ export default @inject('actions') @observer class Login extends Component {
     );
   }
 }
+
+export default injectIntl(Login);
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index e6e5d40fe..0a65dcffa 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -1,8 +1,8 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
-import { TitleBar } from 'electron-react-titlebar';
+import { defineMessages, injectIntl } from 'react-intl';
+import { TitleBar } from 'electron-react-titlebar/renderer';
 import injectSheet from 'react-jss';
 
 import InfoBar from '../ui/InfoBar';
@@ -27,20 +27,20 @@ function createMarkup(HTMLString) {
 const messages = defineMessages({
   servicesUpdated: {
     id: 'infobar.servicesUpdated',
-    defaultMessage: '!!!Your services have been updated.',
+    defaultMessage: 'Your services have been updated.',
   },
   buttonReloadServices: {
     id: 'infobar.buttonReloadServices',
-    defaultMessage: '!!!Reload services',
+    defaultMessage: 'Reload services',
   },
   requiredRequestsFailed: {
     id: 'infobar.requiredRequestsFailed',
-    defaultMessage: '!!!Could not load services and user information',
+    defaultMessage: 'Could not load services and user information',
   },
   authRequestFailed: {
     id: 'infobar.authRequestFailed',
     defaultMessage:
-      '!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.',
+      'There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.',
   },
 });
 
@@ -88,16 +88,13 @@ class AppLayout extends Component {
 
   state = {
     shouldShowAppUpdateInfoBar: true,
+    shouldShowServicesUpdatedInfoBar: true,
   };
 
   static defaultProps = {
     children: [],
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       classes,
@@ -119,7 +116,7 @@ class AppLayout extends Component {
       areRequiredRequestsLoading,
     } = this.props;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <ErrorBoundary>
@@ -179,12 +176,14 @@ class AppLayout extends Component {
                   {intl.formatMessage(messages.authRequestFailed)}
                 </InfoBar>
               )}
-              {showServicesUpdatedInfoBar && (
+              {showServicesUpdatedInfoBar && this.state.shouldShowServicesUpdatedInfoBar && (
                 <InfoBar
                   type="primary"
                   ctaLabel={intl.formatMessage(messages.buttonReloadServices)}
                   onClick={reloadServicesAfterUpdate}
-                  sticky
+                  onHide={() => {
+                    this.setState({ shouldShowServicesUpdatedInfoBar: false });
+                  }}
                 >
                   <span className="mdi mdi-power-plug" />
                   {intl.formatMessage(messages.servicesUpdated)}
@@ -213,4 +212,4 @@ class AppLayout extends Component {
   }
 }
 
-export default AppLayout;
+export default injectIntl(AppLayout);
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 1ee7733b9..87233f7ca 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -1,12 +1,19 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ReactTooltip from 'react-tooltip';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { inject, observer } from 'mobx-react';
 import { Link } from 'react-router';
 
 import Tabbar from '../services/tabs/Tabbar';
-import { settingsShortcutKey, lockFerdiShortcutKey, todosToggleShortcutKey, workspaceToggleShortcutKey, addNewServiceShortcutKey, muteFerdiShortcutKey } from '../../environment';
+import {
+  settingsShortcutKey,
+  lockFerdiShortcutKey,
+  todosToggleShortcutKey,
+  workspaceToggleShortcutKey,
+  addNewServiceShortcutKey,
+  muteFerdiShortcutKey,
+} from '../../environment';
 import { workspaceStore } from '../../features/workspaces';
 import { todosStore } from '../../features/todos';
 import { todoActions } from '../../features/todos/actions';
@@ -17,39 +24,41 @@ import globalMessages from '../../i18n/globalMessages';
 const messages = defineMessages({
   addNewService: {
     id: 'sidebar.addNewService',
-    defaultMessage: '!!!Add new service',
+    defaultMessage: 'Add new service',
   },
   mute: {
     id: 'sidebar.muteApp',
-    defaultMessage: '!!!Disable notifications & audio',
+    defaultMessage: 'Disable notifications & audio',
   },
   unmute: {
     id: 'sidebar.unmuteApp',
-    defaultMessage: '!!!Enable notifications & audio',
+    defaultMessage: 'Enable notifications & audio',
   },
   openWorkspaceDrawer: {
     id: 'sidebar.openWorkspaceDrawer',
-    defaultMessage: '!!!Open workspace drawer',
+    defaultMessage: 'Open workspace drawer',
   },
   closeWorkspaceDrawer: {
     id: 'sidebar.closeWorkspaceDrawer',
-    defaultMessage: '!!!Close workspace drawer',
+    defaultMessage: 'Close workspace drawer',
   },
   openTodosDrawer: {
     id: 'sidebar.openTodosDrawer',
-    defaultMessage: '!!!Open Ferdi Todos',
+    defaultMessage: 'Open Ferdi Todos',
   },
   closeTodosDrawer: {
     id: 'sidebar.closeTodosDrawer',
-    defaultMessage: '!!!Close Ferdi Todos',
+    defaultMessage: 'Close Ferdi Todos',
   },
   lockFerdi: {
     id: 'sidebar.lockFerdi',
-    defaultMessage: '!!!Lock Ferdi',
+    defaultMessage: 'Lock Ferdi',
   },
 });
 
-export default @inject('stores', 'actions') @observer class Sidebar extends Component {
+@inject('stores', 'actions')
+@observer
+class Sidebar extends Component {
   static propTypes = {
     openSettings: PropTypes.func.isRequired,
     closeSettings: PropTypes.func.isRequired,
@@ -79,10 +88,6 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
     }).isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     tooltipEnabled: true,
   };
@@ -115,14 +120,14 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
       actions,
       isTodosServiceActive,
     } = this.props;
-    const { intl } = this.context;
-    const todosToggleMessage = (
-      todosStore.isTodosPanelVisible ? messages.closeTodosDrawer : messages.openTodosDrawer
-    );
+    const { intl } = this.props;
+    const todosToggleMessage = todosStore.isTodosPanelVisible
+      ? messages.closeTodosDrawer
+      : messages.openTodosDrawer;
 
-    const workspaceToggleMessage = (
-      isWorkspaceDrawerOpen ? messages.closeWorkspaceDrawer : messages.openWorkspaceDrawer
-    );
+    const workspaceToggleMessage = isWorkspaceDrawerOpen
+      ? messages.closeWorkspaceDrawer
+      : messages.openWorkspaceDrawer;
     const isLoggedIn = Boolean(localStorage.getItem('authToken'));
 
     return (
@@ -133,9 +138,9 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
           disableToolTip={() => this.disableToolTip()}
           useVerticalStyle={stores.settings.all.app.useVerticalStyle}
         />
-        { isLoggedIn ? (
+        {isLoggedIn ? (
           <>
-            { stores.settings.all.app.lockingFeatureEnabled ? (
+            {stores.settings.all.app.lockingFeatureEnabled ? (
               <button
                 type="button"
                 className="sidebar__button"
@@ -147,12 +152,15 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
                     },
                   });
                 }}
-                data-tip={`${intl.formatMessage(messages.lockFerdi)} (${lockFerdiShortcutKey(false)})`}
+                data-tip={`${intl.formatMessage(
+                  messages.lockFerdi,
+                )} (${lockFerdiShortcutKey(false)})`}
               >
                 <i className="mdi mdi-lock" />
               </button>
             ) : null}
-            {todosStore.isFeatureEnabled && todosStore.isFeatureEnabledByUser ? (
+            {todosStore.isFeatureEnabled &&
+            todosStore.isFeatureEnabledByUser ? (
               <button
                 type="button"
                 onClick={() => {
@@ -160,12 +168,16 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
                   this.updateToolTip();
                 }}
                 disabled={isTodosServiceActive}
-                className={`sidebar__button sidebar__button--todos ${todosStore.isTodosPanelVisible ? 'is-active' : ''}`}
-                data-tip={`${intl.formatMessage(todosToggleMessage)} (${todosToggleShortcutKey(false)})`}
+                className={`sidebar__button sidebar__button--todos ${
+                  todosStore.isTodosPanelVisible ? 'is-active' : ''
+                }`}
+                data-tip={`${intl.formatMessage(
+                  todosToggleMessage,
+                )} (${todosToggleShortcutKey(false)})`}
               >
                 <i className="mdi mdi-check-all" />
               </button>
-            ) : null}
+              ) : null}
             {workspaceStore.isFeatureEnabled ? (
               <button
                 type="button"
@@ -173,8 +185,12 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
                   toggleWorkspaceDrawer();
                   this.updateToolTip();
                 }}
-                className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`}
-                data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${workspaceToggleShortcutKey(false)})`}
+                className={`sidebar__button sidebar__button--workspaces ${
+                  isWorkspaceDrawerOpen ? 'is-active' : ''
+                }`}
+                data-tip={`${intl.formatMessage(
+                  workspaceToggleMessage,
+                )} (${workspaceToggleShortcutKey(false)})`}
               >
                 <i className="mdi mdi-view-grid" />
               </button>
@@ -185,8 +201,12 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
                 toggleMuteApp();
                 this.updateToolTip();
               }}
-              className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
-              data-tip={`${intl.formatMessage(isAppMuted ? messages.unmute : messages.mute)} (${muteFerdiShortcutKey(false)})`}
+              className={`sidebar__button sidebar__button--audio ${
+                isAppMuted ? 'is-muted' : ''
+              }`}
+              data-tip={`${intl.formatMessage(
+                isAppMuted ? messages.unmute : messages.mute,
+              )} (${muteFerdiShortcutKey(false)})`}
             >
               <i className={`mdi mdi-bell${isAppMuted ? '-off' : ''}`} />
             </button>
@@ -194,7 +214,9 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
               type="button"
               onClick={() => openSettings({ path: 'recipes' })}
               className="sidebar__button sidebar__button--new-service"
-              data-tip={`${intl.formatMessage(messages.addNewService)} (${addNewServiceShortcutKey(false)})`}
+              data-tip={`${intl.formatMessage(
+                messages.addNewService,
+              )} (${addNewServiceShortcutKey(false)})`}
             >
               <i className="mdi mdi-plus-box" />
             </button>
@@ -212,15 +234,17 @@ 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(globalMessages.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
-            || this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.DOWNLOADED) && (
-            <span className="update-available">
-              •
-            </span>
-          ) }
+          {(this.props.stores.app.updateStatus ===
+            this.props.stores.app.updateStatusTypes.AVAILABLE ||
+            this.props.stores.app.updateStatus ===
+              this.props.stores.app.updateStatusTypes.DOWNLOADED) && (
+              <span className="update-available">•</span>
+          )}
         </button>
         {this.state.tooltipEnabled && (
           <ReactTooltip place="right" type="dark" effect="solid" />
@@ -229,3 +253,5 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
     );
   }
 }
+
+export default injectIntl(Sidebar);
diff --git a/src/components/services/content/ConnectionLostBanner.js b/src/components/services/content/ConnectionLostBanner.js
index ebe863333..423edb3c7 100644
--- a/src/components/services/content/ConnectionLostBanner.js
+++ b/src/components/services/content/ConnectionLostBanner.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 import { Icon } from '@meetfranz/ui';
-import { intlShape, defineMessages } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import { mdiAlert } from '@mdi/js';
 import { LIVE_API_FERDI_WEBSITE } from '../../../config';
@@ -12,15 +12,15 @@ import { LIVE_API_FERDI_WEBSITE } from '../../../config';
 const messages = defineMessages({
   text: {
     id: 'connectionLostBanner.message',
-    defaultMessage: '!!!Oh no! Ferdi lost the connection to {name}.',
+    defaultMessage: 'Oh no! Ferdi lost the connection to {name}.',
   },
   moreInformation: {
     id: 'connectionLostBanner.informationLink',
-    defaultMessage: '!!!What happened?',
+    defaultMessage: 'What happened?',
   },
   cta: {
     id: 'connectionLostBanner.cta',
-    defaultMessage: '!!!Reload Service',
+    defaultMessage: 'Reload Service',
   },
 });
 
@@ -78,16 +78,12 @@ class ConnectionLostBanner extends Component {
     reload: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   inputRef = React.createRef();
 
   render() {
     const { classes, name, reload } = this.props;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <div className={classes.root}>
@@ -110,4 +106,4 @@ class ConnectionLostBanner extends Component {
   }
 }
 
-export default ConnectionLostBanner;
+export default injectIntl(ConnectionLostBanner);
diff --git a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
index 36e0ac418..b00db8c3f 100644
--- a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
+++ b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import injectSheet from 'react-jss';
 
 import Button from '../../../ui/Button';
@@ -11,27 +11,29 @@ import styles from './styles';
 const messages = defineMessages({
   headline: {
     id: 'service.errorHandler.headline',
-    defaultMessage: '!!!Oh no!',
+    defaultMessage: 'Oh no!',
   },
   text: {
     id: 'service.errorHandler.text',
-    defaultMessage: '!!!{name} has failed to load.',
+    defaultMessage: '{name} has failed to load.',
   },
   action: {
     id: 'service.errorHandler.action',
-    defaultMessage: '!!!Reload {name}',
+    defaultMessage: 'Reload {name}',
   },
   editAction: {
     id: 'service.errorHandler.editAction',
-    defaultMessage: '!!!Edit {name}',
+    defaultMessage: 'Edit {name}',
   },
   errorMessage: {
     id: 'service.errorHandler.message',
-    defaultMessage: '!!!Error:',
+    defaultMessage: 'Error',
   },
 });
 
-export default @injectSheet(styles) @observer class WebviewErrorHandler extends Component {
+@injectSheet(styles)
+@observer
+class WebviewErrorHandler extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     reload: PropTypes.func.isRequired,
@@ -40,30 +42,16 @@ export default @injectSheet(styles) @observer class WebviewErrorHandler extends
     classes: PropTypes.object.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
-    const {
-      name,
-      reload,
-      edit,
-      errorMessage,
-      classes,
-    } = this.props;
-    const { intl } = this.context;
+    const { name, reload, edit, errorMessage, classes } = this.props;
+    const { intl } = this.props;
 
     return (
       <div className={classes.component}>
         <h1>{intl.formatMessage(messages.headline)}</h1>
         <p>{intl.formatMessage(messages.text, { name })}</p>
         <p>
-          <strong>
-            {intl.formatMessage(messages.errorMessage)}
-            :
-          </strong>
-          {' '}
+          <strong>{intl.formatMessage(messages.errorMessage)}:</strong>{' '}
           {errorMessage}
         </p>
         <div className={classes.buttonContainer}>
@@ -82,3 +70,5 @@ export default @injectSheet(styles) @observer class WebviewErrorHandler extends
     );
   }
 }
+
+export default injectIntl(WebviewErrorHandler);
diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js
index d0f12256e..e59ed58bd 100644
--- a/src/components/services/content/ServiceDisabled.js
+++ b/src/components/services/content/ServiceDisabled.js
@@ -1,38 +1,35 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import Button from '../../ui/Button';
 
 const messages = defineMessages({
   headline: {
     id: 'service.disabledHandler.headline',
-    defaultMessage: '!!!{name} is disabled',
+    defaultMessage: '{name} is disabled',
   },
   action: {
     id: 'service.disabledHandler.action',
-    defaultMessage: '!!!Enable {name}',
+    defaultMessage: 'Enable {name}',
   },
 });
 
-export default @observer class ServiceDisabled extends Component {
+@observer
+class ServiceDisabled extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     enable: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   countdownInterval = null;
 
   countdownIntervalTimeout = 1000;
 
   render() {
     const { name, enable } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <div className="services__info-layer">
@@ -46,3 +43,5 @@ export default @observer class ServiceDisabled extends Component {
     );
   }
 }
+
+export default injectIntl(ServiceDisabled);
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index 3fc084ff0..81401b1d2 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -15,7 +15,9 @@ import SettingsStore from '../../../stores/SettingsStore';
 import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen';
 import { CUSTOM_WEBSITE_RECIPE_ID } from '../../../config';
 
-export default @inject('stores', 'actions') @observer class ServiceView extends Component {
+@inject('stores', 'actions')
+@observer
+class ServiceView extends Component {
   static propTypes = {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     setWebviewReference: PropTypes.func.isRequired,
@@ -63,7 +65,7 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
     clearTimeout(this.hibernationTimer);
   }
 
-  updateTargetUrl = (event) => {
+  updateTargetUrl = event => {
     let visible = true;
     if (event.url === '' || event.url === '#') {
       visible = false;
@@ -86,11 +88,12 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
       isSpellcheckerEnabled,
     } = this.props;
 
-    const {
-      navigationBarBehaviour,
-    } = stores.settings.app;
+    const { navigationBarBehaviour } = stores.settings.app;
 
-    const showNavBar = navigationBarBehaviour === 'always' || (navigationBarBehaviour === 'custom' && service.recipe.id === CUSTOM_WEBSITE_RECIPE_ID);
+    const showNavBar =
+      navigationBarBehaviour === 'always' ||
+      (navigationBarBehaviour === 'custom' &&
+        service.recipe.id === CUSTOM_WEBSITE_RECIPE_ID);
 
     const webviewClasses = classnames({
       services__webview: true,
@@ -101,13 +104,11 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
 
     let statusBar = null;
     if (this.state.statusBarVisible) {
-      statusBar = (
-        <StatusBarTargetUrl text={this.state.targetUrl} />
-      );
+      statusBar = <StatusBarTargetUrl text={this.state.targetUrl} />;
     }
 
     return (
-      <div className={webviewClasses}>
+      <div className={webviewClasses} data-name={service.name}>
         {service.isActive && service.isEnabled && (
           <>
             {service.hasCrashed && (
@@ -117,11 +118,11 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
                 reload={reload}
               />
             )}
-            {service.isEnabled && service.isLoading && service.isFirstLoad && !service.isServiceAccessRestricted && (
-              <WebviewLoader
-                loaded={false}
-                name={service.name}
-              />
+            {service.isEnabled &&
+              service.isLoading &&
+              service.isFirstLoad &&
+              !service.isServiceAccessRestricted && (
+                <WebviewLoader loaded={false} name={service.name} />
             )}
             {service.isError && (
               <WebviewErrorHandler
@@ -147,9 +148,7 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
           <>
             {!service.isHibernating ? (
               <>
-                {showNavBar && (
-                  <WebControlsScreen service={service} />
-                )}
+                {showNavBar && <WebControlsScreen service={service} />}
                 <ServiceWebview
                   service={service}
                   setWebviewReference={setWebviewReference}
@@ -159,9 +158,11 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
               </>
             ) : (
               <div>
-                <span role="img" aria-label="Sleeping Emoji">😴</span>
-                {' '}
-                This service is currently hibernating. If this page doesn&#x27;t close soon, please try reloading Ferdi.
+                <span role="img" aria-label="Sleeping Emoji">
+                  😴
+                </span>{' '}
+                This service is currently hibernating. If this page doesn&#x27;t
+                close soon, please try reloading Ferdi.
               </div>
             )}
           </>
@@ -171,3 +172,5 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
     );
   }
 }
+
+export default ServiceView;
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index c0f48793a..d3170be53 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -85,7 +85,8 @@ class ServiceWebview extends Component {
         useragent={service.userAgent}
         disablewebsecurity={service.recipe.disablewebsecurity ? true : undefined}
         allowpopups
-        webpreferences={`spellcheck=${isSpellcheckerEnabled ? 1 : 0}`}
+        nodeintegration
+        webpreferences={`spellcheck=${isSpellcheckerEnabled ? 1 : 0}, contextIsolation=1, enableRemoteModule=1`}
       />
     );
   }
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index bb93ff7d4..fb43fb816 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react';
 import { Link } from 'react-router';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import Confetti from 'react-confetti';
 import ms from 'ms';
 import injectSheet from 'react-jss';
@@ -14,23 +14,24 @@ import serverlessLogin from '../../../helpers/serverless-helpers';
 const messages = defineMessages({
   welcome: {
     id: 'services.welcome',
-    defaultMessage: '!!!Welcome to Ferdi',
+    defaultMessage: 'Welcome to Ferdi',
   },
   getStarted: {
     id: 'services.getStarted',
-    defaultMessage: '!!!Get started',
+    defaultMessage: 'Get started',
   },
   login: {
     id: 'services.login',
-    defaultMessage: '!!!Please login to use Ferdi.',
+    defaultMessage: 'Please login to use Ferdi.',
   },
   serverless: {
     id: 'services.serverless',
-    defaultMessage: '!!!Use Ferdi without an Account',
+    defaultMessage: 'Use Ferdi without an Account',
   },
   serverInfo: {
     id: 'services.serverInfo',
-    defaultMessage: '!!!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!',
+    defaultMessage:
+      '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!',
   },
 });
 
@@ -43,7 +44,10 @@ const styles = {
   },
 };
 
-export default @injectSheet(styles) @inject('actions') @observer class Services extends Component {
+@injectSheet(styles)
+@inject('actions')
+@observer
+class Services extends Component {
   static propTypes = {
     services: MobxPropTypes.arrayOrObservableArray,
     setWebviewReference: PropTypes.func.isRequired,
@@ -63,10 +67,6 @@ export default @injectSheet(styles) @inject('actions') @observer class Services
     services: [],
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     showConfetti: true,
   };
@@ -112,11 +112,9 @@ export default @injectSheet(styles) @inject('actions') @observer class Services
       isSpellcheckerEnabled,
     } = this.props;
 
-    const {
-      showConfetti,
-    } = this.state;
+    const { showConfetti } = this.state;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
     const isLoggedIn = Boolean(localStorage.getItem('authToken'));
 
     return (
@@ -131,25 +129,28 @@ export default @injectSheet(styles) @inject('actions') @observer class Services
           </div>
         )}
         {services.length === 0 && (
-          <Appear
-            timeout={1500}
-            transitionName="slideUp"
-          >
+          <Appear timeout={1500} transitionName="slideUp">
             <div className="services__no-service">
-              <img src="./assets/images/logo.svg" alt="Logo" style={{ maxHeight: '50vh' }} />
+              <img
+                src="./assets/images/logo.svg"
+                alt="Logo"
+                style={{ maxHeight: '50vh' }}
+              />
               <h1>{intl.formatMessage(messages.welcome)}</h1>
-              { !isLoggedIn && (
+              {!isLoggedIn && (
                 <>
                   <p>{intl.formatMessage(messages.login)}</p>
                   <p>{intl.formatMessage(messages.serverInfo)}</p>
                 </>
-              ) }
-              <Appear
-                timeout={300}
-                transitionName="slideUp"
-              >
-                <Link to={isLoggedIn ? '/settings/recipes' : '/auth/welcome'} className="button">
-                  { isLoggedIn ? intl.formatMessage(messages.getStarted) : 'Login' }
+              )}
+              <Appear timeout={300} transitionName="slideUp">
+                <Link
+                  to={isLoggedIn ? '/settings/recipes' : '/auth/welcome'}
+                  className="button"
+                >
+                  {isLoggedIn
+                    ? intl.formatMessage(messages.getStarted)
+                    : 'Login'}
                 </Link>
                 {!isLoggedIn && (
                   <button
@@ -167,27 +168,33 @@ export default @injectSheet(styles) @inject('actions') @observer class Services
             </div>
           </Appear>
         )}
-        {services.filter((service) => !service.isTodosService).map((service) => (
-          <ServiceView
-            key={service.id}
-            service={service}
-            handleIPCMessage={handleIPCMessage}
-            setWebviewReference={setWebviewReference}
-            detachService={detachService}
-            openWindow={openWindow}
-            reload={() => reload({ serviceId: service.id })}
-            edit={() => openSettings({ path: `services/edit/${service.id}` })}
-            enable={() => update({
-              serviceId: service.id,
-              serviceData: {
-                isEnabled: true,
-              },
-              redirect: false,
-            })}
-            isSpellcheckerEnabled={isSpellcheckerEnabled}
-          />
-        ))}
+        {services
+          .filter(service => !service.isTodosService)
+          .map(service => (
+            <ServiceView
+              key={service.id}
+              service={service}
+              handleIPCMessage={handleIPCMessage}
+              setWebviewReference={setWebviewReference}
+              detachService={detachService}
+              openWindow={openWindow}
+              reload={() => reload({ serviceId: service.id })}
+              edit={() => openSettings({ path: `services/edit/${service.id}` })}
+              enable={() =>
+                update({
+                  serviceId: service.id,
+                  serviceData: {
+                    isEnabled: true,
+                  },
+                  redirect: false,
+                })
+              }
+              isSpellcheckerEnabled={isSpellcheckerEnabled}
+            />
+          ))}
       </div>
     );
   }
 }
+
+export default injectIntl(Services);
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js
index 10ff0bbbb..a332602be 100644
--- a/src/components/services/content/WebviewCrashHandler.js
+++ b/src/components/services/content/WebviewCrashHandler.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import ms from 'ms';
 
 import Button from '../../ui/Button';
@@ -9,35 +9,33 @@ import Button from '../../ui/Button';
 const messages = defineMessages({
   headline: {
     id: 'service.crashHandler.headline',
-    defaultMessage: '!!!Oh no!',
+    defaultMessage: 'Oh no!',
   },
   text: {
     id: 'service.crashHandler.text',
-    defaultMessage: '!!!{name} has caused an error.',
+    defaultMessage: '{name} has caused an error.',
   },
   action: {
     id: 'service.crashHandler.action',
-    defaultMessage: '!!!Reload {name}',
+    defaultMessage: 'Reload {name}',
   },
   autoReload: {
     id: 'service.crashHandler.autoReload',
-    defaultMessage: '!!!Trying to automatically restore {name} in {seconds} seconds',
+    defaultMessage:
+      'Trying to automatically restore {name} in {seconds} seconds',
   },
 });
 
-export default @observer class WebviewCrashHandler extends Component {
+@observer
+class WebviewCrashHandler extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     reload: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     countdown: ms('10s'),
-  }
+  };
 
   countdownInterval = null;
 
@@ -47,7 +45,7 @@ export default @observer class WebviewCrashHandler extends Component {
     const { reload } = this.props;
 
     this.countdownInterval = setInterval(() => {
-      this.setState((prevState) => ({
+      this.setState(prevState => ({
         countdown: prevState.countdown - this.countdownIntervalTimeout,
       }));
 
@@ -60,7 +58,7 @@ export default @observer class WebviewCrashHandler extends Component {
 
   render() {
     const { name, reload } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <div className="services__info-layer">
@@ -82,3 +80,5 @@ export default @observer class WebviewCrashHandler extends Component {
     );
   }
 }
+
+export default injectIntl(WebviewCrashHandler);
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index e5892be5d..2474682df 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -1,6 +1,6 @@
-import { Menu, dialog, app, getCurrentWindow } from '@electron/remote';
+import { Menu, dialog, app } from '@electron/remote';
 import React, { Component } from 'react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
@@ -20,56 +20,55 @@ const IS_SERVICE_DEBUGGING_ENABLED = (
 const messages = defineMessages({
   reload: {
     id: 'tabs.item.reload',
-    defaultMessage: '!!!Reload',
+    defaultMessage: 'Reload',
   },
   disableNotifications: {
     id: 'tabs.item.disableNotifications',
-    defaultMessage: '!!!Disable notifications',
+    defaultMessage: 'Disable notifications',
   },
   enableNotifications: {
     id: 'tabs.item.enableNotification',
-    defaultMessage: '!!!Enable notifications',
+    defaultMessage: 'Enable notifications',
   },
   disableAudio: {
     id: 'tabs.item.disableAudio',
-    defaultMessage: '!!!Disable audio',
+    defaultMessage: 'Disable audio',
   },
   enableAudio: {
     id: 'tabs.item.enableAudio',
-    defaultMessage: '!!!Enable audio',
+    defaultMessage: 'Enable audio',
   },
   enableDarkMode: {
     id: 'tabs.item.enableDarkMode',
-    defaultMessage: '!!!Enable Dark mode',
+    defaultMessage: 'Enable Dark mode',
   },
   disableDarkMode: {
     id: 'tabs.item.disableDarkMode',
-    defaultMessage: '!!!Disable Dark mode',
+    defaultMessage: 'Disable Dark mode',
   },
   disableService: {
     id: 'tabs.item.disableService',
-    defaultMessage: '!!!Disable Service',
+    defaultMessage: 'Disable service',
   },
   enableService: {
     id: 'tabs.item.enableService',
-    defaultMessage: '!!!Enable Service',
+    defaultMessage: 'Enable service',
   },
   hibernateService: {
     id: 'tabs.item.hibernateService',
-    defaultMessage: '!!!Hibernate Service',
+    defaultMessage: 'Hibernate service',
   },
   wakeUpService: {
     id: 'tabs.item.wakeUpService',
-    defaultMessage: '!!!Wake Up Service',
+    defaultMessage: 'Wake up service',
   },
   deleteService: {
     id: 'tabs.item.deleteService',
-    defaultMessage: '!!!Delete Service',
+    defaultMessage: 'Delete service',
   },
   confirmDeleteService: {
     id: 'tabs.item.confirmDeleteService',
-    defaultMessage:
-      '!!!Do you really want to delete the {serviceName} service?',
+    defaultMessage: 'Do you really want to delete the {serviceName} service?',
   },
 });
 
@@ -134,14 +133,44 @@ class TabItem extends Component {
     showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   @observable isPolled = false;
 
   @observable isPollAnswered = false;
 
+  constructor(props) {
+    super(props);
+    this.state = {
+      showShortcutIndex: false,
+    };
+  }
+
+  handleShowShortcutIndex = () => {
+    this.setState({ showShortcutIndex: true });
+  };
+
+  checkForLongPress = () => {
+    let longpressDelay = null;
+    const longpressDelayDuration = 1000;
+
+    document.addEventListener(
+      'keydown',
+      e => {
+        if (e.ctrlKey || e.metaKey) {
+          longpressDelay = setTimeout(
+            this.handleShowShortcutIndex,
+            longpressDelayDuration,
+          );
+        }
+      },
+      { capture: true },
+    );
+
+    document.addEventListener('keyup', () => {
+      clearTimeout(longpressDelay);
+      this.setState({ showShortcutIndex: false });
+    });
+  };
+
   componentDidMount() {
     const { service } = this.props;
 
@@ -164,6 +193,8 @@ class TabItem extends Component {
         }
       });
     }
+
+    this.checkForLongPress();
   }
 
   render() {
@@ -185,7 +216,7 @@ class TabItem extends Component {
       showMessageBadgeWhenMutedSetting,
       showMessageBadgesEvenWhenMuted,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     const menuTemplate = [
       {
@@ -240,8 +271,9 @@ class TabItem extends Component {
             ? messages.wakeUpService
             : messages.hibernateService,
         ),
+        // eslint-disable-next-line no-confusing-arrow
         click: () =>
-          (service.isHibernating ? wakeUpService() : hibernateService()),
+          service.isHibernating ? wakeUpService() : hibernateService(),
         enabled: service.canHibernate,
       },
       {
@@ -256,7 +288,10 @@ class TabItem extends Component {
             detail: intl.formatMessage(messages.confirmDeleteService, {
               serviceName: service.name || service.recipe.name,
             }),
-            buttons: [intl.formatMessage(globalMessages.yes), intl.formatMessage(globalMessages.no)],
+            buttons: [
+              intl.formatMessage(globalMessages.yes),
+              intl.formatMessage(globalMessages.no),
+            ],
           });
           if (selection === 0) {
             deleteService();
@@ -283,7 +318,7 @@ class TabItem extends Component {
             service.unreadDirectMessageCount === 0 &&
             service.isIndirectMessageBadgeEnabled && (
               <span className="tab-item__message-count is-indirect">•</span>
-          )}
+            )}
           {service.isHibernating && (
             <span className="tab-item__message-count hibernating">•</span>
           )}
@@ -302,9 +337,11 @@ class TabItem extends Component {
           'is-disabled': !service.isEnabled,
         })}
         onClick={clickHandler}
-        onContextMenu={() => menu.popup(getCurrentWindow())}
+        onContextMenu={() => menu.popup()}
         data-tip={`${service.name} ${
-          shortcutIndex <= 9 ? `(${cmdOrCtrlShortcutKey(false)}+${shortcutIndex})` : ''
+          shortcutIndex <= 9
+            ? `(${cmdOrCtrlShortcutKey(false)}+${shortcutIndex})`
+            : ''
         }`}
       >
         <img src={service.icon} className="tab-item__icon" alt="" />
@@ -327,9 +364,12 @@ class TabItem extends Component {
             />
           </>
         )}
+        {shortcutIndex && this.state.showShortcutIndex && (
+          <span className="tab-item__shortcut-index">{shortcutIndex}</span>
+        )}
       </li>
     );
   }
 }
 
-export default SortableElement(TabItem);
+export default injectIntl(SortableElement(TabItem));
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js
index c1421a2b1..a77799819 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -4,7 +4,8 @@ import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 
 import TabBarSortableList from './TabBarSortableList';
 
-export default @observer class TabBar extends Component {
+@observer
+class TabBar extends Component {
   static propTypes = {
     services: MobxPropTypes.arrayOrObservableArray.isRequired,
     setActive: PropTypes.func.isRequired,
@@ -26,16 +27,13 @@ export default @observer class TabBar extends Component {
   };
 
   onSortEnd = ({ oldIndex, newIndex }) => {
-    const {
-      enableToolTip,
-      reorder,
-    } = this.props;
+    const { enableToolTip, reorder } = this.props;
 
     enableToolTip();
     reorder({ oldIndex, newIndex });
   };
 
-  shouldPreventSorting = (event) => event.target.tagName !== 'LI';
+  shouldPreventSorting = event => event.target.tagName !== 'LI';
 
   toggleService = ({ serviceId, isEnabled }) => {
     const { updateService } = this.props;
@@ -102,10 +100,10 @@ export default @observer class TabBar extends Component {
           toggleAudio={toggleAudio}
           toggleDarkMode={toggleDarkMode}
           deleteService={deleteService}
-          disableService={(args) => this.disableService(args)}
-          enableService={(args) => this.enableService(args)}
-          hibernateService={(args) => this.hibernateService(args)}
-          wakeUpService={(args) => this.wakeUpService(args)}
+          disableService={args => this.disableService(args)}
+          enableService={args => this.enableService(args)}
+          hibernateService={args => this.hibernateService(args)}
+          wakeUpService={args => this.wakeUpService(args)}
           openSettings={openSettings}
           distance={20}
           axis={axis}
@@ -118,3 +116,5 @@ export default @observer class TabBar extends Component {
     );
   }
 }
+
+export default TabBar;
diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js
index 5b3b754fa..71250bd4d 100644
--- a/src/components/settings/SettingsLayout.js
+++ b/src/components/settings/SettingsLayout.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import ErrorBoundary from '../util/ErrorBoundary';
 import { oneOrManyChildElements } from '../../prop-types';
@@ -10,11 +10,10 @@ import Appear from '../ui/effects/Appear';
 const messages = defineMessages({
   closeSettings: {
     id: 'settings.app.closeSettings',
-    defaultMessage: '!!!Close settings',
+    defaultMessage: 'Close settings',
   },
 });
 
-export default
 @observer
 class SettingsLayout extends Component {
   static propTypes = {
@@ -23,10 +22,6 @@ class SettingsLayout extends Component {
     closeSettings: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   componentDidMount() {
     document.addEventListener('keydown', this.handleKeyDown.bind(this), false);
   }
@@ -34,6 +29,7 @@ class SettingsLayout extends Component {
   componentWillUnmount() {
     document.removeEventListener(
       'keydown',
+      // eslint-disable-next-line unicorn/no-invalid-remove-event-listener
       this.handleKeyDown.bind(this),
       false,
     );
@@ -49,7 +45,7 @@ class SettingsLayout extends Component {
   render() {
     const { navigation, children, closeSettings } = this.props;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <Appear transitionName="fadeIn-fast">
@@ -77,3 +73,5 @@ class SettingsLayout extends Component {
     );
   }
 }
+
+export default injectIntl(SettingsLayout);
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index ef7748343..544821e9a 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import ReactTooltip from 'react-tooltip';
 import { H1, H2 } from '@meetfranz/ui';
 
@@ -13,45 +13,45 @@ import { LOCAL_SERVER, LIVE_FRANZ_API } from '../../../config';
 const messages = defineMessages({
   headline: {
     id: 'settings.account.headline',
-    defaultMessage: '!!!Account',
+    defaultMessage: 'Account',
   },
   headlineDangerZone: {
     id: 'settings.account.headlineDangerZone',
-    defaultMessage: '!!Danger Zone',
+    defaultMessage: 'Danger Zone',
   },
   accountEditButton: {
     id: 'settings.account.account.editButton',
-    defaultMessage: '!!!Edit Account',
+    defaultMessage: 'Edit account',
   },
   invoicesButton: {
     id: 'settings.account.headlineInvoices',
-    defaultMessage: '!!Invoices',
+    defaultMessage: 'Invoices',
   },
   userInfoRequestFailed: {
     id: 'settings.account.userInfoRequestFailed',
-    defaultMessage: '!!!Could not load user information',
+    defaultMessage: 'Could not load user information',
   },
   tryReloadUserInfoRequest: {
     id: 'settings.account.tryReloadUserInfoRequest',
-    defaultMessage: '!!!Try again',
+    defaultMessage: 'Try again',
   },
   deleteAccount: {
     id: 'settings.account.deleteAccount',
-    defaultMessage: '!!!Delete account',
+    defaultMessage: 'Delete account',
   },
   deleteInfo: {
     id: 'settings.account.deleteInfo',
     defaultMessage:
-      "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
+      "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
   },
   deleteEmailSent: {
     id: 'settings.account.deleteEmailSent',
     defaultMessage:
-      '!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!',
+      'You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!',
   },
   yourLicense: {
     id: 'settings.account.yourLicense',
-    defaultMessage: '!!!Your Franz License:',
+    defaultMessage: 'Your Ferdi License:',
   },
   accountUnavailable: {
     id: 'settings.account.accountUnavailable',
@@ -59,7 +59,8 @@ const messages = defineMessages({
   },
   accountUnavailableInfo: {
     id: 'settings.account.accountUnavailableInfo',
-    defaultMessage: '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.',
+    defaultMessage:
+      '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.',
   },
 });
 
@@ -78,10 +79,6 @@ class AccountDashboard extends Component {
     server: PropTypes.string.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       user,
@@ -95,7 +92,7 @@ class AccountDashboard extends Component {
       openInvoices,
       server,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     const isUsingWithoutAccount = server === LOCAL_SERVER;
     const isUsingFranzServer = server === LIVE_FRANZ_API;
@@ -182,9 +179,7 @@ class AccountDashboard extends Component {
                         <div className="account">
                           <div className="account__box">
                             <H2>{intl.formatMessage(messages.yourLicense)}</H2>
-                            <p>
-                              Franz
-                            </p>
+                            <p>Franz</p>
                             <div className="manage-user-links">
                               <Button
                                 label={intl.formatMessage(
@@ -203,7 +198,9 @@ class AccountDashboard extends Component {
                   {isUsingFranzServer && (
                     <div className="account franz-form">
                       <div className="account__box">
-                        <H2>{intl.formatMessage(messages.headlineDangerZone)}</H2>
+                        <H2>
+                          {intl.formatMessage(messages.headlineDangerZone)}
+                        </H2>
                         {!isDeleteAccountSuccessful && (
                           <div className="account__subscription">
                             <p>{intl.formatMessage(messages.deleteInfo)}</p>
@@ -232,4 +229,4 @@ class AccountDashboard extends Component {
   }
 }
 
-export default AccountDashboard;
+export default injectIntl(AccountDashboard);
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 0a5ace586..72c7faa66 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { inject, observer } from 'mobx-react';
 import { RouterStore } from 'mobx-react-router';
 
@@ -15,35 +15,37 @@ import globalMessages from '../../../i18n/globalMessages';
 const messages = defineMessages({
   availableServices: {
     id: 'settings.navigation.availableServices',
-    defaultMessage: '!!!Available services',
+    defaultMessage: 'Available services',
   },
   yourServices: {
     id: 'settings.navigation.yourServices',
-    defaultMessage: '!!!Your services',
+    defaultMessage: 'Your services',
   },
   yourWorkspaces: {
     id: 'settings.navigation.yourWorkspaces',
-    defaultMessage: '!!!Your workspaces',
+    defaultMessage: 'Your workspaces',
   },
   account: {
     id: 'settings.navigation.account',
-    defaultMessage: '!!!Account',
+    defaultMessage: 'Account',
   },
   team: {
     id: 'settings.navigation.team',
-    defaultMessage: '!!!Manage Team',
+    defaultMessage: 'Manage Team',
   },
   supportFerdi: {
     id: 'settings.navigation.supportFerdi',
-    defaultMessage: '!!!About Ferdi',
+    defaultMessage: 'About Ferdi',
   },
   logout: {
     id: 'settings.navigation.logout',
-    defaultMessage: '!!!Logout',
+    defaultMessage: 'Logout',
   },
 });
 
-export default @inject('stores', 'actions') @observer class SettingsNavigation extends Component {
+@inject('stores', 'actions')
+@observer
+class SettingsNavigation extends Component {
   static propTypes = {
     stores: PropTypes.shape({
       ui: PropTypes.instanceOf(UIStore).isRequired,
@@ -58,13 +60,10 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
     workspaceCount: PropTypes.number.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   handleLoginLogout() {
     const isLoggedIn = Boolean(localStorage.getItem('authToken'));
-    const isUsingWithoutAccount = this.props.stores.settings.app.server === LOCAL_SERVER;
+    const isUsingWithoutAccount =
+      this.props.stores.settings.app.server === LOCAL_SERVER;
 
     if (isLoggedIn) {
       // Remove current auth token
@@ -82,7 +81,9 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
       this.props.stores.user.isLoggingOut = true;
     }
 
-    this.props.stores.router.push(isLoggedIn ? '/auth/logout' : '/auth/welcome');
+    this.props.stores.router.push(
+      isLoggedIn ? '/auth/logout' : '/auth/welcome',
+    );
 
     if (isLoggedIn) {
       // Reload Ferdi, otherwise many settings won't sync correctly with the server
@@ -93,7 +94,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
 
   render() {
     const { serviceCount, workspaceCount, stores } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
     const isLoggedIn = Boolean(localStorage.getItem('authToken'));
     const isUsingWithoutAccount = stores.settings.app.server === LOCAL_SERVER;
     const isUsingFranzServer = stores.settings.app.server === LIVE_FRANZ_API;
@@ -113,11 +114,8 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
           activeClassName="is-active"
           disabled={!isLoggedIn}
         >
-          {intl.formatMessage(messages.yourServices)}
-          {' '}
-          <span className="badge">
-            {serviceCount}
-          </span>
+          {intl.formatMessage(messages.yourServices)}{' '}
+          <span className="badge">{serviceCount}</span>
         </Link>
         {workspaceStore.isFeatureEnabled ? (
           <Link
@@ -126,8 +124,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
             activeClassName="is-active"
             disabled={!isLoggedIn}
           >
-            {intl.formatMessage(messages.yourWorkspaces)}
-            {' '}
+            {intl.formatMessage(messages.yourWorkspaces)}{' '}
             <span className="badge">{workspaceCount}</span>
           </Link>
         ) : null}
@@ -172,9 +169,13 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
           className="settings-navigation__link"
           onClick={this.handleLoginLogout.bind(this)}
         >
-          { isLoggedIn && !isUsingWithoutAccount ? intl.formatMessage(messages.logout) : 'Login'}
+          {isLoggedIn && !isUsingWithoutAccount
+            ? intl.formatMessage(messages.logout)
+            : 'Login'}
         </button>
       </div>
     );
   }
 }
+
+export default injectIntl(SettingsNavigation);
diff --git a/src/components/settings/recipes/RecipeItem.js b/src/components/settings/recipes/RecipeItem.js
index 55f415bd5..ca188aa99 100644
--- a/src/components/settings/recipes/RecipeItem.js
+++ b/src/components/settings/recipes/RecipeItem.js
@@ -4,7 +4,8 @@ import { observer } from 'mobx-react';
 
 import RecipePreviewModel from '../../../models/RecipePreview';
 
-export default @observer class RecipeItem extends Component {
+@observer
+class RecipeItem extends Component {
   static propTypes = {
     recipe: PropTypes.instanceOf(RecipePreviewModel).isRequired,
     onClick: PropTypes.func.isRequired,
@@ -14,19 +15,11 @@ export default @observer class RecipeItem extends Component {
     const { recipe, onClick } = this.props;
 
     return (
-      <button
-        type="button"
-        className="recipe-teaser"
-        onClick={onClick}
-      >
+      <button type="button" className="recipe-teaser" onClick={onClick}>
         {recipe.isDevRecipe && (
           <span className="recipe-teaser__dev-badge">dev</span>
         )}
-        <img
-          src={recipe.icons.svg}
-          className="recipe-teaser__icon"
-          alt=""
-        />
+        <img src={recipe.icons.svg} className="recipe-teaser__icon" alt="" />
         <span className="recipe-teaser__label">{recipe.name}</span>
         {recipe.aliases && recipe.aliases.length > 0 && (
           <span className="recipe-teaser__alias_label">
@@ -37,3 +30,5 @@ export default @observer class RecipeItem extends Component {
     );
   }
 }
+
+export default RecipeItem;
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index 44ff2d0d7..44f5bc39a 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router';
 
 import { Button, Input } from '@meetfranz/forms';
@@ -18,55 +18,56 @@ import RecipePreview from '../../../models/RecipePreview';
 const messages = defineMessages({
   headline: {
     id: 'settings.recipes.headline',
-    defaultMessage: '!!!Available Services',
+    defaultMessage: 'Available services',
   },
   searchService: {
     id: 'settings.searchService',
-    defaultMessage: '!!!Search service',
+    defaultMessage: 'Search service',
   },
   allRecipes: {
     id: 'settings.recipes.all',
-    defaultMessage: '!!!All services',
+    defaultMessage: 'All services',
   },
   customRecipes: {
     id: 'settings.recipes.custom',
-    defaultMessage: '!!!Custom Services',
+    defaultMessage: 'Custom Services',
   },
   nothingFound: {
     id: 'settings.recipes.nothingFound',
-    defaultMessage: '!!!Sorry, but no service matched your search term - but you can still probably add it using the "Custom Website" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.',
+    defaultMessage:
+      'Sorry, but no service matched your search term - but you can still probably add it using the "Custom Website" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.',
   },
   servicesSuccessfulAddedInfo: {
     id: 'settings.recipes.servicesSuccessfulAddedInfo',
-    defaultMessage: '!!!Service successfully added',
+    defaultMessage: 'Service successfully added',
   },
   missingService: {
     id: 'settings.recipes.missingService',
-    defaultMessage: '!!!Missing a service?',
+    defaultMessage: 'Missing a service?',
   },
   customRecipeIntro: {
     id: 'settings.recipes.customService.intro',
-    defaultMessage: '!!!To add a custom service, copy the recipe folder into:',
+    defaultMessage: 'To add a custom service, copy the service recipe to:',
   },
   openFolder: {
     id: 'settings.recipes.customService.openFolder',
-    defaultMessage: '!!!Open directory',
+    defaultMessage: 'Open folder',
   },
   openDevDocs: {
     id: 'settings.recipes.customService.openDevDocs',
-    defaultMessage: '!!!Developer Documentation',
+    defaultMessage: 'Developer Documentation',
   },
   headlineCustomRecipes: {
     id: 'settings.recipes.customService.headline.customRecipes',
-    defaultMessage: '!!!Custom 3rd Party Recipes',
+    defaultMessage: 'Custom 3rd Party Recipes',
   },
   headlineCommunityRecipes: {
     id: 'settings.recipes.customService.headline.communityRecipes',
-    defaultMessage: '!!!Community 3rd Party Recipes',
+    defaultMessage: 'Community 3rd Party Recipes',
   },
   headlineDevRecipes: {
     id: 'settings.recipes.customService.headline.devRecipes',
-    defaultMessage: '!!!Your Development Service Recipes',
+    defaultMessage: 'Your Development Service Recipes',
   },
 });
 
@@ -81,7 +82,8 @@ const styles = {
     marginTop: 20,
 
     '& > div': {
-      fontFamily: 'SFMono-Regular,Consolas,Liberation Mono,Menlo,Courier,monospace',
+      fontFamily:
+        'SFMono-Regular,Consolas,Liberation Mono,Menlo,Courier,monospace',
     },
   },
   actionContainer: {
@@ -98,7 +100,9 @@ const styles = {
   },
 };
 
-export default @injectSheet(styles) @observer class RecipesDashboard extends Component {
+@injectSheet(styles)
+@observer
+class RecipesDashboard extends Component {
   static propTypes = {
     recipes: MobxPropTypes.arrayOrObservableArray.isRequired,
     customWebsiteRecipe: PropTypes.instanceOf(RecipePreview).isRequired,
@@ -118,10 +122,6 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
   static defaultProps = {
     searchNeedle: '',
     recipeFilter: 'all',
-  }
-
-  static contextTypes = {
-    intl: intlShape,
   };
 
   render() {
@@ -140,7 +140,7 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
       openDevDocs,
       classes,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     const communityRecipes = recipes.filter(r => !r.isDevRecipe);
     const devRecipes = recipes.filter(r => r.isDevRecipe);
@@ -188,9 +188,13 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
             >
               {intl.formatMessage(messages.customRecipes)}
             </Link>
-            <a href={FRANZ_SERVICE_REQUEST} target="_blank" className="link recipes__service-request" rel="noreferrer">
-              {intl.formatMessage(messages.missingService)}
-              {' '}
+            <a
+              href={FRANZ_SERVICE_REQUEST}
+              target="_blank"
+              className="link recipes__service-request"
+              rel="noreferrer"
+            >
+              {intl.formatMessage(messages.missingService)}{' '}
               <i className="mdi mdi-open-in-new" />
             </a>
           </div>
@@ -201,13 +205,9 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
             <>
               {recipeFilter === 'dev' && (
                 <>
-                  <H2>
-                    {intl.formatMessage(messages.headlineCustomRecipes)}
-                  </H2>
+                  <H2>{intl.formatMessage(messages.headlineCustomRecipes)}</H2>
                   <div className={classes.devRecipeIntroContainer}>
-                    <p>
-                      {intl.formatMessage(messages.customRecipeIntro)}
-                    </p>
+                    <p>{intl.formatMessage(messages.customRecipeIntro)}</p>
                     <Input
                       value={recipeDirectory}
                       className={classes.path}
@@ -238,12 +238,19 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
                       <img src="./assets/images/emoji/dontknow.png" alt="" />
                     </span>
 
-                    <p className="settings__empty-state-text">{intl.formatMessage(messages.nothingFound)}</p>
+                    <p className="settings__empty-state-text">
+                      {intl.formatMessage(messages.nothingFound)}
+                    </p>
 
                     <RecipeItem
                       key={customWebsiteRecipe.id}
                       recipe={customWebsiteRecipe}
-                      onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: customWebsiteRecipe.id })}
+                      onClick={() =>
+                        isLoggedIn &&
+                        showAddServiceInterface({
+                          recipeId: customWebsiteRecipe.id,
+                        })
+                      }
                     />
                   </div>
                 )}
@@ -251,7 +258,10 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
                   <RecipeItem
                     key={recipe.id}
                     recipe={recipe}
-                    onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: recipe.id })}
+                    onClick={() =>
+                      isLoggedIn &&
+                      showAddServiceInterface({ recipeId: recipe.id })
+                    }
                   />
                 ))}
               </div>
@@ -263,7 +273,10 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
                       <RecipeItem
                         key={recipe.id}
                         recipe={recipe}
-                        onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: recipe.id })}
+                        onClick={() =>
+                          isLoggedIn &&
+                          showAddServiceInterface({ recipeId: recipe.id })
+                        }
                       />
                     ))}
                   </div>
@@ -276,3 +289,5 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
     );
   }
 }
+
+export default injectIntl(RecipesDashboard);
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index c41cdd56a..22089ec45 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -2,13 +2,14 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { Link } from 'react-router';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import normalizeUrl from 'normalize-url';
 
 import Form from '../../../lib/Form';
 import Recipe from '../../../models/Recipe';
 import Service from '../../../models/Service';
-import Tabs, { TabItem } from '../../ui/Tabs';
+import Tabs from '../../ui/Tabs/Tabs';
+import { TabItem } from '../../ui/Tabs/TabItem';
 import Input from '../../ui/Input';
 import Toggle from '../../ui/Toggle';
 import Slider from '../../ui/Slider';
@@ -22,111 +23,117 @@ import globalMessages from '../../../i18n/globalMessages';
 const messages = defineMessages({
   saveService: {
     id: 'settings.service.form.saveButton',
-    defaultMessage: '!!!Save service',
+    defaultMessage: 'Save service',
   },
   deleteService: {
     id: 'settings.service.form.deleteButton',
-    defaultMessage: '!!!Delete Service',
+    defaultMessage: 'Delete service',
   },
   openDarkmodeCss: {
     id: 'settings.service.form.openDarkmodeCss',
-    defaultMessage: '!!!Open darkmode.css',
+    defaultMessage: 'Open darkmode.css',
   },
   openUserCss: {
     id: 'settings.service.form.openUserCss',
-    defaultMessage: '!!!Open user.css',
+    defaultMessage: 'Open user.css',
   },
   openUserJs: {
     id: 'settings.service.form.openUserJs',
-    defaultMessage: '!!!Open user.js',
+    defaultMessage: 'Open user.js',
   },
   recipeFileInfo: {
     id: 'settings.service.form.recipeFileInfo',
-    defaultMessage: '!!!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.',
+    defaultMessage:
+      '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.',
   },
   availableServices: {
     id: 'settings.service.form.availableServices',
-    defaultMessage: '!!!Available services',
+    defaultMessage: 'Available services',
   },
   yourServices: {
     id: 'settings.service.form.yourServices',
-    defaultMessage: '!!!Your services',
+    defaultMessage: 'Your services',
   },
   addServiceHeadline: {
     id: 'settings.service.form.addServiceHeadline',
-    defaultMessage: '!!!Add {name}',
+    defaultMessage: 'Add {name}',
   },
   editServiceHeadline: {
     id: 'settings.service.form.editServiceHeadline',
-    defaultMessage: '!!!Edit {name}',
+    defaultMessage: 'Edit {name}',
   },
   tabHosted: {
     id: 'settings.service.form.tabHosted',
-    defaultMessage: '!!!Hosted',
+    defaultMessage: 'Hosted',
   },
   tabOnPremise: {
     id: 'settings.service.form.tabOnPremise',
-    defaultMessage: '!!!Self hosted ��',
+    defaultMessage: 'Self hosted ��',
   },
   useHostedService: {
     id: 'settings.service.form.useHostedService',
-    defaultMessage: '!!!Use the hosted {name} service.',
+    defaultMessage: 'Use the hosted {name} service.',
   },
   customUrlValidationError: {
     id: 'settings.service.form.customUrlValidationError',
-    defaultMessage: '!!!Could not validate custom {name} server.',
+    defaultMessage: 'Could not validate custom {name} server.',
   },
   indirectMessageInfo: {
     id: 'settings.service.form.indirectMessageInfo',
-    defaultMessage: '!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...',
+    defaultMessage:
+      'You will be notified about all new messages in a channel, not just @username, @channel, @here, ...',
   },
   isMutedInfo: {
     id: 'settings.service.form.isMutedInfo',
-    defaultMessage: '!!!When disabled, all notification sounds and audio playback are muted',
+    defaultMessage:
+      'When disabled, all notification sounds and audio playback are muted',
   },
   isHibernationEnabledInfo: {
     id: 'settings.service.form.isHibernatedEnabledInfo',
-    defaultMessage: '!!!When enabled, a service will be shut down after a period of time to save system resources.',
+    defaultMessage:
+      'When enabled, a service will be shut down after a period of time to save system resources.',
   },
   headlineNotifications: {
     id: 'settings.service.form.headlineNotifications',
-    defaultMessage: '!!!Notifications',
+    defaultMessage: 'Notifications',
   },
   headlineBadges: {
     id: 'settings.service.form.headlineBadges',
-    defaultMessage: '!!!Unread message badges',
+    defaultMessage: 'Unread message badges',
   },
   headlineGeneral: {
     id: 'settings.service.form.headlineGeneral',
-    defaultMessage: '!!!General',
+    defaultMessage: 'General',
   },
   headlineDarkReaderSettings: {
     id: 'settings.service.form.headlineDarkReaderSettings',
-    defaultMessage: '!!!Dark Reader Settings',
+    defaultMessage: 'Dark Reader Settings',
   },
   iconDelete: {
     id: 'settings.service.form.iconDelete',
-    defaultMessage: '!!!Delete',
+    defaultMessage: 'Delete',
   },
   iconUpload: {
     id: 'settings.service.form.iconUpload',
-    defaultMessage: '!!!Drop your image, or click here',
+    defaultMessage: 'Drop your image, or click here',
   },
   headlineProxy: {
     id: 'settings.service.form.proxy.headline',
-    defaultMessage: '!!!HTTP/HTTPS Proxy Settings',
+    defaultMessage: 'HTTP/HTTPS Proxy Settings',
   },
   proxyRestartInfo: {
     id: 'settings.service.form.proxy.restartInfo',
-    defaultMessage: '!!!Please restart Ferdi after changing proxy Settings.',
+    defaultMessage: 'Please restart Ferdi after changing proxy Settings.',
   },
   proxyInfo: {
     id: 'settings.service.form.proxy.info',
-    defaultMessage: '!!!Proxy settings will not be synchronized with the Ferdi servers.',
+    defaultMessage:
+      'Proxy settings will not be synchronized with the Ferdi servers.',
   },
 });
 
-export default @observer class EditServiceForm extends Component {
+@observer
+class EditServiceForm extends Component {
   static propTypes = {
     recipe: PropTypes.instanceOf(Recipe).isRequired,
     service(props, propName) {
@@ -151,20 +158,16 @@ export default @observer class EditServiceForm extends Component {
     service: {},
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     isValidatingCustomUrl: false,
-  }
+  };
 
   submit(e) {
     const { recipe } = this.props;
 
     e.preventDefault();
     this.props.form.submit({
-      onSuccess: async (form) => {
+      onSuccess: async form => {
         const values = form.values();
         let isValid = true;
 
@@ -176,10 +179,13 @@ export default @observer class EditServiceForm extends Component {
         if (recipe.validateUrl && values.customUrl) {
           this.setState({ isValidatingCustomUrl: true });
           try {
-            values.customUrl = normalizeUrl(values.customUrl, { stripWWW: false, removeTrailingSlash: false });
+            values.customUrl = normalizeUrl(values.customUrl, {
+              stripWWW: false,
+              removeTrailingSlash: false,
+            });
             isValid = await recipe.validateUrl(values.customUrl);
-          } catch (err) {
-            console.warn('ValidateURL', err);
+          } catch (error) {
+            console.warn('ValidateURL', error);
             isValid = false;
           }
         }
@@ -208,7 +214,7 @@ export default @observer class EditServiceForm extends Component {
       openRecipeFile,
       isProxyFeatureEnabled,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     const { isValidatingCustomUrl } = this.state;
 
@@ -236,7 +242,8 @@ export default @observer class EditServiceForm extends Component {
       activeTabIndex = 2;
     }
 
-    const requiresUserInput = !recipe.hasHostedOption && (recipe.hasTeamId || recipe.hasCustomUrl);
+    const requiresUserInput =
+      !recipe.hasHostedOption && (recipe.hasTeamId || recipe.hasCustomUrl);
 
     return (
       <div className="settings__main">
@@ -254,29 +261,27 @@ export default @observer class EditServiceForm extends Component {
           </span>
           <span className="separator" />
           <span className="settings__header-item">
-            {action === 'add' ? (
-              intl.formatMessage(messages.addServiceHeadline, {
-                name: recipe.name,
-              })
-            ) : (
-              intl.formatMessage(messages.editServiceHeadline, {
-                name: service.name !== '' ? service.name : recipe.name,
-              })
-            )}
+            {action === 'add'
+              ? intl.formatMessage(messages.addServiceHeadline, {
+                  name: recipe.name,
+                })
+              : intl.formatMessage(messages.editServiceHeadline, {
+                  name: service.name !== '' ? service.name : recipe.name,
+                })}
           </span>
         </div>
         <div className="settings__body">
-          <form onSubmit={(e) => this.submit(e)} id="form">
+          <form onSubmit={e => this.submit(e)} id="form">
             <div className="service-name">
               <Input field={form.$('name')} focus />
             </div>
             {(recipe.hasTeamId || recipe.hasCustomUrl) && (
-              <Tabs
-                active={activeTabIndex}
-              >
+              <Tabs active={activeTabIndex}>
                 {recipe.hasHostedOption && (
                   <TabItem title={recipe.name}>
-                    {intl.formatMessage(messages.useHostedService, { name: recipe.name })}
+                    {intl.formatMessage(messages.useHostedService, {
+                      name: recipe.name,
+                    })}
                   </TabItem>
                 )}
                 {recipe.hasTeamId && (
@@ -293,7 +298,9 @@ export default @observer class EditServiceForm extends Component {
                     <Input field={form.$('customUrl')} />
                     {form.error === 'url-validation-error' && (
                       <p className="franz-form__error">
-                        {intl.formatMessage(messages.customUrlValidationError, { name: recipe.name })}
+                        {intl.formatMessage(messages.customUrlValidationError, {
+                          name: recipe.name,
+                        })}
                       </p>
                     )}
                   </TabItem>
@@ -326,13 +333,19 @@ export default @observer class EditServiceForm extends Component {
                 <div className="settings__settings-group">
                   <h3>{intl.formatMessage(messages.headlineBadges)}</h3>
                   <Toggle field={form.$('isBadgeEnabled')} />
-                  {recipe.hasIndirectMessages && form.$('isBadgeEnabled').value && (
-                    <>
-                      <Toggle field={form.$('isIndirectMessageBadgeEnabled')} />
-                      <p className="settings__help indented__help">
-                        {intl.formatMessage(messages.indirectMessageInfo)}
-                      </p>
-                    </>
+                  {recipe.hasIndirectMessages &&
+                    form.$('isBadgeEnabled').value && (
+                      <>
+                        <Toggle
+                          field={form.$('isIndirectMessageBadgeEnabled')}
+                        />
+                        <p className="settings__help indented__help">
+                          {intl.formatMessage(messages.indirectMessageInfo)}
+                        </p>
+                      </>
+                    )}
+                  {recipe.allowFavoritesDelineationInUnreadCount && (
+                    <Toggle field={form.$('onlyShowFavoritesInUnreadCount')} />
                   )}
                 </div>
 
@@ -344,15 +357,18 @@ export default @observer class EditServiceForm extends Component {
                     {intl.formatMessage(messages.isHibernationEnabledInfo)}
                   </p>
                   <Toggle field={form.$('isDarkModeEnabled')} />
-                  {form.$('isDarkModeEnabled').value
-                    && (
-                      <>
-                        <h3>{intl.formatMessage(messages.headlineDarkReaderSettings)}</h3>
-                        <Slider field={form.$('darkReaderBrightness')} />
-                        <Slider field={form.$('darkReaderContrast')} />
-                        <Slider field={form.$('darkReaderSepia')} />
-                      </>
-                    )}
+                  {form.$('isDarkModeEnabled').value && (
+                    <>
+                      <h3>
+                        {intl.formatMessage(
+                          messages.headlineDarkReaderSettings,
+                        )}
+                      </h3>
+                      <Slider field={form.$('darkReaderBrightness')} />
+                      <Slider field={form.$('darkReaderContrast')} />
+                      <Slider field={form.$('darkReaderSepia')} />
+                    </>
+                  )}
                 </div>
               </div>
               <div className="service-icon">
@@ -381,7 +397,10 @@ export default @observer class EditServiceForm extends Component {
                   <>
                     <div className="grid">
                       <div className="grid__row">
-                        <Input field={form.$('proxy.host')} className="proxyHost" />
+                        <Input
+                          field={form.$('proxy.host')}
+                          className="proxyHost"
+                        />
                         <Input field={form.$('proxy.port')} />
                       </div>
                     </div>
@@ -409,7 +428,9 @@ export default @observer class EditServiceForm extends Component {
 
             <div className="user-agent">
               <Input field={form.$('userAgentPref')} />
-              <p className="settings__help">{intl.formatMessage(globalMessages.userAgentHelp)}</p>
+              <p className="settings__help">
+                {intl.formatMessage(globalMessages.userAgentHelp)}
+              </p>
             </div>
           </form>
 
@@ -464,7 +485,9 @@ export default @observer class EditServiceForm extends Component {
               type="submit"
               label={intl.formatMessage(messages.saveService)}
               htmlForm="form"
-              disabled={action !== 'edit' && (form.isPristine && requiresUserInput)}
+              disabled={
+                action !== 'edit' && form.isPristine && requiresUserInput
+              }
             />
           )}
         </div>
@@ -472,3 +495,5 @@ export default @observer class EditServiceForm extends Component {
     );
   }
 }
+
+export default injectIntl(EditServiceForm);
diff --git a/src/components/settings/services/ServiceError.js b/src/components/settings/services/ServiceError.js
index 3cfc080d6..d16d76db2 100644
--- a/src/components/settings/services/ServiceError.js
+++ b/src/components/settings/services/ServiceError.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { observer } from 'mobx-react';
 import { Link } from 'react-router';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import Infobox from '../../ui/Infobox';
 import Button from '../../ui/Button';
@@ -9,29 +9,26 @@ import Button from '../../ui/Button';
 const messages = defineMessages({
   headline: {
     id: 'settings.service.error.headline',
-    defaultMessage: '!!!Error',
+    defaultMessage: 'Error',
   },
   goBack: {
     id: 'settings.service.error.goBack',
-    defaultMessage: '!!!Back to services',
+    defaultMessage: 'Back to services',
   },
   availableServices: {
     id: 'settings.service.form.availableServices',
-    defaultMessage: '!!!Available services',
+    defaultMessage: 'Available services',
   },
   errorMessage: {
     id: 'settings.service.error.message',
-    defaultMessage: '!!!Could not load service recipe.',
+    defaultMessage: 'Could not load service recipe.',
   },
 });
 
-export default @observer class ServiceError extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
+@observer
+class ServiceError extends Component {
   render() {
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <div className="settings__main">
@@ -47,10 +44,7 @@ export default @observer class ServiceError extends Component {
           </span>
         </div>
         <div className="settings__body">
-          <Infobox
-            type="danger"
-            icon="alert"
-          >
+          <Infobox type="danger" icon="alert">
             {intl.formatMessage(messages.errorMessage)}
           </Infobox>
         </div>
@@ -65,3 +59,5 @@ export default @observer class ServiceError extends Component {
     );
   }
 }
+
+export default injectIntl(ServiceError);
diff --git a/src/components/settings/services/ServiceItem.js b/src/components/settings/services/ServiceItem.js
index ebc618a00..4916e4ecc 100644
--- a/src/components/settings/services/ServiceItem.js
+++ b/src/components/settings/services/ServiceItem.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import ReactTooltip from 'react-tooltip';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
@@ -10,35 +10,32 @@ import ServiceModel from '../../../models/Service';
 const messages = defineMessages({
   tooltipIsDisabled: {
     id: 'settings.services.tooltip.isDisabled',
-    defaultMessage: '!!!Service is disabled',
+    defaultMessage: 'Service is disabled',
   },
   tooltipNotificationsDisabled: {
     id: 'settings.services.tooltip.notificationsDisabled',
-    defaultMessage: '!!!Notifications are disabled',
+    defaultMessage: 'Notifications are disabled',
   },
   tooltipIsMuted: {
     id: 'settings.services.tooltip.isMuted',
-    defaultMessage: '!!!All sounds are muted',
+    defaultMessage: 'All sounds are muted',
   },
 });
 
-export default @observer class ServiceItem extends Component {
+@observer
+class ServiceItem extends Component {
   static propTypes = {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     goToServiceForm: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       service,
       // toggleAction,
       goToServiceForm,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <tr
@@ -47,10 +44,7 @@ export default @observer class ServiceItem extends Component {
           'service-table__row--disabled': !service.isEnabled,
         })}
       >
-        <td
-          className="service-table__column-icon"
-          onClick={goToServiceForm}
-        >
+        <td className="service-table__column-icon" onClick={goToServiceForm}>
           <img
             src={service.icon}
             className={classnames({
@@ -60,16 +54,10 @@ export default @observer class ServiceItem extends Component {
             alt=""
           />
         </td>
-        <td
-          className="service-table__column-name"
-          onClick={goToServiceForm}
-        >
+        <td className="service-table__column-name" onClick={goToServiceForm}>
           {service.name !== '' ? service.name : service.recipe.name}
         </td>
-        <td
-          className="service-table__column-info"
-          onClick={goToServiceForm}
-        >
+        <td className="service-table__column-info" onClick={goToServiceForm}>
           {service.isMuted && (
             <span
               className="mdi mdi-bell-off"
@@ -77,10 +65,7 @@ export default @observer class ServiceItem extends Component {
             />
           )}
         </td>
-        <td
-          className="service-table__column-info"
-          onClick={goToServiceForm}
-        >
+        <td className="service-table__column-info" onClick={goToServiceForm}>
           {!service.isEnabled && (
             <span
               className="mdi mdi-power"
@@ -88,14 +73,13 @@ export default @observer class ServiceItem extends Component {
             />
           )}
         </td>
-        <td
-          className="service-table__column-info"
-          onClick={goToServiceForm}
-        >
+        <td className="service-table__column-info" onClick={goToServiceForm}>
           {!service.isNotificationEnabled && (
             <span
               className="mdi mdi-message-bulleted-off"
-              data-tip={intl.formatMessage(messages.tooltipNotificationsDisabled)}
+              data-tip={intl.formatMessage(
+                messages.tooltipNotificationsDisabled,
+              )}
             />
           )}
           <ReactTooltip place="top" type="dark" effect="solid" />
@@ -104,3 +88,5 @@ export default @observer class ServiceItem extends Component {
     );
   }
 }
+
+export default injectIntl(ServiceItem);
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js
index 11d3eaa79..bb52db97f 100644
--- a/src/components/settings/services/ServicesDashboard.js
+++ b/src/components/settings/services/ServicesDashboard.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { Link } from 'react-router';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import SearchInput from '../../ui/SearchInput';
 import Infobox from '../../ui/Infobox';
@@ -14,43 +14,45 @@ import Appear from '../../ui/effects/Appear';
 const messages = defineMessages({
   headline: {
     id: 'settings.services.headline',
-    defaultMessage: '!!!Your services',
+    defaultMessage: 'Your services',
   },
   searchService: {
     id: 'settings.searchService',
-    defaultMessage: '!!!Search service',
+    defaultMessage: 'Search service',
   },
   noServicesAdded: {
     id: 'settings.services.noServicesAdded',
-    defaultMessage: '!!!Start by adding a service.',
+    defaultMessage: 'Start by adding a service.',
   },
   noServiceFound: {
-    id: 'settings.recipes.nothingFound',
-    defaultMessage: '!!!Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.',
+    id: 'settings.services.nothingFound',
+    defaultMessage:
+      'Sorry, but no service matched your search term - but you can still probably add it using the "Custom Website" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.',
   },
   discoverServices: {
     id: 'settings.services.discoverServices',
-    defaultMessage: '!!!Discover services',
+    defaultMessage: 'Discover services',
   },
   servicesRequestFailed: {
     id: 'settings.services.servicesRequestFailed',
-    defaultMessage: '!!!Could not load your services',
+    defaultMessage: 'Could not load your services',
   },
   tryReloadServices: {
     id: 'settings.account.tryReloadServices',
-    defaultMessage: '!!!Try again',
+    defaultMessage: 'Try again',
   },
   updatedInfo: {
     id: 'settings.services.updatedInfo',
-    defaultMessage: '!!!Your changes have been saved',
+    defaultMessage: 'Your changes have been saved',
   },
   deletedInfo: {
     id: 'settings.services.deletedInfo',
-    defaultMessage: '!!!Service has been deleted',
+    defaultMessage: 'Service has been deleted',
   },
 });
 
-export default @observer class ServicesDashboard extends Component {
+@observer
+class ServicesDashboard extends Component {
   static propTypes = {
     services: MobxPropTypes.arrayOrObservableArray.isRequired,
     isLoading: PropTypes.bool.isRequired,
@@ -68,10 +70,6 @@ export default @observer class ServicesDashboard extends Component {
     searchNeedle: '',
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       services,
@@ -85,7 +83,7 @@ export default @observer class ServicesDashboard extends Component {
       status,
       searchNeedle,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <div className="settings__main">
@@ -93,10 +91,10 @@ export default @observer class ServicesDashboard extends Component {
           <h1>{intl.formatMessage(messages.headline)}</h1>
         </div>
         <div className="settings__body">
-          {(services.length !== 0 || searchNeedle) && !isLoading && (
+          {(services.length > 0 || searchNeedle) && !isLoading && (
             <SearchInput
               placeholder={intl.formatMessage(messages.searchService)}
-              onChange={(needle) => filterServices({ needle })}
+              onChange={needle => filterServices({ needle })}
               onReset={() => resetFilter()}
               autoFocus
             />
@@ -145,7 +143,9 @@ export default @observer class ServicesDashboard extends Component {
                 </span>
                 {intl.formatMessage(messages.noServicesAdded)}
               </p>
-              <Link to="/settings/recipes" className="button">{intl.formatMessage(messages.discoverServices)}</Link>
+              <Link to="/settings/recipes" className="button">
+                {intl.formatMessage(messages.discoverServices)}
+              </Link>
             </div>
           )}
           {!isLoading && services.length === 0 && searchNeedle && (
@@ -163,12 +163,16 @@ export default @observer class ServicesDashboard extends Component {
           ) : (
             <table className="service-table">
               <tbody>
-                {services.map((service) => (
+                {services.map(service => (
                   <ServiceItem
                     key={service.id}
                     service={service}
-                    toggleAction={() => toggleService({ serviceId: service.id })}
-                    goToServiceForm={() => goTo(`/settings/services/edit/${service.id}`)}
+                    toggleAction={() =>
+                      toggleService({ serviceId: service.id })
+                    }
+                    goToServiceForm={() =>
+                      goTo(`/settings/services/edit/${service.id}`)
+                    }
                   />
                 ))}
               </tbody>
@@ -176,12 +180,12 @@ export default @observer class ServicesDashboard extends Component {
           )}
 
           <FAB>
-            <Link to="/settings/recipes">
-              +
-            </Link>
+            <Link to="/settings/recipes">+</Link>
           </FAB>
         </div>
       </div>
     );
   }
 }
+
+export default injectIntl(ServicesDashboard);
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 6a919b902..123ab4c2d 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import prettyBytes from 'pretty-bytes';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import Form from '../../../lib/Form';
 import Button from '../../ui/Button';
@@ -12,155 +12,172 @@ import ToggleRaw from '../../ui/ToggleRaw';
 import Select from '../../ui/Select';
 import Input from '../../ui/Input';
 
-import { FRANZ_TRANSLATION, GITHUB_FRANZ_URL } from '../../../config';
-import { DEFAULT_APP_SETTINGS, ferdiVersion, isMac, isWindows, lockFerdiShortcutKey, userDataPath, userDataRecipesPath } from '../../../environment';
+import { DEFAULT_APP_SETTINGS, FRANZ_TRANSLATION, GITHUB_FRANZ_URL } from '../../../config';
+import {
+  isMac,
+  isWindows,
+  lockFerdiShortcutKey,
+} from '../../../environment';
+import { ferdiVersion, userDataPath, userDataRecipesPath } from '../../../environment-remote';
 import { openPath } from '../../../helpers/url-helpers';
 import globalMessages from '../../../i18n/globalMessages';
 
+const debug = require('debug')('Ferdi:EditSettingsForm');
+
 const messages = defineMessages({
   headlineGeneral: {
     id: 'settings.app.headlineGeneral',
-    defaultMessage: '!!!General',
+    defaultMessage: 'General',
   },
   sentryInfo: {
     id: 'settings.app.sentryInfo',
-    defaultMessage: '!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!',
+    defaultMessage:
+      'Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!',
   },
   hibernateInfo: {
     id: 'settings.app.hibernateInfo',
-    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.',
+    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.',
   },
   inactivityLockInfo: {
     id: 'settings.app.inactivityLockInfo',
-    defaultMessage: '!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable',
+    defaultMessage:
+      'Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable',
   },
   todoServerInfo: {
     id: 'settings.app.todoServerInfo',
-    defaultMessage: '!!!This server will be used for the "Franz Todo" feature. (default: https://app.franztodos.com)',
+    defaultMessage: 'This server will be used for the "Ferdi Todo" feature.',
   },
   lockedPassword: {
     id: 'settings.app.lockedPassword',
-    defaultMessage: '!!!Password',
+    defaultMessage: 'Password',
   },
   lockedPasswordInfo: {
     id: 'settings.app.lockedPasswordInfo',
-    defaultMessage: '!!!Please make sure to set a password you\'ll remember.\nIf you loose this password, you will have to reinstall Ferdi.',
+    defaultMessage:
+      "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   },
   lockInfo: {
     id: 'settings.app.lockInfo',
-    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}.',
+    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}.',
   },
   scheduledDNDTimeInfo: {
     id: 'settings.app.scheduledDNDTimeInfo',
-    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.',
+    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.',
   },
   scheduledDNDInfo: {
     id: 'settings.app.scheduledDNDInfo',
-    defaultMessage: '!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.',
+    defaultMessage:
+      'Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.',
   },
   headlineLanguage: {
     id: 'settings.app.headlineLanguage',
-    defaultMessage: '!!!Language',
+    defaultMessage: 'Language',
   },
   headlineUpdates: {
     id: 'settings.app.headlineUpdates',
-    defaultMessage: '!!!Updates',
+    defaultMessage: 'Updates',
   },
   headlineAppearance: {
     id: 'settings.app.headlineAppearance',
-    defaultMessage: '!!!Appearance',
+    defaultMessage: 'Appearance',
   },
   universalDarkModeInfo: {
     id: 'settings.app.universalDarkModeInfo',
-    defaultMessage: '!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.',
+    defaultMessage:
+      'Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.',
   },
   accentColorInfo: {
     id: 'settings.app.accentColorInfo',
-    defaultMessage: '!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})',
+    defaultMessage:
+      'Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})',
   },
   headlinePrivacy: {
     id: 'settings.app.headlinePrivacy',
-    defaultMessage: '!!!Privacy',
+    defaultMessage: 'Privacy',
   },
   headlineAdvanced: {
     id: 'settings.app.headlineAdvanced',
-    defaultMessage: '!!!Advanced',
+    defaultMessage: 'Advanced',
   },
   translationHelp: {
     id: 'settings.app.translationHelp',
-    defaultMessage: '!!!Help us to translate Ferdi into your language.',
+    defaultMessage: 'Help us to translate Ferdi into your language.',
   },
   spellCheckerLanguageInfo: {
     id: 'settings.app.spellCheckerLanguageInfo',
-    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.',
+    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.",
   },
   subheadlineCache: {
     id: 'settings.app.subheadlineCache',
-    defaultMessage: '!!!Cache',
+    defaultMessage: 'Cache',
   },
   cacheInfo: {
     id: 'settings.app.cacheInfo',
-    defaultMessage: '!!!Ferdi cache is currently using {size} of disk space.',
+    defaultMessage: 'Ferdi cache is currently using {size} of disk space.',
   },
   cacheNotCleared: {
     id: 'settings.app.cacheNotCleared',
-    defaultMessage: '!!!Couldn\'t clear all cache',
+    defaultMessage: "Couldn't clear all cache",
   },
   buttonClearAllCache: {
     id: 'settings.app.buttonClearAllCache',
-    defaultMessage: '!!!Clear cache',
+    defaultMessage: 'Clear cache',
   },
   subheadlineFerdiProfile: {
     id: 'settings.app.subheadlineFerdiProfile',
-    defaultMessage: '!!!Ferdi Profile',
+    defaultMessage: 'Ferdi Profile',
   },
   buttonOpenFerdiProfileFolder: {
     id: 'settings.app.buttonOpenFerdiProfileFolder',
-    defaultMessage: '!!!Open Profile folder',
+    defaultMessage: 'Open Profile folder',
   },
   buttonOpenFerdiServiceRecipesFolder: {
     id: 'settings.app.buttonOpenFerdiServiceRecipesFolder',
-    defaultMessage: '!!!Open Service Recipes folder',
+    defaultMessage: 'Open Service Recipes folder',
   },
   buttonSearchForUpdate: {
     id: 'settings.app.buttonSearchForUpdate',
-    defaultMessage: '!!!Check for updates',
+    defaultMessage: 'Check for updates',
   },
   buttonInstallUpdate: {
     id: 'settings.app.buttonInstallUpdate',
-    defaultMessage: '!!!Restart & install update',
+    defaultMessage: 'Restart & install update',
   },
   updateStatusSearching: {
     id: 'settings.app.updateStatusSearching',
-    defaultMessage: '!!!Is searching for update',
+    defaultMessage: 'Is searching for update',
   },
   updateStatusAvailable: {
     id: 'settings.app.updateStatusAvailable',
-    defaultMessage: '!!!Update available, downloading...',
+    defaultMessage: 'Update available, downloading...',
   },
   updateStatusUpToDate: {
     id: 'settings.app.updateStatusUpToDate',
-    defaultMessage: '!!!You are using the latest version of Ferdi',
+    defaultMessage: 'You are using the latest version of Ferdi',
   },
   currentVersion: {
     id: 'settings.app.currentVersion',
-    defaultMessage: '!!!Current version:',
+    defaultMessage: 'Current version:',
   },
   appRestartRequired: {
     id: 'settings.app.restartRequired',
-    defaultMessage: '!!!Changes require restart',
+    defaultMessage: 'Changes require restart',
   },
   languageDisclaimer: {
     id: 'settings.app.languageDisclaimer',
-    defaultMessage: '!!!Official translations are English & German. All other languages are community based translations.',
+    defaultMessage:
+      'Official translations are English & German. All other languages are community based translations.',
   },
 });
 
-const Hr = () => (
-  <hr style={{ marginBottom: 20 }} />
-);
+const Hr = () => <hr style={{ marginBottom: 20 }} />;
 
-export default @observer class EditSettingsForm extends Component {
+@observer
+class EditSettingsForm extends Component {
   static propTypes = {
     checkForUpdates: PropTypes.func.isRequired,
     installUpdate: PropTypes.func.isRequired,
@@ -184,14 +201,10 @@ export default @observer class EditSettingsForm extends Component {
     isOnline: PropTypes.bool.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     activeSetttingsTab: 'general',
     clearCacheButtonClicked: false,
-  }
+  };
 
   setActiveSettingsTab(tab) {
     this.setState({
@@ -199,14 +212,14 @@ export default @observer class EditSettingsForm extends Component {
     });
   }
 
-  onClearCacheClicked=() => {
+  onClearCacheClicked = () => {
     this.setState({ clearCacheButtonClicked: true });
-  }
+  };
 
   submit(e) {
     e.preventDefault();
     this.props.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         const values = form.values();
         this.props.onSubmit(values);
       },
@@ -236,7 +249,7 @@ export default @observer class EditSettingsForm extends Component {
       hasAddedTodosAsService,
       isOnline,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     let updateButtonLabelMessage = messages.buttonSearchForUpdate;
     if (isCheckingForUpdates) {
@@ -247,18 +260,21 @@ export default @observer class EditSettingsForm extends Component {
       updateButtonLabelMessage = messages.buttonSearchForUpdate;
     }
 
-    const {
-      lockingFeatureEnabled,
-      scheduledDNDEnabled,
-    } = window.ferdi.stores.settings.all.app;
+    const { lockingFeatureEnabled, scheduledDNDEnabled } =
+      window.ferdi.stores.settings.all.app;
 
     let cacheSize;
     let notCleared;
     if (this.state.activeSetttingsTab === 'advanced') {
       const cacheSizeBytes = getCacheSize();
+      debug('cacheSizeBytes:', cacheSizeBytes);
       if (typeof cacheSizeBytes === 'number') {
         cacheSize = prettyBytes(cacheSizeBytes);
-        notCleared = this.state.clearCacheButtonClicked && isClearingAllCache === false && cacheSizeBytes !== 0;
+        debug('cacheSize:', cacheSize);
+        notCleared =
+          this.state.clearCacheButtonClicked &&
+          isClearingAllCache === false &&
+          cacheSizeBytes !== 0;
       } else {
         cacheSize = '…';
         notCleared = false;
@@ -275,58 +291,94 @@ export default @observer class EditSettingsForm extends Component {
         </div>
         <div className="settings__body">
           <form
-            onSubmit={(e) => this.submit(e)}
-            onChange={(e) => this.submit(e)}
+            onSubmit={e => this.submit(e)}
+            onChange={e => this.submit(e)}
             id="form"
           >
             {/* Titles */}
             <div className="recipes__navigation">
               <h2
                 id="general"
-                className={this.state.activeSetttingsTab === 'general' ? 'badge badge--primary' : 'badge'}
-                onClick={() => { this.setActiveSettingsTab('general'); }}
+                className={
+                  this.state.activeSetttingsTab === 'general'
+                    ? 'badge badge--primary'
+                    : 'badge'
+                }
+                onClick={() => {
+                  this.setActiveSettingsTab('general');
+                }}
               >
                 {intl.formatMessage(messages.headlineGeneral)}
               </h2>
               <h2
                 id="appearance"
-                className={this.state.activeSetttingsTab === 'appearance' ? 'badge badge--primary' : 'badge'}
-                onClick={() => { this.setActiveSettingsTab('appearance'); }}
+                className={
+                  this.state.activeSetttingsTab === 'appearance'
+                    ? 'badge badge--primary'
+                    : 'badge'
+                }
+                onClick={() => {
+                  this.setActiveSettingsTab('appearance');
+                }}
               >
                 {intl.formatMessage(messages.headlineAppearance)}
               </h2>
               <h2
                 id="privacy"
-                className={this.state.activeSetttingsTab === 'privacy' ? 'badge badge--primary' : 'badge'}
-                onClick={() => { this.setActiveSettingsTab('privacy'); }}
+                className={
+                  this.state.activeSetttingsTab === 'privacy'
+                    ? 'badge badge--primary'
+                    : 'badge'
+                }
+                onClick={() => {
+                  this.setActiveSettingsTab('privacy');
+                }}
               >
                 {intl.formatMessage(messages.headlinePrivacy)}
               </h2>
               <h2
                 id="language"
-                className={this.state.activeSetttingsTab === 'language' ? 'badge badge--primary' : 'badge'}
-                onClick={() => { this.setActiveSettingsTab('language'); }}
+                className={
+                  this.state.activeSetttingsTab === 'language'
+                    ? 'badge badge--primary'
+                    : 'badge'
+                }
+                onClick={() => {
+                  this.setActiveSettingsTab('language');
+                }}
               >
                 {intl.formatMessage(messages.headlineLanguage)}
               </h2>
               <h2
                 id="advanced"
-                className={this.state.activeSetttingsTab === 'advanced' ? 'badge badge--primary' : 'badge'}
-                onClick={() => { this.setActiveSettingsTab('advanced'); }}
+                className={
+                  this.state.activeSetttingsTab === 'advanced'
+                    ? 'badge badge--primary'
+                    : 'badge'
+                }
+                onClick={() => {
+                  this.setActiveSettingsTab('advanced');
+                }}
               >
                 {intl.formatMessage(messages.headlineAdvanced)}
               </h2>
               <h2
                 id="updates"
-                className={this.state.activeSetttingsTab === 'updates' ? 'badge badge--primary' : 'badge'}
-                onClick={() => { this.setActiveSettingsTab('updates'); }}
+                className={
+                  this.state.activeSetttingsTab === 'updates'
+                    ? 'badge badge--primary'
+                    : 'badge'
+                }
+                onClick={() => {
+                  this.setActiveSettingsTab('updates');
+                }}
               >
                 {intl.formatMessage(messages.headlineUpdates)}
               </h2>
             </div>
 
             {/* General */}
-            { this.state.activeSetttingsTab === 'general' && (
+            {this.state.activeSetttingsTab === 'general' && (
               <div>
                 <Toggle field={form.$('autoLaunchOnStart')} />
                 <Toggle field={form.$('runInBackground')} />
@@ -334,12 +386,8 @@ export default @observer class EditSettingsForm extends Component {
                 <Toggle field={form.$('enableSystemTray')} />
                 <Toggle field={form.$('reloadAfterResume')} />
                 <Toggle field={form.$('startMinimized')} />
-                {isWindows && (
-                  <Toggle field={form.$('minimizeToSystemTray')} />
-                )}
-                {isWindows && (
-                  <Toggle field={form.$('closeToSystemTray')} />
-                )}
+                {isWindows && <Toggle field={form.$('minimizeToSystemTray')} />}
+                {isWindows && <Toggle field={form.$('closeToSystemTray')} />}
                 <Select field={form.$('navigationBarBehaviour')} />
 
                 <Hr />
@@ -349,12 +397,13 @@ export default @observer class EditSettingsForm extends Component {
                 <p
                   className="settings__message"
                   style={{
-                    borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
+                    borderTop: 0,
+                    marginTop: 0,
+                    paddingTop: 0,
+                    marginBottom: '2rem',
                   }}
                 >
-                  <span>
-                    { intl.formatMessage(messages.hibernateInfo) }
-                  </span>
+                  <span>{intl.formatMessage(messages.hibernateInfo)}</span>
                 </p>
 
                 <Select field={form.$('wakeUpStrategy')} />
@@ -374,20 +423,24 @@ export default @observer class EditSettingsForm extends Component {
                     {isTodosActivated && (
                       <div>
                         <Select field={form.$('predefinedTodoServer')} />
-                        {form.$('predefinedTodoServer').value === 'isUsingCustomTodoService' && (
+                        {form.$('predefinedTodoServer').value ===
+                          'isUsingCustomTodoService' && (
                           <div>
                             <Input
                               placeholder="Todo Server"
-                              onChange={(e) => this.submit(e)}
+                              onChange={e => this.submit(e)}
                               field={form.$('customTodoServer')}
                             />
                             <p
                               className="settings__message"
                               style={{
-                                borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
+                                borderTop: 0,
+                                marginTop: 0,
+                                paddingTop: 0,
+                                marginBottom: '2rem',
                               }}
                             >
-                              { intl.formatMessage(messages.todoServerInfo) }
+                              {intl.formatMessage(messages.todoServerInfo)}
                             </p>
                           </div>
                         )}
@@ -400,56 +453,58 @@ export default @observer class EditSettingsForm extends Component {
                 <Toggle field={form.$('scheduledDNDEnabled')} />
                 {scheduledDNDEnabled && (
                   <>
-                    <div style={{
-                      display: 'flex',
-                      justifyContent: 'center',
-                    }}
-                    >
-                      <div style={{
-                        padding: '0 1rem',
-                        width: '100%',
+                    <div
+                      style={{
+                        display: 'flex',
+                        justifyContent: 'center',
                       }}
+                    >
+                      <div
+                        style={{
+                          padding: '0 1rem',
+                          width: '100%',
+                        }}
                       >
                         <Input
                           placeholder="17:00"
-                          onChange={(e) => this.submit(e)}
+                          onChange={e => this.submit(e)}
                           field={form.$('scheduledDNDStart')}
                           type="time"
                         />
                       </div>
-                      <div style={{
-                        padding: '0 1rem',
-                        width: '100%',
-                      }}
+                      <div
+                        style={{
+                          padding: '0 1rem',
+                          width: '100%',
+                        }}
                       >
                         <Input
                           placeholder="09:00"
-                          onChange={(e) => this.submit(e)}
+                          onChange={e => this.submit(e)}
                           field={form.$('scheduledDNDEnd')}
                           type="time"
                         />
                       </div>
                     </div>
-                    <p>
-                      { intl.formatMessage(messages.scheduledDNDTimeInfo) }
-                    </p>
+                    <p>{intl.formatMessage(messages.scheduledDNDTimeInfo)}</p>
                   </>
                 )}
                 <p
                   className="settings__message"
                   style={{
-                    borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
+                    borderTop: 0,
+                    marginTop: 0,
+                    paddingTop: 0,
+                    marginBottom: '2rem',
                   }}
                 >
-                  <span>
-                    { intl.formatMessage(messages.scheduledDNDInfo) }
-                  </span>
+                  <span>{intl.formatMessage(messages.scheduledDNDInfo)}</span>
                 </p>
               </div>
             )}
 
             {/* Appearance */}
-            { this.state.activeSetttingsTab === 'appearance' && (
+            {this.state.activeSetttingsTab === 'appearance' && (
               <div>
                 <Toggle field={form.$('showDisabledServices')} />
                 <Toggle field={form.$('showMessageBadgeWhenMuted')} />
@@ -459,25 +514,34 @@ export default @observer class EditSettingsForm extends Component {
                 <Hr />
 
                 <Toggle field={form.$('adaptableDarkMode')} />
-                {!isAdaptableDarkModeEnabled && <Toggle field={form.$('darkMode')} />}
+                {!isAdaptableDarkModeEnabled && (
+                  <Toggle field={form.$('darkMode')} />
+                )}
                 {(isDarkmodeEnabled || isAdaptableDarkModeEnabled) && (
-                <>
-                  <Toggle field={form.$('universalDarkMode')} />
-                  <p
-                    className="settings__message"
-                    style={{
-                      borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
-                    }}
-                  >
-                    <span>
-                      { intl.formatMessage(messages.universalDarkModeInfo) }
-                    </span>
-                  </p>
-                </>
+                  <>
+                    <Toggle field={form.$('universalDarkMode')} />
+                    <p
+                      className="settings__message"
+                      style={{
+                        borderTop: 0,
+                        marginTop: 0,
+                        paddingTop: 0,
+                        marginBottom: '2rem',
+                      }}
+                    >
+                      <span>
+                        {intl.formatMessage(messages.universalDarkModeInfo)}
+                      </span>
+                    </p>
+                  </>
                 )}
 
                 <Hr />
 
+                <Toggle field={form.$('splitMode')} />
+
+                <Hr />
+
                 <Select field={form.$('serviceRibbonWidth')} />
 
                 <Toggle field={form.$('useVerticalStyle')} />
@@ -491,23 +555,25 @@ export default @observer class EditSettingsForm extends Component {
 
                 <Input
                   placeholder="Accent Color"
-                  onChange={(e) => this.submit(e)}
+                  onChange={e => this.submit(e)}
                   field={form.$('accentColor')}
                 />
                 <p>
-                  {intl.formatMessage(messages.accentColorInfo,
-                    { defaultAccentColor: DEFAULT_APP_SETTINGS.accentColor })}
+                  {intl.formatMessage(messages.accentColorInfo, {
+                    defaultAccentColor: DEFAULT_APP_SETTINGS.accentColor,
+                  })}
                 </p>
               </div>
             )}
 
             {/* Privacy */}
-            { this.state.activeSetttingsTab === 'privacy' && (
+            {this.state.activeSetttingsTab === 'privacy' && (
               <div>
                 <Toggle field={form.$('privateNotifications')} />
                 <Toggle field={form.$('clipboardNotifications')} />
                 {(isWindows || isMac) && (
-                  <Toggle field={form.$('notifyTaskBarOnMessage')} />)}
+                  <Toggle field={form.$('notifyTaskBarOnMessage')} />
+                )}
 
                 <Hr />
 
@@ -516,8 +582,12 @@ export default @observer class EditSettingsForm extends Component {
                 <Hr />
 
                 <Toggle field={form.$('sentry')} />
-                <p className="settings__help">{intl.formatMessage(messages.sentryInfo)}</p>
-                <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p>
+                <p className="settings__help">
+                  {intl.formatMessage(messages.sentryInfo)}
+                </p>
+                <p className="settings__help">
+                  {intl.formatMessage(messages.appRestartRequired)}
+                </p>
 
                 <Hr />
 
@@ -530,57 +600,60 @@ export default @observer class EditSettingsForm extends Component {
 
                     <Input
                       placeholder={intl.formatMessage(messages.lockedPassword)}
-                      onChange={(e) => this.submit(e)}
+                      onChange={e => this.submit(e)}
                       field={form.$('lockedPassword')}
                       type="password"
                       scorePassword
                       showPasswordToggle
                     />
-                    <p>
-                      { intl.formatMessage(messages.lockedPasswordInfo) }
-                    </p>
+                    <p>{intl.formatMessage(messages.lockedPasswordInfo)}</p>
 
                     <Input
                       placeholder="Lock after inactivity"
-                      onChange={(e) => this.submit(e)}
+                      onChange={e => this.submit(e)}
                       field={form.$('inactivityLock')}
                       autoFocus
                     />
-                    <p>
-                      { intl.formatMessage(messages.inactivityLockInfo) }
-                    </p>
+                    <p>{intl.formatMessage(messages.inactivityLockInfo)}</p>
                   </>
                 )}
                 <p
                   className="settings__message"
                   style={{
-                    borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
+                    borderTop: 0,
+                    marginTop: 0,
+                    paddingTop: 0,
+                    marginBottom: '2rem',
                   }}
                 >
                   <span>
-                    { intl.formatMessage(messages.lockInfo, { lockShortcut: `${lockFerdiShortcutKey(false)}` }) }
+                    {intl.formatMessage(messages.lockInfo, {
+                      lockShortcut: `${lockFerdiShortcutKey(false)}`,
+                    })}
                   </span>
                 </p>
               </div>
             )}
 
             {/* Language */}
-            { this.state.activeSetttingsTab === 'language' && (
+            {this.state.activeSetttingsTab === 'language' && (
               <div>
                 <Select field={form.$('locale')} showLabel={false} />
 
                 <Hr />
 
-                <Toggle
-                  field={form.$('enableSpellchecking')}
-                />
+                <Toggle field={form.$('enableSpellchecking')} />
                 {!isMac && form.$('enableSpellchecking').value && (
                   <Select field={form.$('spellcheckerLanguage')} />
                 )}
                 {isMac && form.$('enableSpellchecking').value && (
-                  <p className="settings__help">{intl.formatMessage(messages.spellCheckerLanguageInfo)}</p>
+                  <p className="settings__help">
+                    {intl.formatMessage(messages.spellCheckerLanguageInfo)}
+                  </p>
                 )}
-                <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p>
+                <p className="settings__help">
+                  {intl.formatMessage(messages.appRestartRequired)}
+                </p>
 
                 <Hr />
 
@@ -590,52 +663,54 @@ export default @observer class EditSettingsForm extends Component {
                   className="link"
                   rel="noreferrer"
                 >
-                  {intl.formatMessage(messages.translationHelp)}
-                  {' '}
+                  {intl.formatMessage(messages.translationHelp)}{' '}
                   <i className="mdi mdi-open-in-new" />
                 </a>
               </div>
             )}
 
             {/* Advanced */}
-            { this.state.activeSetttingsTab === 'advanced' && (
+            {this.state.activeSetttingsTab === 'advanced' && (
               <div>
                 <Toggle field={form.$('enableGPUAcceleration')} />
-                <p className="settings__help indented__help">{intl.formatMessage(messages.appRestartRequired)}</p>
+                <p className="settings__help indented__help">
+                  {intl.formatMessage(messages.appRestartRequired)}
+                </p>
 
                 <Hr />
 
                 <Input
                   placeholder="User Agent"
-                  onChange={(e) => this.submit(e)}
+                  onChange={e => this.submit(e)}
                   field={form.$('userAgentPref')}
                 />
-                <p className="settings__help">{intl.formatMessage(globalMessages.userAgentHelp)}</p>
-                <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p>
+                <p className="settings__help">
+                  {intl.formatMessage(globalMessages.userAgentHelp)}
+                </p>
+                <p className="settings__help">
+                  {intl.formatMessage(messages.appRestartRequired)}
+                </p>
 
                 <Hr />
 
                 <div className="settings__settings-group">
-                  <h3>
-                    {intl.formatMessage(messages.subheadlineCache)}
-                  </h3>
+                  <h3>{intl.formatMessage(messages.subheadlineCache)}</h3>
                   <p>
                     {intl.formatMessage(messages.cacheInfo, {
                       size: cacheSize,
                     })}
                   </p>
-                  {
-                    notCleared && (
-                      <p>
-                        {intl.formatMessage(messages.cacheNotCleared)}
-                      </p>
-                    )
-                  }
+                  {notCleared && (
+                    <p>{intl.formatMessage(messages.cacheNotCleared)}</p>
+                  )}
                   <p>
                     <Button
                       buttonType="secondary"
                       label={intl.formatMessage(messages.buttonClearAllCache)}
-                      onClick={() => { onClearAllCache(); this.onClearCacheClicked(); }}
+                      onClick={() => {
+                        onClearAllCache();
+                        this.onClearCacheClicked();
+                      }}
                       disabled={isClearingAllCache}
                       loaded={!isClearingAllCache}
                     />
@@ -652,13 +727,17 @@ export default @observer class EditSettingsForm extends Component {
                     <div className="settings__open-settings-file-container">
                       <Button
                         buttonType="secondary"
-                        label={intl.formatMessage(messages.buttonOpenFerdiProfileFolder)}
+                        label={intl.formatMessage(
+                          messages.buttonOpenFerdiProfileFolder,
+                        )}
                         className="settings__open-settings-file-button"
                         onClick={() => openPath(profileFolder)}
                       />
                       <Button
                         buttonType="secondary"
-                        label={intl.formatMessage(messages.buttonOpenFerdiServiceRecipesFolder)}
+                        label={intl.formatMessage(
+                          messages.buttonOpenFerdiServiceRecipesFolder,
+                        )}
                         className="settings__open-settings-file-button"
                         onClick={() => openPath(recipeFolder)}
                       />
@@ -669,66 +748,78 @@ export default @observer class EditSettingsForm extends Component {
             )}
 
             {/* Updates */}
-            { this.state.activeSetttingsTab === 'updates' && (
-            <div>
-              <Toggle field={form.$('automaticUpdates')} />
-              {automaticUpdates && (
+            {this.state.activeSetttingsTab === 'updates' && (
               <div>
-                <Toggle field={form.$('beta')} />
-                <ToggleRaw
-                  field={{
-                    value: isNightlyEnabled,
-                    id: 'nightly',
-                    label: 'Include nightly versions',
-                    name: 'Nightly builds',
-                  }}
-                  onChange={window.ferdi.features.nightlyBuilds.toggleFeature}
-                />
-                {updateIsReadyToInstall ? (
-                  <Button
-                    label={intl.formatMessage(messages.buttonInstallUpdate)}
-                    onClick={installUpdate}
-                  />
-                ) : (
-                  <Button
-                    buttonType="secondary"
-                    label={intl.formatMessage(updateButtonLabelMessage)}
-                    onClick={checkForUpdates}
-                    disabled={!automaticUpdates || isCheckingForUpdates || isUpdateAvailable || !isOnline}
-                    loaded={!isCheckingForUpdates || !isUpdateAvailable}
-                  />
+                <Toggle field={form.$('automaticUpdates')} />
+                {automaticUpdates && (
+                  <div>
+                    <Toggle field={form.$('beta')} />
+                    <ToggleRaw
+                      field={{
+                        value: isNightlyEnabled,
+                        id: 'nightly',
+                        label: 'Include nightly versions',
+                        name: 'Nightly builds',
+                      }}
+                      onChange={
+                        window.ferdi.features.nightlyBuilds.toggleFeature
+                      }
+                    />
+                    {updateIsReadyToInstall ? (
+                      <Button
+                        label={intl.formatMessage(messages.buttonInstallUpdate)}
+                        onClick={installUpdate}
+                      />
+                    ) : (
+                      <Button
+                        buttonType="secondary"
+                        label={intl.formatMessage(updateButtonLabelMessage)}
+                        onClick={checkForUpdates}
+                        disabled={
+                          !automaticUpdates ||
+                          isCheckingForUpdates ||
+                          isUpdateAvailable ||
+                          !isOnline
+                        }
+                        loaded={!isCheckingForUpdates || !isUpdateAvailable}
+                      />
+                    )}
+                    <br />
+                  </div>
+                )}
+                {intl.formatMessage(messages.currentVersion)} {ferdiVersion}
+                {noUpdateAvailable && (
+                  <>
+                    <br />
+                    <br />
+                    {intl.formatMessage(messages.updateStatusUpToDate)}
+                  </>
                 )}
-                <br />
+                <p className="settings__message">
+                  <span className="mdi mdi-github-face" />
+                  <span>
+                    Ferdi is based on{' '}
+                    <a
+                      href={`${GITHUB_FRANZ_URL}/franz`}
+                      target="_blank"
+                      rel="noreferrer"
+                    >
+                      Franz
+                    </a>
+                    , a project published under the{' '}
+                    <a
+                      href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`}
+                      target="_blank"
+                      rel="noreferrer"
+                    >
+                      Apache-2.0 License
+                    </a>
+                  </span>
+                  <br />
+                  <span className="mdi mdi-information" />
+                  {intl.formatMessage(messages.languageDisclaimer)}
+                </p>
               </div>
-              )}
-              {intl.formatMessage(messages.currentVersion)}
-              {' '}
-              {ferdiVersion}
-              {noUpdateAvailable && (
-              <>
-                <br />
-                <br />
-                {intl.formatMessage(messages.updateStatusUpToDate)}
-              </>
-              )}
-              <p className="settings__message">
-                <span className="mdi mdi-github-face" />
-                <span>
-
-                  Ferdi is based on
-                  {' '}
-                  <a href={`${GITHUB_FRANZ_URL}/franz`} target="_blank" rel="noreferrer">Franz</a>
-
-                  , a project published
-                  under the
-                  {' '}
-                  <a href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`} target="_blank" rel="noreferrer">Apache-2.0 License</a>
-                </span>
-                <br />
-                <span className="mdi mdi-information" />
-                {intl.formatMessage(messages.languageDisclaimer)}
-              </p>
-            </div>
             )}
           </form>
         </div>
@@ -736,3 +827,5 @@ export default @observer class EditSettingsForm extends Component {
     );
   }
 }
+
+export default injectIntl(EditSettingsForm);
diff --git a/src/components/settings/supportFerdi/SupportFerdiDashboard.js b/src/components/settings/supportFerdi/SupportFerdiDashboard.js
index b84e06739..f24e4bd62 100644
--- a/src/components/settings/supportFerdi/SupportFerdiDashboard.js
+++ b/src/components/settings/supportFerdi/SupportFerdiDashboard.js
@@ -1,76 +1,77 @@
 import React, { Component } from 'react';
-import { defineMessages, FormattedHTMLMessage, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { BrowserWindow } from '@electron/remote';
 import InfoBar from '../../ui/InfoBar';
 
 const messages = defineMessages({
   headline: {
     id: 'settings.supportFerdi.headline',
-    defaultMessage: '!!!About Ferdi',
+    defaultMessage: 'About Ferdi',
   },
   title: {
     id: 'settings.supportFerdi.title',
-    defaultMessage: '!!!Do you like Ferdi?',
+    defaultMessage: 'Do you like Ferdi?',
   },
   aboutIntro: {
     id: 'settings.supportFerdi.aboutIntro',
-    defaultMessage: '!!!<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>',
+    defaultMessage:
+      '<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>',
   },
   textListContributors: {
     id: 'settings.supportFerdi.textListContributors',
-    defaultMessage: '!!!Full list of contributor',
+    defaultMessage: 'Full list of contributors',
   },
   textListContributorsHere: {
     id: 'settings.supportFerdi.textListContributorsHere',
-    defaultMessage: '!!!here',
+    defaultMessage: 'here',
   },
   textVolunteers: {
     id: 'settings.supportFerdi.textVolunteers',
-    defaultMessage: '!!!The development of Ferdi is done by volunteers. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.',
+    defaultMessage:
+      'The development of Ferdi is done by volunteers. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.',
   },
   textSupportWelcome: {
     id: 'settings.supportFerdi.textSupportWelcome',
-    defaultMessage: '!!!Support is always welcome. You can find a list of the help we need',
+    defaultMessage:
+      'Support is always welcome. You can find a list of the help we need',
   },
   textSupportWelcomeHere: {
     id: 'settings.supportFerdi.textSupportWelcomeHere',
-    defaultMessage: '!!!here',
+    defaultMessage: 'here',
   },
   textExpenses: {
     id: 'settings.supportFerdi.textExpenses',
-    defaultMessage: '!!!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',
+    defaultMessage:
+      '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',
   },
   textOpenCollective: {
     id: 'settings.supportFerdi.textOpenCollective',
-    defaultMessage: '!!!Open Collective',
+    defaultMessage: 'Open Collective',
   },
   textDonation: {
     id: 'settings.supportFerdi.textDonation',
-    defaultMessage: '!!!If you feel like supporting Ferdi development with a donation, you can do so on both,',
+    defaultMessage:
+      'If you feel like supporting Ferdi development with a donation, you can do so on both,',
   },
   textDonationAnd: {
     id: 'settings.supportFerdi.textDonationAnd',
-    defaultMessage: '!!!and',
+    defaultMessage: 'and',
   },
   textGitHubSponsors: {
     id: 'settings.supportFerdi.textGitHubSponsors',
-    defaultMessage: '!!!GitHub Sponsors',
+    defaultMessage: 'GitHub Sponsors',
   },
   openSurvey: {
     id: 'settings.supportFerdi.openSurvey',
-    defaultMessage: '!!!Open Survey',
+    defaultMessage: 'Open survey',
   },
   bannerText: {
     id: 'settings.supportFerdi.bannerText',
-    defaultMessage: '!!!Do you want to help us improve Ferdi?',
+    defaultMessage: 'Do you want to help us improve Ferdi?',
   },
 });
 
 class SupportFerdiDashboard extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   openSurveyWindow() {
     let win = new BrowserWindow({ width: 670, height: 400 });
     win.on('closed', () => {
@@ -81,7 +82,9 @@ class SupportFerdiDashboard extends Component {
   }
 
   render() {
-    const { intl } = this.context;
+    const { intl } = this.props;
+
+    const aboutIntro = intl.formatMessage(messages.aboutIntro);
 
     return (
       <div className="settings__main">
@@ -94,22 +97,67 @@ class SupportFerdiDashboard extends Component {
           <h1>{intl.formatMessage(messages.title)}</h1>
           <div>
             <p className="settings__support-badges">
-              <a href="https://github.com/getferdi/ferdi" target="_blank" rel="noreferrer"><img alt="GitHub Stars" src="https://img.shields.io/github/stars/getferdi/ferdi?style=social" /></a>
-              <a href="https://twitter.com/getferdi/" target="_blank" rel="noreferrer"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/getferdi?label=Follow&style=social" /></a>
-              <a href="https://opencollective.com/getferdi#section-contributors" target="_blank" rel="noreferrer"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective" /></a>
-              <a href="https://opencollective.com/getferdi#section-contributors" target="_blank" rel="noreferrer"><img alt="Open Collective sponsors" src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective" /></a>
+              <a
+                href="https://github.com/getferdi/ferdi"
+                target="_blank"
+                rel="noreferrer"
+              >
+                <img
+                  alt="GitHub Stars"
+                  src="https://img.shields.io/github/stars/getferdi/ferdi?style=social"
+                />
+              </a>
+              <a
+                href="https://twitter.com/getferdi/"
+                target="_blank"
+                rel="noreferrer"
+              >
+                <img
+                  alt="Twitter Follow"
+                  src="https://img.shields.io/twitter/follow/getferdi?label=Follow&style=social"
+                />
+              </a>
+              <a
+                href="https://opencollective.com/getferdi#section-contributors"
+                target="_blank"
+                rel="noreferrer"
+              >
+                <img
+                  alt="Open Collective backers"
+                  src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective"
+                />
+              </a>
+              <a
+                href="https://opencollective.com/getferdi#section-contributors"
+                target="_blank"
+                rel="noreferrer"
+              >
+                <img
+                  alt="Open Collective sponsors"
+                  src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective"
+                />
+              </a>
             </p>
-            <FormattedHTMLMessage {...messages.aboutIntro} />
+            <span dangerouslySetInnerHTML={{ __html: aboutIntro }} />
             <br />
             <br />
             <p>
               <a href="#contributors-via-opencollective">
-                <img alt="GitHub contributors (non-exhaustive)" width="100%" src="https://opencollective.com/getferdi/contributors.svg?width=642&button=false" />
+                <img
+                  alt="GitHub contributors (non-exhaustive)"
+                  width="100%"
+                  src="https://opencollective.com/getferdi/contributors.svg?width=642&button=false"
+                />
               </a>
             </p>
             <p>
               {intl.formatMessage(messages.textListContributors)}
-              <a href="https://github.com/getferdi/ferdi#contributors-" target="_blank" className="link" rel="noreferrer">
+              <a
+                href="https://github.com/getferdi/ferdi#contributors-"
+                target="_blank"
+                className="link"
+                rel="noreferrer"
+              >
                 {' '}
                 {intl.formatMessage(messages.textListContributorsHere)}
                 <i className="mdi mdi-open-in-new" />
@@ -117,12 +165,15 @@ class SupportFerdiDashboard extends Component {
               <br />
               <br />
             </p>
-            <p>
-              {intl.formatMessage(messages.textVolunteers)}
-            </p>
+            <p>{intl.formatMessage(messages.textVolunteers)}</p>
             <p>
               {intl.formatMessage(messages.textSupportWelcome)}
-              <a href="https://help.getferdi.com/general/support" target="_blank" className="link" rel="noreferrer">
+              <a
+                href="https://help.getferdi.com/general/support"
+                target="_blank"
+                className="link"
+                rel="noreferrer"
+              >
                 {' '}
                 {intl.formatMessage(messages.textSupportWelcomeHere)}
                 <i className="mdi mdi-open-in-new" />
@@ -130,7 +181,12 @@ class SupportFerdiDashboard extends Component {
             </p>
             <p>
               {intl.formatMessage(messages.textExpenses)}
-              <a href="https://opencollective.com/getferdi#section-budget" target="_blank" className="link" rel="noreferrer">
+              <a
+                href="https://opencollective.com/getferdi#section-budget"
+                target="_blank"
+                className="link"
+                rel="noreferrer"
+              >
                 {' '}
                 {intl.formatMessage(messages.textOpenCollective)}
                 <i className="mdi mdi-open-in-new" />
@@ -138,14 +194,23 @@ class SupportFerdiDashboard extends Component {
             </p>
             <p>
               {intl.formatMessage(messages.textDonation)}
-              <a href="https://opencollective.com/getferdi#section-contribute" target="_blank" className="link" rel="noreferrer">
+              <a
+                href="https://opencollective.com/getferdi#section-contribute"
+                target="_blank"
+                className="link"
+                rel="noreferrer"
+              >
                 {' '}
                 {intl.formatMessage(messages.textOpenCollective)}
                 <i className="mdi mdi-open-in-new" />
-              </a>
-              {' '}
+              </a>{' '}
               {intl.formatMessage(messages.textDonationAnd)}
-              <a href="https://github.com/sponsors/getferdi" target="_blank" className="link" rel="noreferrer">
+              <a
+                href="https://github.com/sponsors/getferdi"
+                target="_blank"
+                className="link"
+                rel="noreferrer"
+              >
                 {' '}
                 {intl.formatMessage(messages.textGitHubSponsors)}
                 <i className="mdi mdi-open-in-new" />
@@ -166,4 +231,4 @@ class SupportFerdiDashboard extends Component {
   }
 }
 
-export default SupportFerdiDashboard;
+export default injectIntl(SupportFerdiDashboard);
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js
index 437225058..06f244997 100644
--- a/src/components/settings/team/TeamDashboard.js
+++ b/src/components/settings/team/TeamDashboard.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import ReactTooltip from 'react-tooltip';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
@@ -14,31 +14,34 @@ import { LIVE_FRANZ_API } from '../../../config';
 const messages = defineMessages({
   headline: {
     id: 'settings.team.headline',
-    defaultMessage: '!!!Team',
+    defaultMessage: 'Team',
   },
   contentHeadline: {
     id: 'settings.team.contentHeadline',
-    defaultMessage: '!!!Franz Team Management',
+    defaultMessage: 'Franz Team Management',
   },
   intro: {
     id: 'settings.team.intro',
-    defaultMessage: '!!!Your are currently using Franz Servers, which is why you have access to Team Management.',
+    defaultMessage:
+      'You are currently using Franz Servers, which is why you have access to Team Management.',
   },
   copy: {
     id: 'settings.team.copy',
-    defaultMessage: '!!!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.',
+    defaultMessage:
+      "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.",
   },
   manageButton: {
     id: 'settings.team.manageAction',
-    defaultMessage: '!!!Manage your Team on meetfranz.com',
+    defaultMessage: 'Manage your Team on meetfranz.com',
   },
   teamsUnavailable: {
     id: 'settings.team.teamsUnavailable',
-    defaultMessage: '!!!Teams are unavailable',
+    defaultMessage: 'Teams are unavailable',
   },
   teamsUnavailableInfo: {
     id: 'settings.team.teamsUnavailableInfo',
-    defaultMessage: '!!!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.',
+    defaultMessage:
+      '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.',
   },
 });
 
@@ -87,7 +90,9 @@ const styles = {
   },
 };
 
-export default @injectSheet(styles) @observer class TeamDashboard extends Component {
+@injectSheet(styles)
+@observer
+class TeamDashboard extends Component {
   static propTypes = {
     isLoading: PropTypes.bool.isRequired,
     userInfoRequestFailed: PropTypes.bool.isRequired,
@@ -97,10 +102,6 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
     server: PropTypes.string.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       isLoading,
@@ -110,7 +111,7 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
       classes,
       server,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     if (server === LIVE_FRANZ_API) {
       return (
@@ -121,9 +122,7 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
             </span>
           </div>
           <div className="settings__body">
-            {isLoading && (
-              <Loader />
-            )}
+            {isLoading && <Loader />}
 
             {!isLoading && userInfoRequestFailed && (
               <Infobox
@@ -142,20 +141,24 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
                 {!isLoading && (
                   <>
                     <>
-                      <h1 className={classnames({
-                        [classes.headline]: true,
-                        [classes.headlineWithSpacing]: true,
-                      })}
+                      <h1
+                        className={classnames({
+                          [classes.headline]: true,
+                          [classes.headlineWithSpacing]: true,
+                        })}
                       >
                         {intl.formatMessage(messages.contentHeadline)}
-
                       </h1>
                       <div className={classes.container}>
                         <div className={classes.content}>
                           <p>{intl.formatMessage(messages.intro)}</p>
                           <p>{intl.formatMessage(messages.copy)}</p>
                         </div>
-                        <img className={classes.image} src="https://cdn.franzinfra.com/announcements/assets/teams.png" alt="Ferdi for Teams" />
+                        <img
+                          className={classes.image}
+                          src="https://cdn.franzinfra.com/announcements/assets/teams.png"
+                          alt="Ferdi for Teams"
+                        />
                       </div>
                       <div className={classes.buttonContainer}>
                         <Button
@@ -188,7 +191,8 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
           <p
             className="settings__message"
             style={{
-              borderTop: 0, marginTop: 0,
+              borderTop: 0,
+              marginTop: 0,
             }}
           >
             {intl.formatMessage(messages.teamsUnavailableInfo)}
@@ -198,3 +202,5 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
     );
   }
 }
+
+export default injectIntl(TeamDashboard);
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js
index db78acb69..adc107ccc 100644
--- a/src/components/settings/user/EditUserForm.js
+++ b/src/components/settings/user/EditUserForm.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router';
 import { Input } from '@meetfranz/forms';
 
@@ -14,31 +14,32 @@ import Infobox from '../../ui/Infobox';
 const messages = defineMessages({
   headline: {
     id: 'settings.account.headline',
-    defaultMessage: '!!!Account',
+    defaultMessage: 'Account',
   },
   headlineProfile: {
     id: 'settings.account.headlineProfile',
-    defaultMessage: '!!!Update Profile',
+    defaultMessage: 'Update profile',
   },
   headlineAccount: {
     id: 'settings.account.headlineAccount',
-    defaultMessage: '!!!Account Information',
+    defaultMessage: 'Account information',
   },
   headlinePassword: {
     id: 'settings.account.headlinePassword',
-    defaultMessage: '!!!Change Password',
+    defaultMessage: 'Change password',
   },
   successInfo: {
     id: 'settings.account.successInfo',
-    defaultMessage: '!!!Your changes have been saved',
+    defaultMessage: 'Your changes have been saved',
   },
   buttonSave: {
     id: 'settings.account.buttonSave',
-    defaultMessage: '!!!Update profile',
+    defaultMessage: 'Update profile',
   },
 });
 
-export default @observer class EditUserForm extends Component {
+@observer
+class EditUserForm extends Component {
   static propTypes = {
     status: MobxPropTypes.observableArray.isRequired,
     form: PropTypes.instanceOf(Form).isRequired,
@@ -46,14 +47,10 @@ export default @observer class EditUserForm extends Component {
     isSaving: PropTypes.bool.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   submit(e) {
     e.preventDefault();
     this.props.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         const values = form.values();
         this.props.onSubmit(values);
       },
@@ -68,7 +65,7 @@ export default @observer class EditUserForm extends Component {
       form,
       isSaving,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <div className="settings__main">
@@ -84,12 +81,9 @@ export default @observer class EditUserForm extends Component {
           </span>
         </div>
         <div className="settings__body">
-          <form onSubmit={(e) => this.submit(e)} id="form">
+          <form onSubmit={e => this.submit(e)} id="form">
             {status.length > 0 && status.includes('data-updated') && (
-              <Infobox
-                type="success"
-                icon="checkbox-marked-circle-outline"
-              >
+              <Infobox type="success" icon="checkbox-marked-circle-outline">
                 {intl.formatMessage(messages.successInfo)}
               </Infobox>
             )}
@@ -104,10 +98,7 @@ export default @observer class EditUserForm extends Component {
               <Input field={form.$('organization')} />
             )}
             <h2>{intl.formatMessage(messages.headlinePassword)}</h2>
-            <Input
-              {...form.$('oldPassword').bind()}
-              showPasswordToggle
-            />
+            <Input {...form.$('oldPassword').bind()} showPasswordToggle />
             <Input
               {...form.$('newPassword').bind()}
               showPasswordToggle
@@ -137,3 +128,5 @@ export default @observer class EditUserForm extends Component {
     );
   }
 }
+
+export default injectIntl(EditUserForm);
diff --git a/src/components/ui/AppLoader/index.js b/src/components/ui/AppLoader/index.js
index bbfd5de28..fa4a719ab 100644
--- a/src/components/ui/AppLoader/index.js
+++ b/src/components/ui/AppLoader/index.js
@@ -19,7 +19,9 @@ const textList = shuffleArray([
   'Fixing bugs',
 ]);
 
-export default @injectSheet(styles) @withTheme class AppLoader extends Component {
+@injectSheet(styles)
+@withTheme
+class AppLoader extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
     theme: PropTypes.object.isRequired,
@@ -28,7 +30,7 @@ export default @injectSheet(styles) @withTheme class AppLoader extends Component
 
   static defaultProps = {
     texts: textList,
-  }
+  };
 
   state = {
     step: 0,
@@ -38,7 +40,7 @@ export default @injectSheet(styles) @withTheme class AppLoader extends Component
 
   componentDidMount() {
     this.interval = setInterval(() => {
-      this.setState((prevState) => ({
+      this.setState(prevState => ({
         step: prevState.step === textList.length - 1 ? 0 : prevState.step + 1,
       }));
     }, 2500);
@@ -73,3 +75,5 @@ export default @injectSheet(styles) @withTheme class AppLoader extends Component
     );
   }
 }
+
+export default AppLoader;
diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js
index 5066b9c06..f6c9fd3d3 100644
--- a/src/components/ui/Button.js
+++ b/src/components/ui/Button.js
@@ -4,7 +4,9 @@ import { observer, inject } from 'mobx-react';
 import Loader from 'react-loader';
 import classnames from 'classnames';
 
-export default @inject('stores') @observer class Button extends Component {
+@inject('stores')
+@observer
+class Button extends Component {
   static propTypes = {
     className: PropTypes.string,
     label: PropTypes.string.isRequired,
@@ -26,7 +28,7 @@ export default @inject('stores') @observer class Button extends Component {
   static defaultProps = {
     className: null,
     disabled: false,
-    onClick: () => { },
+    onClick: () => {},
     type: 'button',
     buttonType: '',
     loaded: true,
@@ -76,7 +78,11 @@ export default @inject('stores') @observer class Button extends Component {
           loaded={loaded}
           lines={10}
           scale={0.4}
-          color={buttonType !== 'secondary' ? '#FFF' : this.props.stores.settings.app.accentColor}
+          color={
+            buttonType !== 'secondary'
+              ? '#FFF'
+              : this.props.stores.settings.app.accentColor
+          }
           component="span"
         />
         {label}
@@ -85,3 +91,5 @@ export default @inject('stores') @observer class Button extends Component {
     );
   }
 }
+
+export default Button;
diff --git a/src/components/ui/FAB.js b/src/components/ui/FAB.js
index 633edbe2c..a3aa06bc9 100644
--- a/src/components/ui/FAB.js
+++ b/src/components/ui/FAB.js
@@ -8,7 +8,8 @@ import classnames from 'classnames';
 
 import { oneOrManyChildElements } from '../../prop-types';
 
-export default @observer class Button extends Component {
+@observer
+class Button extends Component {
   static propTypes = {
     className: PropTypes.string,
     disabled: PropTypes.bool,
@@ -21,7 +22,7 @@ export default @observer class Button extends Component {
   static defaultProps = {
     className: null,
     disabled: false,
-    onClick: () => { },
+    onClick: () => {},
     type: 'button',
     htmlForm: '',
   };
@@ -29,14 +30,8 @@ export default @observer class Button extends Component {
   element = null;
 
   render() {
-    const {
-      className,
-      disabled,
-      onClick,
-      type,
-      children,
-      htmlForm,
-    } = this.props;
+    const { className, disabled, onClick, type, children, htmlForm } =
+      this.props;
 
     const buttonProps = {
       className: classnames({
@@ -66,3 +61,5 @@ export default @observer class Button extends Component {
     );
   }
 }
+
+export default Button;
diff --git a/src/components/ui/FeatureItem.js b/src/components/ui/FeatureItem.js
deleted file mode 100644
index 646cf56ca..000000000
--- a/src/components/ui/FeatureItem.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React from 'react';
-import injectSheet from 'react-jss';
-import { Icon } from '@meetfranz/ui';
-import classnames from 'classnames';
-import { mdiCheckCircle } from '@mdi/js';
-
-const styles = (theme) => ({
-  featureItem: {
-    borderBottom: [1, 'solid', theme.defaultContentBorder],
-    padding: [8, 0],
-    display: 'flex',
-    alignItems: 'center',
-    textAlign: 'left',
-  },
-  featureIcon: {
-    fill: theme.brandSuccess,
-    marginRight: 10,
-  },
-});
-
-export const FeatureItem = injectSheet(styles)(({
-  classes, className, name, icon,
-}) => (
-  <li className={classnames({
-    [classes.featureItem]: true,
-    [className]: className,
-  })}
-  >
-    {icon ? (
-      <span className={classes.featureIcon}>{icon}</span>
-    ) : (
-      <Icon icon={mdiCheckCircle} className={classes.featureIcon} size={1.5} />
-    )}
-    {name}
-  </li>
-));
-
-export default FeatureItem;
diff --git a/src/components/ui/FeatureList.js b/src/components/ui/FeatureList.js
deleted file mode 100644
index cf2664830..000000000
--- a/src/components/ui/FeatureList.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { defineMessages, intlShape } from 'react-intl';
-
-import { FeatureItem } from './FeatureItem';
-
-const messages = defineMessages({
-  availableRecipes: {
-    id: 'pricing.features.recipes',
-    defaultMessage: '!!!Choose from more than 70 Services', // TODO: Make this dynamic
-  },
-  accountSync: {
-    id: 'pricing.features.accountSync',
-    defaultMessage: '!!!Account Synchronisation',
-  },
-  desktopNotifications: {
-    id: 'pricing.features.desktopNotifications',
-    defaultMessage: '!!!Desktop Notifications',
-  },
-  unlimitedServices: {
-    id: 'pricing.features.unlimitedServices',
-    defaultMessage: '!!!Add unlimited services',
-  },
-  spellchecker: {
-    id: 'pricing.features.spellchecker',
-    defaultMessage: '!!!Spellchecker support',
-  },
-  workspaces: {
-    id: 'pricing.features.workspaces',
-    defaultMessage: '!!!Workspaces',
-  },
-  customWebsites: {
-    id: 'pricing.features.customWebsites',
-    defaultMessage: '!!!Add Custom Websites',
-  },
-  onPremise: {
-    id: 'pricing.features.onPremise',
-    defaultMessage: '!!!On-premise & other Hosted Services',
-  },
-  thirdPartyServices: {
-    id: 'pricing.features.thirdPartyServices',
-    defaultMessage: '!!!Install 3rd party services',
-  },
-  serviceProxies: {
-    id: 'pricing.features.serviceProxies',
-    defaultMessage: '!!!Service Proxies',
-  },
-  teamManagement: {
-    id: 'pricing.features.teamManagement',
-    defaultMessage: '!!!Team Management',
-  },
-});
-
-export class FeatureList extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    featureClassName: PropTypes.string,
-  };
-
-  static defaultProps = {
-    className: '',
-    featureClassName: '',
-  }
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  render() {
-    const {
-      className,
-      featureClassName,
-    } = this.props;
-    const { intl } = this.context;
-
-    const features = [
-      messages.availableRecipes,
-      messages.accountSync,
-      messages.desktopNotifications,
-
-      messages.spellchecker,
-
-      messages.workspaces,
-      messages.customWebsites,
-      messages.thirdPartyServices,
-
-      messages.unlimitedServices,
-      messages.onPremise,
-      messages.serviceProxies,
-      messages.teamManagement,
-    ];
-
-    return (
-      <ul className={className}>
-        {features.map((feature) => <FeatureItem name={intl.formatMessage(feature)} className={featureClassName} />)}
-      </ul>
-    );
-  }
-}
-
-export default FeatureList;
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js
index 2952cd96b..ab5e2f365 100644
--- a/src/components/ui/FullscreenLoader/index.js
+++ b/src/components/ui/FullscreenLoader/index.js
@@ -8,7 +8,10 @@ import Loader from '../Loader';
 
 import styles from './styles';
 
-export default @withTheme @injectSheet(styles) @observer class FullscreenLoader extends Component {
+@withTheme
+@injectSheet(styles)
+@observer
+class FullscreenLoader extends Component {
   static propTypes = {
     className: PropTypes.string,
     title: PropTypes.string.isRequired,
@@ -25,14 +28,8 @@ export default @withTheme @injectSheet(styles) @observer class FullscreenLoader
   };
 
   render() {
-    const {
-      classes,
-      title,
-      children,
-      spinnerColor,
-      className,
-      theme,
-    } = this.props;
+    const { classes, title, children, spinnerColor, className, theme } =
+      this.props;
 
     return (
       <div className={classes.wrapper}>
@@ -44,13 +41,11 @@ export default @withTheme @injectSheet(styles) @observer class FullscreenLoader
         >
           <h1 className={classes.title}>{title}</h1>
           <Loader color={spinnerColor || theme.colorFullscreenLoaderSpinner} />
-          {children && (
-            <div className={classes.content}>
-              {children}
-            </div>
-          )}
+          {children && <div className={classes.content}>{children}</div>}
         </div>
       </div>
     );
   }
 }
+
+export default FullscreenLoader;
diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js
index bb4ea0565..49aff389b 100644
--- a/src/components/ui/ImageUpload.js
+++ b/src/components/ui/ImageUpload.js
@@ -6,7 +6,8 @@ import classnames from 'classnames';
 import Dropzone from 'react-dropzone';
 import { isWindows } from '../../environment';
 
-export default @observer class ImageUpload extends Component {
+@observer
+class ImageUpload extends Component {
   static propTypes = {
     field: PropTypes.instanceOf(Field).isRequired,
     className: PropTypes.string,
@@ -29,22 +30,20 @@ export default @observer class ImageUpload extends Component {
   onDrop(acceptedFiles) {
     const { field } = this.props;
 
-    acceptedFiles.forEach((file) => {
+    for (const file of acceptedFiles) {
       const imgPath = isWindows ? file.path.replace(/\\/g, '/') : file.path;
       this.setState({
         path: imgPath,
       });
 
       this.props.field.onDrop(file);
-    });
+    }
 
     field.set('');
   }
 
   render() {
-    const {
-      field, className, multiple, textDelete, textUpload,
-    } = this.props;
+    const { field, className, multiple, textDelete, textUpload } = this.props;
 
     const cssClasses = classnames({
       'image-upload__dropzone': true,
@@ -86,7 +85,7 @@ export default @observer class ImageUpload extends Component {
             </>
           ) : (
             <Dropzone
-              ref={(node) => {
+              ref={node => {
                 this.dropzoneRef = node;
               }}
               onDrop={this.onDrop.bind(this)}
@@ -107,3 +106,5 @@ export default @observer class ImageUpload extends Component {
     );
   }
 }
+
+export default ImageUpload;
diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js
index bd2af2296..dc6be10da 100644
--- a/src/components/ui/InfoBar.js
+++ b/src/components/ui/InfoBar.js
@@ -3,23 +3,21 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import Loader from 'react-loader';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
-// import { oneOrManyChildElements } from '../../prop-types';
 import Appear from './effects/Appear';
 
 const messages = defineMessages({
   hide: {
     id: 'infobar.hide',
-    defaultMessage: '!!!Hide',
+    defaultMessage: 'Hide',
   },
 });
 
-export default
 @observer
 class InfoBar extends Component {
   static propTypes = {
-    // eslint-disable-next-line
+    // eslint-disable-next-line react/forbid-prop-types
     children: PropTypes.any.isRequired,
     onClick: PropTypes.func,
     type: PropTypes.string,
@@ -42,10 +40,6 @@ class InfoBar extends Component {
     onHide: () => null,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       children,
@@ -59,7 +53,7 @@ class InfoBar extends Component {
       onHide,
     } = this.props;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     let transitionName = 'slideUp';
     if (position === 'top') {
@@ -103,3 +97,5 @@ class InfoBar extends Component {
     );
   }
 }
+
+export default injectIntl(InfoBar);
diff --git a/src/components/ui/Infobox.js b/src/components/ui/Infobox.js
index 73b48b957..9e34bf110 100644
--- a/src/components/ui/Infobox.js
+++ b/src/components/ui/Infobox.js
@@ -3,20 +3,20 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import Loader from 'react-loader';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 const messages = defineMessages({
   dismiss: {
     id: 'infobox.dismiss',
-    defaultMessage: '!!!Dismiss',
+    defaultMessage: 'Dismiss',
   },
 });
 
-export default
 @observer
 class Infobox extends Component {
   static propTypes = {
-    children: PropTypes.any.isRequired, // eslint-disable-line
+    // eslint-disable-next-line react/forbid-prop-types
+    children: PropTypes.any.isRequired,
     icon: PropTypes.string,
     type: PropTypes.string,
     ctaOnClick: PropTypes.func,
@@ -38,10 +38,6 @@ class Infobox extends Component {
     onSeen: () => null,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     dismissed: false,
   };
@@ -63,7 +59,7 @@ class Infobox extends Component {
       onDismiss,
     } = this.props;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     if (this.state.dismissed) {
       return null;
@@ -106,3 +102,5 @@ class Infobox extends Component {
     );
   }
 }
+
+export default injectIntl(Infobox);
diff --git a/src/components/ui/Input.js b/src/components/ui/Input.js
index 7417fef1c..43fab10ee 100644
--- a/src/components/ui/Input.js
+++ b/src/components/ui/Input.js
@@ -3,18 +3,17 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { Field } from 'mobx-react-form';
 import classnames from 'classnames';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import { scorePassword as scorePasswordFunc } from '../../helpers/password-helpers';
 
 const messages = defineMessages({
   passwordToggle: {
     id: 'settings.app.form.passwordToggle',
-    defaultMessage: '!!!Password toggle',
+    defaultMessage: 'Password toggle',
   },
 });
 
-export default
 @observer
 class Input extends Component {
   static propTypes = {
@@ -38,16 +37,12 @@ class Input extends Component {
     suffix: '',
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     showPassword: false,
     passwordScore: 0,
   };
 
-  inputElement = null;
+  inputElement;
 
   componentDidMount() {
     if (this.props.focus) {
@@ -82,7 +77,7 @@ class Input extends Component {
 
     const { passwordScore } = this.state;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     let { type } = field;
     if (type === 'password' && this.state.showPassword) {
@@ -106,10 +101,10 @@ class Input extends Component {
             name={field.name}
             value={field.value}
             placeholder={field.placeholder}
-            onChange={(e) => this.onChange(e)}
+            onChange={e => this.onChange(e)}
             onBlur={field.onBlur}
             onFocus={field.onFocus}
-            ref={(element) => {
+            ref={element => {
               this.inputElement = element;
             }}
             disabled={field.disabled}
@@ -124,9 +119,11 @@ class Input extends Component {
                 'mdi-eye': !this.state.showPassword,
                 'mdi-eye-off': this.state.showPassword,
               })}
-              onClick={() => this.setState((prevState) => ({
-                showPassword: !prevState.showPassword,
-              }))}
+              onClick={() =>
+                this.setState(prevState => ({
+                  showPassword: !prevState.showPassword,
+                }))
+              }
               tabIndex={-1}
               aria-label={intl.formatMessage(messages.passwordToggle)}
             />
@@ -136,10 +133,10 @@ class Input extends Component {
               {/* <progress value={this.state.passwordScore} max="100" /> */}
               <meter
                 value={passwordScore < 5 ? 5 : passwordScore}
-                low="30"
-                high="75"
-                optimum="100"
-                max="100"
+                low={30}
+                high={75}
+                optimum={100}
+                max={100}
               />
             </div>
           )}
@@ -154,3 +151,5 @@ class Input extends Component {
     );
   }
 }
+
+export default injectIntl(Input);
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js
index 003211e5c..94db3f842 100644
--- a/src/components/ui/Link.js
+++ b/src/components/ui/Link.js
@@ -9,7 +9,9 @@ import { matchRoute } from '../../helpers/routing-helpers';
 import { openExternalUrl } from '../../helpers/url-helpers';
 
 // TODO: create container component for this component
-export default @inject('stores') @observer class Link extends Component {
+@inject('stores')
+@observer
+class Link extends Component {
   onClick(e) {
     if (this.props.disabled) {
       e.preventDefault();
@@ -50,7 +52,7 @@ export default @inject('stores') @observer class Link extends Component {
         href={router.history.createHref(to)}
         className={linkClasses}
         style={style}
-        onClick={(e) => this.onClick(e)}
+        onClick={e => this.onClick(e)}
       >
         {children}
       </a>
@@ -62,10 +64,8 @@ Link.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
     router: PropTypes.instanceOf(RouterStore).isRequired,
   }).isRequired,
-  children: PropTypes.oneOfType([
-    oneOrManyChildElements,
-    PropTypes.string,
-  ]).isRequired,
+  children: PropTypes.oneOfType([oneOrManyChildElements, PropTypes.string])
+    .isRequired,
   to: PropTypes.string.isRequired,
   className: PropTypes.string,
   activeClassName: PropTypes.string,
@@ -83,3 +83,5 @@ Link.wrappedComponent.defaultProps = {
   target: '',
   style: {},
 };
+
+export default Link;
diff --git a/src/components/ui/Loader.js b/src/components/ui/Loader.js
index 4d7113aa1..46c1390bf 100644
--- a/src/components/ui/Loader.js
+++ b/src/components/ui/Loader.js
@@ -5,7 +5,9 @@ import Loader from 'react-loader';
 
 import { oneOrManyChildElements } from '../../prop-types';
 
-export default @inject('stores') @observer class LoaderComponent extends Component {
+@inject('stores')
+@observer
+class LoaderComponent extends Component {
   static propTypes = {
     children: oneOrManyChildElements,
     loaded: PropTypes.bool,
@@ -28,13 +30,12 @@ export default @inject('stores') @observer class LoaderComponent extends Compone
   };
 
   render() {
-    const {
-      children,
-      loaded,
-      className,
-    } = this.props;
+    const { children, loaded, className } = this.props;
 
-    const color = this.props.color !== 'ACCENT' ? this.props.color : this.props.stores.settings.app.accentColor;
+    const color =
+      this.props.color !== 'ACCENT'
+        ? this.props.color
+        : this.props.stores.settings.app.accentColor;
 
     return (
       <Loader
@@ -51,3 +52,5 @@ export default @inject('stores') @observer class LoaderComponent extends Compone
     );
   }
 }
+
+export default LoaderComponent;
diff --git a/src/components/ui/Modal/index.js b/src/components/ui/Modal/index.js
index a9fa0cd1b..3c7c66c59 100644
--- a/src/components/ui/Modal/index.js
+++ b/src/components/ui/Modal/index.js
@@ -10,7 +10,8 @@ import styles from './styles';
 
 // ReactModal.setAppElement('#root');
 
-export default @injectCSS(styles) class Modal extends Component {
+@injectCSS(styles)
+class Modal extends Component {
   static propTypes = {
     children: PropTypes.node.isRequired,
     className: PropTypes.string,
@@ -20,14 +21,14 @@ export default @injectCSS(styles) class Modal extends Component {
     close: PropTypes.func.isRequired,
     shouldCloseOnOverlayClick: PropTypes.bool,
     showClose: PropTypes.bool,
-  }
+  };
 
   static defaultProps = {
     className: null,
     portal: 'modal-portal',
     shouldCloseOnOverlayClick: false,
     showClose: true,
-  }
+  };
 
   render() {
     const {
@@ -53,21 +54,17 @@ export default @injectCSS(styles) class Modal extends Component {
         portal={portal}
         onRequestClose={close}
         shouldCloseOnOverlayClick={shouldCloseOnOverlayClick}
-        appElement={document.getElementById('root')}
+        appElement={document.querySelector('#root')}
       >
         {showClose && close && (
-          <button
-            type="button"
-            className={classes.close}
-            onClick={close}
-          >
+          <button type="button" className={classes.close} onClick={close}>
             <Icon icon={mdiClose} size={1.5} />
           </button>
         )}
-        <div className={classes.content}>
-          {children}
-        </div>
+        <div className={classes.content}>{children}</div>
       </ReactModal>
     );
   }
 }
+
+export default Modal;
diff --git a/src/components/ui/Radio.js b/src/components/ui/Radio.js
index e77714eb7..65a777ff1 100644
--- a/src/components/ui/Radio.js
+++ b/src/components/ui/Radio.js
@@ -4,7 +4,8 @@ import { observer } from 'mobx-react';
 import { Field } from 'mobx-react-form';
 import classnames from 'classnames';
 
-export default @observer class Radio extends Component {
+@observer
+class Radio extends Component {
   static propTypes = {
     field: PropTypes.instanceOf(Field).isRequired,
     className: PropTypes.string,
@@ -31,11 +32,7 @@ export default @observer class Radio extends Component {
   }
 
   render() {
-    const {
-      field,
-      className,
-      showLabel,
-    } = this.props;
+    const { field, className, showLabel } = this.props;
 
     return (
       <div
@@ -46,15 +43,12 @@ export default @observer class Radio extends Component {
         })}
       >
         {field.label && showLabel && (
-          <label
-            className="franz-form__label"
-            htmlFor={field.name}
-          >
+          <label className="franz-form__label" htmlFor={field.name}>
             {field.label}
           </label>
         )}
         <div className="franz-form__radio-wrapper">
-          {field.options.map((type) => (
+          {field.options.map(type => (
             <label
               key={type.value}
               htmlFor={`${field.id}-${type.value}`}
@@ -75,14 +69,10 @@ export default @observer class Radio extends Component {
             </label>
           ))}
         </div>
-        {field.error && (
-          <div
-            className="franz-form__error"
-          >
-            {field.error}
-          </div>
-        )}
+        {field.error && <div className="franz-form__error">{field.error}</div>}
       </div>
     );
   }
 }
+
+export default Radio;
diff --git a/src/components/ui/SearchInput.js b/src/components/ui/SearchInput.js
index 0b25734dd..2d760beab 100644
--- a/src/components/ui/SearchInput.js
+++ b/src/components/ui/SearchInput.js
@@ -4,7 +4,8 @@ import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import { debounce } from 'lodash';
 
-export default @observer class SearchInput extends Component {
+@observer
+class SearchInput extends Component {
   static propTypes = {
     value: PropTypes.string,
     placeholder: PropTypes.string,
@@ -27,7 +28,7 @@ export default @observer class SearchInput extends Component {
     onChange: () => null,
     onReset: () => null,
     autoFocus: false,
-  }
+  };
 
   input = null;
 
@@ -38,7 +39,10 @@ export default @observer class SearchInput extends Component {
       value: props.value,
     };
 
-    this.throttledOnChange = debounce(this.throttledOnChange, this.props.throttleDelay);
+    this.throttledOnChange = debounce(
+      this.throttledOnChange,
+      this.props.throttleDelay,
+    );
   }
 
   componentDidMount() {
@@ -80,24 +84,18 @@ export default @observer class SearchInput extends Component {
     const { value } = this.state;
 
     return (
-      <div
-        className={classnames([
-          className,
-          'search-input',
-        ])}
-      >
-        <label
-          htmlFor={name}
-          className="mdi mdi-magnify"
-        >
+      <div className={classnames([className, 'search-input'])}>
+        <label htmlFor={name} className="mdi mdi-magnify">
           <input
             name={name}
             id={name}
             type="text"
             placeholder={placeholder}
             value={value}
-            onChange={(e) => this.onChange(e)}
-            ref={(ref) => { this.input = ref; }}
+            onChange={e => this.onChange(e)}
+            ref={ref => {
+              this.input = ref;
+            }}
           />
         </label>
         {value.length > 0 && (
@@ -110,3 +108,5 @@ export default @observer class SearchInput extends Component {
     );
   }
 }
+
+export default SearchInput;
diff --git a/src/components/ui/Select.js b/src/components/ui/Select.js
index e7a5eafa8..5ac7ddd6d 100644
--- a/src/components/ui/Select.js
+++ b/src/components/ui/Select.js
@@ -4,7 +4,8 @@ import { observer } from 'mobx-react';
 import { Field } from 'mobx-react-form';
 import classnames from 'classnames';
 
-export default @observer class Select extends Component {
+@observer
+class Select extends Component {
   static propTypes = {
     field: PropTypes.instanceOf(Field).isRequired,
     className: PropTypes.string,
@@ -43,18 +44,12 @@ export default @observer class Select extends Component {
   }
 
   render() {
-    const {
-      field,
-      className,
-      showLabel,
-      disabled,
-      multiple,
-    } = this.props;
+    const { field, className, showLabel, disabled, multiple } = this.props;
 
     let selected = field.value;
 
     if (multiple) {
-      if (typeof field.value === 'string' && field.value.substr(0, 1) === '[') {
+      if (typeof field.value === 'string' && field.value.slice(0, 1) === '[') {
         // Value is JSON encoded
         selected = JSON.parse(field.value);
       } else if (typeof field.value === 'object') {
@@ -74,15 +69,12 @@ export default @observer class Select extends Component {
         })}
       >
         {field.label && showLabel && (
-          <label
-            className="franz-form__label"
-            htmlFor={field.name}
-          >
+          <label className="franz-form__label" htmlFor={field.name}>
             {field.label}
           </label>
         )}
         <select
-          onChange={multiple ? (e) => this.multipleChange(e) : field.onChange}
+          onChange={multiple ? e => this.multipleChange(e) : field.onChange}
           id={field.id}
           defaultValue={selected}
           className="franz-form__select"
@@ -90,7 +82,7 @@ export default @observer class Select extends Component {
           multiple={multiple}
           ref={this.element}
         >
-          {field.options.map((type) => (
+          {field.options.map(type => (
             <option
               key={type.value}
               value={type.value}
@@ -100,14 +92,10 @@ export default @observer class Select extends Component {
             </option>
           ))}
         </select>
-        {field.error && (
-          <div
-            className="franz-form__error"
-          >
-            {field.error}
-          </div>
-        )}
+        {field.error && <div className="franz-form__error">{field.error}</div>}
       </div>
     );
   }
 }
+
+export default Select;
diff --git a/src/components/ui/Slider.js b/src/components/ui/Slider.js
index f344449a0..6f17eae00 100644
--- a/src/components/ui/Slider.js
+++ b/src/components/ui/Slider.js
@@ -4,62 +4,64 @@ import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import { Field } from 'mobx-react-form';
 
-export default @observer class Slider extends Component {
-    static propTypes = {
-      field: PropTypes.instanceOf(Field).isRequired,
-      className: PropTypes.string,
-      showLabel: PropTypes.bool,
-      disabled: PropTypes.bool,
-    };
+@observer
+class Slider extends Component {
+  static propTypes = {
+    field: PropTypes.instanceOf(Field).isRequired,
+    className: PropTypes.string,
+    showLabel: PropTypes.bool,
+    disabled: PropTypes.bool,
+  };
 
-    static defaultProps = {
-      className: '',
-      showLabel: true,
-      disabled: false,
-    };
+  static defaultProps = {
+    className: '',
+    showLabel: true,
+    disabled: false,
+  };
 
-    onChange(e) {
-      const { field } = this.props;
+  onChange(e) {
+    const { field } = this.props;
 
-      field.onChange(e);
-    }
-
-    render() {
-      const {
-        field,
-        className,
-        showLabel,
-        disabled,
-      } = this.props;
+    field.onChange(e);
+  }
 
-      if (field.value === '' && field.default !== '') {
-        field.value = field.default;
-      }
+  render() {
+    const { field, className, showLabel, disabled } = this.props;
 
-      return (
-        <div
-          className={classnames([
-            'franz-form__field',
-            'franz-form__slider-wrapper',
-            className,
-          ])}
-        >
-          <div className="slider-container">
-            <input
-              className="slider"
-              type="range"
-              id={field.id}
-              name={field.name}
-              value={field.value}
-              min="1"
-              max="100"
-              onChange={(e) => (!disabled ? this.onChange(e) : null)}
-            />
-          </div>
+    if (field.value === '' && field.default !== '') {
+      field.value = field.default;
+    }
 
-          {field.error && <div className={field.error}>{field.error}</div>}
-          {field.label && showLabel && <label className="franz-form__label" htmlFor={field.id}>{field.label}</label>}
+    return (
+      <div
+        className={classnames([
+          'franz-form__field',
+          'franz-form__slider-wrapper',
+          className,
+        ])}
+      >
+        <div className="slider-container">
+          <input
+            className="slider"
+            type="range"
+            id={field.id}
+            name={field.name}
+            value={field.value}
+            min="1"
+            max="100"
+            onChange={e => (!disabled ? this.onChange(e) : null)}
+          />
         </div>
-      );
-    }
+
+        {field.error && <div className={field.error}>{field.error}</div>}
+        {field.label && showLabel && (
+          <label className="franz-form__label" htmlFor={field.id}>
+            {field.label}
+          </label>
+        )}
+      </div>
+    );
+  }
 }
+
+export default Slider;
diff --git a/src/components/ui/StatusBarTargetUrl.js b/src/components/ui/StatusBarTargetUrl.js
index 6fc50fe5c..ff4e8c795 100644
--- a/src/components/ui/StatusBarTargetUrl.js
+++ b/src/components/ui/StatusBarTargetUrl.js
@@ -5,7 +5,8 @@ import classnames from 'classnames';
 
 import Appear from './effects/Appear';
 
-export default @observer class StatusBarTargetUrl extends Component {
+@observer
+class StatusBarTargetUrl extends Component {
   static propTypes = {
     className: PropTypes.string,
     text: PropTypes.string,
@@ -17,10 +18,7 @@ export default @observer class StatusBarTargetUrl extends Component {
   };
 
   render() {
-    const {
-      className,
-      text,
-    } = this.props;
+    const { className, text } = this.props;
 
     return (
       <Appear
@@ -29,10 +27,10 @@ export default @observer class StatusBarTargetUrl extends Component {
           [`${className}`]: true,
         })}
       >
-        <div className="status-bar-target-url__content">
-          {text}
-        </div>
+        <div className="status-bar-target-url__content">{text}</div>
       </Appear>
     );
   }
 }
+
+export default StatusBarTargetUrl;
diff --git a/src/components/ui/Tabs/TabItem.js b/src/components/ui/Tabs/TabItem.js
deleted file mode 100644
index d0ef4e798..000000000
--- a/src/components/ui/Tabs/TabItem.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import React, { Component } from 'react';
-
-import { oneOrManyChildElements } from '../../../prop-types';
-
-export default class TabItem extends Component {
-  static propTypes = {
-    children: oneOrManyChildElements.isRequired,
-  };
-
-  render() {
-    const { children } = this.props;
-
-    return <>{children}</>;
-  }
-}
diff --git a/src/components/ui/Tabs/TabItem.tsx b/src/components/ui/Tabs/TabItem.tsx
new file mode 100644
index 000000000..bd613ddc7
--- /dev/null
+++ b/src/components/ui/Tabs/TabItem.tsx
@@ -0,0 +1,3 @@
+import React from 'react';
+
+export const TabItem = ({ children }) => <>{children}</>;
diff --git a/src/components/ui/Tabs/Tabs.js b/src/components/ui/Tabs/Tabs.js
index 56c76f215..195398708 100644
--- a/src/components/ui/Tabs/Tabs.js
+++ b/src/components/ui/Tabs/Tabs.js
@@ -5,7 +5,6 @@ import classnames from 'classnames';
 
 import { oneOrManyChildElements } from '../../../prop-types';
 
-export default
 @observer
 class Tab extends Component {
   constructor(props) {
@@ -28,7 +27,7 @@ class Tab extends Component {
 
   render() {
     const { children: childElements } = this.props;
-    const children = childElements.filter((c) => !!c);
+    const children = childElements.filter(c => !!c);
 
     if (children.length === 1) {
       return <div>{children}</div>;
@@ -69,3 +68,5 @@ class Tab extends Component {
     );
   }
 }
+
+export default Tab;
diff --git a/src/components/ui/Tabs/index.js b/src/components/ui/Tabs/index.js
deleted file mode 100644
index e4adb62c7..000000000
--- a/src/components/ui/Tabs/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Tabs from './Tabs';
-import TabItem from './TabItem';
-
-export default Tabs;
-
-export { TabItem };
diff --git a/src/components/ui/Toggle.js b/src/components/ui/Toggle.js
index 14330e5c7..bd7bc242d 100644
--- a/src/components/ui/Toggle.js
+++ b/src/components/ui/Toggle.js
@@ -4,7 +4,8 @@ import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import { Field } from 'mobx-react-form';
 
-export default @observer class Toggle extends Component {
+@observer
+class Toggle extends Component {
   static propTypes = {
     field: PropTypes.instanceOf(Field).isRequired,
     className: PropTypes.string,
@@ -25,12 +26,7 @@ export default @observer class Toggle extends Component {
   }
 
   render() {
-    const {
-      field,
-      className,
-      showLabel,
-      disabled,
-    } = this.props;
+    const { field, className, showLabel, disabled } = this.props;
 
     if (field.value === '' && field.default !== '') {
       field.value = field.default;
@@ -59,12 +55,18 @@ export default @observer class Toggle extends Component {
             name={field.name}
             value={field.name}
             checked={field.value}
-            onChange={(e) => (!disabled ? this.onChange(e) : null)}
+            onChange={e => (!disabled ? this.onChange(e) : null)}
           />
         </label>
         {field.error && <div className={field.error}>{field.error}</div>}
-        {field.label && showLabel && <label className="franz-form__label" htmlFor={field.id}>{field.label}</label>}
+        {field.label && showLabel && (
+          <label className="franz-form__label" htmlFor={field.id}>
+            {field.label}
+          </label>
+        )}
       </div>
     );
   }
 }
+
+export default Toggle;
diff --git a/src/components/ui/ToggleRaw.js b/src/components/ui/ToggleRaw.js
index 4700127d4..1fde879ac 100644
--- a/src/components/ui/ToggleRaw.js
+++ b/src/components/ui/ToggleRaw.js
@@ -6,7 +6,8 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
 
-export default @observer class ToggleRaw extends Component {
+@observer
+class ToggleRaw extends Component {
   static propTypes = {
     onChange: PropTypes.func.isRequired,
     field: PropTypes.shape({
@@ -34,12 +35,7 @@ export default @observer class ToggleRaw extends Component {
   }
 
   render() {
-    const {
-      field,
-      className,
-      showLabel,
-      disabled,
-    } = this.props;
+    const { field, className, showLabel, disabled } = this.props;
 
     return (
       <div
@@ -64,12 +60,18 @@ export default @observer class ToggleRaw extends Component {
             name={field.name}
             value={field.name}
             checked={field.value}
-            onChange={(e) => (!disabled ? this.onChange(e) : null)}
+            onChange={e => (!disabled ? this.onChange(e) : null)}
           />
         </label>
         {field.error && <div className={field.error}>{field.error}</div>}
-        {field.label && showLabel && <label className="franz-form__label" htmlFor={field.id}>{field.label}</label>}
+        {field.label && showLabel && (
+          <label className="franz-form__label" htmlFor={field.id}>
+            {field.label}
+          </label>
+        )}
       </div>
     );
   }
 }
+
+export default ToggleRaw;
diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js
index c58d69374..8f4499e7b 100644
--- a/src/components/ui/WebviewLoader/index.js
+++ b/src/components/ui/WebviewLoader/index.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import FullscreenLoader from '../FullscreenLoader';
 import styles from './styles';
@@ -10,23 +10,21 @@ import styles from './styles';
 const messages = defineMessages({
   loading: {
     id: 'service.webviewLoader.loading',
-    defaultMessage: '!!!Loading {service}',
+    defaultMessage: 'Loading {service}',
   },
 });
 
-export default @injectSheet(styles) @observer class WebviewLoader extends Component {
+@injectSheet(styles)
+@observer
+class WebviewLoader extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     classes: PropTypes.object.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const { classes, name } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
     return (
       <FullscreenLoader
         className={classes.component}
@@ -35,3 +33,5 @@ export default @injectSheet(styles) @observer class WebviewLoader extends Compon
     );
   }
 }
+
+export default injectIntl(WebviewLoader);
diff --git a/src/components/ui/effects/Appear.js b/src/components/ui/effects/Appear.js
index 1255fce2e..183181f8f 100644
--- a/src/components/ui/effects/Appear.js
+++ b/src/components/ui/effects/Appear.js
@@ -1,11 +1,11 @@
-/* eslint-disable react/no-did-mount-set-state */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
 
 export default class Appear extends Component {
   static propTypes = {
-    children: PropTypes.any.isRequired, // eslint-disable-line
+    // eslint-disable-next-line react/forbid-prop-types
+    children: PropTypes.any.isRequired,
     transitionName: PropTypes.string,
     className: PropTypes.string,
   };
@@ -24,11 +24,7 @@ export default class Appear extends Component {
   }
 
   render() {
-    const {
-      children,
-      transitionName,
-      className,
-    } = this.props;
+    const { children, transitionName, className } = this.props;
 
     if (!this.state.mounted) {
       return null;
diff --git a/src/components/util/ErrorBoundary/index.js b/src/components/util/ErrorBoundary/index.js
index 5db0db226..9c789e981 100644
--- a/src/components/util/ErrorBoundary/index.js
+++ b/src/components/util/ErrorBoundary/index.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import injectSheet from 'react-jss';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import Button from '../../ui/Button';
 
@@ -10,26 +10,23 @@ import styles from './styles';
 const messages = defineMessages({
   headline: {
     id: 'app.errorHandler.headline',
-    defaultMessage: '!!!Something went wrong.',
+    defaultMessage: 'Something went wrong.',
   },
   action: {
     id: 'app.errorHandler.action',
-    defaultMessage: '!!!Reload',
+    defaultMessage: 'Reload',
   },
 });
 
-export default @injectSheet(styles) class ErrorBoundary extends Component {
+@injectSheet(styles)
+class ErrorBoundary extends Component {
   state = {
     hasError: false,
-  }
+  };
 
   static propTypes = {
     classes: PropTypes.object.isRequired,
     children: PropTypes.node.isRequired,
-  }
-
-  static contextTypes = {
-    intl: intlShape,
   };
 
   componentDidCatch() {
@@ -38,7 +35,7 @@ export default @injectSheet(styles) class ErrorBoundary extends Component {
 
   render() {
     const { classes } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     if (this.state.hasError) {
       return (
@@ -58,3 +55,5 @@ export default @injectSheet(styles) class ErrorBoundary extends Component {
     return this.props.children;
   }
 }
+
+export default injectIntl(ErrorBoundary);
diff --git a/src/config.ts b/src/config.ts
index 7bb2525a5..fe9145021 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -2,10 +2,12 @@
 
 import ms from 'ms';
 
+import { DEFAULT_ACCENT_COLOR } from '@meetfranz/theme';
+
 export const CHECK_INTERVAL = ms('1h'); // How often should we perform checks
 
 export const LOCAL_HOSTNAME = 'localhost';
-export const LOCAL_PORT = 45569;
+export const LOCAL_PORT = 45_569;
 export const LOCAL_API = 'http://localhost:3000';
 export const DEV_FRANZ_API = 'https://dev.franzinfra.com';
 
@@ -158,10 +160,6 @@ export const FRANZ_SERVICE_REQUEST = `${GITHUB_FERDI_URL}/recipes/issues`;
 export const FRANZ_TRANSLATION = 'https://crowdin.com/project/getferdi';
 export const FRANZ_DEV_DOCS = 'http://bit.ly/franz-dev-hub';
 
-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 LOCAL_SERVER = 'You are using Ferdi without a server';
@@ -180,3 +178,59 @@ export const TODOS_PARTITION_ID = 'persist:todos';
 export const CUSTOM_WEBSITE_RECIPE_ID = 'franz-custom-website';
 
 export const DEFAULT_SERVICE_ORDER = 99; // something high enough that it gets added to the end of the already-added services on the left sidebar
+
+export const DEFAULT_APP_SETTINGS = {
+  autoLaunchInBackground: false,
+  runInBackground: true,
+  reloadAfterResume: true,
+  enableSystemTray: true,
+  startMinimized: false,
+  confirmOnQuit: false,
+  minimizeToSystemTray: false,
+  closeToSystemTray: false,
+  privateNotifications: false,
+  clipboardNotifications: true,
+  notifyTaskBarOnMessage: false,
+  showDisabledServices: true,
+  showMessageBadgeWhenMuted: true,
+  showDragArea: false,
+  enableSpellchecking: true,
+  spellcheckerLanguage: 'en-us',
+  darkMode: false,
+  splitMode: false,
+  locale: '',
+  fallbackLocale: 'en-US',
+  beta: false,
+  isAppMuted: false,
+  enableGPUAcceleration: true,
+
+  // Ferdi specific options
+  server: LIVE_FERDI_API,
+  predefinedTodoServer: DEFAULT_TODO_SERVICE,
+  autohideMenuBar: false,
+  lockingFeatureEnabled: false,
+  locked: false,
+  lockedPassword: '',
+  useTouchIdToUnlock: true,
+  scheduledDNDEnabled: false,
+  scheduledDNDStart: '17:00',
+  scheduledDNDEnd: '09:00',
+  hibernateOnStartup: true,
+  hibernationStrategy: '300', // seconds
+  wakeUpStrategy: '300', // seconds
+  inactivityLock: 0,
+  automaticUpdates: true,
+  universalDarkMode: true,
+  userAgentPref: '',
+  adaptableDarkMode: true,
+  accentColor: DEFAULT_ACCENT_COLOR,
+  serviceRibbonWidth: 68,
+  iconSize: iconSizeBias,
+  sentry: false,
+  nightly: false,
+  navigationBarBehaviour: 'custom',
+  searchEngine: SEARCH_ENGINE_DDG,
+  useVerticalStyle: false,
+  alwaysShowWorkspaces: false,
+  liftSingleInstanceLock: false,
+};
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js
index a0d50ab54..7673ab9c7 100644
--- a/src/containers/auth/AuthLayoutContainer.js
+++ b/src/containers/auth/AuthLayoutContainer.js
@@ -14,7 +14,6 @@ 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 {
@@ -85,3 +84,5 @@ AuthLayoutContainer.wrappedComponent.propTypes = {
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
 };
+
+export default AuthLayoutContainer;
diff --git a/src/containers/auth/ChangeServerScreen.js b/src/containers/auth/ChangeServerScreen.js
index 28ecc0198..a8910e7b1 100644
--- a/src/containers/auth/ChangeServerScreen.js
+++ b/src/containers/auth/ChangeServerScreen.js
@@ -5,7 +5,9 @@ import { RouterStore } from 'mobx-react-router';
 import ChangeServer from '../../components/auth/ChangeServer';
 import SettingsStore from '../../stores/SettingsStore';
 
-export default @inject('stores', 'actions') @observer class ChangeServerScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class ChangeServerScreen extends Component {
   constructor(props) {
     super(props);
 
@@ -28,12 +30,7 @@ export default @inject('stores', 'actions') @observer class ChangeServerScreen e
     const { stores } = this.props;
     const { server } = stores.settings.all.app;
 
-    return (
-      <ChangeServer
-        onSubmit={this.onSubmit}
-        server={server}
-      />
-    );
+    return <ChangeServer onSubmit={this.onSubmit} server={server} />;
   }
 }
 
@@ -46,3 +43,5 @@ ChangeServerScreen.wrappedComponent.propTypes = {
     router: PropTypes.instanceOf(RouterStore).isRequired,
   }).isRequired,
 };
+
+export default ChangeServerScreen;
diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js
index 9143ef616..ce786bdb8 100644
--- a/src/containers/auth/ImportScreen.js
+++ b/src/containers/auth/ImportScreen.js
@@ -5,7 +5,9 @@ import { RouterStore } from 'mobx-react-router';
 import Import from '../../components/auth/Import';
 import UserStore from '../../stores/UserStore';
 
-export default @inject('stores', 'actions') @observer class ImportScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class ImportScreen extends Component {
   render() {
     const { actions, stores } = this.props;
 
@@ -33,3 +35,5 @@ ImportScreen.wrappedComponent.propTypes = {
     router: PropTypes.instanceOf(RouterStore).isRequired,
   }).isRequired,
 };
+
+export default ImportScreen;
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js
index 66afaf7e1..d9d52a57c 100644
--- a/src/containers/auth/InviteScreen.js
+++ b/src/containers/auth/InviteScreen.js
@@ -3,16 +3,13 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import Invite from '../../components/auth/Invite';
 
-export default @inject('stores', 'actions') @observer class InviteScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class InviteScreen extends Component {
   render() {
     const { actions } = this.props;
 
-    return (
-      <Invite
-        onSubmit={actions.user.invite}
-        embed={false}
-      />
-    );
+    return <Invite onSubmit={actions.user.invite} embed={false} />;
   }
 }
 
@@ -23,3 +20,5 @@ InviteScreen.wrappedComponent.propTypes = {
     }).isRequired,
   }).isRequired,
 };
+
+export default InviteScreen;
diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js
index 4e97c6573..a49549731 100644
--- a/src/containers/auth/LockedScreen.js
+++ b/src/containers/auth/LockedScreen.js
@@ -7,10 +7,12 @@ import SettingsStore from '../../stores/SettingsStore';
 import { hash } from '../../helpers/password-helpers';
 import UserStore from '../../stores/UserStore';
 
-export default @inject('stores', 'actions') @observer class LockedScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class LockedScreen extends Component {
   state = {
     error: false,
-  }
+  };
 
   constructor(props) {
     super(props);
@@ -83,3 +85,5 @@ LockedScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
+
+export default LockedScreen;
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js
index e636f99e0..cab73316b 100644
--- a/src/containers/auth/LoginScreen.js
+++ b/src/containers/auth/LoginScreen.js
@@ -6,7 +6,9 @@ import UserStore from '../../stores/UserStore';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
-export default @inject('stores', 'actions') @observer class LoginScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class LoginScreen extends Component {
   static propTypes = {
     error: globalErrorPropType.isRequired,
   };
@@ -18,7 +20,9 @@ export default @inject('stores', 'actions') @observer class LoginScreen extends
         onSubmit={actions.user.login}
         isSubmitting={stores.user.loginRequest.isExecuting}
         isTokenExpired={stores.user.isTokenExpired}
-        isServerLogout={stores.user.logoutReason === stores.user.logoutReasonTypes.SERVER}
+        isServerLogout={
+          stores.user.logoutReason === stores.user.logoutReasonTypes.SERVER
+        }
         signupRoute={stores.user.signupRoute}
         passwordRoute={stores.user.passwordRoute}
         changeServerRoute={stores.user.changeServerRoute}
@@ -36,3 +40,5 @@ LoginScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
+
+export default LoginScreen;
diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js
index 9c6732f1a..86a746b9b 100644
--- a/src/containers/auth/PasswordScreen.js
+++ b/src/containers/auth/PasswordScreen.js
@@ -4,7 +4,9 @@ import { inject, observer } from 'mobx-react';
 import Password from '../../components/auth/Password';
 import UserStore from '../../stores/UserStore';
 
-export default @inject('stores', 'actions') @observer class PasswordScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class PasswordScreen extends Component {
   render() {
     const { actions, stores } = this.props;
 
@@ -28,3 +30,5 @@ PasswordScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
+
+export default PasswordScreen;
diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.js
index d7036969a..efda2e9d2 100644
--- a/src/containers/auth/SetupAssistantScreen.js
+++ b/src/containers/auth/SetupAssistantScreen.js
@@ -14,7 +14,6 @@ import ServicesStore from '../../stores/ServicesStore';
 import RecipesStore from '../../stores/RecipesStore';
 import UserStore from '../../stores/UserStore';
 
-export default
 @inject('stores', 'actions')
 @observer
 class SetupAssistantScreen extends Component {
@@ -134,3 +133,5 @@ SetupAssistantScreen.wrappedComponent.propTypes = {
     recipe: PropTypes.instanceOf(RecipesStore).isRequired,
   }).isRequired,
 };
+
+export default SetupAssistantScreen;
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js
index 38c5dfb43..b20a7fd62 100644
--- a/src/containers/auth/SignupScreen.js
+++ b/src/containers/auth/SignupScreen.js
@@ -8,7 +8,9 @@ import FeaturesStore from '../../stores/FeaturesStore';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
-export default @inject('stores', 'actions') @observer class SignupScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class SignupScreen extends Component {
   static propTypes = {
     error: globalErrorPropType.isRequired,
   };
@@ -24,7 +26,7 @@ export default @inject('stores', 'actions') @observer class SignupScreen extends
 
     return (
       <Signup
-        onSubmit={(values) => this.onSignup(values)}
+        onSubmit={values => this.onSignup(values)}
         isSubmitting={stores.user.signupRequest.isExecuting}
         loginRoute={stores.user.loginRoute}
         changeServerRoute={stores.user.changeServerRoute}
@@ -43,3 +45,5 @@ SignupScreen.wrappedComponent.propTypes = {
     features: PropTypes.instanceOf(FeaturesStore).isRequired,
   }).isRequired,
 };
+
+export default SignupScreen;
diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js
index bfcc880d0..d169e5f0f 100644
--- a/src/containers/auth/WelcomeScreen.js
+++ b/src/containers/auth/WelcomeScreen.js
@@ -6,7 +6,9 @@ import Welcome from '../../components/auth/Welcome';
 import UserStore from '../../stores/UserStore';
 import RecipePreviewsStore from '../../stores/RecipePreviewsStore';
 
-export default @inject('stores', 'actions') @observer class LoginScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class LoginScreen extends Component {
   render() {
     const { user, recipePreviews } = this.props.stores;
 
@@ -27,3 +29,5 @@ LoginScreen.wrappedComponent.propTypes = {
     recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired,
   }).isRequired,
 };
+
+export default LoginScreen;
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 83a25168b..3e92b0610 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -25,7 +25,6 @@ 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 {
@@ -199,3 +198,5 @@ AppLayoutContainer.wrappedComponent.propTypes = {
   }).isRequired,
   children: oneOrManyChildElements,
 };
+
+export default AppLayoutContainer;
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index 8d92b01be..1515fc22b 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -10,9 +10,8 @@ import SettingsStore from '../../stores/SettingsStore';
 import AccountDashboard from '../../components/settings/account/AccountDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { LIVE_FRANZ_API } from '../../config';
-import { WEBSITE } from '../../environment';
+import { WEBSITE } from '../../environment-remote';
 
-export default
 @inject('stores', 'actions')
 @observer
 class AccountScreen extends Component {
@@ -33,14 +32,12 @@ class AccountScreen extends Component {
 
     const api = stores.settings.all.app.server;
 
-    let url;
-    if (api === LIVE_FRANZ_API) {
-      url = stores.user.getAuthURL(
-        `${WEBSITE}${route}?utm_source=app&utm_medium=account_dashboard`,
-      );
-    } else {
-      url = `${api}${route}`;
-    }
+    const url =
+      api === LIVE_FRANZ_API
+        ? stores.user.getAuthURL(
+            `${WEBSITE}${route}?utm_source=app&utm_medium=account_dashboard`,
+          )
+        : `${api}${route}`;
 
     actions.app.openExternalUrl({ url });
   }
@@ -58,16 +55,16 @@ class AccountScreen extends Component {
           user={user.data}
           isLoading={isLoadingUserInfo}
           userInfoRequestFailed={
-            user.getUserInfoRequest.wasExecuted
-            && user.getUserInfoRequest.isError
+            user.getUserInfoRequest.wasExecuted &&
+            user.getUserInfoRequest.isError
           }
           retryUserInfoRequest={() => this.reloadData()}
           onCloseSubscriptionWindow={() => this.onCloseWindow()}
           deleteAccount={userActions.delete}
           isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
           isDeleteAccountSuccessful={
-            user.deleteAccountRequest.wasExecuted
-            && !user.deleteAccountRequest.isError
+            user.deleteAccountRequest.wasExecuted &&
+            !user.deleteAccountRequest.isError
           }
           openEditAccount={() => this.handleWebsiteLink('/user/profile')}
           openInvoices={() => this.handleWebsiteLink('/user/invoices')}
@@ -89,3 +86,5 @@ AccountScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
+
+export default AccountScreen;
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index c880e97ae..dee7e7cff 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import { RouterStore } from 'mobx-react-router';
 import UserStore from '../../stores/UserStore';
@@ -27,87 +27,89 @@ import globalMessages from '../../i18n/globalMessages';
 const messages = defineMessages({
   name: {
     id: 'settings.service.form.name',
-    defaultMessage: '!!!Name',
+    defaultMessage: 'Name',
   },
   enableService: {
     id: 'settings.service.form.enableService',
-    defaultMessage: '!!!Enable service',
+    defaultMessage: 'Enable service',
   },
   enableHibernation: {
     id: 'settings.service.form.enableHibernation',
-    defaultMessage: '!!!Enable hibernation',
+    defaultMessage: 'Enable hibernation',
   },
   enableNotification: {
     id: 'settings.service.form.enableNotification',
-    defaultMessage: '!!!Enable Notifications',
+    defaultMessage: 'Enable notifications',
   },
   enableBadge: {
     id: 'settings.service.form.enableBadge',
-    defaultMessage: '!!!Show unread message badges',
+    defaultMessage: 'Show unread message badges',
   },
   enableAudio: {
     id: 'settings.service.form.enableAudio',
-    defaultMessage: '!!!Enable audio',
+    defaultMessage: 'Enable audio',
   },
   team: {
     id: 'settings.service.form.team',
-    defaultMessage: '!!!Team',
+    defaultMessage: 'Team',
   },
   customUrl: {
     id: 'settings.service.form.customUrl',
-    defaultMessage: '!!!Service URL',
+    defaultMessage: 'Custom server',
   },
   indirectMessages: {
     id: 'settings.service.form.indirectMessages',
-    defaultMessage: '!!!Show message badge for all new messages',
+    defaultMessage: 'Show message badge for all new messages',
   },
   icon: {
     id: 'settings.service.form.icon',
-    defaultMessage: '!!!Custom icon',
+    defaultMessage: 'Custom icon',
   },
   enableDarkMode: {
     id: 'settings.service.form.enableDarkMode',
-    defaultMessage: '!!!Enable Dark Mode',
+    defaultMessage: 'Enable Dark Mode',
   },
   darkReaderBrightness: {
     id: 'settings.service.form.darkReaderBrightness',
-    defaultMessage: '!!!Dark Reader Brightness',
+    defaultMessage: 'Dark Reader Brightness',
   },
   darkReaderContrast: {
     id: 'settings.service.form.darkReaderContrast',
-    defaultMessage: '!!!Dark Reader Contrast',
+    defaultMessage: 'Dark Reader Contrast',
   },
   darkReaderSepia: {
     id: 'settings.service.form.darkReaderSepia',
-    defaultMessage: '!!!Dark Reader Sepia',
+    defaultMessage: 'Dark Reader Sepia',
+  },
+  onlyShowFavoritesInUnreadCount: {
+    id: 'settings.service.form.onlyShowFavoritesInUnreadCount',
+    defaultMessage: 'Only show Favorites in unread count',
   },
   enableProxy: {
     id: 'settings.service.form.proxy.isEnabled',
-    defaultMessage: '!!!Use Proxy',
+    defaultMessage: 'Use Proxy',
   },
   proxyHost: {
     id: 'settings.service.form.proxy.host',
-    defaultMessage: '!!!Proxy Host/IP',
+    defaultMessage: 'Proxy Host/IP',
   },
   proxyPort: {
     id: 'settings.service.form.proxy.port',
-    defaultMessage: '!!!Port',
+    defaultMessage: 'Port',
   },
   proxyUser: {
     id: 'settings.service.form.proxy.user',
-    defaultMessage: '!!!User',
+    defaultMessage: 'User (optional)',
   },
   proxyPassword: {
     id: 'settings.service.form.proxy.password',
-    defaultMessage: '!!!Password',
+    defaultMessage: 'Password (optional)',
   },
 });
 
-export default @inject('stores', 'actions') @observer class EditServiceScreen extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
+@inject('stores', 'actions')
+@observer
+class EditServiceScreen extends Component {
   onSubmit(data) {
     const { action } = this.props.router.params;
     const { recipes, services } = this.props.stores;
@@ -132,27 +134,31 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
   }
 
   prepareForm(recipe, service, proxy) {
-    const {
-      intl,
-    } = this.context;
+    const { intl } = this.props;
 
-    const {
-      stores,
-      router,
-    } = this.props;
+    const { stores, router } = this.props;
 
     const { action } = router.params;
 
-    let defaultSpellcheckerLanguage = SPELLCHECKER_LOCALES[stores.settings.app.spellcheckerLanguage];
+    let defaultSpellcheckerLanguage =
+      SPELLCHECKER_LOCALES[stores.settings.app.spellcheckerLanguage];
 
     if (stores.settings.app.spellcheckerLanguage === 'automatic') {
-      defaultSpellcheckerLanguage = intl.formatMessage(globalMessages.spellcheckerAutomaticDetectionShort);
+      defaultSpellcheckerLanguage = intl.formatMessage(
+        globalMessages.spellcheckerAutomaticDetectionShort,
+      );
     }
 
     const spellcheckerLanguage = getSelectOptions({
       locales: SPELLCHECKER_LOCALES,
-      resetToDefaultText: intl.formatMessage(globalMessages.spellcheckerSystemDefault, { default: defaultSpellcheckerLanguage }),
-      automaticDetectionText: stores.settings.app.spellcheckerLanguage !== 'automatic' ? intl.formatMessage(globalMessages.spellcheckerAutomaticDetection) : '',
+      resetToDefaultText: intl.formatMessage(
+        globalMessages.spellcheckerSystemDefault,
+        { default: defaultSpellcheckerLanguage },
+      ),
+      automaticDetectionText:
+        stores.settings.app.spellcheckerLanguage !== 'automatic'
+          ? intl.formatMessage(globalMessages.spellcheckerAutomaticDetection)
+          : '',
     });
 
     const config = {
@@ -169,7 +175,10 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
         },
         isHibernationEnabled: {
           label: intl.formatMessage(messages.enableHibernation),
-          value: action !== 'edit' ? recipe.autoHibernate : service.isHibernationEnabled,
+          value:
+            action !== 'edit'
+              ? recipe.autoHibernate
+              : service.isHibernationEnabled,
           default: true,
         },
         isNotificationEnabled: {
@@ -200,17 +209,23 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
         },
         darkReaderBrightness: {
           label: intl.formatMessage(messages.darkReaderBrightness),
-          value: service.darkReaderSettings ? service.darkReaderSettings.brightness : undefined,
+          value: service.darkReaderSettings
+            ? service.darkReaderSettings.brightness
+            : undefined,
           default: 100,
         },
         darkReaderContrast: {
           label: intl.formatMessage(messages.darkReaderContrast),
-          value: service.darkReaderSettings ? service.darkReaderSettings.contrast : undefined,
+          value: service.darkReaderSettings
+            ? service.darkReaderSettings.contrast
+            : undefined,
           default: 90,
         },
         darkReaderSepia: {
           label: intl.formatMessage(messages.darkReaderSepia),
-          value: service.darkReaderSettings ? service.darkReaderSettings.sepia : undefined,
+          value: service.darkReaderSettings
+            ? service.darkReaderSettings.sepia
+            : undefined,
           default: 10,
         },
         spellcheckerLanguage: {
@@ -252,7 +267,10 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
     // More fine grained and use case specific validation rules
     if (recipe.hasTeamId && recipe.hasCustomUrl) {
       config.fields.team.validators = [oneRequired(['team', 'customUrl'])];
-      config.fields.customUrl.validators = [url, oneRequired(['team', 'customUrl'])];
+      config.fields.customUrl.validators = [
+        url,
+        oneRequired(['team', 'customUrl']),
+      ];
     }
 
     // If a service can be hosted and has a teamId or customUrl
@@ -275,6 +293,16 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
       });
     }
 
+    if (recipe.allowFavoritesDelineationInUnreadCount) {
+      Object.assign(config.fields, {
+        onlyShowFavoritesInUnreadCount: {
+          label: intl.formatMessage(messages.onlyShowFavoritesInUnreadCount),
+          value: service.onlyShowFavoritesInUnreadCount,
+          default: false,
+        },
+      });
+    }
+
     if (proxy.isEnabled) {
       const serviceProxyConfig = stores.settings.proxy[service.id] || {};
 
@@ -344,9 +372,7 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
   }
 
   render() {
-    const {
-      recipes, services, user,
-    } = this.props.stores;
+    const { recipes, services, user } = this.props.stores;
     const { action } = this.props.router.params;
 
     let recipe;
@@ -358,9 +384,7 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
 
       // TODO: render error message when recipe is `null`
       if (!recipe) {
-        return (
-          <ServiceError />
-        );
+        return <ServiceError />;
       }
     } else {
       service = services.activeSettings;
@@ -372,13 +396,11 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
     }
 
     if (isLoading) {
-      return (<div>Loading...</div>);
+      return <div>Loading...</div>;
     }
 
     if (!recipe) {
-      return (
-        <div>something went wrong</div>
-      );
+      return <div>something went wrong</div>;
     }
 
     const form = this.prepareForm(recipe, service, proxyFeature);
@@ -392,11 +414,14 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
           user={user.data}
           form={form}
           status={services.actionStatus}
-          isSaving={services.updateServiceRequest.isExecuting || services.createServiceRequest.isExecuting}
+          isSaving={
+            services.updateServiceRequest.isExecuting ||
+            services.createServiceRequest.isExecuting
+          }
           isDeleting={services.deleteServiceRequest.isExecuting}
-          onSubmit={(d) => this.onSubmit(d)}
+          onSubmit={d => this.onSubmit(d)}
           onDelete={() => this.deleteService()}
-          openRecipeFile={(file) => this.openRecipeFile(file)}
+          openRecipeFile={file => this.openRecipeFile(file)}
           isProxyFeatureEnabled={proxyFeature.isEnabled}
         />
       </ErrorBoundary>
@@ -417,3 +442,5 @@ EditServiceScreen.wrappedComponent.propTypes = {
     service: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
 };
+
+export default injectIntl(EditServiceScreen);
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 09244bc3c..1b05644f9 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import AppStore from '../../stores/AppStore';
 import SettingsStore from '../../stores/SettingsStore';
@@ -10,10 +10,18 @@ import TodosStore from '../../features/todos/store';
 import Form from '../../lib/Form';
 import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
 import {
-  HIBERNATION_STRATEGIES, SIDEBAR_WIDTH, ICON_SIZES, NAVIGATION_BAR_BEHAVIOURS, SEARCH_ENGINE_NAMES, TODO_APPS,
-  DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED, DEFAULT_IS_FEATURE_ENABLED_BY_USER, WAKE_UP_STRATEGIES,
+  DEFAULT_APP_SETTINGS,
+  HIBERNATION_STRATEGIES,
+  SIDEBAR_WIDTH,
+  ICON_SIZES,
+  NAVIGATION_BAR_BEHAVIOURS,
+  SEARCH_ENGINE_NAMES,
+  TODO_APPS,
+  DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED,
+  DEFAULT_IS_FEATURE_ENABLED_BY_USER,
+  WAKE_UP_STRATEGIES,
 } from '../../config';
-import { DEFAULT_APP_SETTINGS, isMac } from '../../environment';
+import { isMac } from '../../environment';
 
 import { getSelectOptions } from '../../helpers/i18n-helpers';
 import { hash } from '../../helpers/password-helpers';
@@ -31,195 +39,197 @@ const debug = require('debug')('Ferdi:EditSettingsScreen');
 const messages = defineMessages({
   autoLaunchOnStart: {
     id: 'settings.app.form.autoLaunchOnStart',
-    defaultMessage: '!!!Launch Ferdi on start',
+    defaultMessage: 'Launch Ferdi on start',
   },
   autoLaunchInBackground: {
     id: 'settings.app.form.autoLaunchInBackground',
-    defaultMessage: '!!!Open in background',
+    defaultMessage: 'Open in background',
   },
   runInBackground: {
     id: 'settings.app.form.runInBackground',
-    defaultMessage: '!!!Keep Ferdi in background when closing the window',
+    defaultMessage: 'Keep Ferdi in background when closing the window',
   },
   startMinimized: {
     id: 'settings.app.form.startMinimized',
-    defaultMessage: '!!!Start minimized',
+    defaultMessage: 'Start minimized',
   },
   confirmOnQuit: {
     id: 'settings.app.form.confirmOnQuit',
-    defaultMessage: '!!!Confirm when quitting Ferdi',
+    defaultMessage: 'Confirm when quitting Ferdi',
   },
   enableSystemTray: {
     id: 'settings.app.form.enableSystemTray',
-    defaultMessage: '!!!Always show Ferdi in System Tray',
+    defaultMessage: 'Always show Ferdi in System Tray',
   },
   enableMenuBar: {
     id: 'settings.app.form.enableMenuBar',
-    defaultMessage: '!!!Always show Ferdi in Menu Bar',
+    defaultMessage: 'Always show Ferdi in Menu Bar',
   },
   reloadAfterResume: {
     id: 'settings.app.form.reloadAfterResume',
-    defaultMessage: '!!!Reload Ferdi after system resume',
+    defaultMessage: 'Reload Ferdi after system resume',
   },
   minimizeToSystemTray: {
     id: 'settings.app.form.minimizeToSystemTray',
-    defaultMessage: '!!!Minimize Ferdi to system tray',
+    defaultMessage: 'Minimize Ferdi to system tray',
   },
   closeToSystemTray: {
     id: 'settings.app.form.closeToSystemTray',
-    defaultMessage: '!!!Close Ferdi to system tray',
+    defaultMessage: 'Close Ferdi to system tray',
   },
   privateNotifications: {
     id: 'settings.app.form.privateNotifications',
-    defaultMessage: '!!!Don\'t show message content in notifications',
+    defaultMessage: "Don't show message content in notifications",
   },
   clipboardNotifications: {
     id: 'settings.app.form.clipboardNotifications',
-    defaultMessage: '!!!Don\'t show notifications for clipboard events',
+    defaultMessage: "Don't show notifications for clipboard events",
   },
   notifyTaskBarOnMessage: {
     id: 'settings.app.form.notifyTaskBarOnMessage',
-    defaultMessage: '!!!Notify TaskBar/Dock on new message',
+    defaultMessage: 'Notify TaskBar/Dock on new message',
   },
   navigationBarBehaviour: {
     id: 'settings.app.form.navigationBarBehaviour',
-    defaultMessage: '!!!Navigation bar behaviour',
+    defaultMessage: 'Navigation bar behaviour',
   },
   searchEngine: {
     id: 'settings.app.form.searchEngine',
-    defaultMessage: '!!!Search engine',
+    defaultMessage: 'Search engine',
   },
   sentry: {
     id: 'settings.app.form.sentry',
-    defaultMessage: '!!!Send telemetry data',
+    defaultMessage: 'Send telemetry data',
   },
   hibernateOnStartup: {
     id: 'settings.app.form.hibernateOnStartup',
-    defaultMessage: '!!!Keep services in hibernation on startup',
+    defaultMessage: 'Keep services in hibernation on startup',
   },
   hibernationStrategy: {
     id: 'settings.app.form.hibernationStrategy',
-    defaultMessage: '!!!Hibernation strategy',
+    defaultMessage: 'Hibernation strategy',
   },
   wakeUpStrategy: {
     id: 'settings.app.form.wakeUpStrategy',
-    defaultMessage: '!!!Wake up strategy',
+    defaultMessage: 'Wake up strategy',
   },
   predefinedTodoServer: {
     id: 'settings.app.form.predefinedTodoServer',
-    defaultMessage: '!!!Todo Server',
+    defaultMessage: 'Todo Server',
   },
   customTodoServer: {
     id: 'settings.app.form.customTodoServer',
-    defaultMessage: '!!!Custom TodoServer',
+    defaultMessage: 'Custom Todo Server',
   },
   enableLock: {
     id: 'settings.app.form.enableLock',
-    defaultMessage: '!!!Enable Password Lock',
+    defaultMessage: 'Enable Password Lock',
   },
   lockPassword: {
     id: 'settings.app.form.lockPassword',
-    defaultMessage: '!!!Password',
+    defaultMessage: 'Password',
   },
   useTouchIdToUnlock: {
     id: 'settings.app.form.useTouchIdToUnlock',
-    defaultMessage: '!!!Allow using Touch ID to unlock',
+    defaultMessage: 'Allow using TouchID to unlock Ferdi',
   },
   inactivityLock: {
     id: 'settings.app.form.inactivityLock',
-    defaultMessage: '!!!Lock after inactivity',
+    defaultMessage: 'Lock after inactivity',
   },
   scheduledDNDEnabled: {
     id: 'settings.app.form.scheduledDNDEnabled',
-    defaultMessage: '!!!Enable scheduled Do-not-Disturb',
+    defaultMessage: 'Enable scheduled Do-not-Disturb',
   },
   scheduledDNDStart: {
     id: 'settings.app.form.scheduledDNDStart',
-    defaultMessage: '!!!From',
+    defaultMessage: 'From',
   },
   scheduledDNDEnd: {
     id: 'settings.app.form.scheduledDNDEnd',
-    defaultMessage: '!!!To',
+    defaultMessage: 'To',
   },
   language: {
     id: 'settings.app.form.language',
-    defaultMessage: '!!!Language',
+    defaultMessage: 'Language',
   },
   darkMode: {
     id: 'settings.app.form.darkMode',
-    defaultMessage: '!!!Dark Mode',
+    defaultMessage: 'Enable Dark Mode',
   },
   adaptableDarkMode: {
     id: 'settings.app.form.adaptableDarkMode',
-    defaultMessage: '!!!Synchronize dark mode with my OS\'s dark mode setting',
+    defaultMessage: "Synchronize dark mode with my OS's dark mode setting",
   },
   universalDarkMode: {
     id: 'settings.app.form.universalDarkMode',
-    defaultMessage: '!!!Enable universal Dark Mode',
+    defaultMessage: 'Enable universal Dark Mode',
+  },
+  splitMode: {
+    id: 'settings.app.form.splitMode',
+    defaultMessage: 'Enable Split View Mode',
   },
   serviceRibbonWidth: {
     id: 'settings.app.form.serviceRibbonWidth',
-    defaultMessage: '!!!Sidebar width',
+    defaultMessage: 'Sidebar width',
   },
   iconSize: {
     id: 'settings.app.form.iconSize',
-    defaultMessage: '!!!Service icon size',
+    defaultMessage: 'Service icon size',
   },
   useVerticalStyle: {
     id: 'settings.app.form.useVerticalStyle',
-    defaultMessage: '!!!Use horizontal style',
+    defaultMessage: 'Use horizontal style',
   },
   alwaysShowWorkspaces: {
     id: 'settings.app.form.alwaysShowWorkspaces',
-    defaultMessage: '!!!Always show workspace drawer',
+    defaultMessage: 'Always show workspace drawer',
   },
   accentColor: {
     id: 'settings.app.form.accentColor',
-    defaultMessage: '!!!Accent color',
+    defaultMessage: 'Accent color',
   },
   showDisabledServices: {
     id: 'settings.app.form.showDisabledServices',
-    defaultMessage: '!!!Display disabled services tabs',
+    defaultMessage: 'Display disabled services tabs',
   },
   showMessageBadgeWhenMuted: {
     id: 'settings.app.form.showMessagesBadgesWhenMuted',
-    defaultMessage: '!!!Show unread message badge when notifications are disabled',
+    defaultMessage: 'Show unread message badge when notifications are disabled',
   },
   showDragArea: {
     id: 'settings.app.form.showDragArea',
-    defaultMessage: '!!!Show draggable area on window',
+    defaultMessage: 'Show draggable area on window',
   },
   enableSpellchecking: {
     id: 'settings.app.form.enableSpellchecking',
-    defaultMessage: '!!!Enable spell checking',
+    defaultMessage: 'Enable spell checking',
   },
   enableGPUAcceleration: {
     id: 'settings.app.form.enableGPUAcceleration',
-    defaultMessage: '!!!Enable GPU Acceleration',
+    defaultMessage: 'Enable GPU Acceleration',
   },
   beta: {
     id: 'settings.app.form.beta',
-    defaultMessage: '!!!Include beta versions',
+    defaultMessage: 'Include beta versions',
   },
   automaticUpdates: {
     id: 'settings.app.form.automaticUpdates',
-    defaultMessage: '!!!Enable updates',
+    defaultMessage: 'Enable updates',
   },
   enableTodos: {
     id: 'settings.app.form.enableTodos',
-    defaultMessage: '!!!Enable Franz Todos',
+    defaultMessage: 'Enable Ferdi Todos',
   },
   keepAllWorkspacesLoaded: {
     id: 'settings.app.form.keepAllWorkspacesLoaded',
-    defaultMessage: '!!!Keep all workspaces loaded',
+    defaultMessage: 'Keep all workspaces loaded',
   },
 });
 
-export default @inject('stores', 'actions') @observer class EditSettingsScreen extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
+@inject('stores', 'actions')
+@observer
+class EditSettingsScreen extends Component {
   constructor(props) {
     super(props);
 
@@ -283,12 +293,15 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         darkMode: Boolean(settingsData.darkMode),
         adaptableDarkMode: Boolean(settingsData.adaptableDarkMode),
         universalDarkMode: Boolean(settingsData.universalDarkMode),
+        splitMode: Boolean(settingsData.splitMode),
         serviceRibbonWidth: Number(settingsData.serviceRibbonWidth),
         iconSize: Number(settingsData.iconSize),
         useVerticalStyle: Boolean(settingsData.useVerticalStyle),
         alwaysShowWorkspaces: Boolean(settingsData.alwaysShowWorkspaces),
         accentColor: settingsData.accentColor,
-        showMessageBadgeWhenMuted: Boolean(settingsData.showMessageBadgeWhenMuted),
+        showMessageBadgeWhenMuted: Boolean(
+          settingsData.showMessageBadgeWhenMuted,
+        ),
         showDragArea: Boolean(settingsData.showDragArea),
         enableSpellchecking: Boolean(settingsData.enableSpellchecking),
         spellcheckerLanguage: settingsData.spellcheckerLanguage,
@@ -309,24 +322,27 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
 
     if (workspaces.isFeatureActive) {
       const { keepAllWorkspacesLoaded } = workspaces.settings;
-      if (Boolean(keepAllWorkspacesLoaded) !== Boolean(settingsData.keepAllWorkspacesLoaded)) {
+      if (
+        Boolean(keepAllWorkspacesLoaded) !==
+        Boolean(settingsData.keepAllWorkspacesLoaded)
+      ) {
         workspaceActions.toggleKeepAllWorkspacesLoadedSetting();
       }
     }
 
     if (todos.isFeatureActive) {
       const { isFeatureEnabledByUser } = todos.settings;
-      if (Boolean(isFeatureEnabledByUser) !== Boolean(settingsData.enableTodos)) {
+      if (
+        Boolean(isFeatureEnabledByUser) !== Boolean(settingsData.enableTodos)
+      ) {
         todosActions.toggleTodosFeatureVisibility();
       }
     }
   }
 
   prepareForm() {
-    const {
-      app, settings, user, todos, workspaces,
-    } = this.props.stores;
-    const { intl } = this.context;
+    const { app, settings, user, todos, workspaces } = this.props.stores;
+    const { intl } = this.props;
     const { lockedPassword } = this.state;
 
     const locales = getSelectOptions({
@@ -370,7 +386,9 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
 
     const spellcheckingLanguages = getSelectOptions({
       locales: SPELLCHECKER_LOCALES,
-      automaticDetectionText: this.context.intl.formatMessage(globalMessages.spellcheckerAutomaticDetection),
+      automaticDetectionText: intl.formatMessage(
+        globalMessages.spellcheckerAutomaticDetection,
+      ),
     });
 
     const config = {
@@ -401,7 +419,9 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           default: DEFAULT_APP_SETTINGS.confirmOnQuit,
         },
         enableSystemTray: {
-          label: intl.formatMessage(isMac ? messages.enableMenuBar : messages.enableSystemTray),
+          label: intl.formatMessage(
+            isMac ? messages.enableMenuBar : messages.enableSystemTray,
+          ),
           value: settings.all.app.enableSystemTray,
           default: DEFAULT_APP_SETTINGS.enableSystemTray,
         },
@@ -566,6 +586,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.universalDarkMode,
           default: DEFAULT_APP_SETTINGS.universalDarkMode,
         },
+        splitMode: {
+          label: intl.formatMessage(messages.splitMode),
+          value: settings.all.app.splitMode,
+          default: DEFAULT_APP_SETTINGS.splitMode,
+        },
         serviceRibbonWidth: {
           label: intl.formatMessage(messages.serviceRibbonWidth),
           value: settings.all.app.serviceRibbonWidth,
@@ -637,23 +662,15 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
   }
 
   render() {
-    const {
-      app,
-      todos,
-      workspaces,
-      services,
-    } = this.props.stores;
+    const { app, todos, workspaces, services } = this.props.stores;
     const {
       updateStatus,
       updateStatusTypes,
       isClearingAllCache,
       lockingFeatureEnabled,
     } = app;
-    const {
-      checkForUpdates,
-      installUpdate,
-      clearAllCache,
-    } = this.props.actions.app;
+    const { checkForUpdates, installUpdate, clearAllCache } =
+      this.props.actions.app;
     const form = this.prepareForm();
 
     return (
@@ -666,7 +683,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           isUpdateAvailable={updateStatus === updateStatusTypes.AVAILABLE}
           noUpdateAvailable={updateStatus === updateStatusTypes.NOT_AVAILABLE}
           updateIsReadyToInstall={updateStatus === updateStatusTypes.DOWNLOADED}
-          onSubmit={(d) => this.onSubmit(d)}
+          onSubmit={d => this.onSubmit(d)}
           getCacheSize={() => app.cacheSize}
           isClearingAllCache={isClearingAllCache}
           onClearAllCache={clearAllCache}
@@ -675,9 +692,13 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           lockingFeatureEnabled={lockingFeatureEnabled}
           automaticUpdates={this.props.stores.settings.app.automaticUpdates}
           isDarkmodeEnabled={this.props.stores.settings.app.darkMode}
-          isAdaptableDarkModeEnabled={this.props.stores.settings.app.adaptableDarkMode}
+          isAdaptableDarkModeEnabled={
+            this.props.stores.settings.app.adaptableDarkMode
+          }
           isTodosActivated={this.props.stores.todos.isFeatureEnabledByUser}
-          isUsingCustomTodoService={this.props.stores.todos.isUsingCustomTodoService}
+          isUsingCustomTodoService={
+            this.props.stores.todos.isUsingCustomTodoService
+          }
           isNightlyEnabled={this.props.stores.settings.app.nightly}
           hasAddedTodosAsService={services.isTodosServiceAdded}
           isOnline={app.isOnline}
@@ -704,3 +725,5 @@ EditSettingsScreen.wrappedComponent.propTypes = {
     workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired,
   }).isRequired,
 };
+
+export default injectIntl(EditSettingsScreen);
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index 820b5e4d3..ca1363c59 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import UserStore from '../../stores/UserStore';
 import Form from '../../lib/Form';
@@ -13,47 +13,45 @@ import { required, email, minLength } from '../../helpers/validation-helpers';
 const messages = defineMessages({
   firstname: {
     id: 'settings.user.form.firstname',
-    defaultMessage: '!!!Firstname',
+    defaultMessage: 'First Name',
   },
   lastname: {
     id: 'settings.user.form.lastname',
-    defaultMessage: '!!!Lastname',
+    defaultMessage: 'Last Name',
   },
   email: {
     id: 'settings.user.form.email',
-    defaultMessage: '!!!Email',
+    defaultMessage: 'Email',
   },
   accountTypeLabel: {
     id: 'settings.user.form.accountType.label',
-    defaultMessage: '!!!Account type',
+    defaultMessage: 'Account type',
   },
   accountTypeIndividual: {
     id: 'settings.user.form.accountType.individual',
-    defaultMessage: '!!!Individual',
+    defaultMessage: 'Individual',
   },
   accountTypeNonProfit: {
     id: 'settings.user.form.accountType.non-profit',
-    defaultMessage: '!!!Non-Profit',
+    defaultMessage: 'Non-Profit',
   },
   accountTypeCompany: {
     id: 'settings.user.form.accountType.company',
-    defaultMessage: '!!!Company',
+    defaultMessage: 'Company',
   },
   currentPassword: {
     id: 'settings.user.form.currentPassword',
-    defaultMessage: '!!!Current password',
+    defaultMessage: 'Current password',
   },
   newPassword: {
     id: 'settings.user.form.newPassword',
-    defaultMessage: '!!!New password',
+    defaultMessage: 'New password',
   },
 });
 
-export default @inject('stores', 'actions') @observer class EditUserScreen extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
+@inject('stores', 'actions')
+@observer
+class EditUserScreen extends Component {
   componentWillUnmount() {
     this.props.actions.user.resetStatus();
   }
@@ -67,7 +65,7 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
   }
 
   prepareForm(user) {
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     const config = {
       fields: {
@@ -93,16 +91,20 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
           value: user.accountType,
           validators: [required],
           label: intl.formatMessage(messages.accountTypeLabel),
-          options: [{
-            value: 'individual',
-            label: intl.formatMessage(messages.accountTypeIndividual),
-          }, {
-            value: 'non-profit',
-            label: intl.formatMessage(messages.accountTypeNonProfit),
-          }, {
-            value: 'company',
-            label: intl.formatMessage(messages.accountTypeCompany),
-          }],
+          options: [
+            {
+              value: 'individual',
+              label: intl.formatMessage(messages.accountTypeIndividual),
+            },
+            {
+              value: 'non-profit',
+              label: intl.formatMessage(messages.accountTypeNonProfit),
+            },
+            {
+              value: 'company',
+              label: intl.formatMessage(messages.accountTypeCompany),
+            },
+          ],
         },
         organization: {
           label: intl.formatMessage(messages.accountTypeCompany),
@@ -129,7 +131,7 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
     const { user } = this.props.stores;
 
     if (user.getUserInfoRequest.isExecuting) {
-      return (<div>Loading...</div>);
+      return <div>Loading...</div>;
     }
 
     const form = this.prepareForm(user.data);
@@ -141,7 +143,7 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
           status={user.actionStatus}
           form={form}
           isSaving={user.updateUserInfoRequest.isExecuting}
-          onSubmit={(d) => this.onSubmit(d)}
+          onSubmit={d => this.onSubmit(d)}
         />
       </ErrorBoundary>
     );
@@ -156,3 +158,5 @@ EditUserScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
+
+export default injectIntl(EditUserScreen);
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js
index 4fdaef08b..bf393f42f 100644
--- a/src/containers/settings/InviteScreen.js
+++ b/src/containers/settings/InviteScreen.js
@@ -6,7 +6,9 @@ import Invite from '../../components/auth/Invite';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import UserStore from '../../stores/UserStore';
 
-export default @inject('stores', 'actions') @observer class InviteScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class InviteScreen extends Component {
   componentWillUnmount() {
     this.props.stores.user.inviteRequest.reset();
   }
@@ -20,7 +22,9 @@ export default @inject('stores', 'actions') @observer class InviteScreen extends
         <Invite
           onSubmit={actions.user.invite}
           isLoadingInvite={user.inviteRequest.isExecuting}
-          isInviteSuccessful={user.inviteRequest.wasExecuted && !user.inviteRequest.isError}
+          isInviteSuccessful={
+            user.inviteRequest.wasExecuted && !user.inviteRequest.isError
+          }
           embed
         />
       </ErrorBoundary>
@@ -36,3 +40,5 @@ InviteScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
+
+export default InviteScreen;
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index 784052bbe..2e60ceefa 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -12,13 +12,16 @@ import UserStore from '../../stores/UserStore';
 import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { CUSTOM_WEBSITE_RECIPE_ID, FRANZ_DEV_DOCS } from '../../config';
-import { asarRecipesPath, userDataRecipesPath } from '../../environment';
+import { userDataRecipesPath } from '../../environment-remote';
+import { asarRecipesPath } from '../../helpers/asar-helpers';
 import { communityRecipesStore } from '../../features/communityRecipes';
 import RecipePreview from '../../models/RecipePreview';
 import AppStore from '../../stores/AppStore';
 import { openPath } from '../../helpers/url-helpers';
 
-export default @inject('stores', 'actions') @observer class RecipesScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class RecipesScreen extends Component {
   static propTypes = {
     params: PropTypes.shape({
       filter: PropTypes.string,
@@ -75,25 +78,32 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
   }
 
   _sortByName(recipe1, recipe2) {
-    if (recipe1.name.toLowerCase() < recipe2.name.toLowerCase()) { return -1; }
-    if (recipe1.name.toLowerCase() > recipe2.name.toLowerCase()) { return 1; }
+    if (recipe1.name.toLowerCase() < recipe2.name.toLowerCase()) {
+      return -1;
+    }
+    if (recipe1.name.toLowerCase() > recipe2.name.toLowerCase()) {
+      return 1;
+    }
     return 0;
   }
 
   prepareRecipes(recipes) {
-    return recipes
-    // Filter out duplicate recipes
-      .filter((recipe, index, self) => {
-        const ids = self.map((rec) => rec.id);
-        return ids.indexOf(recipe.id) === index;
-
-        // Sort alphabetically
-      }).sort(this._sortByName);
+    return (
+      recipes
+        // Filter out duplicate recipes
+        .filter((recipe, index, self) => {
+          const ids = self.map(rec => rec.id);
+          return ids.indexOf(recipe.id) === index;
+
+          // Sort alphabetically
+        })
+        .sort(this._sortByName)
+    );
   }
 
   // Create an array of RecipePreviews from an array of recipe objects
   createPreviews(recipes) {
-    return recipes.map((recipe) => new RecipePreview(recipe));
+    return recipes.map(recipe => new RecipePreview(recipe));
   }
 
   resetSearch() {
@@ -101,16 +111,9 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
   }
 
   render() {
-    const {
-      recipePreviews,
-      recipes,
-      services,
-    } = this.props.stores;
+    const { recipePreviews, recipes, services } = this.props.stores;
 
-    const {
-      app: appActions,
-      service: serviceActions,
-    } = this.props.actions;
+    const { app: appActions, service: serviceActions } = this.props.actions;
 
     const { filter } = { filter: 'all', ...this.props.params };
     let recipeFilter;
@@ -125,21 +128,33 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
     }
     recipeFilter = recipeFilter.sort(this._sortByName);
 
-    const allRecipes = this.state.needle ? this.prepareRecipes([
-      // All search recipes from server
-      ...recipePreviews.searchResults,
-      // All search recipes from local recipes
-      ...this.createPreviews(
-        this.customRecipes
-          .filter((service) => service.name.toLowerCase().includes(this.state.needle.toLowerCase()) || (service.aliases || []).some(alias => alias.toLowerCase().includes(this.state.needle.toLowerCase()))),
-      ),
-    ]).sort(this._sortByName) : recipeFilter;
-
-    const customWebsiteRecipe = recipePreviews.all.find((service) => service.id === CUSTOM_WEBSITE_RECIPE_ID);
+    const allRecipes = this.state.needle
+      ? this.prepareRecipes([
+        // All search recipes from server
+        ...recipePreviews.searchResults,
+        // All search recipes from local recipes
+        ...this.createPreviews(
+          this.customRecipes.filter(
+            service =>
+              service.name
+                .toLowerCase()
+                .includes(this.state.needle.toLowerCase()) ||
+                (service.aliases || []).some(alias =>
+                  alias.toLowerCase().includes(this.state.needle.toLowerCase()),
+                ),
+          ),
+        ),
+      ]).sort(this._sortByName)
+      : recipeFilter;
+
+    const customWebsiteRecipe = recipePreviews.all.find(
+      service => service.id === CUSTOM_WEBSITE_RECIPE_ID,
+    );
 
-    const isLoading = recipePreviews.allRecipePreviewsRequest.isExecuting
-      || recipes.installRecipeRequest.isExecuting
-      || recipePreviews.searchRecipePreviewsRequest.isExecuting;
+    const isLoading =
+      recipePreviews.allRecipePreviewsRequest.isExecuting ||
+      recipes.installRecipeRequest.isExecuting ||
+      recipePreviews.searchRecipePreviewsRequest.isExecuting;
 
     const recipeDirectory = userDataRecipesPath('dev');
 
@@ -151,14 +166,16 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
           isLoading={isLoading}
           addedServiceCount={services.all.length}
           showAddServiceInterface={serviceActions.showAddServiceInterface}
-          searchRecipes={(e) => this.searchRecipes(e)}
+          searchRecipes={e => this.searchRecipes(e)}
           resetSearch={() => this.resetSearch()}
           searchNeedle={this.state.needle}
           serviceStatus={services.actionStatus}
           recipeFilter={filter}
           recipeDirectory={recipeDirectory}
           openRecipeDirectory={() => openPath(recipeDirectory)}
-          openDevDocs={() => appActions.openExternalUrl({ url: FRANZ_DEV_DOCS })}
+          openDevDocs={() =>
+            appActions.openExternalUrl({ url: FRANZ_DEV_DOCS })
+          }
         />
       </ErrorBoundary>
     );
@@ -180,3 +197,5 @@ RecipesScreen.wrappedComponent.propTypes = {
     }).isRequired,
   }).isRequired,
 };
+
+export default RecipesScreen;
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js
index eb2b1bcb5..c9dfc68d0 100644
--- a/src/containers/settings/ServicesScreen.js
+++ b/src/containers/settings/ServicesScreen.js
@@ -10,7 +10,9 @@ import ServiceStore from '../../stores/ServicesStore';
 import ServicesDashboard from '../../components/settings/services/ServicesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
-export default @inject('stores', 'actions') @observer class ServicesScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class ServicesScreen extends Component {
   componentWillUnmount() {
     this.props.actions.service.resetFilter();
     this.props.actions.service.resetStatus();
@@ -23,11 +25,7 @@ export default @inject('stores', 'actions') @observer class ServicesScreen exten
 
   render() {
     const { user, services, router } = this.props.stores;
-    const {
-      toggleService,
-      filter,
-      resetFilter,
-    } = this.props.actions.service;
+    const { toggleService, filter, resetFilter } = this.props.actions.service;
     const isLoading = services.allServicesRequest.isExecuting;
 
     let allServices = services.all;
@@ -47,7 +45,10 @@ export default @inject('stores', 'actions') @observer class ServicesScreen exten
           filterServices={filter}
           resetFilter={resetFilter}
           goTo={router.push}
-          servicesRequestFailed={services.allServicesRequest.wasExecuted && services.allServicesRequest.isError}
+          servicesRequestFailed={
+            services.allServicesRequest.wasExecuted &&
+            services.allServicesRequest.isError
+          }
           retryServicesRequest={() => services.allServicesRequest.reload()}
           searchNeedle={services.filterNeedle}
         />
@@ -66,3 +67,5 @@ ServicesScreen.wrappedComponent.propTypes = {
     service: PropTypes.instanceOf(ServiceStore).isRequired,
   }).isRequired,
 };
+
+export default ServicesScreen;
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js
index 9bb64b6fe..e03c4c1d2 100644
--- a/src/containers/settings/SettingsWindow.js
+++ b/src/containers/settings/SettingsWindow.js
@@ -11,17 +11,19 @@ import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { workspaceStore } from '../../features/workspaces';
 import UIStore from '../../stores/UIStore';
 
-export default @inject('stores', 'actions') @observer class SettingsContainer extends Component {
+@inject('stores', 'actions')
+@observer
+class SettingsContainer extends Component {
   portalRoot = document.querySelector('#portalContainer');
 
   el = document.createElement('div');
 
   componentDidMount() {
-    this.portalRoot.appendChild(this.el);
+    this.portalRoot.append(this.el);
   }
 
   componentWillUnmount() {
-    this.portalRoot.removeChild(this.el);
+    this.el.remove();
   }
 
   render() {
@@ -36,16 +38,11 @@ export default @inject('stores', 'actions') @observer class SettingsContainer ex
     );
 
     return ReactDOM.createPortal(
-      (
-        <ErrorBoundary>
-          <Layout
-            navigation={navigation}
-            closeSettings={closeSettings}
-          >
-            {children}
-          </Layout>
-        </ErrorBoundary>
-      ),
+      <ErrorBoundary>
+        <Layout navigation={navigation} closeSettings={closeSettings}>
+          {children}
+        </Layout>
+      </ErrorBoundary>,
       this.el,
     );
   }
@@ -60,3 +57,5 @@ SettingsContainer.wrappedComponent.propTypes = {
     ui: PropTypes.instanceOf(UIStore).isRequired,
   }).isRequired,
 };
+
+export default SettingsContainer;
diff --git a/src/containers/settings/SupportScreen.js b/src/containers/settings/SupportScreen.js
index 7d3b22f19..646f672ce 100644
--- a/src/containers/settings/SupportScreen.js
+++ b/src/containers/settings/SupportScreen.js
@@ -6,7 +6,8 @@ import SupportFerdi from '../../components/settings/supportFerdi/SupportFerdiDas
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import AppStore from '../../stores/AppStore';
 
-export default @inject('actions') class SupportScreen extends Component {
+@inject('actions')
+class SupportScreen extends Component {
   constructor(props) {
     super(props);
 
@@ -20,9 +21,7 @@ export default @inject('actions') class SupportScreen extends Component {
   render() {
     return (
       <ErrorBoundary>
-        <SupportFerdi
-          openLink={this.openLink}
-        />
+        <SupportFerdi openLink={this.openLink} />
       </ErrorBoundary>
     );
   }
@@ -33,3 +32,5 @@ SupportScreen.wrappedComponent.propTypes = {
     app: PropTypes.instanceOf(AppStore).isRequired,
   }).isRequired,
 };
+
+export default SupportScreen;
diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js
index 10c2e36ef..ea447469b 100644
--- a/src/containers/settings/TeamScreen.js
+++ b/src/containers/settings/TeamScreen.js
@@ -10,7 +10,9 @@ import TeamDashboard from '../../components/settings/team/TeamDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { DEV_API_FRANZ_WEBSITE } from '../../config';
 
-export default @inject('stores', 'actions') @observer class TeamScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class TeamScreen extends Component {
   handleWebsiteLink(route) {
     const { actions, stores } = this.props;
 
@@ -29,7 +31,10 @@ export default @inject('stores', 'actions') @observer class TeamScreen extends C
       <ErrorBoundary>
         <TeamDashboard
           isLoading={isLoadingUserInfo}
-          userInfoRequestFailed={user.getUserInfoRequest.wasExecuted && user.getUserInfoRequest.isError}
+          userInfoRequestFailed={
+            user.getUserInfoRequest.wasExecuted &&
+            user.getUserInfoRequest.isError
+          }
           retryUserInfoRequest={() => this.reloadData()}
           openTeamManagement={() => this.handleWebsiteLink('/user/team')}
           server={server}
@@ -50,3 +55,5 @@ TeamScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
+
+export default TeamScreen;
diff --git a/src/dev-app-update.yml b/src/dev-app-update.yml
index 978e30a9b..9a32defa4 100644
--- a/src/dev-app-update.yml
+++ b/src/dev-app-update.yml
@@ -1,3 +1,3 @@
 owner: kytwb
-repo: Ferdi
+repo: ferdi
 provider: github
diff --git a/src/electron-util.ts b/src/electron-util.ts
new file mode 100644
index 000000000..f4b26cb10
--- /dev/null
+++ b/src/electron-util.ts
@@ -0,0 +1,30 @@
+// Enhanced from: https://github.com/dertieran/electron-util/blob/replace-remote/source/api.js
+
+import electron from 'electron';
+import { initialize } from '@electron/remote/main';
+
+export const initializeRemote = () => {
+  if (process.type !== 'browser') {
+    throw new Error('The remote api must be initialized from the main process.');
+  }
+
+  initialize();
+};
+
+export const remote = new Proxy({}, {
+  get: (_target, property) => {
+    // eslint-disable-next-line global-require
+    const remote = require('@electron/remote');
+    return remote[property];
+  },
+});
+
+export const api = new Proxy(electron, {
+  get: (target, property) => {
+    if (target[property]) {
+      return target[property];
+    }
+
+    return remote[property];
+  },
+});
diff --git a/src/electron/Settings.js b/src/electron/Settings.ts
index 3e11bb175..98acfa1d5 100644
--- a/src/electron/Settings.js
+++ b/src/electron/Settings.ts
@@ -1,15 +1,17 @@
 import { observable, toJS } from 'mobx';
 import { pathExistsSync, outputJsonSync, readJsonSync } from 'fs-extra';
-import { userDataPath } from '../environment';
+import { userDataPath } from '../environment-remote';
 
 const debug = require('debug')('Ferdi:Settings');
 
 export default class Settings {
   type = '';
 
+  defaultState: {};
+
   @observable store = {};
 
-  constructor(type, defaultState = {}) {
+  constructor(type: string, defaultState = {}) {
     this.type = type;
     this.store = defaultState;
     this.defaultState = defaultState;
@@ -35,7 +37,7 @@ export default class Settings {
     return toJS(this.store);
   }
 
-  get(key) {
+  get(key: string | number) {
     return this.store[key];
   }
 
@@ -56,6 +58,9 @@ export default class Settings {
   }
 
   get settingsFile() {
-    return userDataPath('config', `${this.type === 'app' ? 'settings' : this.type}.json`);
+    return userDataPath(
+      'config',
+      `${this.type === 'app' ? 'settings' : this.type}.json`,
+    );
   }
 }
diff --git a/src/electron/deepLinking.js b/src/electron/deepLinking.ts
index 70e5cfb6f..70e5cfb6f 100644
--- a/src/electron/deepLinking.js
+++ b/src/electron/deepLinking.ts
diff --git a/src/electron/exception.js b/src/electron/exception.ts
index 0065e2604..0065e2604 100644
--- a/src/electron/exception.js
+++ b/src/electron/exception.ts
diff --git a/src/electron/ipc-api/appIndicator.js b/src/electron/ipc-api/appIndicator.ts
index c6c261d0f..a51ed8161 100644
--- a/src/electron/ipc-api/appIndicator.js
+++ b/src/electron/ipc-api/appIndicator.ts
@@ -6,15 +6,22 @@ import { isMac, isWindows, isLinux } from '../../environment';
 const INDICATOR_TASKBAR = 'taskbar';
 const FILE_EXTENSION = isWindows ? 'ico' : 'png';
 
-let isTrayIconEnabled;
+let isTrayIconEnabled: boolean;
 
-function getAsset(type, asset) {
+function getAsset(type: 'tray' | 'taskbar', asset: string) {
   return join(
-    __dirname, '..', '..', 'assets', 'images', type, process.platform, `${asset}.${FILE_EXTENSION}`,
+    __dirname,
+    '..',
+    '..',
+    'assets',
+    'images',
+    type,
+    process.platform,
+    `${asset}.${FILE_EXTENSION}`,
   );
 }
 
-export default (params) => {
+export default params => {
   autorun(() => {
     isTrayIconEnabled = params.settings.app.get('enableSystemTray');
 
@@ -25,36 +32,37 @@ export default (params) => {
     }
   });
 
-  ipcMain.on('updateAppIndicator', (event, args) => {
+  ipcMain.on('updateAppIndicator', (_event, args) => {
     // Flash TaskBar for windows, bounce Dock on Mac
-    if (!app.mainWindow.isFocused()) {
-      if (params.settings.app.get('notifyTaskBarOnMessage')) {
+    if (!(app as any).mainWindow.isFocused() && params.settings.app.get('notifyTaskBarOnMessage')) {
         if (isWindows) {
-          app.mainWindow.flashFrame(true);
-          app.mainWindow.once('focus', () => app.mainWindow.flashFrame(false));
+          (app as any).mainWindow.flashFrame(true);
+          (app as any).mainWindow.once('focus', () =>
+            (app as any).mainWindow.flashFrame(false),
+          );
         } else if (isMac) {
           app.dock.bounce('informational');
         }
       }
-    }
 
     // Update badge
-    if (isMac
-      && typeof (args.indicator) === 'string') {
+    if (isMac && typeof args.indicator === 'string') {
       app.dock.setBadge(args.indicator);
     }
 
-    if ((isMac || isLinux)
-      && typeof (args.indicator) === 'number'
-    ) {
+    if ((isMac || isLinux) && typeof args.indicator === 'number') {
       app.badgeCount = args.indicator;
     }
 
     if (isWindows) {
-      if (typeof args.indicator === 'number'
-        && args.indicator !== 0) {
+      if (typeof args.indicator === 'number' && args.indicator !== 0) {
         params.mainWindow.setOverlayIcon(
-          getAsset('taskbar', `${INDICATOR_TASKBAR}-${(args.indicator >= 10 ? 10 : args.indicator)}`),
+          getAsset(
+            'taskbar',
+            `${INDICATOR_TASKBAR}-${
+              args.indicator >= 10 ? 10 : args.indicator
+            }`,
+          ),
           '',
         );
       } else if (typeof args.indicator === 'string') {
diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.ts
index 255595b9e..e6b805edc 100644
--- a/src/electron/ipc-api/autoUpdate.js
+++ b/src/electron/ipc-api/autoUpdate.ts
@@ -1,11 +1,10 @@
-import { app, ipcMain } from 'electron';
+import { app, ipcMain, BrowserWindow } from 'electron';
 import { autoUpdater } from 'electron-updater';
-import { GITHUB_NIGHTLIES_REPO_NAME, GITHUB_ORG_NAME } from '../../config';
 import { isMac, isWindows } from '../../environment';
 
 const debug = require('debug')('Ferdi:ipcApi:autoUpdate');
 
-export default (params) => {
+export default (params: { mainWindow: BrowserWindow; settings: any }) => {
   const enableUpdate = Boolean(params.settings.app.get('automaticUpdates'));
 
   if (!enableUpdate) {
@@ -16,17 +15,16 @@ export default (params) => {
       if (enableUpdate) {
         try {
           autoUpdater.autoInstallOnAppQuit = false;
-          autoUpdater.allowPrerelease = Boolean(params.settings.app.get('beta'));
+          autoUpdater.allowPrerelease = Boolean(
+            params.settings.app.get('beta'),
+          );
           autoUpdater.channel = autoUpdater.allowPrerelease ? 'beta' : 'latest';
 
           if (params.settings.app.get('nightly')) {
-            autoUpdater.allowPrerelease = Boolean(params.settings.app.get('nightly'));
+            autoUpdater.allowPrerelease = Boolean(
+              params.settings.app.get('nightly'),
+            );
             autoUpdater.channel = 'alpha';
-            autoUpdater.setFeedURL({
-              provider: 'github',
-              owner: GITHUB_ORG_NAME,
-              repo: GITHUB_NIGHTLIES_REPO_NAME,
-            });
           }
 
           if (args.action === 'check') {
@@ -40,8 +38,8 @@ export default (params) => {
               app.quit();
             }, 20);
           }
-        } catch (e) {
-          console.error(e);
+        } catch (error) {
+          console.error(error);
           event.sender.send('autoUpdate', { error: true });
         }
       }
@@ -52,7 +50,7 @@ export default (params) => {
       params.mainWindow.webContents.send('autoUpdate', { available: false });
     });
 
-    autoUpdater.on('update-available', (event) => {
+    autoUpdater.on('update-available', event => {
       debug('update-available');
 
       if (enableUpdate) {
@@ -63,7 +61,7 @@ export default (params) => {
       }
     });
 
-    autoUpdater.on('download-progress', (progressObj) => {
+    autoUpdater.on('download-progress', progressObj => {
       let logMessage = `Download speed: ${progressObj.bytesPerSecond}`;
       logMessage = `${logMessage} - Downloaded ${progressObj.percent}%`;
       logMessage = `${logMessage} (${progressObj.transferred}/${progressObj.total})`;
diff --git a/src/electron/ipc-api/cld.js b/src/electron/ipc-api/cld.ts
index 73e320ad9..4221f9b22 100644
--- a/src/electron/ipc-api/cld.js
+++ b/src/electron/ipc-api/cld.ts
@@ -4,17 +4,20 @@ import cld from 'cld';
 const debug = require('debug')('Ferdi:ipcApi:cld');
 
 export default async () => {
-  ipcMain.handle('detect-language', async (event, { sample }) => {
+  ipcMain.handle('detect-language', async (_event, { sample }) => {
     try {
       const result = await cld.detect(sample);
       debug('Checking language', 'probability', result.languages);
       if (result.reliable) {
-        debug('Language detected reliably, setting spellchecker language to', result.languages[0].code);
+        debug(
+          'Language detected reliably, setting spellchecker language to',
+          result.languages[0].code,
+        );
 
         return result.languages[0].code;
       }
-    } catch (e) {
-      console.error(e);
+    } catch (error) {
+      console.error(error);
     }
   });
 };
diff --git a/src/electron/ipc-api/dnd.js b/src/electron/ipc-api/dnd.ts
index 6fb8999a3..afaef9a66 100644
--- a/src/electron/ipc-api/dnd.js
+++ b/src/electron/ipc-api/dnd.ts
@@ -15,8 +15,8 @@ export default async () => {
       const isDND = getDoNotDisturb();
       debug('Fetching DND state, set to', isDND);
       return isDND;
-    } catch (e) {
-      console.error(e);
+    } catch (error) {
+      console.error(error);
       return false;
     }
   });
diff --git a/src/electron/ipc-api/download.js b/src/electron/ipc-api/download.js
deleted file mode 100644
index ba261ba1e..000000000
--- a/src/electron/ipc-api/download.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import { ipcMain, dialog, BrowserWindow } from 'electron';
-import { download } from 'electron-dl';
-import mime from 'mime-types';
-import { writeFileSync } from 'fs-extra';
-
-const debug = require('debug')('Ferdi:ipcApi:download');
-
-function decodeBase64Image(dataString) {
-  const matches = dataString.match(/^data:([A-Za-z-+/]+);base64,(.+)$/);
-
-  if (matches.length !== 3) {
-    return new Error('Invalid input string');
-  }
-
-  return Buffer.from(matches[2], 'base64');
-}
-
-export default (params) => {
-  ipcMain.on('download-file', async (event, { url, content, fileOptions = {} }) => {
-    const win = BrowserWindow.getFocusedWindow();
-
-    try {
-      if (!content) {
-        const dl = await download(win, url, {
-          saveAs: true,
-        });
-        debug('File saved to', dl.savePath);
-      } else {
-        const extension = mime.extension(fileOptions.mime);
-        const filename = `${fileOptions.name}.${extension}`;
-
-        try {
-          const saveDialog = await dialog.showSaveDialog(params.mainWindow, {
-            defaultPath: filename,
-          });
-
-          if (saveDialog.canceled) return;
-
-          const binaryImage = decodeBase64Image(content);
-          writeFileSync(saveDialog.filePath, binaryImage, 'binary');
-
-          debug('File blob saved to', saveDialog.filePath);
-        } catch (err) {
-          console.log(err);
-        }
-      }
-    } catch (e) {
-      console.error(e);
-    }
-  });
-};
diff --git a/src/electron/ipc-api/download.ts b/src/electron/ipc-api/download.ts
new file mode 100644
index 000000000..af15b157e
--- /dev/null
+++ b/src/electron/ipc-api/download.ts
@@ -0,0 +1,59 @@
+import { ipcMain, dialog, BrowserWindow } from 'electron';
+import { download } from 'electron-dl';
+import mime from 'mime-types';
+import { writeFileSync } from 'fs-extra';
+import { PathLike } from 'fs';
+
+const debug = require('debug')('Ferdi:ipcApi:download');
+
+function decodeBase64Image(dataString: string) {
+  const matches = dataString.match(/^data:([+/A-Za-z-]+);base64,(.+)$/);
+
+  if (matches?.length !== 3) {
+    return new Error('Invalid input string');
+  }
+
+  return Buffer.from(matches[2], 'base64');
+}
+
+export default (params: { mainWindow: BrowserWindow }) => {
+  ipcMain.on(
+    'download-file',
+    async (_event, { url, content, fileOptions = {} }) => {
+      const win = BrowserWindow.getFocusedWindow();
+
+      try {
+        if (!content) {
+          const dl = await download(win!, url, {
+            saveAs: true,
+          });
+          debug('File saved to', dl.savePath);
+        } else {
+          const extension = mime.extension(fileOptions.mime);
+          const filename = `${fileOptions.name}.${extension}`;
+
+          try {
+            const saveDialog = await dialog.showSaveDialog(params.mainWindow, {
+              defaultPath: filename,
+            });
+
+            if (saveDialog.canceled) return;
+
+            const binaryImage = decodeBase64Image(content);
+            writeFileSync(
+              saveDialog.filePath as PathLike,
+              binaryImage as unknown as string,
+              'binary',
+            );
+
+            debug('File blob saved to', saveDialog.filePath);
+          } catch (error) {
+            console.log(error);
+          }
+        }
+      } catch (error) {
+        console.error(error);
+      }
+    },
+  );
+};
diff --git a/src/electron/ipc-api/focusState.js b/src/electron/ipc-api/focusState.ts
index 0b4a0d8f3..01aa1a971 100644
--- a/src/electron/ipc-api/focusState.js
+++ b/src/electron/ipc-api/focusState.ts
@@ -1,4 +1,6 @@
-export default (params) => {
+import { BrowserWindow } from 'electron';
+
+export default (params: { mainWindow: BrowserWindow }) => {
   params.mainWindow.on('focus', () => {
     params.mainWindow.webContents.send('isWindowFocused', true);
   });
diff --git a/src/electron/ipc-api/index.js b/src/electron/ipc-api/index.ts
index 5da1edc39..f03f61517 100644
--- a/src/electron/ipc-api/index.js
+++ b/src/electron/ipc-api/index.ts
@@ -1,5 +1,7 @@
+import { BrowserWindow, Tray } from 'electron';
 import autoUpdate from './autoUpdate';
 import settings from './settings';
+import sessionStorage from './sessionStorage';
 import appIndicator from './appIndicator';
 import download from './download';
 import localServer from './localServer';
@@ -7,13 +9,18 @@ import cld from './cld';
 import dnd from './dnd';
 import focusState from './focusState';
 
-export default (params) => {
+export default (params: {
+  mainWindow: BrowserWindow;
+  settings: any;
+  tray: Tray;
+}) => {
   settings(params);
+  sessionStorage();
   autoUpdate(params);
   appIndicator(params);
   download(params);
   localServer(params);
-  cld(params);
+  cld();
   dnd();
   focusState(params);
 };
diff --git a/src/electron/ipc-api/localServer.js b/src/electron/ipc-api/localServer.ts
index 591e70504..7ee642101 100644
--- a/src/electron/ipc-api/localServer.js
+++ b/src/electron/ipc-api/localServer.ts
@@ -1,12 +1,12 @@
-import { ipcMain } from 'electron';
+import { ipcMain, BrowserWindow } from 'electron';
 import net from 'net';
 import { LOCAL_HOSTNAME, LOCAL_PORT } from '../../config';
-import { userDataPath } from '../../environment';
-import startServer from '../../internal-server/start';
+import { userDataPath } from '../../environment-remote';
+import { server } from '../../internal-server/start';
 
-const portInUse = function (port) {
-  return new Promise((resolve) => {
-    const server = net.createServer((socket) => {
+const portInUse = (port: number): Promise<boolean> =>
+  new Promise(resolve => {
+    const server = net.createServer(socket => {
       socket.write('Echo server\r\n');
       socket.pipe(socket);
     });
@@ -20,11 +20,10 @@ const portInUse = function (port) {
       resolve(false);
     });
   });
-};
 
 let localServerStarted = false;
 
-export default (params) => {
+export default (params: { mainWindow: BrowserWindow }) => {
   ipcMain.on('startLocalServer', () => {
     if (!localServerStarted) {
       // Find next unused port for server
@@ -36,7 +35,7 @@ export default (params) => {
         }
         console.log('Starting local server on port', port);
 
-        startServer(userDataPath(), port);
+        server(userDataPath(), port);
 
         params.mainWindow.webContents.send('localServerPort', {
           port,
diff --git a/src/electron/ipc-api/sessionStorage.ts b/src/electron/ipc-api/sessionStorage.ts
new file mode 100644
index 000000000..3eda568a1
--- /dev/null
+++ b/src/electron/ipc-api/sessionStorage.ts
@@ -0,0 +1,35 @@
+import { ipcMain, Session, session } from 'electron';
+
+import { TODOS_PARTITION_ID } from '../../config';
+
+const debug = require('debug')('Ferdi:ipcApi:sessionStorage');
+
+function deduceSession(serviceId: string | undefined | null): Session {
+  if (serviceId) {
+    return session.fromPartition(serviceId === TODOS_PARTITION_ID ? TODOS_PARTITION_ID : `persist:service-${serviceId}`);
+  }
+  return session.defaultSession;
+}
+
+export default async () => {
+  ipcMain.on('clear-storage-data', (_event, { serviceId, targetsToClear }) => {
+    try {
+      const serviceSession = deduceSession(serviceId);
+      serviceSession.flushStorageData();
+      if (targetsToClear) {
+        debug('Clearing targets:', targetsToClear);
+        serviceSession.clearStorageData(targetsToClear);
+      } else {
+        debug('Clearing all targets');
+        serviceSession.clearStorageData();
+      }
+    } catch (error) {
+      debug(error);
+    }
+  });
+
+  ipcMain.handle('clear-cache', (_event, { serviceId }) => {
+    const serviceSession = deduceSession(serviceId);
+    return serviceSession.clearCache();
+  });
+};
diff --git a/src/electron/ipc-api/settings.js b/src/electron/ipc-api/settings.js
deleted file mode 100644
index 15182739c..000000000
--- a/src/electron/ipc-api/settings.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { ipcMain } from 'electron';
-
-export default (params) => {
-  ipcMain.on('getAppSettings', (event, type) => {
-    params.mainWindow.webContents.send('appSettings', {
-      type,
-      data: params.settings[type].allSerialized,
-    });
-  });
-
-  ipcMain.on('updateAppSettings', (event, args) => {
-    params.settings[args.type].set(args.data);
-  });
-};
diff --git a/src/electron/ipc-api/settings.ts b/src/electron/ipc-api/settings.ts
new file mode 100644
index 000000000..72de6866d
--- /dev/null
+++ b/src/electron/ipc-api/settings.ts
@@ -0,0 +1,14 @@
+import { ipcMain, BrowserWindow, Settings } from 'electron';
+
+export default (params: { mainWindow: BrowserWindow; settings: Settings }) => {
+  ipcMain.on('getAppSettings', (_event, type) => {
+    params.mainWindow.webContents.send('appSettings', {
+      type,
+      data: params.settings[type].allSerialized,
+    });
+  });
+
+  ipcMain.on('updateAppSettings', (_event, args) => {
+    params.settings[args.type].set(args.data);
+  });
+};
diff --git a/src/electron/macOSPermissions.js b/src/electron/macOSPermissions.ts
index 887af2903..bcd5b5931 100644
--- a/src/electron/macOSPermissions.js
+++ b/src/electron/macOSPermissions.ts
@@ -1,18 +1,21 @@
-import { systemPreferences, dialog } from 'electron';
+import { systemPreferences, BrowserWindow, dialog } from 'electron';
 import { pathExistsSync, mkdirSync, writeFileSync } from 'fs-extra';
 import macosVersion from 'macos-version';
 import { dirname } from 'path';
 import { askForScreenCaptureAccess } from 'node-mac-permissions';
-import { userDataPath } from '../environment';
+import { userDataPath } from '../environment-remote';
 
 const debug = require('debug')('Ferdi:macOSPermissions');
 
-const isExplicitScreenCapturePermissionReqd = macosVersion.isGreaterThanOrEqualTo('10.15');
-debug(`Should check explicitly for screen-capture permissions: ${isExplicitScreenCapturePermissionReqd}`);
+const isExplicitScreenCapturePermissionReqd =
+  macosVersion.isGreaterThanOrEqualTo('10.15');
+debug(
+  `Should check explicitly for screen-capture permissions: ${isExplicitScreenCapturePermissionReqd}`,
+);
 
 const filePath = userDataPath('.has-app-requested-screen-capture-permissions');
 
-function hasPromptedForScreenCapturePermission() {
+function hasPromptedForScreenCapturePermission(): string | boolean {
   if (!isExplicitScreenCapturePermissionReqd) {
     return false;
   }
@@ -21,7 +24,7 @@ function hasPromptedForScreenCapturePermission() {
   return filePath && pathExistsSync(filePath);
 }
 
-function hasScreenCapturePermissionAlreadyBeenGranted() {
+function hasScreenCapturePermissionAlreadyBeenGranted(): boolean {
   if (!isExplicitScreenCapturePermissionReqd) {
     return true;
   }
@@ -35,7 +38,7 @@ function createStatusFile() {
   try {
     writeFileSync(filePath, '');
   } catch (error) {
-    if (error.code === 'ENOENT') {
+    if ((error as any).code === 'ENOENT') {
       mkdirSync(dirname(filePath));
       writeFileSync(filePath, '');
     }
@@ -44,7 +47,7 @@ function createStatusFile() {
   }
 }
 
-export const askFormacOSPermissions = async mainWindow => {
+export const askFormacOSPermissions = async (mainWindow: BrowserWindow) => {
   debug('Checking camera & microphone permissions');
   systemPreferences.askForMediaAccess('camera');
   systemPreferences.askForMediaAccess('microphone');
diff --git a/src/electron/webview-ime-focus.js b/src/electron/webview-ime-focus.js
deleted file mode 100644
index e187ee0b4..000000000
--- a/src/electron/webview-ime-focus.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { webContents } from '@electron/remote';
-import { releaseDocumentFocus } from './webview-ime-focus-helpers';
-
-function giveWebviewDocumentFocus(element) {
-  releaseDocumentFocus();
-
-  window.requestAnimationFrame(() => {
-    element.send('claim-document-focus');
-  });
-}
-
-function elementIsUnfocusedWebview(element) {
-  return element.tagName === 'WEBVIEW' && !webContents.fromId(element.getWebContentsId()).isFocused();
-}
-
-function webviewDidAutofocus(element) {
-  function didKeyDown() {
-    element.removeEventListener('keydown', didKeyDown, true);
-    giveWebviewDocumentFocus(element);
-  }
-
-  element.addEventListener('keydown', didKeyDown, true);
-}
-
-function handleAutofocus(element) {
-  element.addEventListener('ipc-message', (event) => {
-    if (event.channel === 'autofocus') {
-      element.focus();
-      webviewDidAutofocus(element);
-    }
-  });
-}
-
-function didMouseDown(event) {
-  if (elementIsUnfocusedWebview(event.target)) {
-    giveWebviewDocumentFocus(event.target);
-  }
-}
-
-document.addEventListener('mousedown', didMouseDown, true);
-document.querySelectorAll('webview').forEach(handleAutofocus);
diff --git a/src/electron/windowUtils.js b/src/electron/windowUtils.js
deleted file mode 100644
index 23b946ac4..000000000
--- a/src/electron/windowUtils.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/* eslint import/prefer-default-export: 0 */
-
-import { screen } from 'electron';
-
-export function isPositionValid(position) {
-  const displays = screen.getAllDisplays();
-  const { x, y } = position;
-  return displays.some(({
-    workArea,
-  }) => x >= workArea.x && x <= workArea.x + workArea.width && y >= workArea.y && y <= workArea.y + workArea.height);
-}
diff --git a/src/electron/windowUtils.ts b/src/electron/windowUtils.ts
new file mode 100644
index 000000000..1db1ff246
--- /dev/null
+++ b/src/electron/windowUtils.ts
@@ -0,0 +1,13 @@
+import { screen } from 'electron';
+
+export function isPositionValid(position: { x: number; y: number }) {
+  const displays = screen.getAllDisplays();
+  const { x, y } = position;
+  return displays.some(
+    ({ workArea }) =>
+      x >= workArea.x &&
+      x <= workArea.x + workArea.width &&
+      y >= workArea.y &&
+      y <= workArea.y + workArea.height,
+  );
+}
diff --git a/src/enforce-macos-app-location.ts b/src/enforce-macos-app-location.ts
new file mode 100644
index 000000000..0f858013d
--- /dev/null
+++ b/src/enforce-macos-app-location.ts
@@ -0,0 +1,46 @@
+// Enhanced from: https://github.com/dertieran/electron-util/blob/replace-remote/source/enforce-macos-app-location.js
+
+import { isMac } from './environment';
+import { isDevMode } from './environment-remote';
+import { api } from './electron-util';
+
+export function enforceMacOSAppLocation() {
+  if (isDevMode || !isMac || api.app.isInApplicationsFolder()) {
+    return;
+  }
+
+  const clickedButtonIndex = api.dialog.showMessageBoxSync({
+    type: 'error',
+    message: 'Move to Applications folder?',
+    detail: 'Ferdi must live in the Applications folder to be able to run correctly.',
+    buttons: [
+      'Move to Applications folder',
+      'Quit Ferdi',
+    ],
+    defaultId: 0,
+    cancelId: 1,
+  });
+
+  if (clickedButtonIndex === 1) {
+    api.app.quit();
+    return;
+  }
+
+  api.app.moveToApplicationsFolder({
+    conflictHandler: conflict => {
+      if (conflict === 'existsAndRunning') { // Can't replace the active version of the app
+        api.dialog.showMessageBoxSync({
+          type: 'error',
+          message: 'Another version of Ferdi is currently running. Quit it, then launch this version of the app again.',
+          buttons: [
+            'OK',
+          ],
+        });
+
+        api.app.quit();
+      }
+
+      return true;
+    },
+  });
+}
diff --git a/src/environment-remote.ts b/src/environment-remote.ts
new file mode 100644
index 000000000..192510f37
--- /dev/null
+++ b/src/environment-remote.ts
@@ -0,0 +1,93 @@
+import { join } from 'path';
+import osName from 'os-name';
+import { api as electronApi } from './electron-util';
+import {
+  LIVE_FERDI_API,
+  DEV_FRANZ_API,
+  LOCAL_API,
+  LOCAL_API_WEBSITE,
+  DEV_API_FRANZ_WEBSITE,
+  LIVE_API_FERDI_WEBSITE,
+  LIVE_WS_API,
+  LOCAL_WS_API,
+  DEV_WS_API,
+  LOCAL_TODOS_FRONTEND_URL,
+  PRODUCTION_TODOS_FRONTEND_URL,
+} from './config';
+import { chromeVersion, electronVersion, isWindows, nodeVersion, osArch } from './environment';
+
+// @ts-expect-error Cannot find module './buildInfo.json' or its corresponding type declarations.
+import * as buildInfo from './buildInfo.json';
+
+export const { app } = electronApi;
+export const ferdiVersion = app.getVersion();
+export const ferdiLocale = app.getLocale();
+
+// Set app directory before loading user modules
+if (process.env.FERDI_APPDATA_DIR != null) {
+  app.setPath('appData', process.env.FERDI_APPDATA_DIR);
+  app.setPath('userData', app.getPath('appData'));
+} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
+  app.setPath('appData', join(process.env.PORTABLE_EXECUTABLE_DIR, `${app.name}AppData`));
+  app.setPath('userData', join(app.getPath('appData'), `${app.name}AppData`));
+} else if (isWindows && process.env.APPDATA != null) {
+  app.setPath('appData', process.env.APPDATA);
+  app.setPath('userData', join(app.getPath('appData'), app.name));
+}
+
+export const isDevMode = process.env.ELECTRON_IS_DEV !== undefined ? Number.parseInt(process.env.ELECTRON_IS_DEV, 10) === 1 : !app.isPackaged;
+if (isDevMode) {
+  app.setPath('userData', join(app.getPath('appData'), `${app.name}Dev`));
+}
+
+export function userDataPath(...segments: string[]) {
+  return join(app.getPath('userData'), ...[segments].flat());
+}
+
+export function userDataRecipesPath(...segments: string[]) {
+  return userDataPath('recipes', ...[segments].flat());
+}
+
+const useLocalAPI = process.env.USE_LOCAL_API;
+export const useLiveAPI = process.env.USE_LIVE_API;
+
+let api: string;
+let wsApi: string;
+let web: string;
+let todos: string;
+if (!isDevMode || (isDevMode && useLiveAPI)) {
+  api = LIVE_FERDI_API;
+  wsApi = LIVE_WS_API;
+  web = LIVE_API_FERDI_WEBSITE;
+  todos = PRODUCTION_TODOS_FRONTEND_URL;
+} else if (isDevMode && useLocalAPI) {
+  api = LOCAL_API;
+  wsApi = LOCAL_WS_API;
+  web = LOCAL_API_WEBSITE;
+  todos = LOCAL_TODOS_FRONTEND_URL;
+} else {
+  api = DEV_FRANZ_API;
+  wsApi = DEV_WS_API;
+  web = DEV_API_FRANZ_WEBSITE;
+  todos = PRODUCTION_TODOS_FRONTEND_URL;
+}
+
+export const API = api;
+export const API_VERSION = 'v1';
+export const WS_API = wsApi;
+export const WEBSITE = web;
+export const TODOS_FRONTEND = todos;
+
+export function aboutAppDetails() {
+  return [
+    `Version: ${ferdiVersion}`,
+    `Electron: ${electronVersion}`,
+    `Chrome: ${chromeVersion}`,
+    `Node.js: ${nodeVersion}`,
+    `Platform: ${osName()}`,
+    `Arch: ${osArch}`,
+    `Build date: ${new Date(Number(buildInfo.timestamp))}`,
+    `Git SHA: ${buildInfo.gitHashShort}`,
+    `Git branch: ${buildInfo.gitBranch}`,
+  ].join('\n');
+}
diff --git a/src/environment.js b/src/environment.js
deleted file mode 100644
index 9d7ffaf78..000000000
--- a/src/environment.js
+++ /dev/null
@@ -1,173 +0,0 @@
-import os from 'os';
-import { join } from 'path';
-
-import { is, api as electronApi } from 'electron-util';
-
-import { DEFAULT_ACCENT_COLOR } from '@meetfranz/theme';
-
-import {
-  LIVE_FERDI_API,
-  DEV_FRANZ_API,
-  LOCAL_API,
-  LOCAL_API_WEBSITE,
-  DEV_API_FRANZ_WEBSITE,
-  LIVE_API_FERDI_WEBSITE,
-  LIVE_WS_API,
-  LOCAL_WS_API,
-  DEV_WS_API,
-  LOCAL_TODOS_FRONTEND_URL,
-  PRODUCTION_TODOS_FRONTEND_URL,
-  DEFAULT_TODO_SERVICE,
-  SEARCH_ENGINE_DDG,
-  iconSizeBias,
-} from './config';
-
-import { asarPath } from './helpers/asar-helpers';
-
-export const { app } = electronApi;
-export const ferdiVersion = app.getVersion();
-export const electronVersion = process.versions.electron;
-export const chromeVersion = process.versions.chrome;
-export const nodeVersion = process.versions.node;
-export const ferdiLocale = app.getLocale();
-
-// Set app directory before loading user modules
-if (process.env.FERDI_APPDATA_DIR != null) {
-  app.setPath('appData', process.env.FERDI_APPDATA_DIR);
-  app.setPath('userData', join(app.getPath('appData')));
-} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
-  app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.name}AppData`);
-  app.setPath('userData', join(app.getPath('appData'), `${app.name}AppData`));
-} else if (is.windows) {
-  app.setPath('appData', process.env.APPDATA);
-  app.setPath('userData', join(app.getPath('appData'), app.name));
-}
-
-export const isDevMode = is.development;
-if (isDevMode) {
-  app.setPath('userData', join(app.getPath('appData'), `${app.name}Dev`));
-}
-
-export function userDataPath(...segments) {
-  return join(app.getPath('userData'), ...([segments].flat()));
-}
-
-export function userDataRecipesPath(...segments) {
-  return userDataPath('recipes', ...([segments].flat()));
-}
-
-// Replacing app.asar is not beautiful but unfortunately necessary
-export function asarRecipesPath(...segments) {
-  return join(asarPath(join(__dirname, 'recipes')), ...([segments].flat()));
-}
-
-export const useLiveAPI = process.env.USE_LIVE_API;
-const useLocalAPI = process.env.USE_LOCAL_API;
-
-export const isMac = is.macos;
-export const isWindows = is.windows;
-export const isLinux = is.linux;
-export const osPlatform = os.platform();
-export const osArch = os.arch();
-export const osRelease = os.release();
-export const is64Bit = osArch.match(/64/);
-
-// for accelerator, show the shortform that electron/OS understands
-// for tooltip, show symbol
-const ctrlKey = isMac ? '⌘' : 'Ctrl';
-const cmdKey = isMac ? 'Cmd' : 'Ctrl';
-
-export const altKey = (isAccelerator = true) => (!isAccelerator && isMac ? '⌥' : 'Alt');
-export const shiftKey = (isAccelerator = true) => (!isAccelerator && isMac ? '⇧' : 'Shift');
-
-// Platform specific shortcut keys
-export const cmdOrCtrlShortcutKey = (isAccelerator = true) => (isAccelerator ? cmdKey : ctrlKey);
-export const lockFerdiShortcutKey = (isAccelerator = true) => `${cmdOrCtrlShortcutKey(isAccelerator)}+${shiftKey(isAccelerator)}+L`;
-export const todosToggleShortcutKey = (isAccelerator = true) => `${cmdOrCtrlShortcutKey(isAccelerator)}+T`;
-export const workspaceToggleShortcutKey = (isAccelerator = true) => `${cmdOrCtrlShortcutKey(isAccelerator)}+D`;
-export const muteFerdiShortcutKey = (isAccelerator = true) => `${cmdOrCtrlShortcutKey(isAccelerator)}+${shiftKey(isAccelerator)}+M`;
-export const addNewServiceShortcutKey = (isAccelerator = true) => `${cmdOrCtrlShortcutKey(isAccelerator)}+N`;
-export const settingsShortcutKey = (isAccelerator = true) => `${cmdOrCtrlShortcutKey(isAccelerator)}+${isMac ? ',' : 'P'}`;
-
-let api;
-let wsApi;
-let web;
-let todos;
-if (!isDevMode || (isDevMode && useLiveAPI)) {
-  api = LIVE_FERDI_API;
-  wsApi = LIVE_WS_API;
-  web = LIVE_API_FERDI_WEBSITE;
-  todos = PRODUCTION_TODOS_FRONTEND_URL;
-} else if (isDevMode && useLocalAPI) {
-  api = LOCAL_API;
-  wsApi = LOCAL_WS_API;
-  web = LOCAL_API_WEBSITE;
-  todos = LOCAL_TODOS_FRONTEND_URL;
-} else {
-  api = DEV_FRANZ_API;
-  wsApi = DEV_WS_API;
-  web = DEV_API_FRANZ_WEBSITE;
-  todos = PRODUCTION_TODOS_FRONTEND_URL;
-}
-
-export const API = api;
-export const API_VERSION = 'v1';
-export const WS_API = wsApi;
-export const WEBSITE = web;
-export const TODOS_FRONTEND = todos;
-
-export const DEFAULT_APP_SETTINGS = {
-  autoLaunchInBackground: false,
-  runInBackground: true,
-  reloadAfterResume: true,
-  enableSystemTray: true,
-  startMinimized: false,
-  confirmOnQuit: false,
-  minimizeToSystemTray: false,
-  closeToSystemTray: false,
-  privateNotifications: false,
-  clipboardNotifications: true,
-  notifyTaskBarOnMessage: false,
-  showDisabledServices: true,
-  showMessageBadgeWhenMuted: true,
-  showDragArea: false,
-  enableSpellchecking: true,
-  spellcheckerLanguage: 'en-us',
-  darkMode: isMac && electronApi.nativeTheme.shouldUseDarkColors,
-  locale: '',
-  fallbackLocale: 'en-US',
-  beta: false,
-  isAppMuted: false,
-  enableGPUAcceleration: true,
-
-  // Ferdi specific options
-  server: LIVE_FERDI_API,
-  predefinedTodoServer: DEFAULT_TODO_SERVICE,
-  autohideMenuBar: false,
-  lockingFeatureEnabled: false,
-  locked: false,
-  lockedPassword: '',
-  useTouchIdToUnlock: true,
-  scheduledDNDEnabled: false,
-  scheduledDNDStart: '17:00',
-  scheduledDNDEnd: '09:00',
-  hibernateOnStartup: true,
-  hibernationStrategy: '300', // seconds
-  wakeUpStrategy: '300', // seconds
-  inactivityLock: 0,
-  automaticUpdates: true,
-  showServiceNavigationBar: false,
-  universalDarkMode: true,
-  userAgentPref: '',
-  adaptableDarkMode: true,
-  accentColor: DEFAULT_ACCENT_COLOR,
-  serviceRibbonWidth: 68,
-  iconSize: iconSizeBias,
-  sentry: false,
-  nightly: false,
-  navigationBarBehaviour: 'custom',
-  searchEngine: SEARCH_ENGINE_DDG,
-  useVerticalStyle: false,
-  alwaysShowWorkspaces: false,
-  liftSingleInstanceLock: false,
-};
diff --git a/src/environment.ts b/src/environment.ts
new file mode 100644
index 000000000..ce2a77e7a
--- /dev/null
+++ b/src/environment.ts
@@ -0,0 +1,42 @@
+// Note: This file has now become devoid of all references to values deduced from the remote process - all those now live in the `environment-remote.js` file
+
+import os from 'os';
+
+export const isMac = process.platform === 'darwin';
+export const isWindows = process.platform === 'win32';
+export const isLinux = process.platform === 'linux';
+
+export const electronVersion = process.versions.electron;
+export const chromeVersion = process.versions.chrome;
+export const nodeVersion = process.versions.node;
+
+export const osPlatform = os.platform();
+export const osArch = os.arch();
+export const osRelease = os.release();
+export const is64Bit = osArch.match(/64/);
+
+// for accelerator, show the shortform that electron/OS understands
+// for tooltip, show symbol
+const ctrlKey = isMac ? '⌘' : 'Ctrl';
+const cmdKey = isMac ? 'Cmd' : 'Ctrl';
+
+export const altKey = (isAccelerator = true) =>
+  !isAccelerator && isMac ? '⌥' : 'Alt';
+export const shiftKey = (isAccelerator = true) =>
+  !isAccelerator && isMac ? '⇧' : 'Shift';
+
+// Platform specific shortcut keys
+export const cmdOrCtrlShortcutKey = (isAccelerator = true) =>
+  isAccelerator ? cmdKey : ctrlKey;
+export const lockFerdiShortcutKey = (isAccelerator = true) =>
+  `${cmdOrCtrlShortcutKey(isAccelerator)}+${shiftKey(isAccelerator)}+L`;
+export const todosToggleShortcutKey = (isAccelerator = true) =>
+  `${cmdOrCtrlShortcutKey(isAccelerator)}+T`;
+export const workspaceToggleShortcutKey = (isAccelerator = true) =>
+  `${cmdOrCtrlShortcutKey(isAccelerator)}+D`;
+export const muteFerdiShortcutKey = (isAccelerator = true) =>
+  `${cmdOrCtrlShortcutKey(isAccelerator)}+${shiftKey(isAccelerator)}+M`;
+export const addNewServiceShortcutKey = (isAccelerator = true) =>
+  `${cmdOrCtrlShortcutKey(isAccelerator)}+N`;
+export const settingsShortcutKey = (isAccelerator = true) =>
+  `${cmdOrCtrlShortcutKey(isAccelerator)}+${isMac ? ',' : 'P'}`;
diff --git a/src/features/appearance/index.js b/src/features/appearance/index.ts
index 3aab2fcad..bb93507dc 100644
--- a/src/features/appearance/index.js
+++ b/src/features/appearance/index.ts
@@ -1,8 +1,6 @@
 import color from 'color';
 import { reaction } from 'mobx';
-import themeInfo from '../../assets/themeInfo.json';
-import { iconSizeBias } from '../../config';
-import { DEFAULT_APP_SETTINGS } from '../../environment';
+import { DEFAULT_APP_SETTINGS, iconSizeBias } from '../../config';
 
 const STYLE_ELEMENT_ID = 'custom-appearance-style';
 
@@ -10,13 +8,15 @@ function createStyleElement() {
   const styles = document.createElement('style');
   styles.id = STYLE_ELEMENT_ID;
 
-  document.querySelector('head').appendChild(styles);
+  document.querySelector('head')?.appendChild(styles);
 }
 
 function setAppearance(style) {
-  const styleElement = document.getElementById(STYLE_ELEMENT_ID);
+  const styleElement = document.querySelector(`#${STYLE_ELEMENT_ID}`);
 
-  styleElement.innerHTML = style;
+  if (styleElement) {
+    styleElement.innerHTML = style;
+  }
 }
 
 // See https://github.com/Qix-/color/issues/53#issuecomment-656590710
@@ -26,24 +26,64 @@ function darkenAbsolute(originalColor, absoluteChange) {
 }
 
 function generateAccentStyle(accentColorStr) {
-  let style = '';
-
-  Object.keys(themeInfo).forEach((property) => {
-    style += `
-      ${themeInfo[property]} {
-        ${property}: ${accentColorStr};
-      }
-    `;
-  });
-
   let accentColor = color(DEFAULT_APP_SETTINGS.accentColor);
   try {
     accentColor = color(accentColorStr);
-  } catch (e) {
+  } catch {
     // Ignore invalid accent color.
   }
   const darkerColorStr = darkenAbsolute(accentColor, 5).hex();
-  style += `
+  return `
+    .theme__dark .app .sidebar .sidebar__button.is-muted,
+    .theme__dark .app .sidebar .sidebar__button.is-active,
+    .sidebar .sidebar__button.is-muted,
+    .sidebar .sidebar__button.is-active,
+    .tab-item.is-active,
+    .settings .account .invoices .invoices__action button,
+    .settings-navigation .settings-navigation__link.is-active .badge,
+    a.link,
+    button.link,
+    .auth .welcome .button:hover,
+    .auth .welcome .button__inverted,
+    .franz-form .franz-form__radio.is-selected,
+    .theme__dark .franz-form__button.franz-form__button--inverted,
+    .franz-form__button.franz-form__button--inverted {
+      color: ${accentColorStr};
+    }
+
+    .settings .settings__header,
+    .settings .settings__close,
+    .settings-navigation .settings-navigation__link.is-active,
+    a.button,
+    button.button,
+    .auth,
+    .info-bar,
+    .info-bar.info-bar--primary,
+    .infobox.infobox--primary,
+    .theme__dark .badge.badge--primary,
+    .theme__dark,
+    .badge.badge--primary,
+    .content-tabs .content-tabs__tabs .content-tabs__item.is-active,
+    #electron-app-title-bar .toolbar-dropdown:not(.open) > .toolbar-button > button:hover,
+    #electron-app-title-bar .list-item.selected .menu-item,
+    #electron-app-title-bar .list-item.selected:focus .menu-item,
+    .theme__dark .quick-switch .active,
+    .franz-form .franz-form__toggle-wrapper .franz-form__toggle.is-active .franz-form__toggle-button,
+    .theme__dark .franz-form__button,
+    .franz-form__button,
+    .ferdi__fab,
+    .franz-form .franz-form__slider-wrapper .slider::-webkit-slider-thumb {
+      background: ${accentColorStr};
+    }
+
+    .settings .settings__header .separator {
+      border-right-color: ${accentColorStr};
+    }
+
+    .franz-form .franz-form__radio.is-selected {
+      border-color: ${accentColorStr};
+    }
+
     a.button:hover, button.button:hover {
       background: ${darkenAbsolute(accentColor, 10).hex()};
     }
@@ -72,27 +112,27 @@ function generateAccentStyle(accentColorStr) {
       background: ${accentColor.lighten(0.35).hex()};
     }
   `;
-
-  return style;
 }
 
 function generateServiceRibbonWidthStyle(widthStr, iconSizeStr, vertical) {
   const width = Number(widthStr);
   const iconSize = Number(iconSizeStr) - iconSizeBias;
 
-  return vertical ? `
+  return vertical
+    ? `
     .tab-item {
       width: ${width - 2}px !important;
       height: ${width - 5 + iconSize}px !important;
       min-height: unset;
     }
     .tab-item .tab-item__icon {
-      width: ${(width / 2) + iconSize}px !important;
+      width: ${width / 2 + iconSize}px !important;
     }
     .sidebar__button {
       font-size: ${width / 3}px !important;
     }
-  ` : `
+  `
+    : `
     .sidebar {
       width: ${width}px !important;
     }
@@ -101,7 +141,7 @@ function generateServiceRibbonWidthStyle(widthStr, iconSizeStr, vertical) {
       height: ${width - 5 + iconSize}px !important;
     }
     .tab-item .tab-item__icon {
-      width: ${(width / 2) + iconSize}px !important;
+      width: ${width / 2 + iconSize}px !important;
     }
     .sidebar__button {
       font-size: ${width / 3}px !important;
@@ -129,14 +169,14 @@ function generateShowDragAreaStyle(accentColor) {
 }
 
 function generateVerticalStyle(widthStr, alwaysShowWorkspaces) {
-  if (!document.getElementById('vertical-style')) {
+  if (!document.querySelector('#vertical-style')) {
     const link = document.createElement('link');
     link.id = 'vertical-style';
     link.rel = 'stylesheet';
     link.type = 'text/css';
     link.href = './styles/vertical.css';
 
-    document.head.appendChild(link);
+    document.head.append(link);
   }
   const width = Number(widthStr);
   const sidebarWidth = width - 4;
@@ -144,20 +184,19 @@ function generateVerticalStyle(widthStr, alwaysShowWorkspaces) {
 
   return `
   .sidebar {
-    height: ${sidebarWidth + verticalStyleOffset + 1}px !important;
-  ${alwaysShowWorkspaces ? `
+  ${
+    alwaysShowWorkspaces
+      ? `
     width: calc(100% - 300px) !important;
-  ` : ''}
+  `
+      : ''
+  }
   }
 
   .sidebar .sidebar__button {
     width: ${width}px;
   }
 
-  .app .app__content {
-    padding-top: ${sidebarWidth + verticalStyleOffset + 1}px !important;
-  }
-
   .workspaces-drawer {
     margin-top: -${sidebarWidth - verticalStyleOffset - 1}px !important;
   }
@@ -192,21 +231,31 @@ function generateStyle(settings) {
     alwaysShowWorkspaces,
   } = settings;
 
-  if (accentColor.toLowerCase() !== DEFAULT_APP_SETTINGS.accentColor.toLowerCase()) {
+  if (
+    accentColor.toLowerCase() !== DEFAULT_APP_SETTINGS.accentColor.toLowerCase()
+  ) {
     style += generateAccentStyle(accentColor);
   }
-  if (serviceRibbonWidth !== DEFAULT_APP_SETTINGS.serviceRibbonWidth
-      || iconSize !== DEFAULT_APP_SETTINGS.iconSize) {
-    style += generateServiceRibbonWidthStyle(serviceRibbonWidth, iconSize, useVerticalStyle);
+  if (
+    serviceRibbonWidth !== DEFAULT_APP_SETTINGS.serviceRibbonWidth ||
+    iconSize !== DEFAULT_APP_SETTINGS.iconSize
+  ) {
+    style += generateServiceRibbonWidthStyle(
+      serviceRibbonWidth,
+      iconSize,
+      useVerticalStyle,
+    );
   }
   if (showDragArea) {
     style += generateShowDragAreaStyle(accentColor);
   }
   if (useVerticalStyle) {
     style += generateVerticalStyle(serviceRibbonWidth, alwaysShowWorkspaces);
-  } else if (document.getElementById('vertical-style')) {
-    const link = document.getElementById('vertical-style');
-    document.head.removeChild(link);
+  } else if (document.querySelector('#vertical-style')) {
+    const link = document.querySelector('#vertical-style');
+    if (link) {
+      link.remove();
+    }
   }
   if (alwaysShowWorkspaces) {
     style += generateOpenWorkspaceStyle();
@@ -225,14 +274,14 @@ export default function initAppearance(stores) {
 
   // Update style when settings change
   reaction(
-    () => ([
+    () => [
       settings.all.app.accentColor,
       settings.all.app.serviceRibbonWidth,
       settings.all.app.iconSize,
       settings.all.app.showDragArea,
       settings.all.app.useVerticalStyle,
       settings.all.app.alwaysShowWorkspaces,
-    ]),
+    ],
     () => {
       updateStyle(settings.all.app);
     },
diff --git a/src/features/basicAuth/Component.js b/src/features/basicAuth/Component.js
index a9601836b..3cf937f98 100644
--- a/src/features/basicAuth/Component.js
+++ b/src/features/basicAuth/Component.js
@@ -2,19 +2,14 @@ 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 { defineMessages, injectIntl } from 'react-intl';
 import classnames from 'classnames';
 
 import Modal from '../../components/ui/Modal';
 import Input from '../../components/ui/Input';
 import Button from '../../components/ui/Button';
 
-import {
-  state,
-  resetState,
-  sendCredentials,
-  cancelLogin,
-} from './store';
+import { state, resetState, sendCredentials, cancelLogin } from './store';
 import Form from './Form';
 
 import styles from './styles';
@@ -23,17 +18,15 @@ import globalMessages from '../../i18n/globalMessages';
 const messages = defineMessages({
   signIn: {
     id: 'feature.basicAuth.signIn',
-    defaultMessage: '!!!Sign In',
+    defaultMessage: 'Sign In',
   },
 });
 
-export default @injectSheet(styles) @observer class BasicAuthModal extends Component {
+@injectSheet(styles)
+@observer
+class BasicAuthModal extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
-  }
-
-  static contextTypes = {
-    intl: intlShape,
   };
 
   submit(e) {
@@ -56,20 +49,15 @@ export default @injectSheet(styles) @observer class BasicAuthModal extends Compo
   }
 
   render() {
-    const {
-      classes,
-    } = this.props;
+    const { classes } = this.props;
 
-    const {
-      isModalVisible,
-      authInfo,
-    } = state;
+    const { isModalVisible, authInfo } = state;
 
     if (!authInfo) {
       return null;
     }
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <Modal
@@ -89,10 +77,7 @@ export default @injectSheet(styles) @observer class BasicAuthModal extends Compo
           onSubmit={this.submit.bind(this)}
           className={classnames('franz-form', classes.form)}
         >
-          <Input
-            field={Form.$('user')}
-            showLabel={false}
-          />
+          <Input field={Form.$('user')} showLabel={false} />
           <Input
             field={Form.$('password')}
             showLabel={false}
@@ -105,13 +90,11 @@ export default @injectSheet(styles) @observer class BasicAuthModal extends Compo
               buttonType="secondary"
               onClick={this.cancel.bind(this)}
             />
-            <Button
-              type="submit"
-              label={intl.formatMessage(messages.signIn)}
-            />
+            <Button type="submit" label={intl.formatMessage(messages.signIn)} />
           </div>
         </form>
       </Modal>
     );
   }
 }
+export default injectIntl(BasicAuthModal);
diff --git a/src/features/basicAuth/Form.js b/src/features/basicAuth/Form.ts
index 95721d0e9..e84156d96 100644
--- a/src/features/basicAuth/Form.js
+++ b/src/features/basicAuth/Form.ts
@@ -1,5 +1,6 @@
 import Form from '../../lib/Form';
 
+// @ts-expect-error Expected 0 arguments, but got 1
 export default new Form({
   fields: {
     user: {
diff --git a/src/features/basicAuth/mainIpcHandler.js b/src/features/basicAuth/mainIpcHandler.ts
index ae4e7cf93..4ec3848e8 100644
--- a/src/features/basicAuth/mainIpcHandler.js
+++ b/src/features/basicAuth/mainIpcHandler.ts
@@ -1,6 +1,8 @@
+import { BrowserWindow } from 'electron';
+
 const debug = require('debug')('Ferdi:feature:basicAuth:main');
 
-export default function mainIpcHandler(mainWindow, authInfo) {
+export default function mainIpcHandler(mainWindow: BrowserWindow, authInfo) {
   debug('Sending basic auth call', authInfo);
 
   mainWindow.webContents.send('feature:basic-auth', {
diff --git a/src/features/basicAuth/store.js b/src/features/basicAuth/store.ts
index 0713ff572..0713ff572 100644
--- a/src/features/basicAuth/store.js
+++ b/src/features/basicAuth/store.ts
diff --git a/src/features/basicAuth/styles.js b/src/features/basicAuth/styles.ts
index 6bdaf9a6e..6bdaf9a6e 100644
--- a/src/features/basicAuth/styles.js
+++ b/src/features/basicAuth/styles.ts
diff --git a/src/features/communityRecipes/index.js b/src/features/communityRecipes/index.ts
index 828c6d867..828c6d867 100644
--- a/src/features/communityRecipes/index.js
+++ b/src/features/communityRecipes/index.ts
diff --git a/src/features/communityRecipes/store.js b/src/features/communityRecipes/store.ts
index a3614dd11..a8d358ba0 100644
--- a/src/features/communityRecipes/store.js
+++ b/src/features/communityRecipes/store.ts
@@ -4,7 +4,11 @@ import { FeatureStore } from '../utils/FeatureStore';
 const debug = require('debug')('Ferdi:feature:communityRecipes:store');
 
 export class CommunityRecipesStore extends FeatureStore {
-  start(stores, actions) {
+  stores: any;
+
+  actions: any;
+
+  start(stores: any, actions: any) {
     debug('start');
     this.stores = stores;
     this.actions = actions;
@@ -18,12 +22,17 @@ export class CommunityRecipesStore extends FeatureStore {
   @computed get communityRecipes() {
     if (!this.stores) return [];
 
-    return this.stores.recipePreviews.dev.map((r) => {
-      // TODO: Need to figure out if this is even necessary/used
-      r.isDevRecipe = !!r.author.find((a) => a.email === this.stores.user.data.email);
+    return this.stores.recipePreviews.dev.map(
+      (recipePreview: { isDevRecipe: boolean; author: any[] }) => {
+        // TODO: Need to figure out if this is even necessary/used
+        recipePreview.isDevRecipe = !!recipePreview.author.some(
+          (author: { email: any }) =>
+            author.email === this.stores.user.data.email,
+        );
 
-      return r;
-    });
+        return recipePreview;
+      },
+    );
   }
 }
 
diff --git a/src/features/nightlyBuilds/Component.js b/src/features/nightlyBuilds/Component.js
index e43287db5..814d529d9 100644
--- a/src/features/nightlyBuilds/Component.js
+++ b/src/features/nightlyBuilds/Component.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
 import injectSheet from 'react-jss';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { H1 } from '@meetfranz/ui';
 
 import Modal from '../../components/ui/Modal';
@@ -16,15 +16,16 @@ import globalMessages from '../../i18n/globalMessages';
 const messages = defineMessages({
   title: {
     id: 'feature.nightlyBuilds.title',
-    defaultMessage: '!!!Nightly Builds',
+    defaultMessage: 'Nightly Builds',
   },
   info: {
     id: 'feature.nightlyBuilds.info',
-    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.',
+    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.",
   },
   activate: {
     id: 'feature.nightlyBuilds.activate',
-    defaultMessage: '!!!Activate',
+    defaultMessage: 'Activate',
   },
 });
 
@@ -52,11 +53,10 @@ const styles = () => ({
   },
 });
 
-export default @injectSheet(styles) @inject('stores', 'actions') @observer class NightlyBuildsModal extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
+@injectSheet(styles)
+@inject('stores', 'actions')
+@observer
+class NightlyBuildsModal extends Component {
   close() {
     ModalState.isModalVisible = false;
 
@@ -84,11 +84,9 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
   render() {
     const { isModalVisible } = ModalState;
 
-    const {
-      classes,
-    } = this.props;
+    const { classes } = this.props;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <Modal
@@ -132,3 +130,5 @@ NightlyBuildsModal.wrappedComponent.propTypes = {
   }).isRequired,
   classes: PropTypes.object.isRequired,
 };
+
+export default injectIntl(NightlyBuildsModal);
diff --git a/src/features/nightlyBuilds/store.js b/src/features/nightlyBuilds/store.ts
index ed06e5a7d..ed06e5a7d 100644
--- a/src/features/nightlyBuilds/store.js
+++ b/src/features/nightlyBuilds/store.ts
diff --git a/src/features/publishDebugInfo/Component.js b/src/features/publishDebugInfo/Component.js
index 5387bd358..5b5036752 100644
--- a/src/features/publishDebugInfo/Component.js
+++ b/src/features/publishDebugInfo/Component.js
@@ -2,7 +2,7 @@ import { H1 } from '@meetfranz/ui';
 import { inject, observer } from 'mobx-react';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import injectSheet from 'react-jss';
 import { state as ModalState } from './store';
 import { sendAuthRequest } from '../../api/utils/auth';
@@ -18,35 +18,37 @@ const debug = require('debug')('Ferdi:feature:publishDebugInfo');
 const messages = defineMessages({
   title: {
     id: 'feature.publishDebugInfo.title',
-    defaultMessage: '!!!Publish debug information',
+    defaultMessage: 'Publish debug information',
   },
   info: {
     id: 'feature.publishDebugInfo.info',
-    defaultMessage: '!!!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',
+    defaultMessage:
+      "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",
   },
   error: {
     id: 'feature.publishDebugInfo.error',
-    defaultMessage: '!!!There was an error while trying to publish the debug information. Please try again later or view the console for more information.',
+    defaultMessage:
+      'There was an error while trying to publish the debug information. Please try again later or view the console for more information.',
   },
   privacy: {
     id: 'feature.publishDebugInfo.privacy',
-    defaultMessage: '!!!Privacy policy',
+    defaultMessage: 'Privacy policy',
   },
   terms: {
     id: 'feature.publishDebugInfo.terms',
-    defaultMessage: '!!!Terms of service',
+    defaultMessage: 'Terms of service',
   },
   publish: {
     id: 'feature.publishDebugInfo.publish',
-    defaultMessage: '!!!Accept and publish',
+    defaultMessage: 'Accept and publish',
   },
   published: {
     id: 'feature.publishDebugInfo.published',
-    defaultMessage: '!!!Your debug log was published and is now availible at',
+    defaultMessage: 'Your debug log was published and is now availible at',
   },
 });
 
-const styles = (theme) => ({
+const styles = theme => ({
   container: {
     minWidth: '70vw',
   },
@@ -69,7 +71,8 @@ const styles = (theme) => ({
     width: '100%',
 
     '& div': {
-      fontFamily: 'SFMono-Regular,Consolas,Liberation Mono,Menlo,Courier,monospace',
+      fontFamily:
+        'SFMono-Regular,Consolas,Liberation Mono,Menlo,Courier,monospace',
     },
 
     '& input': {
@@ -81,20 +84,19 @@ const styles = (theme) => ({
   },
 });
 
-export default @injectSheet(styles) @inject('stores', 'actions') @observer class PublishDebugLogModal extends Component {
+@injectSheet(styles)
+@inject('stores', 'actions')
+@observer
+class PublishDebugLogModal extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     log: null,
     error: false,
     isSendingLog: false,
-  }
+  };
 
   // Close this modal
   close() {
@@ -109,12 +111,16 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
 
     const debugInfo = JSON.stringify(this.props.stores.app.debugInfo);
 
-    const request = await sendAuthRequest(`${DEBUG_API}/create`, {
-      method: 'POST',
-      body: JSON.stringify({
-        log: debugInfo,
-      }),
-    }, false);
+    const request = await sendAuthRequest(
+      `${DEBUG_API}/create`,
+      {
+        method: 'POST',
+        body: JSON.stringify({
+          log: debugInfo,
+        }),
+      },
+      false,
+    );
 
     debug(`debugInfo: publishing status: ${request.status}`);
     if (request.status === 200) {
@@ -140,17 +146,11 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
   render() {
     const { isModalVisible } = ModalState;
 
-    const {
-      classes,
-    } = this.props;
+    const { classes } = this.props;
 
-    const {
-      log,
-      error,
-      isSendingLog,
-    } = this.state;
+    const { log, error, isSendingLog } = this.state;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <Modal
@@ -159,12 +159,12 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
         close={() => this.close()}
       >
         <div className={classes.container}>
-          <H1>
-            {intl.formatMessage(messages.title)}
-          </H1>
-          { log && (
+          <H1>{intl.formatMessage(messages.title)}</H1>
+          {log && (
             <>
-              <p className={classes.info}>{intl.formatMessage(messages.published)}</p>
+              <p className={classes.info}>
+                {intl.formatMessage(messages.published)}
+              </p>
               <Input
                 className={classes.url}
                 showLabel={false}
@@ -184,12 +184,24 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
 
           {!log && !error && (
             <>
-              <p className={classes.info}>{intl.formatMessage(messages.info)}</p>
-
-              <a href={`${DEBUG_API}/privacy.html`} target="_blank" className={classes.link} rel="noreferrer">
+              <p className={classes.info}>
+                {intl.formatMessage(messages.info)}
+              </p>
+
+              <a
+                href={`${DEBUG_API}/privacy.html`}
+                target="_blank"
+                className={classes.link}
+                rel="noreferrer"
+              >
                 {intl.formatMessage(messages.privacy)}
               </a>
-              <a href={`${DEBUG_API}/terms.html`} target="_blank" className={classes.link} rel="noreferrer">
+              <a
+                href={`${DEBUG_API}/terms.html`}
+                target="_blank"
+                className={classes.link}
+                rel="noreferrer"
+              >
                 {intl.formatMessage(messages.terms)}
               </a>
 
@@ -216,3 +228,5 @@ PublishDebugLogModal.wrappedComponent.propTypes = {
     service: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
 };
+
+export default injectIntl(PublishDebugLogModal);
diff --git a/src/features/publishDebugInfo/store.js b/src/features/publishDebugInfo/store.ts
index ed06e5a7d..ed06e5a7d 100644
--- a/src/features/publishDebugInfo/store.js
+++ b/src/features/publishDebugInfo/store.ts
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
index 78d5d94a0..f21db0ebd 100644
--- a/src/features/quickSwitch/Component.js
+++ b/src/features/quickSwitch/Component.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
 import { reaction } from 'mobx';
 import injectSheet from 'react-jss';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { Input } from '@meetfranz/forms';
 import { H1 } from '@meetfranz/ui';
 
@@ -16,19 +16,20 @@ import ServicesStore from '../../stores/ServicesStore';
 const messages = defineMessages({
   title: {
     id: 'feature.quickSwitch.title',
-    defaultMessage: '!!!QuickSwitch',
+    defaultMessage: 'QuickSwitch',
   },
   search: {
     id: 'feature.quickSwitch.search',
-    defaultMessage: '!!!Search...',
+    defaultMessage: 'Search...',
   },
   info: {
     id: 'feature.quickSwitch.info',
-    defaultMessage: '!!!Select a service with TAB, ↑ and ↓. Open a service with ENTER.',
+    defaultMessage:
+      'Select a service with TAB, ↑ and ↓. Open a service with ENTER.',
   },
 });
 
-const styles = (theme) => ({
+const styles = theme => ({
   modal: {
     width: '80%',
     maxWidth: 600,
@@ -80,20 +81,19 @@ const styles = (theme) => ({
   },
 });
 
-export default @injectSheet(styles) @inject('stores', 'actions') @observer class QuickSwitchModal extends Component {
+@injectSheet(styles)
+@inject('stores', 'actions')
+@observer
+class QuickSwitchModal extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     selected: 0,
     search: '',
     wasPrevVisible: false,
-  }
+  };
 
   ARROW_DOWN = 40;
 
@@ -118,9 +118,7 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
     this.openService = this.openService.bind(this);
 
     reaction(
-      () => (
-        ModalState.isModalVisible
-      ),
+      () => ModalState.isModalVisible,
       () => {
         this._handleVisibilityChange();
       },
@@ -140,10 +138,17 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
   // Get currently shown services
   services() {
     let services = [];
-    if (this.state.search && compact(invoke(this.state.search, 'match', /^[a-z0-9]/i)).length > 0) {
+    if (
+      this.state.search &&
+      compact(invoke(this.state.search, 'match', /^[\da-z]/i)).length > 0
+    ) {
       // Apply simple search algorythm to list of all services
       services = this.props.stores.services.allDisplayed;
-      services = services.filter((service) => service.name.toLowerCase().search(this.state.search.toLowerCase()) !== -1);
+      services = services.filter(
+        service =>
+          service.name.toLowerCase().search(this.state.search.toLowerCase()) !==
+          -1,
+      );
     } else {
       // Add the currently active service first
       const currentService = this.props.stores.services.active;
@@ -186,14 +191,14 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
   // Change the selected service
   // factor should be -1 or 1
   changeSelected(factor) {
-    this.setState((state) => {
+    this.setState(state => {
       let newSelected = state.selected + factor;
       const services = this.services().length;
 
       // Roll around when on edge of list
       if (state.selected < 1 && factor === -1) {
         newSelected = services - 1;
-      } else if ((state.selected >= (services - 1)) && factor === 1) {
+      } else if (state.selected >= services - 1 && factor === 1) {
         newSelected = 0;
       }
 
@@ -256,7 +261,7 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
       // Wrapped inside timeout to let the modal render first
       setTimeout(() => {
         if (this.inputRef.current) {
-          this.inputRef.current.getElementsByTagName('input')[0].focus();
+          this.inputRef.current.querySelectorAll('input')[0].focus();
         }
       }, 10);
 
@@ -268,7 +273,7 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
       // search query change when modal not visible
       setTimeout(() => {
         if (this.inputRef.current) {
-          this.inputRef.current.getElementsByTagName('input')[0].blur();
+          this.inputRef.current.querySelectorAll('input')[0].blur();
         }
       }, 100);
 
@@ -286,17 +291,13 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
   render() {
     const { isModalVisible } = ModalState;
 
-    const {
-      openService,
-    } = this;
+    const { openService } = this;
 
-    const {
-      classes,
-    } = this.props;
+    const { classes } = this.props;
 
     const services = this.services();
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <Modal
@@ -318,12 +319,16 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
         </div>
 
         <div className={classes.services}>
-          { services.map((service, index) => (
+          {services.map((service, index) => (
             <div
-              className={`${classes.service} ${this.state.selected === index ? `${classes.activeService} active` : ''} service`}
+              className={`${classes.service} ${
+                this.state.selected === index
+                  ? `${classes.activeService} active`
+                  : ''
+              } service`}
               onClick={() => openService(index)}
               key={service.id}
-              ref={(el) => {
+              ref={el => {
                 this.serviceElements[index] = el;
               }}
             >
@@ -332,9 +337,7 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
                 className={classes.serviceIcon}
                 alt={service.recipe.name}
               />
-              <div>
-                { service.name }
-              </div>
+              <div>{service.name}</div>
             </div>
           ))}
         </div>
@@ -356,3 +359,5 @@ QuickSwitchModal.wrappedComponent.propTypes = {
     service: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
 };
+
+export default injectIntl(QuickSwitchModal);
diff --git a/src/features/quickSwitch/store.js b/src/features/quickSwitch/store.ts
index ed06e5a7d..ed06e5a7d 100644
--- a/src/features/quickSwitch/store.js
+++ b/src/features/quickSwitch/store.ts
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
deleted file mode 100644
index eb7116651..000000000
--- a/src/features/serviceProxy/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { autorun, observable } from 'mobx';
-import { session } from '@electron/remote';
-
-const debug = require('debug')('Ferdi:feature:serviceProxy');
-
-export const config = observable({
-  isEnabled: true,
-});
-
-export default function init(stores) {
-  debug('Initializing `serviceProxy` feature');
-
-  autorun(() => {
-    config.isEnabled = true;
-
-    const services = stores.services.enabled;
-    const proxySettings = stores.settings.proxy;
-
-    debug('Service Proxy autorun');
-
-    services.forEach((service) => {
-      const s = session.fromPartition(`persist:service-${service.id}`);
-
-      if (config.isEnabled) {
-        const serviceProxyConfig = proxySettings[service.id];
-
-        if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) {
-          const proxyHost = `${serviceProxyConfig.host}${serviceProxyConfig.port ? `:${serviceProxyConfig.port}` : ''}`;
-          debug(`Setting proxy config from service settings for "${service.name}" (${service.id}) to`, proxyHost);
-
-          s.setProxy({ proxyRules: proxyHost }, () => {
-            debug(`Using proxy "${proxyHost}" for "${service.name}" (${service.id})`);
-          });
-        }
-      }
-    });
-  });
-}
diff --git a/src/features/serviceProxy/index.ts b/src/features/serviceProxy/index.ts
new file mode 100644
index 000000000..f095b286a
--- /dev/null
+++ b/src/features/serviceProxy/index.ts
@@ -0,0 +1,54 @@
+import { autorun, observable } from 'mobx';
+import { session } from '@electron/remote';
+
+const debug = require('debug')('Ferdi:feature:serviceProxy');
+
+export const config = observable({
+  isEnabled: true,
+});
+
+export default function init(stores: {
+  services: { enabled: any };
+  settings: { proxy: any };
+}) {
+  debug('Initializing `serviceProxy` feature');
+
+  autorun(() => {
+    config.isEnabled = true;
+
+    const services = stores.services.enabled;
+    const proxySettings = stores.settings.proxy;
+
+    debug('Service Proxy autorun');
+
+    for (const service of services) {
+      const s = session.fromPartition(`persist:service-${service.id}`);
+
+      if (config.isEnabled) {
+        const serviceProxyConfig = proxySettings[service.id];
+
+        if (
+          serviceProxyConfig &&
+          serviceProxyConfig.isEnabled &&
+          serviceProxyConfig.host
+        ) {
+          const proxyHost = `${serviceProxyConfig.host}${
+            serviceProxyConfig.port ? `:${serviceProxyConfig.port}` : ''
+          }`;
+          debug(
+            `Setting proxy config from service settings for "${service.name}" (${service.id}) to`,
+            proxyHost,
+          );
+
+          s.setProxy({ proxyRules: proxyHost })
+            .then(() => {
+              debug(
+                `Using proxy "${proxyHost}" for "${service.name}" (${service.id})`,
+              );
+            })
+            .catch(error => console.error(error));
+        }
+      }
+    }
+  });
+}
diff --git a/src/features/settingsWS/actions.js b/src/features/settingsWS/actions.ts
index 631670c8a..631670c8a 100755
--- a/src/features/settingsWS/actions.js
+++ b/src/features/settingsWS/actions.ts
diff --git a/src/features/settingsWS/index.js b/src/features/settingsWS/index.ts
index 7771421d6..9bb206d82 100755
--- a/src/features/settingsWS/index.js
+++ b/src/features/settingsWS/index.ts
@@ -5,15 +5,16 @@ const debug = require('debug')('Ferdi:feature:settingsWS');
 
 export const settingsStore = new SettingsWSStore();
 
-export default function initSettingsWebSocket(stores, actions) {
+export default function initSettingsWebSocket(
+  stores: { features: any },
+  actions: any,
+) {
   const { features } = stores;
 
   // Toggle SettingsWebSocket feature
   reaction(
-    () => (
-      features.features.isSettingsWSEnabled
-    ),
-    (isEnabled) => {
+    () => features.features.isSettingsWSEnabled,
+    isEnabled => {
       if (isEnabled) {
         debug('Initializing `settingsWS` feature');
         settingsStore.start(stores, actions);
diff --git a/src/features/settingsWS/state.js b/src/features/settingsWS/state.ts
index 7b16b2b6e..7b16b2b6e 100755
--- a/src/features/settingsWS/state.js
+++ b/src/features/settingsWS/state.ts
diff --git a/src/features/settingsWS/store.js b/src/features/settingsWS/store.js
index 9100f33d1..3b9e10825 100755
--- a/src/features/settingsWS/store.js
+++ b/src/features/settingsWS/store.js
@@ -4,7 +4,7 @@ import ms from 'ms';
 
 import { FeatureStore } from '../utils/FeatureStore';
 import { createReactions } from '../../stores/lib/Reaction';
-import { WS_API } from '../../environment';
+import { WS_API } from '../../environment-remote';
 
 const debug = require('debug')('Ferdi:feature:settingsWS:store');
 
@@ -25,11 +25,13 @@ export class SettingsWSStore extends FeatureStore {
     this.stores = stores;
     this.actions = actions;
 
-    this._registerReactions(createReactions([
-      this._initialize.bind(this),
-      this._reconnect.bind(this),
-      this._close.bind(this),
-    ]));
+    this._registerReactions(
+      createReactions([
+        this._initialize.bind(this),
+        this._reconnect.bind(this),
+        this._close.bind(this),
+      ]),
+    );
   }
 
   connect() {
@@ -51,12 +53,12 @@ export class SettingsWSStore extends FeatureStore {
         this.heartbeat();
       });
 
-      this.ws.on('message', (data) => {
+      this.ws.on('message', data => {
         const resp = JSON.parse(data);
         debug('Received message', resp);
 
         if (resp.id) {
-          this.stores.user.getUserInfoRequest.patch((result) => {
+          this.stores.user.getUserInfoRequest.patch(result => {
             if (!result) return;
 
             debug('Patching user object with new values');
@@ -66,8 +68,8 @@ export class SettingsWSStore extends FeatureStore {
       });
 
       this.ws.on('ping', this.heartbeat.bind(this));
-    } catch (err) {
-      console.err(err);
+    } catch (error) {
+      console.error(error);
     }
   }
 
diff --git a/src/features/todos/actions.js b/src/features/todos/actions.js
deleted file mode 100644
index cc17e919b..000000000
--- a/src/features/todos/actions.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import PropTypes from 'prop-types';
-import { createActionsFromDefinitions } from '../../actions/lib/actions';
-
-export const todoActions = createActionsFromDefinitions({
-  resize: {
-    width: PropTypes.number.isRequired,
-  },
-  toggleTodosPanel: {},
-  toggleTodosFeatureVisibility: {},
-  setTodosWebview: {
-    webview: PropTypes.instanceOf(Element).isRequired,
-  },
-  handleHostMessage: {
-    action: PropTypes.string.isRequired,
-    data: PropTypes.object,
-  },
-  handleClientMessage: {
-    channel: PropTypes.string.isRequired,
-    message: PropTypes.shape({
-      action: PropTypes.string.isRequired,
-      data: PropTypes.object,
-    }),
-  },
-  openDevTools: {},
-  reload: {},
-}, PropTypes.checkPropTypes);
-
-export default todoActions;
diff --git a/src/features/todos/actions.ts b/src/features/todos/actions.ts
new file mode 100644
index 000000000..04e299e71
--- /dev/null
+++ b/src/features/todos/actions.ts
@@ -0,0 +1,31 @@
+import PropTypes from 'prop-types';
+import { createActionsFromDefinitions } from '../../actions/lib/actions';
+
+export const todoActions = createActionsFromDefinitions(
+  {
+    resize: {
+      width: PropTypes.number.isRequired,
+    },
+    toggleTodosPanel: {},
+    toggleTodosFeatureVisibility: {},
+    setTodosWebview: {
+      webview: PropTypes.instanceOf(Element).isRequired,
+    },
+    handleHostMessage: {
+      action: PropTypes.string.isRequired,
+      data: PropTypes.object,
+    },
+    handleClientMessage: {
+      channel: PropTypes.string.isRequired,
+      message: PropTypes.shape({
+        action: PropTypes.string.isRequired,
+        data: PropTypes.object,
+      }),
+    },
+    openDevTools: {},
+    reload: {},
+  },
+  PropTypes.checkPropTypes,
+);
+
+export default todoActions;
diff --git a/src/features/todos/constants.js b/src/features/todos/constants.ts
index 303a7a16e..303a7a16e 100644
--- a/src/features/todos/constants.js
+++ b/src/features/todos/constants.ts
diff --git a/src/features/todos/index.js b/src/features/todos/index.ts
index 573190881..3665812e6 100644
--- a/src/features/todos/index.js
+++ b/src/features/todos/index.ts
@@ -5,16 +5,17 @@ const debug = require('debug')('Ferdi:feature:todos');
 
 export const todosStore = new TodoStore();
 
-export default function initTodos(stores, actions) {
+export default function initTodos(
+  stores: { todos?: any; features?: any },
+  actions: any,
+) {
   stores.todos = todosStore;
   const { features } = stores;
 
   // Toggle todos feature
   reaction(
-    () => (
-      features.features.isTodosEnabled
-    ),
-    (isEnabled) => {
+    () => features.features.isTodosEnabled,
+    isEnabled => {
       if (isEnabled) {
         debug('Initializing `todos` feature');
         todosStore.start(stores, actions);
diff --git a/src/features/todos/preload.js b/src/features/todos/preload.js
index 9bd76a704..3b86ddbc5 100644
--- a/src/features/todos/preload.js
+++ b/src/features/todos/preload.js
@@ -7,7 +7,9 @@ debug('Preloading Todos Webview');
 
 let hostMessageListener = ({ action }) => {
   switch (action) {
-    case 'todos:initialize-as-service': ipcRenderer.sendToHost('hello'); break;
+    case 'todos:initialize-as-service':
+      ipcRenderer.sendToHost('hello');
+      break;
     default:
   }
 };
@@ -15,7 +17,9 @@ let hostMessageListener = ({ action }) => {
 window.ferdi = {
   onInitialize(ipcHostMessageListener) {
     hostMessageListener = ipcHostMessageListener;
-    ipcRenderer.sendToHost(IPC.TODOS_CLIENT_CHANNEL, { action: 'todos:initialized' });
+    ipcRenderer.sendToHost(IPC.TODOS_CLIENT_CHANNEL, {
+      action: 'todos:initialized',
+    });
   },
   sendToHost(message) {
     ipcRenderer.sendToHost(IPC.TODOS_CLIENT_CHANNEL, message);
@@ -30,7 +34,7 @@ ipcRenderer.on(IPC.TODOS_HOST_CHANNEL, (event, message) => {
 if (window.location.href === 'https://app.franztodos.com/login/') {
   // Insert info element informing about Franz accounts
   const infoElement = document.createElement('p');
-  infoElement.innerText = `You are using Franz's official Todo Service.
+  infoElement.textContent = `You are using Franz's official Todo Service.
 This service will only work with accounts registered with Franz - no Ferdi accounts will work here!
 If you do not have a Franz account you can change the Todo service by going into Ferdi's settings and changing the "Todo server".
 You can choose any service as this Todo server, e.g. Todoist or Apple Notes.`;
@@ -42,7 +46,7 @@ You can choose any service as this Todo server, e.g. Todoist or Apple Notes.`;
     const textElement = document.querySelector('p');
     if (textElement) {
       clearInterval(waitForReact);
-      textElement.parentElement.insertBefore(infoElement, textElement);
+      textElement.parentElement?.insertBefore(infoElement, textElement);
     } else {
       numChecks += 1;
 
diff --git a/src/features/utils/ActionBinding.js b/src/features/utils/ActionBinding.ts
index 787166d44..787166d44 100644
--- a/src/features/utils/ActionBinding.js
+++ b/src/features/utils/ActionBinding.ts
diff --git a/src/features/utils/FeatureStore.js b/src/features/utils/FeatureStore.js
index 4d4e217a9..afe726294 100644
--- a/src/features/utils/FeatureStore.js
+++ b/src/features/utils/FeatureStore.js
@@ -16,11 +16,11 @@ export class FeatureStore {
   }
 
   _startActions(actions = this._actions) {
-    actions.forEach((a) => a.start());
+    for (const a of actions) a.start();
   }
 
   _stopActions(actions = this._actions) {
-    actions.forEach((a) => a.stop());
+    for (const a of actions) a.stop();
   }
 
   // REACTIONS
@@ -31,10 +31,10 @@ export class FeatureStore {
   }
 
   _startReactions(reactions = this._reactions) {
-    reactions.forEach((r) => r.start());
+    for (const r of reactions) r.start();
   }
 
   _stopReactions(reactions = this._reactions) {
-    reactions.forEach((r) => r.stop());
+    for (const r of reactions) r.stop();
   }
 }
diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js
index bebf52c08..97fa20dcc 100644
--- a/src/features/webControls/components/WebControls.js
+++ b/src/features/webControls/components/WebControls.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 import { Icon } from '@meetfranz/ui';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import {
   mdiReload,
@@ -16,23 +16,23 @@ import {
 const messages = defineMessages({
   goHome: {
     id: 'webControls.goHome',
-    defaultMessage: '!!!Home',
+    defaultMessage: 'Home',
   },
   openInBrowser: {
     id: 'webControls.openInBrowser',
-    defaultMessage: '!!!Open in Browser',
+    defaultMessage: 'Open in Browser',
   },
   back: {
     id: 'webControls.back',
-    defaultMessage: '!!!Back',
+    defaultMessage: 'Back',
   },
   forward: {
     id: 'webControls.forward',
-    defaultMessage: '!!!Forward',
+    defaultMessage: 'Forward',
   },
   reload: {
     id: 'webControls.reload',
-    defaultMessage: '!!!Reload',
+    defaultMessage: 'Reload',
   },
 });
 
@@ -109,10 +109,6 @@ class WebControls extends Component {
     navigate: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   static getDerivedStateFromProps(props, state) {
     const { url } = props;
     const { editUrl } = state;
@@ -148,7 +144,7 @@ class WebControls extends Component {
 
     const { inputUrl, editUrl } = this.state;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <div className={classes.root}>
@@ -241,4 +237,4 @@ class WebControls extends Component {
   }
 }
 
-export default WebControls;
+export default injectIntl(WebControls);
diff --git a/src/features/webControls/containers/WebControlsScreen.js b/src/features/webControls/containers/WebControlsScreen.js
index e1e1b9991..0273bb13e 100644
--- a/src/features/webControls/containers/WebControlsScreen.js
+++ b/src/features/webControls/containers/WebControlsScreen.js
@@ -16,7 +16,8 @@ const URL_EVENTS = [
   'did-navigate-in-page',
 ];
 
-@inject('stores', 'actions') @observer
+@inject('stores', 'actions')
+@observer
 class WebControlsScreen extends Component {
   @observable url = '';
 
@@ -36,15 +37,15 @@ class WebControlsScreen extends Component {
         this.webview = service.webview;
         this.url = this.webview.getURL();
 
-        URL_EVENTS.forEach((event) => {
-          this.webview.addEventListener(event, (e) => {
+        for (const event of URL_EVENTS) {
+          this.webview.addEventListener(event, e => {
             if (!e.isMainFrame) return;
 
             this.url = e.url;
             this.canGoBack = this.webview.canGoBack();
             this.canGoForward = this.webview.canGoForward();
           });
-        });
+        }
       }
     });
   }
@@ -83,13 +84,16 @@ class WebControlsScreen extends Component {
 
     try {
       url = new URL(url).toString();
-    } catch (err) {
-      // eslint-disable-next-line no-useless-escape
-      if (url.match(/^((?!-))(xn--)?[a-z0-9][a-z0-9-_]{0,61}[a-z0-9]{0,1}\.(xn--)?([a-z0-9\-]{1,61}|[a-z0-9-]{1,30}\.[a-z]{2,})$/)) {
-        url = `http://${url}`;
-      } else {
-        url = SEARCH_ENGINE_URLS[this.settings.app.searchEngine]({ searchTerm: url });
-      }
+    } catch {
+      url =
+        // eslint-disable-next-line no-useless-escape
+        /^((?!-))(xn--)?[\da-z][\d_a-z-]{0,61}[\da-z]{0,1}\.(xn--)?([\da-z\-]{1,61}|[\da-z-]{1,30}\.[a-z]{2,})$/.test(
+          url,
+        )
+          ? `http://${url}`
+          : SEARCH_ENGINE_URLS[this.settings.app.searchEngine]({
+              searchTerm: url,
+            });
     }
 
     this.webview.loadURL(url);
@@ -114,7 +118,7 @@ class WebControlsScreen extends Component {
         goBack={() => this.goBack()}
         canGoForward={this.canGoForward}
         goForward={() => this.goForward()}
-        navigate={(url) => this.navigate(url)}
+        navigate={url => this.navigate(url)}
         url={this.url}
       />
     );
diff --git a/src/features/workspaces/actions.js b/src/features/workspaces/actions.js
deleted file mode 100644
index 5b5db422e..000000000
--- a/src/features/workspaces/actions.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import PropTypes from 'prop-types';
-import Workspace from './models/Workspace';
-import { createActionsFromDefinitions } from '../../actions/lib/actions';
-
-export const workspaceActions = createActionsFromDefinitions({
-  edit: {
-    workspace: PropTypes.instanceOf(Workspace).isRequired,
-  },
-  create: {
-    name: PropTypes.string.isRequired,
-  },
-  delete: {
-    workspace: PropTypes.instanceOf(Workspace).isRequired,
-  },
-  update: {
-    workspace: PropTypes.instanceOf(Workspace).isRequired,
-  },
-  activate: {
-    workspace: PropTypes.instanceOf(Workspace).isRequired,
-  },
-  deactivate: {},
-  toggleWorkspaceDrawer: {},
-  openWorkspaceSettings: {},
-  toggleKeepAllWorkspacesLoadedSetting: {},
-}, PropTypes.checkPropTypes);
-
-export default workspaceActions;
diff --git a/src/features/workspaces/actions.ts b/src/features/workspaces/actions.ts
new file mode 100644
index 000000000..5e7e6e721
--- /dev/null
+++ b/src/features/workspaces/actions.ts
@@ -0,0 +1,30 @@
+import PropTypes from 'prop-types';
+import Workspace from './models/Workspace';
+import { createActionsFromDefinitions } from '../../actions/lib/actions';
+
+export const workspaceActions = createActionsFromDefinitions(
+  {
+    edit: {
+      workspace: PropTypes.instanceOf(Workspace).isRequired,
+    },
+    create: {
+      name: PropTypes.string.isRequired,
+    },
+    delete: {
+      workspace: PropTypes.instanceOf(Workspace).isRequired,
+    },
+    update: {
+      workspace: PropTypes.instanceOf(Workspace).isRequired,
+    },
+    activate: {
+      workspace: PropTypes.instanceOf(Workspace).isRequired,
+    },
+    deactivate: {},
+    toggleWorkspaceDrawer: {},
+    openWorkspaceSettings: {},
+    toggleKeepAllWorkspacesLoadedSetting: {},
+  },
+  PropTypes.checkPropTypes,
+);
+
+export default workspaceActions;
diff --git a/src/features/workspaces/api.js b/src/features/workspaces/api.ts
index 322695ed2..8447fc247 100644
--- a/src/features/workspaces/api.js
+++ b/src/features/workspaces/api.ts
@@ -12,12 +12,14 @@ export const workspaceApi = {
     debug('getUserWorkspaces GET', url);
     const result = await sendAuthRequest(url, { method: 'GET' });
     debug('getUserWorkspaces RESULT', result);
-    if (!result.ok) throw result;
+    if (!result.ok) {
+      throw new Error("Couldn't getUserWorkspaces");
+    }
     const workspaces = await result.json();
-    return workspaces.map((data) => new Workspace(data));
+    return workspaces.map(data => new Workspace(data));
   },
 
-  createWorkspace: async (name) => {
+  createWorkspace: async name => {
     const url = `${apiBase()}/workspace`;
     const options = {
       method: 'POST',
@@ -26,20 +28,24 @@ export const workspaceApi = {
     debug('createWorkspace POST', url, options);
     const result = await sendAuthRequest(url, options);
     debug('createWorkspace RESULT', result);
-    if (!result.ok) throw result;
+    if (!result.ok) {
+      throw new Error("Couldn't createWorkspace");
+    }
     return new Workspace(await result.json());
   },
 
-  deleteWorkspace: async (workspace) => {
+  deleteWorkspace: async workspace => {
     const url = `${apiBase()}/workspace/${workspace.id}`;
     debug('deleteWorkspace DELETE', url);
     const result = await sendAuthRequest(url, { method: 'DELETE' });
     debug('deleteWorkspace RESULT', result);
-    if (!result.ok) throw result;
+    if (!result.ok) {
+      throw new Error("Couldn't deleteWorkspace");
+    }
     return true;
   },
 
-  updateWorkspace: async (workspace) => {
+  updateWorkspace: async workspace => {
     const url = `${apiBase()}/workspace/${workspace.id}`;
     const options = {
       method: 'PUT',
@@ -48,15 +54,29 @@ export const workspaceApi = {
     debug('updateWorkspace UPDATE', url, options);
     const result = await sendAuthRequest(url, options);
     debug('updateWorkspace RESULT', result);
-    if (!result.ok) throw result;
+    if (!result.ok) {
+      throw new Error("Couldn't updateWorkspace");
+    }
     return new Workspace(await result.json());
   },
 };
 
-export const getUserWorkspacesRequest = new Request(workspaceApi, 'getUserWorkspaces');
-export const createWorkspaceRequest = new Request(workspaceApi, 'createWorkspace');
-export const deleteWorkspaceRequest = new Request(workspaceApi, 'deleteWorkspace');
-export const updateWorkspaceRequest = new Request(workspaceApi, 'updateWorkspace');
+export const getUserWorkspacesRequest = new Request(
+  workspaceApi,
+  'getUserWorkspaces',
+);
+export const createWorkspaceRequest = new Request(
+  workspaceApi,
+  'createWorkspace',
+);
+export const deleteWorkspaceRequest = new Request(
+  workspaceApi,
+  'deleteWorkspace',
+);
+export const updateWorkspaceRequest = new Request(
+  workspaceApi,
+  'updateWorkspace',
+);
 
 export const resetApiRequests = () => {
   getUserWorkspacesRequest.reset();
diff --git a/src/features/workspaces/components/CreateWorkspaceForm.js b/src/features/workspaces/components/CreateWorkspaceForm.js
index 15b97121d..c9b05b87f 100644
--- a/src/features/workspaces/components/CreateWorkspaceForm.js
+++ b/src/features/workspaces/components/CreateWorkspaceForm.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { Input, Button } from '@meetfranz/forms';
 import injectSheet from 'react-jss';
 import Form from '../../../lib/Form';
@@ -11,11 +11,11 @@ import { workspaceStore } from '../index';
 const messages = defineMessages({
   submitButton: {
     id: 'settings.workspace.add.form.submitButton',
-    defaultMessage: '!!!Create workspace',
+    defaultMessage: 'Create workspace',
   },
   name: {
     id: 'settings.workspace.add.form.name',
-    defaultMessage: '!!!Name',
+    defaultMessage: 'Name',
   },
 });
 
@@ -32,12 +32,9 @@ const styles = () => ({
   },
 });
 
-@injectSheet(styles) @observer
+@injectSheet(styles)
+@observer
 class CreateWorkspaceForm extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   static propTypes = {
     classes: PropTypes.object.isRequired,
     isSubmitting: PropTypes.bool.isRequired,
@@ -45,7 +42,7 @@ class CreateWorkspaceForm extends Component {
   };
 
   form = (() => {
-    const { intl } = this.context;
+    const { intl } = this.props;
     return new Form({
       fields: {
         name: {
@@ -61,7 +58,7 @@ class CreateWorkspaceForm extends Component {
   submitForm() {
     const { form } = this;
     form.submit({
-      onSuccess: async (f) => {
+      onSuccess: async f => {
         const { onSubmit } = this.props;
         const values = f.values();
         onSubmit(values);
@@ -70,7 +67,7 @@ class CreateWorkspaceForm extends Component {
   }
 
   render() {
-    const { intl } = this.context;
+    const { intl } = this.props;
     const { classes, isSubmitting } = this.props;
     const { form } = this;
     return (
@@ -95,4 +92,4 @@ class CreateWorkspaceForm extends Component {
   }
 }
 
-export default CreateWorkspaceForm;
+export default injectIntl(CreateWorkspaceForm);
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js
index c97d4bd9c..f562733dd 100644
--- a/src/features/workspaces/components/EditWorkspaceForm.js
+++ b/src/features/workspaces/components/EditWorkspaceForm.js
@@ -1,7 +1,7 @@
 import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router';
 import { Input, Button } from '@meetfranz/forms';
 import injectSheet from 'react-jss';
@@ -20,40 +20,40 @@ import Toggle from '../../../components/ui/Toggle';
 const messages = defineMessages({
   buttonDelete: {
     id: 'settings.workspace.form.buttonDelete',
-    defaultMessage: '!!!Delete workspace',
+    defaultMessage: 'Delete workspace',
   },
   buttonSave: {
     id: 'settings.workspace.form.buttonSave',
-    defaultMessage: '!!!Save workspace',
+    defaultMessage: 'Save workspace',
   },
   name: {
     id: 'settings.workspace.form.name',
-    defaultMessage: '!!!Name',
+    defaultMessage: 'Name',
   },
   yourWorkspaces: {
     id: 'settings.workspace.form.yourWorkspaces',
-    defaultMessage: '!!!Your workspaces',
+    defaultMessage: 'Your workspaces',
   },
   keepLoaded: {
     id: 'settings.workspace.form.keepLoaded',
-    defaultMessage: '!!!Keep this workspace loaded*',
+    defaultMessage: 'Keep this workspace loaded*',
   },
   keepLoadedInfo: {
     id: 'settings.workspace.form.keepLoadedInfo',
     defaultMessage:
-      '!!!*This option will be overwritten by the global "Keep all workspaces loaded" option.',
+      '*This option will be overwritten by the global "Keep all workspaces loaded" option.',
   },
   servicesInWorkspaceHeadline: {
     id: 'settings.workspace.form.servicesInWorkspaceHeadline',
-    defaultMessage: '!!!Services in this Workspace',
+    defaultMessage: 'Services in this Workspace',
   },
   noServicesAdded: {
     id: 'settings.services.noServicesAdded',
-    defaultMessage: '!!!Start by adding a service.',
+    defaultMessage: 'Start by adding a service.',
   },
   discoverServices: {
     id: 'settings.services.discoverServices',
-    defaultMessage: '!!!Discover services',
+    defaultMessage: 'Discover services',
   },
 });
 
@@ -72,10 +72,6 @@ const styles = () => ({
 @injectSheet(styles)
 @observer
 class EditWorkspaceForm extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   static propTypes = {
     classes: PropTypes.object.isRequired,
     onDelete: PropTypes.func.isRequired,
@@ -97,7 +93,7 @@ class EditWorkspaceForm extends Component {
   }
 
   prepareWorkspaceForm(workspace) {
-    const { intl } = this.context;
+    const { intl } = this.props;
     return new Form({
       fields: {
         name: {
@@ -112,7 +108,7 @@ class EditWorkspaceForm extends Component {
           default: false,
         },
         services: {
-          value: workspace.services.slice(),
+          value: [...workspace.services],
         },
       },
     });
@@ -120,7 +116,7 @@ class EditWorkspaceForm extends Component {
 
   save(form) {
     form.submit({
-      onSuccess: async (f) => {
+      onSuccess: async f => {
         const { onSave } = this.props;
         const values = f.values();
         onSave(values);
@@ -146,7 +142,7 @@ class EditWorkspaceForm extends Component {
   }
 
   render() {
-    const { intl } = this.context;
+    const { intl } = this.props;
     const {
       classes,
       workspace,
@@ -194,7 +190,7 @@ class EditWorkspaceForm extends Component {
               </div>
             ) : (
               <>
-                {services.map((s) => (
+                {services.map(s => (
                   <WorkspaceServiceListItem
                     key={s.id}
                     service={s}
@@ -233,4 +229,4 @@ class EditWorkspaceForm extends Component {
   }
 }
 
-export default EditWorkspaceForm;
+export default injectIntl(EditWorkspaceForm);
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js
index 1138f23d7..3dac77bc2 100644
--- a/src/features/workspaces/components/WorkspaceDrawer.js
+++ b/src/features/workspaces/components/WorkspaceDrawer.js
@@ -2,11 +2,11 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { H1, Icon } from '@meetfranz/ui';
 import ReactTooltip from 'react-tooltip';
 
-import { mdiPlusBox, mdiSettings } from '@mdi/js';
+import { mdiPlusBox, mdiCog } from '@mdi/js';
 import WorkspaceDrawerItem from './WorkspaceDrawerItem';
 import { workspaceActions } from '../actions';
 import { workspaceStore } from '../index';
@@ -14,27 +14,28 @@ import { workspaceStore } from '../index';
 const messages = defineMessages({
   headline: {
     id: 'workspaceDrawer.headline',
-    defaultMessage: '!!!Workspaces',
+    defaultMessage: 'Workspaces',
   },
   allServices: {
     id: 'workspaceDrawer.allServices',
-    defaultMessage: '!!!All services',
+    defaultMessage: 'All services',
   },
   workspacesSettingsTooltip: {
     id: 'workspaceDrawer.workspacesSettingsTooltip',
-    defaultMessage: '!!!Workspaces settings',
+    defaultMessage: 'Edit workspaces settings',
   },
   workspaceFeatureInfo: {
     id: 'workspaceDrawer.workspaceFeatureInfo',
-    defaultMessage: '!!!Info about workspace feature',
+    defaultMessage:
+      '<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>',
   },
   addNewWorkspaceLabel: {
     id: 'workspaceDrawer.addNewWorkspaceLabel',
-    defaultMessage: '!!!add new workspace',
+    defaultMessage: 'Add new workspace',
   },
 });
 
-const styles = (theme) => ({
+const styles = theme => ({
   drawer: {
     background: theme.workspaces.drawer.background,
     width: `${theme.workspaces.drawer.width}px`,
@@ -85,34 +86,26 @@ const styles = (theme) => ({
   },
 });
 
-@injectSheet(styles) @observer
+@injectSheet(styles)
+@observer
 class WorkspaceDrawer extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
     getServicesForWorkspace: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   componentDidMount() {
     ReactTooltip.rebuild();
   }
 
   render() {
-    const {
-      classes,
-      getServicesForWorkspace,
-    } = this.props;
-    const { intl } = this.context;
-    const {
-      activeWorkspace,
-      isSwitchingWorkspace,
-      nextWorkspace,
-      workspaces,
-    } = workspaceStore;
-    const actualWorkspace = isSwitchingWorkspace ? nextWorkspace : activeWorkspace;
+    const { classes, getServicesForWorkspace } = this.props;
+    const { intl } = this.props;
+    const { activeWorkspace, isSwitchingWorkspace, nextWorkspace, workspaces } =
+      workspaceStore;
+    const actualWorkspace = isSwitchingWorkspace
+      ? nextWorkspace
+      : activeWorkspace;
     return (
       <div className={`${classes.drawer} workspaces-drawer`}>
         <H1 className={classes.headline}>
@@ -122,10 +115,12 @@ class WorkspaceDrawer extends Component {
             onClick={() => {
               workspaceActions.openWorkspaceSettings();
             }}
-            data-tip={`${intl.formatMessage(messages.workspacesSettingsTooltip)}`}
+            data-tip={`${intl.formatMessage(
+              messages.workspacesSettingsTooltip,
+            )}`}
           >
             <Icon
-              icon={mdiSettings}
+              icon={mdiCog}
               size={1.5}
               className={classes.workspacesSettingsButtonIcon}
             />
@@ -152,7 +147,9 @@ class WorkspaceDrawer extends Component {
                 workspaceActions.activate({ workspace });
                 workspaceActions.toggleWorkspaceDrawer();
               }}
-              onContextMenuEditClick={() => workspaceActions.edit({ workspace })}
+              onContextMenuEditClick={() =>
+                workspaceActions.edit({ workspace })
+              }
               services={getServicesForWorkspace(workspace)}
               shortcutIndex={index + 1}
             />
@@ -168,9 +165,7 @@ class WorkspaceDrawer extends Component {
               size={1}
               className={classes.workspacesSettingsButtonIcon}
             />
-            <span>
-              {intl.formatMessage(messages.addNewWorkspaceLabel)}
-            </span>
+            <span>{intl.formatMessage(messages.addNewWorkspaceLabel)}</span>
           </div>
         </div>
         <ReactTooltip place="right" type="dark" effect="solid" />
@@ -179,4 +174,4 @@ class WorkspaceDrawer extends Component {
   }
 }
 
-export default WorkspaceDrawer;
+export default injectIntl(WorkspaceDrawer);
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.js b/src/features/workspaces/components/WorkspaceDrawerItem.js
index 252158364..4afb9c108 100644
--- a/src/features/workspaces/components/WorkspaceDrawerItem.js
+++ b/src/features/workspaces/components/WorkspaceDrawerItem.js
@@ -1,20 +1,20 @@
-import { Menu, getCurrentWindow } from '@electron/remote';
+import { Menu } from '@electron/remote';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { altKey, cmdOrCtrlShortcutKey } from '../../../environment';
 
 const messages = defineMessages({
   noServicesAddedYet: {
     id: 'workspaceDrawer.item.noServicesAddedYet',
-    defaultMessage: '!!!No services added yet',
+    defaultMessage: 'No services added yet',
   },
   contextMenuEdit: {
     id: 'workspaceDrawer.item.contextMenuEdit',
-    defaultMessage: '!!!edit',
+    defaultMessage: 'edit',
   },
 });
 
@@ -82,10 +82,6 @@ class WorkspaceDrawerItem extends Component {
     onContextMenuEditClick: null,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       classes,
@@ -96,7 +92,8 @@ class WorkspaceDrawerItem extends Component {
       services,
       shortcutIndex,
     } = this.props;
-    const { intl } = this.context;
+
+    const { intl } = this.props;
 
     const contextMenuTemplate = [
       {
@@ -122,10 +119,14 @@ class WorkspaceDrawerItem extends Component {
         ])}
         onClick={onClick}
         onContextMenu={() =>
-          onContextMenuEditClick && contextMenu.popup(getCurrentWindow())
+          onContextMenuEditClick && contextMenu.popup()
         }
         data-tip={`${
-          shortcutIndex <= 9 ? `(${cmdOrCtrlShortcutKey(false)}+${altKey(false)}+${shortcutIndex})` : ''
+          shortcutIndex <= 9
+            ? `(${cmdOrCtrlShortcutKey(false)}+${altKey(
+              false,
+            )}+${shortcutIndex})`
+            : ''
         }`}
       >
         <span
@@ -142,7 +143,7 @@ class WorkspaceDrawerItem extends Component {
             isActive ? classes.activeServices : null,
           ])}
         >
-          {services.length
+          {services.length > 0
             ? services.join(', ')
             : intl.formatMessage(messages.noServicesAddedYet)}
         </span>
@@ -151,4 +152,4 @@ class WorkspaceDrawerItem extends Component {
   }
 }
 
-export default WorkspaceDrawerItem;
+export default injectIntl(WorkspaceDrawerItem);
diff --git a/src/features/workspaces/components/WorkspaceItem.js b/src/features/workspaces/components/WorkspaceItem.js
index 85fc02d51..ec7b19add 100644
--- a/src/features/workspaces/components/WorkspaceItem.js
+++ b/src/features/workspaces/components/WorkspaceItem.js
@@ -1,12 +1,11 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { intlShape } from 'react-intl';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 
 import Workspace from '../models/Workspace';
 
-const styles = (theme) => ({
+const styles = theme => ({
   row: {
     height: theme.workspaces.settings.listItems.height,
     borderBottom: `1px solid ${theme.workspaces.settings.listItems.borderColor}`,
@@ -17,7 +16,8 @@ const styles = (theme) => ({
   columnName: {},
 });
 
-@injectSheet(styles) @observer
+@injectSheet(styles)
+@observer
 class WorkspaceItem extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -25,18 +25,12 @@ class WorkspaceItem extends Component {
     onItemClick: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const { classes, workspace, onItemClick } = this.props;
 
     return (
       <tr className={classes.row}>
-        <td onClick={() => onItemClick(workspace)}>
-          {workspace.name}
-        </td>
+        <td onClick={() => onItemClick(workspace)}>{workspace.name}</td>
       </tr>
     );
   }
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
index c8ec0bc4c..33a82cf4b 100644
--- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
+++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
@@ -4,14 +4,14 @@ import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
 import { Loader } from '@meetfranz/ui';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import { workspaceStore } from '../index';
 
 const messages = defineMessages({
   switchingTo: {
     id: 'workspaces.switchingIndicator.switchingTo',
-    defaultMessage: '!!!Switching to',
+    defaultMessage: 'Switching to',
   },
 });
 
@@ -61,13 +61,9 @@ class WorkspaceSwitchingIndicator extends Component {
     theme: PropTypes.object.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const { classes, theme } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
     const { isSwitchingWorkspace, nextWorkspace } = workspaceStore;
     if (!isSwitchingWorkspace) return null;
     const nextWorkspaceName = nextWorkspace
@@ -89,4 +85,4 @@ class WorkspaceSwitchingIndicator extends Component {
   }
 }
 
-export default WorkspaceSwitchingIndicator;
+export default injectIntl(WorkspaceSwitchingIndicator);
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index 5f34204f1..49552df6b 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import injectSheet from 'react-jss';
 import { Infobox } from '@meetfranz/ui';
 
@@ -16,35 +16,35 @@ import UIStore from '../../../stores/UIStore';
 const messages = defineMessages({
   headline: {
     id: 'settings.workspaces.headline',
-    defaultMessage: '!!!Your workspaces',
+    defaultMessage: 'Your workspaces',
   },
   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',
-    defaultMessage: '!!!Could not load your workspaces',
+    defaultMessage: 'Could not load your workspaces',
   },
   tryReloadWorkspaces: {
     id: 'settings.workspaces.tryReloadWorkspaces',
-    defaultMessage: '!!!Try again',
+    defaultMessage: 'Try again',
   },
   updatedInfo: {
     id: 'settings.workspaces.updatedInfo',
-    defaultMessage: '!!!Your changes have been saved',
+    defaultMessage: 'Your changes have been saved',
   },
   deletedInfo: {
     id: 'settings.workspaces.deletedInfo',
-    defaultMessage: '!!!Workspace has been deleted',
+    defaultMessage: 'Workspace has been deleted',
   },
   workspaceFeatureInfo: {
     id: 'settings.workspaces.workspaceFeatureInfo',
-    defaultMessage: '!!!Info about workspace feature',
+    defaultMessage: '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.',
   },
   workspaceFeatureHeadline: {
     id: 'settings.workspaces.workspaceFeatureHeadline',
-    defaultMessage: '!!!Less is More: Introducing Ferdi Workspaces',
+    defaultMessage: 'Less is More: Introducing Ferdi Workspaces',
   },
 });
 
@@ -83,10 +83,6 @@ class WorkspacesDashboard extends Component {
     workspaces: MobxPropTypes.arrayOrObservableArray.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       classes,
@@ -99,7 +95,7 @@ class WorkspacesDashboard extends Component {
       workspaces,
     } = this.props;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <div className="settings__main">
@@ -193,7 +189,7 @@ class WorkspacesDashboard extends Component {
   }
 }
 
-export default WorkspacesDashboard;
+export default injectIntl(WorkspacesDashboard);
 
 WorkspacesDashboard.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
diff --git a/src/features/workspaces/constants.js b/src/features/workspaces/constants.ts
index 2d1416ee0..2d1416ee0 100644
--- a/src/features/workspaces/constants.js
+++ b/src/features/workspaces/constants.ts
diff --git a/src/features/workspaces/index.js b/src/features/workspaces/index.ts
index 83e4d9049..ecca64b41 100644
--- a/src/features/workspaces/index.js
+++ b/src/features/workspaces/index.ts
@@ -12,10 +12,8 @@ export default function initWorkspaces(stores, actions) {
 
   // Toggle workspace feature
   reaction(
-    () => (
-      features.features.isWorkspaceEnabled
-    ),
-    (isEnabled) => {
+    () => features.features.isWorkspaceEnabled,
+    isEnabled => {
       if (isEnabled && !workspaceStore.isFeatureActive) {
         debug('Initializing `workspaces` feature');
         workspaceStore.start(stores, actions);
diff --git a/src/features/workspaces/models/Workspace.js b/src/features/workspaces/models/Workspace.ts
index d9488e991..cd3918fba 100644
--- a/src/features/workspaces/models/Workspace.js
+++ b/src/features/workspaces/models/Workspace.ts
@@ -15,7 +15,7 @@ export default class Workspace {
 
   constructor(data) {
     if (!data.id) {
-      throw Error('Workspace requires Id');
+      throw new Error('Workspace requires Id');
     }
 
     this.id = data.id;
@@ -28,8 +28,10 @@ export default class Workspace {
       services.push(KEEP_WS_LOADED_USID);
     } else if (data.saving && data.services.includes(KEEP_WS_LOADED_USID)) {
       // Don't keep loaded
-      services = services.filter((e) => e !== KEEP_WS_LOADED_USID);
+      services = services.filter(e => e !== KEEP_WS_LOADED_USID);
     }
+
+    // @ts-expect-error Property 'replace' does not exist on type 'never[]'.
     this.services.replace(services);
 
     this.userId = data.userId;
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index ec9d7ee7f..db2b69f99 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -190,6 +190,12 @@ export default class WorkspacesStore extends FeatureStore {
     setTimeout(() => {
       this.isSwitchingWorkspace = false;
       this.nextWorkspace = null;
+      if (this.stores.settings.app.splitMode) {
+        const serviceNames = new Set(this.getWorkspaceServices(workspace).map(service => service.name));
+        for (const wrapper of document.querySelectorAll('.services__webview-wrapper')) {
+          wrapper.style.display = serviceNames.has(wrapper.dataset.name) ? '' : 'none';
+        }
+      }
     }, 1000);
   };
 
@@ -205,6 +211,11 @@ export default class WorkspacesStore extends FeatureStore {
     // Indicate that we are done switching to the default workspace
     setTimeout(() => {
       this.isSwitchingWorkspace = false;
+      if (this.stores.settings.app.splitMode) {
+        for (const wrapper of document.querySelectorAll('.services__webview-wrapper')) {
+          wrapper.style.display = '';
+        }
+      }
     }, 1000);
   };
 
@@ -302,8 +313,8 @@ export default class WorkspacesStore extends FeatureStore {
     const { allServicesRequest } = services;
     const servicesHaveBeenLoaded = allServicesRequest.wasExecuted && !allServicesRequest.isError;
     // Loop through all workspaces and remove invalid service ids (locally)
-    this.workspaces.forEach((workspace) => {
-      workspace.services.forEach((serviceId) => {
+    for (const workspace of this.workspaces) {
+      for (const serviceId of workspace.services) {
         if (
           servicesHaveBeenLoaded
           && !services.one(serviceId)
@@ -311,7 +322,7 @@ export default class WorkspacesStore extends FeatureStore {
         ) {
           workspace.services.remove(serviceId);
         }
-      });
-    });
+      }
+    }
   };
 }
diff --git a/src/helpers/asar-helpers.ts b/src/helpers/asar-helpers.ts
index 3d9f0d941..9d975c193 100644
--- a/src/helpers/asar-helpers.ts
+++ b/src/helpers/asar-helpers.ts
@@ -1,3 +1,10 @@
+import { join } from 'path';
+
 export function asarPath(dir: string = '') {
   return dir.replace('app.asar', 'app.asar.unpacked');
 }
+
+// Replacing app.asar is not beautiful but unfortunately necessary
+export function asarRecipesPath(...segments: string[]) {
+  return join(asarPath(join(__dirname, '..', 'recipes')), ...[segments].flat());
+}
diff --git a/src/helpers/i18n-helpers.ts b/src/helpers/i18n-helpers.ts
index c1f18f446..ec7dc8e98 100644
--- a/src/helpers/i18n-helpers.ts
+++ b/src/helpers/i18n-helpers.ts
@@ -4,13 +4,11 @@ export function getLocale({
   let localeStr = locale;
   if (locales[locale] === undefined) {
     let localeFuzzy: string | undefined;
-    Object.keys(locales).forEach((localStr) => {
-      if (locales && Object.hasOwnProperty.call(locales, localStr)) {
-        if (locale.substring(0, 2) === localStr.substring(0, 2)) {
+    for (const localStr of Object.keys(locales)) {
+      if (locales && Object.hasOwnProperty.call(locales, localStr) && locale.slice(0, 2) === localStr.slice(0, 2)) {
           localeFuzzy = localStr;
         }
-      }
-    });
+    }
 
     if (localeFuzzy !== undefined) {
       localeStr = localeFuzzy;
@@ -61,12 +59,12 @@ export function getSelectOptions({
   if (sort) {
     keys = keys.sort(Intl.Collator().compare);
   }
-  keys.forEach((key) => {
+  for (const key of keys) {
     options.push({
       value: key,
       label: locales[key],
     });
-  });
+  }
 
   return options;
 }
diff --git a/src/helpers/password-helpers.ts b/src/helpers/password-helpers.ts
index 89c75c752..e5d9a4a25 100644
--- a/src/helpers/password-helpers.ts
+++ b/src/helpers/password-helpers.ts
@@ -12,9 +12,9 @@ export function scorePassword(password: string) {
 
   // award every unique letter until 5 repetitions
   const letters = {};
-  for (let i = 0; i < password.length; i += 1) {
-    letters[password[i]] = (letters[password[i]] || 0) + 1;
-    score += 5.0 / letters[password[i]];
+  for (const letter of password) {
+    letters[letter] = (letters[letter] || 0) + 1;
+    score += 5 / letters[letter];
   }
 
   // bonus points for mixing it up
@@ -26,11 +26,11 @@ export function scorePassword(password: string) {
   };
 
   let variationCount = 0;
-  Object.keys(variations).forEach((key) => {
-    variationCount += (variations[key] === true) ? 1 : 0;
-  });
+  for (const key of Object.keys(variations)) {
+    variationCount += variations[key] === true ? 1 : 0;
+  }
 
   score += (variationCount - 1) * 10;
 
-  return parseInt(score.toString(), 10);
+  return Number.parseInt(score.toString(), 10);
 }
diff --git a/src/helpers/recipe-helpers.ts b/src/helpers/recipe-helpers.ts
index 965429210..d482dffab 100644
--- a/src/helpers/recipe-helpers.ts
+++ b/src/helpers/recipe-helpers.ts
@@ -1,5 +1,6 @@
+/* eslint-disable global-require */
 import { parse } from 'path';
-import { userDataRecipesPath } from '../environment';
+import { userDataRecipesPath } from '../environment-remote';
 
 export function getRecipeDirectory(id: string = ''): string {
   return userDataRecipesPath(id);
@@ -15,20 +16,17 @@ export function loadRecipeConfig(recipeId: string) {
     // Delete module from cache
     delete require.cache[require.resolve(configPath)];
 
-    // eslint-disable-next-line
-    let config = require(configPath);
+    // eslint-disable-next-line import/no-dynamic-require
+    const config = require(configPath);
 
     const moduleConfigPath = require.resolve(configPath);
     config.path = parse(moduleConfigPath).dir;
 
     return config;
-  } catch (e) {
-    console.error(e);
+  } catch (error) {
+    console.error(error);
     return null;
   }
 }
 
-module.paths.unshift(
-  getDevRecipeDirectory(),
-  getRecipeDirectory(),
-);
+module.paths.unshift(getDevRecipeDirectory(), getRecipeDirectory());
diff --git a/src/helpers/schedule-helpers.ts b/src/helpers/schedule-helpers.ts
index 754fd5556..55b7c1e6f 100644
--- a/src/helpers/schedule-helpers.ts
+++ b/src/helpers/schedule-helpers.ts
@@ -5,15 +5,15 @@ export function isInTimeframe(start: string, end: string) {
     startHourStr,
     startMinuteStr,
   ] = start.split(':');
-  const startHour = parseInt(startHourStr, 10);
-  const startMinute = parseInt(startMinuteStr, 10);
+  const startHour = Number.parseInt(startHourStr, 10);
+  const startMinute = Number.parseInt(startMinuteStr, 10);
 
   const [
     endHourStr,
     endMinuteStr,
   ] = end.split(':');
-  const endHour = parseInt(endHourStr, 10);
-  const endMinute = parseInt(endMinuteStr, 10);
+  const endHour = Number.parseInt(endHourStr, 10);
+  const endMinute = Number.parseInt(endMinuteStr, 10);
 
   const currentHour = new Date().getHours();
   const currentMinute = new Date().getMinutes();
diff --git a/src/helpers/serverless-helpers.js b/src/helpers/serverless-helpers.ts
index 01549e038..01549e038 100644
--- a/src/helpers/serverless-helpers.js
+++ b/src/helpers/serverless-helpers.ts
diff --git a/src/helpers/service-helpers.js b/src/helpers/service-helpers.js
deleted file mode 100644
index 745f40dd9..000000000
--- a/src/helpers/service-helpers.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { readdirSync, removeSync } from 'fs-extra';
-import { userDataPath } from '../environment';
-
-export function getServicePartitionsDirectory(...segments) {
-  return userDataPath('Partitions', ...([segments].flat()));
-}
-
-export function removeServicePartitionDirectory(id = '', addServicePrefix = false) {
-  const servicePartition = getServicePartitionsDirectory(`${addServicePrefix ? 'service-' : ''}${id}`);
-  return removeSync(servicePartition);
-}
-
-export async function getServiceIdsFromPartitions() {
-  const files = readdirSync(getServicePartitionsDirectory());
-  return files.filter((n) => n !== '__chrome_extension');
-}
diff --git a/src/helpers/service-helpers.ts b/src/helpers/service-helpers.ts
new file mode 100644
index 000000000..678d5024f
--- /dev/null
+++ b/src/helpers/service-helpers.ts
@@ -0,0 +1,21 @@
+import { readdirSync, removeSync } from 'fs-extra';
+import { userDataPath } from '../environment-remote';
+
+export function getServicePartitionsDirectory(...segments) {
+  return userDataPath('Partitions', ...[segments].flat());
+}
+
+export function removeServicePartitionDirectory(
+  id = '',
+  addServicePrefix = false,
+) {
+  const servicePartition = getServicePartitionsDirectory(
+    `${addServicePrefix ? 'service-' : ''}${id}`,
+  );
+  return removeSync(servicePartition);
+}
+
+export async function getServiceIdsFromPartitions() {
+  const files = readdirSync(getServicePartitionsDirectory());
+  return files.filter(n => n !== '__chrome_extension');
+}
diff --git a/src/helpers/url-helpers.ts b/src/helpers/url-helpers.ts
index 3657ae693..1e87ecabb 100644
--- a/src/helpers/url-helpers.ts
+++ b/src/helpers/url-helpers.ts
@@ -12,7 +12,7 @@ export function isValidExternalURL(url: string | URL) {
   let parsedUrl: URL;
   try {
     parsedUrl = new URL(url.toString());
-  } catch (_) {
+  } catch {
     return false;
   }
 
diff --git a/src/helpers/userAgent-helpers.ts b/src/helpers/userAgent-helpers.ts
index 73c8bfd03..091a76400 100644
--- a/src/helpers/userAgent-helpers.ts
+++ b/src/helpers/userAgent-helpers.ts
@@ -8,7 +8,7 @@ import {
 function macOS() {
   const version = macosVersion() || '';
   let cpuName = os.cpus()[0].model.split(' ')[0];
-  if (cpuName && cpuName.match(/\(/)) {
+  if (cpuName && /\(/.test(cpuName)) {
     cpuName = cpuName.split('(')[0];
   }
   return `Macintosh; ${cpuName} Mac OS X ${version.replace(/\./g, '_')}`;
diff --git a/src/helpers/validation-helpers.js b/src/helpers/validation-helpers.js
deleted file mode 100644
index 116f19905..000000000
--- a/src/helpers/validation-helpers.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import { defineMessages } from 'react-intl';
-import isEmail from 'validator/lib/isEmail';
-
-const messages = defineMessages({
-  required: {
-    id: 'validation.required',
-    defaultMessage: '!!!Field is required',
-  },
-  email: {
-    id: 'validation.email',
-    defaultMessage: '!!!Email not valid',
-  },
-  url: {
-    id: 'validation.url',
-    defaultMessage: '!!!Not a valid URL',
-  },
-  minLength: {
-    id: 'validation.minLength',
-    defaultMessage: '!!!Too few characters',
-  },
-  oneRequired: {
-    id: 'validation.oneRequired',
-    defaultMessage: '!!!At least one is required',
-  },
-});
-
-export function required({ field }) {
-  const isValid = (field.value.trim() !== '');
-  return [isValid, window.ferdi.intl.formatMessage(messages.required, { field: field.label })];
-}
-
-export function email({ field }) {
-  const value = field.value.trim();
-  const isValid = isEmail(value);
-  return [isValid, window.ferdi.intl.formatMessage(messages.email, { field: field.label })];
-}
-
-export function url({ field }) {
-  const value = field.value.trim();
-  let isValid = false;
-
-  if (value !== '') {
-    // eslint-disable-next-line
-    isValid = Boolean(value.match(/(^|[\s.:;?\-\]<(])(https?:\/\/[-\w;/?:@&=+$|_.!~*|'()[\]%#,☺]+[\w/#](\(\))?)(?=$|[\s',|().:;?\-[\]>)])/i));
-  } else {
-    isValid = true;
-  }
-
-  return [isValid, window.ferdi.intl.formatMessage(messages.url, { field: field.label })];
-}
-
-export function minLength(length) {
-  return ({ field }) => {
-    let isValid = true;
-    if (field.touched) {
-      isValid = field.value.length >= length;
-    }
-    return [isValid, window.ferdi.intl.formatMessage(messages.minLength, { field: field.label, length })];
-  };
-}
-
-export function oneRequired(targets) {
-  return ({ field, form }) => {
-    const invalidFields = targets.filter((target) => form.$(target).value === '');
-    return [targets.length !== invalidFields.length, window.ferdi.intl.formatMessage(messages.required, { field: field.label })];
-  };
-}
diff --git a/src/helpers/validation-helpers.ts b/src/helpers/validation-helpers.ts
new file mode 100644
index 000000000..23c297443
--- /dev/null
+++ b/src/helpers/validation-helpers.ts
@@ -0,0 +1,96 @@
+import { defineMessages } from 'react-intl';
+import isEmail from 'validator/lib/isEmail';
+
+const messages = defineMessages({
+  required: {
+    id: 'validation.required',
+    defaultMessage: '{field} is required',
+  },
+  email: {
+    id: 'validation.email',
+    defaultMessage: '{field} is not valid',
+  },
+  url: {
+    id: 'validation.url',
+    defaultMessage: '{field} is not a valid URL',
+  },
+  minLength: {
+    id: 'validation.minLength',
+    defaultMessage: '{field} should be at least {length} characters long',
+  },
+  oneRequired: {
+    id: 'validation.oneRequired',
+    defaultMessage: 'At least one is required',
+  },
+});
+
+export function required({ field }) {
+  const isValid = field.value.trim() !== '';
+  return [
+    isValid,
+    (window as any).ferdi.intl.formatMessage(messages.required, {
+      field: field.label,
+    }),
+  ];
+}
+
+export function email({ field }) {
+  const value = field.value.trim();
+  const isValid = isEmail(value);
+  return [
+    isValid,
+    (window as any).ferdi.intl.formatMessage(messages.email, {
+      field: field.label,
+    }),
+  ];
+}
+
+export function url({ field }) {
+  const value = field.value.trim();
+  let isValid = false;
+
+  isValid =
+    value !== ''
+      ? Boolean(
+          // eslint-disable-next-line unicorn/better-regex
+          /(^|[\s.:;?\-\]<(])(https?:\/\/[-\w;/?:@&=+$|_.!~*|'()[\]%#,☺]+[\w/#](\(\))?)(?=$|[\s',|().:;?\-[\]>)])/i.test(
+            value,
+          ),
+        )
+      : true;
+
+  return [
+    isValid,
+    (window as any).ferdi.intl.formatMessage(messages.url, {
+      field: field.label,
+    }),
+  ];
+}
+
+export function minLength(length: number) {
+  return ({ field }) => {
+    let isValid = true;
+    if (field.touched) {
+      isValid = field.value.length >= length;
+    }
+    return [
+      isValid,
+      (window as any).ferdi.intl.formatMessage(messages.minLength, {
+        field: field.label,
+        length,
+      }),
+    ];
+  };
+}
+
+export function oneRequired(targets: string[]) {
+  return ({ field, form }) => {
+    const invalidFields = targets.filter(target => form.$(target).value === '');
+    return [
+      targets.length !== invalidFields.length,
+      (window as any).ferdi.intl.formatMessage(messages.required, {
+        field: field.label,
+      }),
+    ];
+  };
+}
diff --git a/src/i18n/apply-branding.js b/src/i18n/apply-branding.ts
index 40a07ded0..801a4a525 100644
--- a/src/i18n/apply-branding.js
+++ b/src/i18n/apply-branding.ts
@@ -1,13 +1,13 @@
 /**
  * Apply Ferdi branding to i18n translations
  */
-const fs = require('fs-extra');
-const path = require('path');
+import fs from 'fs-extra';
+import path from 'path';
 
 console.log('Applying Ferdi branding to translations...');
 
 // Keys to ignore when applying branding
-const ignore = [
+const ignore = new Set([
   'login.customServerSuggestion',
   'login.customServerQuestion',
   'settings.app.todoServerInfo',
@@ -18,15 +18,10 @@ const ignore = [
   'settings.team.copy',
   'settings.team.manageAction',
   'settings.app.serverMoneyInfo',
-];
+]);
 
 // Files to ignore when applying branding
-const ignoreFiles = [
-  'defaultMessages.json',
-  '.DS_Store',
-  '.',
-  '..',
-];
+const ignoreFiles = new Set(['.DS_Store', '.', '..']);
 
 // What to replace
 const replace = {
@@ -43,14 +38,15 @@ const replaceFind = Object.keys(replace);
 const replaceReplaceWith = Object.values(replace);
 
 const replaceStr = (str, find, replaceWith) => {
-  for (let i = 0; i < find.length; i += 1) {
-    str = str.replace(new RegExp(find[i], 'gi'), replaceWith[i]);
+  for (const [i, element] of find.entries()) {
+    str = str.replace(new RegExp(element, 'gi'), replaceWith[i]);
   }
   return str;
 };
 
-files.forEach(async (file) => {
-  if (ignoreFiles.includes(file)) return;
+// eslint-disable-next-line unicorn/no-array-for-each
+files.forEach(async file => {
+  if (ignoreFiles.has(file)) return;
 
   // Read locale data
   const filePath = path.join(locales, file);
@@ -58,7 +54,7 @@ files.forEach(async (file) => {
 
   // Replace branding
   for (const key in locale) {
-    if (!ignore.includes(key)) {
+    if (!ignore.has(key)) {
       locale[key] = replaceStr(locale[key], replaceFind, replaceReplaceWith);
     }
   }
diff --git a/src/i18n/globalMessages.js b/src/i18n/globalMessages.ts
index 66fce8d0f..8e1df10f7 100644
--- a/src/i18n/globalMessages.js
+++ b/src/i18n/globalMessages.ts
@@ -3,75 +3,75 @@ import { defineMessages } from 'react-intl';
 export default defineMessages({
   APIUnhealthy: {
     id: 'global.api.unhealthy',
-    defaultMessage: '!!!Can\'t connect to Ferdi Online Services',
+    defaultMessage: "Can't connect to Ferdi online services",
   },
   notConnectedToTheInternet: {
     id: 'global.notConnectedToTheInternet',
-    defaultMessage: '!!!You are not connected to the internet.',
+    defaultMessage: 'You are not connected to the internet.',
   },
   spellcheckerLanguage: {
     id: 'global.spellchecking.language',
-    defaultMessage: '!!!Spell checking language',
+    defaultMessage: 'Spell checking language',
   },
   spellcheckerSystemDefault: {
     id: 'global.spellchecker.useDefault',
-    defaultMessage: '!!!Use System Default ({default})',
+    defaultMessage: 'Use System Default ({default})',
   },
   spellcheckerAutomaticDetection: {
     id: 'global.spellchecking.autodetect',
-    defaultMessage: '!!!Detect language automatically',
+    defaultMessage: 'Detect language automatically',
   },
   spellcheckerAutomaticDetectionShort: {
     id: 'global.spellchecking.autodetect.short',
-    defaultMessage: '!!!Automatic',
+    defaultMessage: 'Automatic',
   },
   userAgentPref: {
     id: 'global.userAgentPref',
-    defaultMessage: '!!!User Agent',
+    defaultMessage: 'User Agent',
   },
   userAgentHelp: {
     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.",
+    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',
+    defaultMessage: 'Yes',
   },
   no: {
     id: 'global.no',
-    defaultMessage: '!!!No',
+    defaultMessage: 'No',
   },
   ok: {
     id: 'global.ok',
-    defaultMessage: '!!!Ok',
+    defaultMessage: 'Ok',
   },
   cancel: {
     id: 'global.cancel',
-    defaultMessage: '!!!Cancel',
+    defaultMessage: 'Cancel',
   },
   save: {
     id: 'global.save',
-    defaultMessage: '!!!Save',
+    defaultMessage: 'Save',
   },
   submit: {
     id: 'global.submit',
-    defaultMessage: '!!!Submit',
+    defaultMessage: 'Submit',
   },
   quit: {
     id: 'global.quit',
-    defaultMessage: '!!!Quit',
+    defaultMessage: 'Quit',
   },
   quitConfirmation: {
     id: 'global.quitConfirmation',
-    defaultMessage:
-      '!!!Do you really want to quit Ferdi?',
+    defaultMessage: 'Do you really want to quit Ferdi?',
   },
   settings: {
     id: 'global.settings',
-    defaultMessage: '!!!Settings',
+    defaultMessage: 'Settings',
   },
   edit: {
     id: 'global.edit',
-    defaultMessage: '!!!Edit',
+    defaultMessage: 'Edit',
   },
 });
diff --git a/src/i18n/languages.js b/src/i18n/languages.ts
index e7713b42b..e7713b42b 100644
--- a/src/i18n/languages.js
+++ b/src/i18n/languages.ts
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index 2c145d6f4..041b02632 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "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",
@@ -45,7 +44,7 @@
   "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",
+  "import.submit.label": "Import {count} 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",
@@ -118,7 +117,7 @@
   "menu.help.tos": "Terms of Service",
   "menu.services": "Services",
   "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
   "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
@@ -152,18 +151,7 @@
   "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",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
   "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.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",
@@ -220,12 +208,12 @@
   "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.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.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
   "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.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Discover services",
   "settings.services.headline": "Your services",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "Service is disabled",
   "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index ae2952f86..2ab80e865 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "إعادة التحميل",
-  "app.errorHandler.headline": "لقد حدث خطب ما",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "خادم مخصص",
   "changeserver.headline": "تغيير الخادم",
   "changeserver.label": "خادم",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "ماذا حدث؟",
   "connectionLostBanner.message": "أوه لا! �قد �ردي الاتصال بـ.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "نشر معلومات تصحيح الأخطاء",
   "feature.nightlyBuilds.activate": "ت�عيل",
   "feature.nightlyBuilds.info": "الإصدارات الليلية هي إصدارات تجريبية للغاية من �ردي والتي قد تحتوي على ميزات غير مصقولة أو غير كاملة. يتم استخدام هذه الإنشاءات الليلية بشكل أساسي من قبل المطورين لاختبار ميزاتهم المطورة حديثًا وكي�ية أدائهم �ي التصميم النهائي. إذا كنت لا تعر� ما ت�عله ، �نقترح عدم تنشيط الإنشاءات الليلية.",
   "feature.nightlyBuilds.title": "المباني الليلية",
@@ -24,30 +23,30 @@
   "feature.quickSwitch.info": "حدد خدمة من خلال زر تاب، ↑ و ↓. ا�تح الخدمة بالظغط على زر الدخول.",
   "feature.quickSwitch.search": "بحث...",
   "feature.quickSwitch.title": "تبديل سريع",
-  "global.api.unhealthy": "لا يمكن الإتصال بخدمات �ردي عبر الإنترنت",
-  "global.cancel": "إلغاء",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "تعديل",
   "global.no": "No",
   "global.notConnectedToTheInternet": "أنت غير متصل بالإنترنت.",
   "global.ok": "Ok",
-  "global.quit": "خروج",
+  "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "الإعدادات",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "إستخدم الإعدادت الا�تراضية ({default})",
   "global.spellchecking.autodetect": "الكش� عن اللغة تلقائياً",
   "global.spellchecking.autodetect.short": "تلقائي",
   "global.spellchecking.language": "لغة التدقيق الإملائي",
-  "global.submit": "إرسال",
+  "global.submit": "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": "أريد أن أضي� الخدمات يدوياً",
-  "import.submit.label": "خدمات الاستيراد",
+  "import.submit.label": "Import {count} services",
   "infobar.authRequestFailed": "حدثت أخطاء أثناء محاولة تن�يذ طلب المصادقة. الرجاء محاولة تسجيل الخروج والدخول مرة أخرى إذا استمر هذا الخطأ.",
-  "infobar.buttonChangelog": "ما الجديد؟",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "إعادة التشغيل وتثبيت التحديث",
   "infobar.buttonReloadServices": "إعادة تحميل الخدمات",
   "infobar.hide": "إخ�اء",
@@ -75,7 +74,7 @@
   "login.email.label": "البريد الإلكتروني",
   "login.headline": "تسجيل الدخول",
   "login.invalidCredentials": "البريد الإلكتروني أو كلمة المرور غير صالحة",
-  "login.link.password": "إعادة تعيين كلمة المرور",
+  "login.link.password": "Reset password",
   "login.link.signup": "إنشاء حساب مجاني",
   "login.password.label": "كلمة المرور",
   "login.serverLogout": "انتهت صلاحية جلستك، الرجاء تسجيل الدخول مرة أخرى.",
@@ -117,10 +116,10 @@
   "menu.help.support": "الدعم ال�ني",
   "menu.help.tos": "شروط الخدمة",
   "menu.services": "الخدمات",
-  "menu.services.activatePreviousService": "ت�عيل الخدمة السابقة",
-  "menu.services.addNewService": "إضا�ة خدمة جديدة",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "الرئيسية",
-  "menu.services.setNextServiceActive": "ت�عيل الخدمة التالية",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "المهام",
   "menu.todos.enableTodos": "ت�عيل المهام",
   "menu.view": "عرض",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "جميع الخدمات",
   "menu.workspaces.openWorkspaceDrawer": "�تح� د�رج� مساحة العمل",
   "password.email.label": "البريد الإلكتروني",
-  "password.headline": "إعادة تعيين كلمة المرور",
+  "password.headline": "Reset password",
   "password.link.login": "سجل الدخول لحسابك",
   "password.link.signup": "إنشاء حساب مجاني",
-  "password.noUser": "لم ي�عثر على م�ستخدم� بعنوان� البريد� هذا",
-  "password.successInfo": "رجاءً تحقق من عنوان بريدك الإلكتروني",
-  "pricing.features.accountSync": "مزامنة� الحساب",
-  "pricing.features.customWebsites": "إضا�ة مواقع مخصصة",
-  "pricing.features.desktopNotifications": "إشعارات سطح المكتب",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "اختر من بين ما يزيد على 70 خدمة",
-  "pricing.features.serviceProxies": "وكلاء الخدمة",
-  "pricing.features.spellchecker": "دعم المدقق الإملائي",
-  "pricing.features.teamManagement": "�ريق الإدارة",
-  "pricing.features.thirdPartyServices": "تنصيب خدمات الطر� الثالث",
-  "pricing.features.unlimitedServices": "إمكانية إضا�ة خدمات غير محدودة",
-  "pricing.features.workspaces": "مساحات� العمل",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "أعادة تحميل {name}",
   "service.crashHandler.autoReload": "محاولة الاستعادة التلقائية {name} �ي غضون {seconds} ثانية",
   "service.crashHandler.headline": "أوه لا!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "استخدام �ردي بدون حساب",
   "services.welcome": "مرحبا بكم �ي �ردي",
-  "settings.account.account.editButton": "تعديل الحساب",
+  "settings.account.account.editButton": "Edit account",
   "settings.account.accountUnavailable": "الحساب غير متو�ر",
   "settings.account.accountUnavailableInfo": "أنت تستخدم �ردي بدون حساب. إذا كنت ترغب �ي استخدام �ردي مع حساب والح�اظ على مزامنة خدماتك عبر مختل� الحواسيب، الرجاء تحديد خادم �ي علامة تبويب الإعدادات ثم سجل الدخول.",
   "settings.account.buttonSave": "تحديث المل� الشخصي",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "لقد تلقيت رسالة بريد إلكتروني مع رابط لتأكيد حذ� حسابك. لا يمكن استعادة حسابك وبياناتك!",
   "settings.account.deleteInfo": "إذا كنت لا تحتاج إلى حساب �ردي الخاص بك بعد الآن، يمكنك حذ� حسابك وجميع البيانات ذات الصلة من هنا.",
   "settings.account.headline": "الحساب",
-  "settings.account.headlineAccount": "معلومات الحساب",
-  "settings.account.headlineDangerZone": "منطقة الخطر",
-  "settings.account.headlineInvoices": "ال�واتير",
-  "settings.account.headlinePassword": "تغيير كلمة المرور",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "تحديث المل� الشخصي",
   "settings.account.successInfo": "تم ح�ظ التغييرات الخاصة بك",
   "settings.account.tryReloadServices": "حاول مجددًا",
   "settings.account.tryReloadUserInfoRequest": "حاول مجددًا",
   "settings.account.userInfoRequestFailed": "تعذر تحميل معلومات المستخدم",
-  "settings.account.yourLicense": "رخصة �ردي الخاصة بك",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "مسح ذاكرة التخزين المؤقت",
   "settings.app.buttonInstallUpdate": "إعادة التشغيل وتثبيت التحديث",
@@ -219,13 +207,13 @@
   "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.customTodoServer": "Custom Todo Server",
+  "settings.app.form.darkMode": "تمكين الوضع المظلم",
   "settings.app.form.enableGPUAcceleration": "ت�عيل التسريع بوحدة معالجة الرسومات",
   "settings.app.form.enableLock": "ت�عيل الق�ل بكلمة المرور",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "ت�عيل التصحيح الإملائي",
-  "settings.app.form.enableSystemTray": "إظهار �ردي �ي شريط النظام",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "ت�عيل �ردي للمهام",
   "settings.app.form.hibernateOnStartup": "الإبقاء على الخدمات �ي وضع النوم عند بدء التشغيل",
   "settings.app.form.hibernationStrategy": "استراتيجية وضع النوم",
@@ -251,9 +239,10 @@
   "settings.app.form.showDisabledServices": "عرض تبويبات الخدمات المعطلة",
   "settings.app.form.showDragArea": "إظهار المنطقة القابلة للسحب على النا�ذة",
   "settings.app.form.showMessagesBadgesWhenMuted": "إظهار شارة رسالة غير مقروءة عند تعطيل الإشعارات",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "البدء بنا�ذة مصغرة",
   "settings.app.form.universalDarkMode": "تمكين الوضع المظلم الكامل",
-  "settings.app.form.useTouchIdToUnlock": "السماح باستخدام TouchID ل�تح �ردي",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "استخدام النمط الأ�قي",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "متقدم",
@@ -267,7 +256,7 @@
   "settings.app.languageDisclaimer": "الترجمات الرسمية هي الإنكليزية والألمانية. وجميع اللغات الأخرى مبنية على ترجمات مساهمين.",
   "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "كلمة المرور",
-  "settings.app.lockedPasswordInfo": "الرجاء التأكد من تعيين كلمة مرور سو� تتذكرها.\nإذما �قدت كلمة المرور هذه، سو� تضطر إلى إعادة تثبيت �يردي.",
+  "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": "التغيرات تتطلب إعادة تشغيل",
   "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.",
@@ -294,9 +283,9 @@
   "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
   "settings.recipes.customService.headline.customRecipes": "وص�ات طر� ثالث مخصصة",
   "settings.recipes.customService.headline.devRecipes": "وص�ات خدمة التطوير الخاصة بك",
-  "settings.recipes.customService.intro": "لإضا�ة خدمة مخصصة، انسخ وص�ة الخدمة إلى:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
   "settings.recipes.customService.openDevDocs": "وثائق المطور",
-  "settings.recipes.customService.openFolder": "�تح المجلد",
+  "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "الخدمات المتاحة",
   "settings.recipes.missingService": "خدمة م�قودة؟",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "سطوع الشاشة �ي وضع القراءة المظلم",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "حذ� الخدمة",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "تحرير {name}",
   "settings.service.form.enableAudio": "تمكين الصوت",
   "settings.service.form.enableBadge": "إظهار شارات الرسائل غير المقروءة",
@@ -332,17 +321,18 @@
   "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
   "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
   "settings.service.form.name": "الاسم",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "�تح user.css",
   "settings.service.form.openUserJs": "�تح user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "استخدام بروكسي",
-  "settings.service.form.proxy.password": "كلمة المرور (اختياري)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "المن�ذ",
   "settings.service.form.proxy.restartInfo": "الرجاء إعادة تشغيل �يردي بعد تغيير إعدادات البروكسي.",
-  "settings.service.form.proxy.user": "المستخدم (اختياري)",
+  "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": "ح�ظ الخدمة",
   "settings.service.form.tabHosted": "Hosted",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "اكتش� الخدمات",
   "settings.services.headline": "خدماتك",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "تعذرَ تحميل خدماتك",
   "settings.services.tooltip.isDisabled": "الخدمة معطّلة",
   "settings.services.tooltip.isMuted": "تم كتم جميع الأصوات",
@@ -387,8 +378,8 @@
   "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.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "كلمة سرّ جديدة",
   "settings.workspace.add.form.name": "الاسم",
   "settings.workspace.add.form.submitButton": "إنشاء مساحة عمل",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "تمكين الإشعارات والصوت",
   "signup.email.label": "البريد الإلكتروني",
   "signup.emailDuplicate": "مستخدم بهذا البريد الإلكتروني موجود بال�عل",
-  "signup.firstname.label": "الاسم الأول",
+  "signup.firstname.label": "First Name",
   "signup.headline": "التسجيل",
-  "signup.lastname.label": "اسم العائلة",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "من خلال إنشاء حساب �يردي �إنك تقبل",
   "signup.legal.privacy": "بيان الخصوصية",
   "signup.legal.terms": "بنود الخدمة",
@@ -430,11 +421,11 @@
   "signup.password.label": "كلمة المرور",
   "signup.submit.label": "أنشئ حساب",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "حذ� الخدمة",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "تعطيل الصوت",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "تعطيل الإشعارات",
-  "tabs.item.disableService": "تعطيل الخدمة",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "تمكين الصوت",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "ت�عيل الإشعارات",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "إعادة التحميل",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} غير صالح",
-  "validation.minLength": "{field} يجب أن يكون على الأقل {length} حر�اً",
+  "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} مطلوب",
-  "validation.url": "{field} ليس عنوان URL صالح",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "الرجوع",
   "webControls.forward": "تقدم",
   "webControls.goHome": "الرئيسية",
@@ -454,12 +445,12 @@
   "webControls.reload": "إعادة التحميل",
   "welcome.loginButton": "تسجيل الدخول إلى حسابك",
   "welcome.signupButton": "إنشاء حساب مجاني",
-  "workspaceDrawer.addNewWorkspaceLabel": "إضا�ة مساحة عمل جديدة",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "جميع الخدمات",
   "workspaceDrawer.headline": "مساحات� العمل",
   "workspaceDrawer.item.contextMenuEdit": "تعديل",
   "workspaceDrawer.item.noServicesAddedYet": "لم تض� أي خدمات بعد",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>ي�مكنك �يردي من التركيز على ما هو مهم لديك الآن. أنشاء مجموعات مختل�ة من الخدمات وإداراتها والتنقل بينها بسهولة �ي أي وقت.<p><p/>أنتَ  من يقرر أيّ الخدمات تحتاج ساعة تحتاج وأين تحتاج, لذا نستطيع مساعدتك لتبقى محا�ظ مع مستجدات ما تقوم به أو تستريح إن شئت.<p/>",
-  "workspaceDrawer.workspacesSettingsTooltip": "تعديل إعدادات مساحات العمل",
+  "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": "التبديل إلى"
 }
diff --git a/src/i18n/locales/be.json b/src/i18n/locales/be.json
index 31a5111a9..8caf73fe6 100644
--- a/src/i18n/locales/be.json
+++ b/src/i18n/locales/be.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "�бнавіць",
-  "app.errorHandler.headline": "�ешта пайшло не так",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Па�лужнік",
@@ -10,7 +10,6 @@
   "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",
@@ -45,7 +44,7 @@
   "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",
+  "import.submit.label": "Import {count} 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",
@@ -118,7 +117,7 @@
   "menu.help.tos": "Terms of Service",
   "menu.services": "Services",
   "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
   "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
@@ -152,18 +151,7 @@
   "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",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
   "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.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",
@@ -220,12 +208,12 @@
   "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.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.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
   "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.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Discover services",
   "settings.services.headline": "Your services",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "Service is disabled",
   "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index 2c145d6f4..041b02632 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "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",
@@ -45,7 +44,7 @@
   "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",
+  "import.submit.label": "Import {count} 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",
@@ -118,7 +117,7 @@
   "menu.help.tos": "Terms of Service",
   "menu.services": "Services",
   "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
   "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
@@ -152,18 +151,7 @@
   "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",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
   "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.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",
@@ -220,12 +208,12 @@
   "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.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.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
   "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.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Discover services",
   "settings.services.headline": "Your services",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "Service is disabled",
   "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 3cb52af9b..6e33be919 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Recarrega",
-  "app.errorHandler.headline": "Quelcom ha anat malament",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Servidor personalitzat",
   "changeserver.headline": "Canvía de Servidor",
   "changeserver.label": "Servidor",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "Què ha passat?",
   "connectionLostBanner.message": "Oh no! Ferdi ha perdut la connexió a {name}.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Registra la informació de depuració",
   "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",
@@ -24,8 +23,8 @@
   "feature.quickSwitch.info": "Seleccioneu un servei amb TAB, ↑ i ↓. Obriu un servei amb ENTER.",
   "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.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Edita",
   "global.no": "No",
   "global.notConnectedToTheInternet": "No esteu connectat a Internet.",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Configuració",
+  "global.settings": "Settings",
   "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.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": "Importa els teus serveis Ferdi 4",
   "import.notSupportedHeadline": "Serveis que encara no s'admeten a Ferdi 5",
   "import.skip.label": "Vull afegir serveis manualment",
-  "import.submit.label": "Importa serveis",
+  "import.submit.label": "Import {count} services",
   "infobar.authRequestFailed": "S'han produït errors al intentar realitzar una sol·licitud autentificada. Proveu de tancar la sessió i tornar-hi si aquest error continua.",
-  "infobar.buttonChangelog": "Que hi ha de nou?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Reinicia i instal·la l'actualització",
   "infobar.buttonReloadServices": "Recarrega els serveis",
   "infobar.hide": "Amaga",
@@ -75,7 +74,7 @@
   "login.email.label": "Correu electrònic",
   "login.headline": "Accedir-hi",
   "login.invalidCredentials": "El correu electrònic o la contrasenya no són vàlids",
-  "login.link.password": "Restablir la contrasenya",
+  "login.link.password": "Reset password",
   "login.link.signup": "Crea un compte gratuït",
   "login.password.label": "Contrasenya",
   "login.serverLogout": "La teva sessió ha caducat, torna-la a iniciar.",
@@ -117,10 +116,10 @@
   "menu.help.support": "Suport",
   "menu.help.tos": "Condicions del Servei",
   "menu.services": "Serveis",
-  "menu.services.activatePreviousService": "Activa el servei anterior",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Inici",
-  "menu.services.setNextServiceActive": "Activa el següent servei",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Tasques",
   "menu.todos.enableTodos": "Activar Tasques",
   "menu.view": "Visualitza",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Tots els serveis",
   "menu.workspaces.openWorkspaceDrawer": "Obrir el calaix d'espais de treball",
   "password.email.label": "Correu electrònic",
-  "password.headline": "Restablir la contrasenya",
+  "password.headline": "Reset password",
   "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.successInfo": "Comproveu el vostre correu electrònic",
-  "pricing.features.accountSync": "Sincronització de Conte",
-  "pricing.features.customWebsites": "Afegir llocs web personalitzats",
-  "pricing.features.desktopNotifications": "Notificacions a l'escriptori",
-  "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": "Espais de treball",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Recarrega {name}",
   "service.crashHandler.autoReload": "Intentant restablir automàticament {name} en {seconds} segons",
   "service.crashHandler.headline": "Oh no!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Benvingut a Ferdi",
-  "settings.account.account.editButton": "Editar Compte",
+  "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": "Actualitzar el perfil",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Has rebut un correu electrònic amb un enllaç per confirmar l'eliminació del compte. El teu compte i la seva informació no podran ser restaurats!",
   "settings.account.deleteInfo": "Si ja no necessites el teu compte de Ferdi, pots esborrar el teu compte i tota la seva informació emmagatzemada aquí.",
   "settings.account.headline": "Compte",
-  "settings.account.headlineAccount": "Informació del compte",
-  "settings.account.headlineDangerZone": "Zona de perill",
-  "settings.account.headlineInvoices": "Factures",
-  "settings.account.headlinePassword": "Canvia la contrasenya",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Actualitzar el perfil",
   "settings.account.successInfo": "S'han desat els canvis",
   "settings.account.tryReloadServices": "Torna a provar-ho",
   "settings.account.tryReloadUserInfoRequest": "Torna a provar-ho",
   "settings.account.userInfoRequestFailed": "No s'ha pogut carregar la informació de l'usuari",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Buida la memòria cau",
   "settings.app.buttonInstallUpdate": "Reinicia i instal·la l'actualització",
@@ -220,12 +208,12 @@
   "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.darkMode": "Activar el Mode Fosc",
   "settings.app.form.enableGPUAcceleration": "Activar acceleració GPU",
   "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Habilita la comprobació ortogràfica",
-  "settings.app.form.enableSystemTray": "Mostra Ferdi a la safata del sistema",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Mostra les pestanyes dels serveis desactivats",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostra la insígnia de missatges no llegits quan les notificacions estiguin desactivades",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Suprimeix el servei",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Edita {name}",
   "settings.service.form.enableAudio": "Activa l'àudio",
   "settings.service.form.enableBadge": "Mostra les insígnies als missatges no llegits.",
@@ -332,17 +321,18 @@
   "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": "Quan es desactiva, tots els sons de notificació i reproducció d'àudio es silenciaran",
   "settings.service.form.name": "Nom",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "Ajustaments Proxy HTTP/HTTPS",
   "settings.service.form.proxy.host": "Host Proxy / IP",
-  "settings.service.form.proxy.info": "Els ajustaments del Proxy no es sincronitzaran amb els servidors de Ferdi",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Utilitzar Proxy",
-  "settings.service.form.proxy.password": "Contrasenya (opcional)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
   "settings.service.form.proxy.restartInfo": "Siusplau, reinicieu el Ferdi després de canviar els ajustaments de proxy",
-  "settings.service.form.proxy.user": "Usuari (opcional)",
+  "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": "Desa el servei",
   "settings.service.form.tabHosted": "Allotjat",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Descobrir serveis",
   "settings.services.headline": "Els vostres serveis",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "El servei està desactivat",
   "settings.services.tooltip.isMuted": "Tots els sons estan desactivats",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Sense ànim de lucre",
   "settings.user.form.currentPassword": "Contrasenya actual",
   "settings.user.form.email": "Correu electrònic",
-  "settings.user.form.firstname": "Nom",
-  "settings.user.form.lastname": "Cognoms",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Nova contrasenya",
   "settings.workspace.add.form.name": "Nom",
   "settings.workspace.add.form.submitButton": "Create workspace",
@@ -420,9 +411,9 @@
   "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",
-  "signup.firstname.label": "Nom",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Donar-se d'alta",
-  "signup.lastname.label": "Cognoms",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "En crear un compte de Ferdi, accepteu",
   "signup.legal.privacy": "Declaració de privacitat",
   "signup.legal.terms": "Termes del Servei",
@@ -430,11 +421,11 @@
   "signup.password.label": "Contrasenya",
   "signup.submit.label": "Crea un compte",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Suprimeix el servei",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Desactiva l'àudio",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Desactiva les notificacions",
-  "tabs.item.disableService": "Desactiva el servei",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Activa l'àudio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Activa les notificacions",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Recarrega",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} no es vàlid",
-  "validation.minLength": "{field} ha de ser al menys {length} caràcters de llargada",
+  "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} es requerit",
-  "validation.url": "{field} es una URL no vàlida",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Enrere",
   "webControls.forward": "Endavant",
   "webControls.goHome": "Inici",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 1a82d3016..08468e307 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Obnovit",
-  "app.errorHandler.headline": "Něco se pokazilo",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Vlastní server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "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",
@@ -24,8 +23,8 @@
   "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": "Nemůžeme připojit Ferdi k online službám",
-  "global.cancel": "Zrušit",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Upravit",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Připojení k internetu není k dispozici.",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Nastavení",
+  "global.settings": "Settings",
   "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.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": "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ě",
-  "import.submit.label": "Importovat služby",
+  "import.submit.label": "Import {count} 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": "Co je nového?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Restartovat a nainstalovat aktualizace",
   "infobar.buttonReloadServices": "Obnovit služby",
   "infobar.hide": "Skrýt",
@@ -75,7 +74,7 @@
   "login.email.label": "E-mailová adresa",
   "login.headline": "Přihlásit se",
   "login.invalidCredentials": "Email nebo heslo nesouhlasí",
-  "login.link.password": "Obnovit heslo",
+  "login.link.password": "Reset password",
   "login.link.signup": "Vytvořit uživatelský ú�et zdarma",
   "login.password.label": "Password",
   "login.serverLogout": "Sezení vypršelo, je třeba se znovu přihlásit.",
@@ -118,7 +117,7 @@
   "menu.help.tos": "Podmínky použití",
   "menu.services": "Služby",
   "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
   "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Všechny služby",
   "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
   "password.email.label": "E-mailová adresa",
-  "password.headline": "Obnovit heslo",
+  "password.headline": "Reset password",
   "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.successInfo": "Prosím, zkontrolujte svůj e-mail",
-  "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",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Na�íst znovu {name}",
   "service.crashHandler.autoReload": "Pokus o automatické obnovení {name} za {seconds} sekund",
   "service.crashHandler.headline": "Ale ne!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Vítejte v programu Ferdi",
-  "settings.account.account.editButton": "Upravit ú�et",
+  "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": "Aktualizovat profil",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Na váš mail byl odeslán email s odkazem pro potvrzení smazání ú�tu. Váš ú�et a data poté nepůjde obnovit!",
   "settings.account.deleteInfo": "Pokud již nepotřebujete váš Ferdi ú�et, můžete zde váš ú�et, a všechna data v něm, smazat.",
   "settings.account.headline": "Ú�et",
-  "settings.account.headlineAccount": "Informace o ú�tu",
-  "settings.account.headlineDangerZone": "Nebezpe�ná zóna",
-  "settings.account.headlineInvoices": "Faktury",
-  "settings.account.headlinePassword": "Změnit heslo",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Aktualizovat profil",
   "settings.account.successInfo": "Vaše změny byly uloženy",
   "settings.account.tryReloadServices": "Zkusit opět",
   "settings.account.tryReloadUserInfoRequest": "Zkusit opět",
   "settings.account.userInfoRequestFailed": "Nelze na�íst informace o uživateli.",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Vyprázdnit mezipaměti",
   "settings.app.buttonInstallUpdate": "Restartovat a nainstalovat aktualizace",
@@ -220,12 +208,12 @@
   "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.darkMode": "Povolit Tmavý vzhled",
   "settings.app.form.enableGPUAcceleration": "Aktivovat GPU zrychlení",
   "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Zapnout kontrolu pravopisu",
-  "settings.app.form.enableSystemTray": "Zobrazit Ferdi v systémové liště",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Zobrazit záložky vypnutých služeb",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Zobrazit odznak pro nepře�tené zprávy když jsou upozornění vypnutá",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Odstranit službu",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Upravit {name}",
   "settings.service.form.enableAudio": "Zapnout zvuk",
   "settings.service.form.enableBadge": "Ukázat odznaky nepře�tených zpráv",
@@ -332,12 +321,13 @@
   "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": "Pokud je vypnuto, všechny zvuky notifikací a jiného audia budou ztišeny",
   "settings.service.form.name": "Jméno",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "Nastavení HTTP/HTTPS Proxy",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Objevte služby",
   "settings.services.headline": "Vaše služby",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "Služba je zakázána",
   "settings.services.tooltip.isMuted": "Všechny zvuky jsou ztišeny",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Nezisková organizace",
   "settings.user.form.currentPassword": "Aktuální heslo",
   "settings.user.form.email": "Email",
-  "settings.user.form.firstname": "Jméno",
-  "settings.user.form.lastname": "Příjmení",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Nové heslo",
   "settings.workspace.add.form.name": "Jméno",
   "settings.workspace.add.form.submitButton": "Create workspace",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "Zapnout upozornění a zvuky",
   "signup.email.label": "E-mailová adresa",
   "signup.emailDuplicate": "Uživatel s touto emailovou adresou již existuje",
-  "signup.firstname.label": "Jméno",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Přihlásit se",
-  "signup.lastname.label": "Příjmení",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Vytvořením ú�tu Ferdi souhlasíte s",
   "signup.legal.privacy": "Prohlášení o ochraně soukromí",
   "signup.legal.terms": "Podmínky služby",
@@ -430,11 +421,11 @@
   "signup.password.label": "Password",
   "signup.submit.label": "Vytvořit ú�et",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Odstranit službu",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Vypnout zvuk",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Zakázat upozornění",
-  "tabs.item.disableService": "Zakázat službu",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Zapnout zvuk",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Povolit upozornění",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Obnovit",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} není validní",
-  "validation.minLength": "{field} musí být alespoň {length} znaků dlouhé",
+  "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} je povinné",
-  "validation.url": "{field} není validní URL",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Back",
   "webControls.forward": "Forward",
   "webControls.goHome": "Home",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index 31271cae5..9a6d0cf7e 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Genindlæs",
-  "app.errorHandler.headline": "Noget gik galt",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Brugerdefineret server",
   "changeserver.headline": "Skift server",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "Hvad skete der?",
   "connectionLostBanner.message": "Ã…h nej! Ferdi mistede forbindelsen til {name}.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Udgiv fejlfindingsoplysninger",
   "feature.nightlyBuilds.activate": "Aktiver",
   "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",
@@ -24,8 +23,8 @@
   "feature.quickSwitch.info": "Vælg en tjeneste med TAB, ↑ og ↓. Åbn en tjeneste med ENTER.",
   "feature.quickSwitch.search": "Søg...",
   "feature.quickSwitch.title": "Hurtigskift",
-  "global.api.unhealthy": "Kan ikke oprette forbindelse til Ferdi onlinetjenester",
-  "global.cancel": "Annuller",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Rediger",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Du har ikke forbindelse til internettet.",
@@ -33,7 +32,7 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Indstillinger",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Benyt systemstandard ({default})",
   "global.spellchecking.autodetect": "Vælg sprog automatisk",
   "global.spellchecking.autodetect.short": "Automatisk",
@@ -45,9 +44,9 @@
   "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",
-  "import.submit.label": "Importer tjenester",
+  "import.submit.label": "Import {count} services",
   "infobar.authRequestFailed": "Der var fejl under forsøget på at udføre en godkendt anmodning. Prøv at logge ud og ind igen hvis fejlen fortsætter.",
-  "infobar.buttonChangelog": "Hvad er nyt?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Genstart og installer opdatering",
   "infobar.buttonReloadServices": "Genindlæs tjenester",
   "infobar.hide": "Skjul",
@@ -75,7 +74,7 @@
   "login.email.label": "Mailadresse",
   "login.headline": "Log ind",
   "login.invalidCredentials": "Ugyldig mail eller adgangskode",
-  "login.link.password": "Nulstil adgangskode",
+  "login.link.password": "Reset password",
   "login.link.signup": "Opret en gratis konto",
   "login.password.label": "Adgangskode",
   "login.serverLogout": "Din session er udløbet, log ind igen.",
@@ -117,10 +116,10 @@
   "menu.help.support": "Support",
   "menu.help.tos": "Servicevilkår",
   "menu.services": "Tjenester",
-  "menu.services.activatePreviousService": "GÃ¥ til forrige tjeneste",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Hjem",
-  "menu.services.setNextServiceActive": "Gå til næste tjeneste",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Aktiver Todos",
   "menu.view": "Vis",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Alle tjenester",
   "menu.workspaces.openWorkspaceDrawer": "Ã…bn arbejdsrumspanel",
   "password.email.label": "Mailadresse",
-  "password.headline": "Nulstil adgangskode",
+  "password.headline": "Reset password",
   "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.successInfo": "Tjek venligst din mail",
-  "pricing.features.accountSync": "Kontosynkronisering",
-  "pricing.features.customWebsites": "Tilføj brugerdefinerede hjemmesider",
-  "pricing.features.desktopNotifications": "Skrivebordsnotifikationer",
-  "pricing.features.onPremise": "Lokale- & andre hostede tjenester",
-  "pricing.features.recipes": "Vælg mellem mere end 70 tjenester",
-  "pricing.features.serviceProxies": "Tjeneste-proxyer",
-  "pricing.features.spellchecker": "Understøttelse af stavekontrol",
-  "pricing.features.teamManagement": "Teamhåndtering",
-  "pricing.features.thirdPartyServices": "Installer tredjeparts tjenester",
-  "pricing.features.unlimitedServices": "Tilføj ubegrænsede tjenester",
-  "pricing.features.workspaces": "Arbejdsrum",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Genindlæs {name}",
   "service.crashHandler.autoReload": "Forsøger automatisk at gendanne {name} om {seconds} sekunder",
   "service.crashHandler.headline": "Ã…h nej!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Brug Ferdi uden en konto",
   "services.welcome": "Velkommen til Ferdi",
-  "settings.account.account.editButton": "Rediger konto",
+  "settings.account.account.editButton": "Edit account",
   "settings.account.accountUnavailable": "Konto utilgængelig",
   "settings.account.accountUnavailableInfo": "Du bruger Ferdi uden en konto. Hvis du ønsker at bruge Ferdi med en konto og holde dine tjenester synkroniseret på tværs af enheder, vælg en server under fanen Indstillinger, og log derefter ind.",
   "settings.account.buttonSave": "Opdater profil",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Du har modtaget en mail med et link til at bekræfte sletning af din konto. Din konto og data kan ikke gendannes!",
   "settings.account.deleteInfo": "Hvis du ikke længere har brug for din Ferdi-konto, kan du slette den og alle relaterede data her.",
   "settings.account.headline": "Konto",
-  "settings.account.headlineAccount": "Kontooplysninger",
-  "settings.account.headlineDangerZone": "Farezone",
-  "settings.account.headlineInvoices": "Fakturaer",
-  "settings.account.headlinePassword": "Skift adgangskode",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Opdater profil",
   "settings.account.successInfo": "Dine ændringer er blevet gemt",
   "settings.account.tryReloadServices": "Prøv igen",
   "settings.account.tryReloadUserInfoRequest": "Prøv igen",
   "settings.account.userInfoRequestFailed": "Kunne ikke indlæse brugerinformation",
-  "settings.account.yourLicense": "Din Ferdi-licens",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Ryd cache",
   "settings.app.buttonInstallUpdate": "Genstart og installer opdatering",
@@ -219,13 +207,13 @@
   "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.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Aktiver mørk tilstand",
   "settings.app.form.enableGPUAcceleration": "Aktiver GPU-acceleration",
   "settings.app.form.enableLock": "Aktiver adgangskodelås",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Aktiver stavekontrol",
-  "settings.app.form.enableSystemTray": "Vis Ferdi i systembakken",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Aktiver Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Sæt tjenester i dvale ved opstart",
   "settings.app.form.hibernationStrategy": "Dvale strategi",
@@ -251,9 +239,10 @@
   "settings.app.form.showDisabledServices": "Vis faneblade for deaktiverede tjenester",
   "settings.app.form.showDragArea": "Vis trækområde i vinduet",
   "settings.app.form.showMessagesBadgesWhenMuted": "Vis ulæst beskedikon når notifikationer er deaktiveret",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimeret",
   "settings.app.form.universalDarkMode": "Aktiver universel mørk tilstand",
-  "settings.app.form.useTouchIdToUnlock": "Tillad brug af TouchID for at låse Ferdi op",
+  "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": "Avanceret",
@@ -267,7 +256,7 @@
   "settings.app.languageDisclaimer": "Officielle oversættelser er engelske og tyske. Alle andre sprog er fællesskabsstyrede oversættelser.",
   "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Adgangskode",
-  "settings.app.lockedPasswordInfo": "Sørg for at angive en adgangskode, du husker.\nHvis du mister denne adgangskode, vil du blive nødt til at geninstallere Ferdi.",
+  "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": "Ændringer kræver genstart",
   "settings.app.scheduledDNDInfo": "Planlagt Forstyr ikke giver dig mulighed for at definere et tidsrum, hvor du ikke ønsker at få meddelelser fra Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Tider er i 24-timer format. Sluttidspunktet kan være før starttidspunktet (f.eks. fra 17:00 til 09:00) for at aktivere Forstyr ikke natten over.",
@@ -275,7 +264,7 @@
   "settings.app.spellCheckerLanguageInfo": "Ferdi bruger din Macs indbyggede stavekontrol. Hvis du ønsker at ændre de sprog, stavekontrollen kontrollerer for, kan du gøre det i din Macs systemindstillinger.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
-  "settings.app.todoServerInfo": "Denne server vil blive brugt til funktionen \"Ferdi Todo\".",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Hjælp os med at oversætte Ferdi til dit sprog.",
   "settings.app.universalDarkModeInfo": "Universel mørk tilstand forsøger at dynamisk generere mørk tilstand stilarter for tjenester, der ellers ikke er understøttet.",
   "settings.app.updateStatusAvailable": "Opdatering tilgængelig, downloader...",
@@ -294,9 +283,9 @@
   "settings.recipes.customService.headline.communityRecipes": "Fællesskabstyrede Tredjepartsopskrifter",
   "settings.recipes.customService.headline.customRecipes": "Brugerdefinerede Tredjepartsopskrifter",
   "settings.recipes.customService.headline.devRecipes": "Dine Udviklingsopskrifter",
-  "settings.recipes.customService.intro": "For at tilføje en brugerdefineret tjeneste, kopier tjenestens opskrift til:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
   "settings.recipes.customService.openDevDocs": "Udvikler Dokumentation",
-  "settings.recipes.customService.openFolder": "Ã…bn mappe",
+  "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Tilgængelige tjenester",
   "settings.recipes.missingService": "Mangler du en 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.",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Mørk læser lysstyrke",
   "settings.service.form.darkReaderContrast": "Mørk læser kontrast",
   "settings.service.form.darkReaderSepia": "Mørk læser sepia",
-  "settings.service.form.deleteButton": "Slet tjeneste",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Rediger {name}",
   "settings.service.form.enableAudio": "Aktiver lyd",
   "settings.service.form.enableBadge": "Vis ulæste beskedbadges",
@@ -332,17 +321,18 @@
   "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": "Når deaktiveret, er alle notifikationslyde og lydafspilning slået fra",
   "settings.service.form.name": "Navn",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Ã…bn darkmode.css",
   "settings.service.form.openUserCss": "Ã…bn user.css",
   "settings.service.form.openUserJs": "Ã…bn user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS proxyindstillinger",
   "settings.service.form.proxy.host": "Proxy vært/IP",
-  "settings.service.form.proxy.info": "Proxyindstillinger synkroniseres ikke med Ferdi serverne.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Brug Proxy",
-  "settings.service.form.proxy.password": "Adgangskode (valgfri)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
   "settings.service.form.proxy.restartInfo": "Genstart Ferdi efter ændring af proxyindstillinger.",
-  "settings.service.form.proxy.user": "Bruger (valgfri)",
+  "settings.service.form.proxy.user": "User (optional)",
   "settings.service.form.recipeFileInfo": "Dine brugerfiler vil blive indsat i websiden, så du kan tilpasse tjenester lige som du ønsker. Brugerfiler gemmes kun lokalt og overføres ikke til andre enheder der bruger samme konto.",
   "settings.service.form.saveButton": "Gem service",
   "settings.service.form.tabHosted": "Hosted",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Opdag tjenester",
   "settings.services.headline": "Dine tjenester",
   "settings.services.noServicesAdded": "Start med at tilføje en tjeneste.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Kunne ikke indlæse dine tjenester",
   "settings.services.tooltip.isDisabled": "Tjenesten er deaktiveret",
   "settings.services.tooltip.isMuted": "Alle lyde er slået fra",
@@ -362,12 +353,12 @@
   "settings.supportFerdi.aboutIntro": "<p>Ferdi er et \"open source\" og fællesskabsstyret program.</p><p>Tak til de personer, der gør dette muligt:</p>",
   "settings.supportFerdi.bannerText": "Vil du hjælpe os med at forbedre Ferdi?",
   "settings.supportFerdi.headline": "Om Ferdi",
-  "settings.supportFerdi.openSurvey": "Åbn undersøgelse",
+  "settings.supportFerdi.openSurvey": "Open survey",
   "settings.supportFerdi.textDonation": "Hvis du har lyst til at støtte Ferdi's udviklere med en donation, kan du gøre det på både,",
   "settings.supportFerdi.textDonationAnd": "og",
   "settings.supportFerdi.textExpenses": "Omend frivillige gør det meste af arbejdet, er vi stadig nødt til at betale for servere og certifikater. Som et fællesskab er vi fuldt ud gennemsigtige med hensyn til de midler, vi indsamler og bruger - se vores",
   "settings.supportFerdi.textGitHubSponsors": "GitHub Sponsors",
-  "settings.supportFerdi.textListContributors": "Fuld liste over bidragsydere",
+  "settings.supportFerdi.textListContributors": "Full list of contributors",
   "settings.supportFerdi.textListContributorsHere": "her",
   "settings.supportFerdi.textOpenCollective": "Open Collective",
   "settings.supportFerdi.textSupportWelcome": "Støtte er altid velkommen. Du kan finde en liste over den hjælp, vi har brug for",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Nonprofit",
   "settings.user.form.currentPassword": "Nuværende adgangskode",
   "settings.user.form.email": "Mailadresse",
-  "settings.user.form.firstname": "Fornavn",
-  "settings.user.form.lastname": "Efternavn",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Ny adgangskode",
   "settings.workspace.add.form.name": "Navn",
   "settings.workspace.add.form.submitButton": "Opret arbejdsrum",
@@ -405,7 +396,7 @@
   "settings.workspaces.tryReloadWorkspaces": "Prøv igen",
   "settings.workspaces.updatedInfo": "Dine ændringer er blevet gemt",
   "settings.workspaces.workspaceFeatureHeadline": "Mindre er mere: Introducerer Ferdi arbejdsrum",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi Arbejdsrum lader dig fokusere på, hvad der er vigtigt lige nu. Konfigurer forskellige sæt af tjenester og skift nemt mellem dem til enhver tid. Du bestemmer hvilke tjenester du har brug for hvor og hvornår, så vi kan hjælpe dig med at holde dig på toppen - eller nemt lukke ned for arbejdet, når du vil.",
+  "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": "Kunne ikke indlæse dine arbejdsrum",
   "setupAssistant.headline": "Let's get started",
   "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "Aktiver notifikationer og lyd",
   "signup.email.label": "Mailadresse",
   "signup.emailDuplicate": "Der findes allerede en bruger med den mailadresse",
-  "signup.firstname.label": "Fornavn",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Tilmeld dig",
-  "signup.lastname.label": "Efternavn",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Ved at oprette en Ferdi konto accepterer du",
   "signup.legal.privacy": "Privatlivspolitik",
   "signup.legal.terms": "Servicevilkårene",
@@ -430,11 +421,11 @@
   "signup.password.label": "Adgangskode",
   "signup.submit.label": "Opret konto",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Slet tjeneste",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Deaktiver lyd",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Deaktiver notifikationer",
-  "tabs.item.disableService": "Deaktiver tjeneste",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Aktiver lyd",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktiver notifikationer",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Genindlæs",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} er ugyldigt",
-  "validation.minLength": "{field} skal være på mindst {length} tegn",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "Mindst én er påkrævet",
-  "validation.required": "{field} er obligatorisk",
-  "validation.url": "{field} er ikke en gyldig URL",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Tilbage",
   "webControls.forward": "Fremad",
   "webControls.goHome": "Hjem",
@@ -454,12 +445,12 @@
   "webControls.reload": "Genindlæs",
   "welcome.loginButton": "Log ind på din konto",
   "welcome.signupButton": "Opret en gratis konto",
-  "workspaceDrawer.addNewWorkspaceLabel": "Tilføj nyt arbejdsrum",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "Alle tjenester",
   "workspaceDrawer.headline": "Arbejdsrum",
   "workspaceDrawer.item.contextMenuEdit": "rediger",
   "workspaceDrawer.item.noServicesAddedYet": "Ingen tjenester tilføjet endnu",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Arbejdsrum lader dig fokusere på, hvad der er vigtigt lige nu. Konfigurer forskellige sæt af tjenester og skift nemt mellem dem til enhver tid.</p>\n<p>Du bestemmer hvilke tjenester du har brug for hvor og hvornår, så vi kan hjælpe dig med at holde dig på toppen - eller nemt lukke ned for arbejdet, når du vil.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Rediger indstillinger for arbejdsrum",
+  "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": "Skifter til"
 }
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 1deee8e54..0baa4cf5e 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Neu laden",
-  "app.errorHandler.headline": "Es ist ein Fehler aufgetreten",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Eigener Server",
   "changeserver.headline": "Server wechseln",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "Was ist passiert?",
   "connectionLostBanner.message": "Oh nein! Ferdi hat die Verbindung zu {name} verloren.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Debug-Informationen veröffentlichen",
   "feature.nightlyBuilds.activate": "Aktivieren",
   "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",
@@ -24,8 +23,8 @@
   "feature.quickSwitch.info": "Wähle einen Service mit TAB, ↑ und ↓. Um einen Service zu öffnen, drücke ENTER.",
   "feature.quickSwitch.search": "Suchen...",
   "feature.quickSwitch.title": "Schnellauswahl",
-  "global.api.unhealthy": "Verbindung zu den Ferdi Online Services fehlgeschlagen",
-  "global.cancel": "Abbrechen",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Bearbeiten",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Du bist nicht mit dem Internet verbunden.",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Einstellungen",
+  "global.settings": "Settings",
   "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.submit": "Submit",
   "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",
-  "import.submit.label": "Dienste importieren",
+  "import.submit.label": "Import {count} services",
   "infobar.authRequestFailed": "Es sind Fehler während einem authentifizierten Anfrage an den Ferdi Server aufgetreten. Sollte dieser Fehler bestehen, logge dich bitte aus und wieder ein.",
-  "infobar.buttonChangelog": "Was gibt es Neues?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Neu starten & Update installieren",
   "infobar.buttonReloadServices": "Dienste neu laden",
   "infobar.hide": "Ausblenden",
@@ -75,7 +74,7 @@
   "login.email.label": "E-Mail-Adresse",
   "login.headline": "Anmelden",
   "login.invalidCredentials": "E-Mail-Adresse oder Passwort ungültig",
-  "login.link.password": "Passwort zurücksetzen",
+  "login.link.password": "Reset password",
   "login.link.signup": "Kostenloses Konto erstellen",
   "login.password.label": "Passwort",
   "login.serverLogout": "Deine Sitzung ist abgelaufen, bitte melde Dich erneut an.",
@@ -117,10 +116,10 @@
   "menu.help.support": "Hilfe",
   "menu.help.tos": "Nutzungsbedingungen",
   "menu.services": "Dienste",
-  "menu.services.activatePreviousService": "Vorheriger Dienst",
-  "menu.services.addNewService": "Neuen Dienst hinzufügen",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Startseite",
-  "menu.services.setNextServiceActive": "Nächster Dienst",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Todos aktivieren",
   "menu.view": "Darstellung",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Alle Dienste",
   "menu.workspaces.openWorkspaceDrawer": "Workspaces schließen",
   "password.email.label": "E-Mail-Adresse",
-  "password.headline": "Passwort zurücksetzen",
+  "password.headline": "Reset password",
   "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.successInfo": "Wir haben Dir eine E-Mail mit weiteren Anweisungen geschickt",
-  "pricing.features.accountSync": "Konto-Synchronisierung",
-  "pricing.features.customWebsites": "Hinzufügen von eigenen Websites",
-  "pricing.features.desktopNotifications": "Desktop Benachrichtigungen",
-  "pricing.features.onPremise": "On-premise & andere Hosted Services",
-  "pricing.features.recipes": "Wählen Sie aus mehr als 70 Diensten",
-  "pricing.features.serviceProxies": "Service-Proxies",
-  "pricing.features.spellchecker": "Rechtschreibprüfung",
-  "pricing.features.teamManagement": "Team-Management",
-  "pricing.features.thirdPartyServices": "Integration von Services über Drittanbieter",
-  "pricing.features.unlimitedServices": "Unbegrenztes hinzufügen von Services",
-  "pricing.features.workspaces": "Arbeitsbereiche",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "{name} neu laden",
   "service.crashHandler.autoReload": "{name} wird in {seconds} Sekunden automatisch wiederhergestellt",
   "service.crashHandler.headline": "Oh nein!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Ferdi ohne ein Konto verwenden",
   "services.welcome": "Willkommen bei Ferdi!",
-  "settings.account.account.editButton": "Konto bearbeiten",
+  "settings.account.account.editButton": "Edit account",
   "settings.account.accountUnavailable": "Konto nicht verfügbar",
   "settings.account.accountUnavailableInfo": "Du verwendest Ferdi ohne ein Konto. Wenn du Ferdi mit einem Konto verwenden möchtest und deine Dienste über alle verschiedene Computer hinweg synchronisieren möchtest, wählen bitte einen Server in den Einstellungen und melde dich danach an.",
   "settings.account.buttonSave": "Profil aktualisieren",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Du hast eine E-Mail zur Bestätigung der Löschung Deines Benutzerkontos erhalten. Dein Benutzerkonto und Deine Daten können nach der Löschung nicht wiederhergestellt werden!",
   "settings.account.deleteInfo": "Wenn du dein Ferdi-Benutzerkonto nicht mehr länger benötigst, kannst du es hier mit allen dazugehörigen Daten löschen.",
   "settings.account.headline": "Konto",
-  "settings.account.headlineAccount": "Konto-Informationen",
-  "settings.account.headlineDangerZone": "Benutzerkonto löschen",
-  "settings.account.headlineInvoices": "Rechnungen",
-  "settings.account.headlinePassword": "Passwort ändern",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Profil aktualisieren",
   "settings.account.successInfo": "Deine Änderungen wurden gespeichert",
   "settings.account.tryReloadServices": "Erneut versuchen",
   "settings.account.tryReloadUserInfoRequest": "Erneut versuchen",
   "settings.account.userInfoRequestFailed": "Benutzerinformationen konnten nicht geladen werden",
-  "settings.account.yourLicense": "Deine Ferdi Lizenz",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Schreibe deine Akzentfarbe in einem CSS-kompatiblen Format. (Standard: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Cache leeren",
   "settings.app.buttonInstallUpdate": "Neu starten & Update installieren",
@@ -219,13 +207,13 @@
   "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.customTodoServer": "Custom Todo Server",
+  "settings.app.form.darkMode": "Dark Mode aktivieren",
   "settings.app.form.enableGPUAcceleration": "Hardwarebeschleunigung aktivieren",
   "settings.app.form.enableLock": "Passwort-Sperre aktivieren",
   "settings.app.form.enableMenuBar": "Ferdi immer in der Menüleiste anzeigen",
   "settings.app.form.enableSpellchecking": "Rechtschreibprüfung aktivieren",
-  "settings.app.form.enableSystemTray": "Ferdi im Infobereich anzeigen",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Ferdi Todos aktivieren",
   "settings.app.form.hibernateOnStartup": "Behalte Dienste im Ruhezustand beim Start",
   "settings.app.form.hibernationStrategy": "\"Service Hibernation\"-Strategie",
@@ -251,9 +239,10 @@
   "settings.app.form.showDisabledServices": "Deaktivierte Services-Tabs anzeigen",
   "settings.app.form.showDragArea": "Zeige ziehbare Fläche im Fenster",
   "settings.app.form.showMessagesBadgesWhenMuted": "Ungelesene Nachrichten zeigen, wenn die Benachrichtigungen deaktiviert sind",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Minimiert starten",
   "settings.app.form.universalDarkMode": "Universellen Dark Mode aktivieren",
-  "settings.app.form.useTouchIdToUnlock": "Verwenden von Touch ID zum Entsperren von Ferdi erlauben",
+  "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": "Erweitert",
@@ -267,7 +256,7 @@
   "settings.app.languageDisclaimer": "Offizielle Ãœbersetzungen: Englisch & Deutsch. Alle anderen Sprachen sind Ãœbersetzungen der Ferdi Community.",
   "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Passwort",
-  "settings.app.lockedPasswordInfo": "Bitte stelle sicher, dass du ein Passwort setzt, an welches du dich erinnern kannst.\nSolltest du dieses Passwort vergessen, musst du Ferdi neu installieren.",
+  "settings.app.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": "Änderungen werden erst nach einem Neustart wirksam.",
   "settings.app.scheduledDNDInfo": "Die geplante \"Nicht-stören\"-Funktion erlaubt es dir eine Zeitspanne festzulegen, in der du keine Benachrichtigungen von Ferdi erhalten möchtest.",
   "settings.app.scheduledDNDTimeInfo": "Zeiten im 24-Stunden-Format (z.B. 18:00). Endzeit kann vor Beginn der Startzeit sein (z.B. 17:00 Uhr, Ende 09:00), um die Funktion über Nacht zu aktivieren.",
@@ -275,7 +264,7 @@
   "settings.app.spellCheckerLanguageInfo": "Ferdi verwendet den eingebauten Rechtschreibprüfer deines Macs, um nach Tippfehlern zu suchen. Wenn du die zu überprüfenden Sprachen ändern möchtest, kannst du das in deinen Systemeinstellungen tun.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
-  "settings.app.todoServerInfo": "Dieser Server wird für die \"Ferdi Todo\"-Funktion verwendet.",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Hilf uns, Ferdi in Deine Sprache zu übersetzen.",
   "settings.app.universalDarkModeInfo": "Universeller Dark Mode versucht dynamisch Dienste abzudunkeln, die vom normalen Dark Mode noch nicht unterstützt werden.",
   "settings.app.updateStatusAvailable": "Update verfügbar, lädt herunter ...",
@@ -294,12 +283,12 @@
   "settings.recipes.customService.headline.communityRecipes": "Community Recipes",
   "settings.recipes.customService.headline.customRecipes": "Benutzerdefinierte Recipes",
   "settings.recipes.customService.headline.devRecipes": "Eigene Recipes",
-  "settings.recipes.customService.intro": "Um ein benutzerdefiniertes Service hinzuzufügen, kopiere das Service Recipe nach:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
   "settings.recipes.customService.openDevDocs": "Entwicklerdokumentation",
-  "settings.recipes.customService.openFolder": "Ordner öffnen",
+  "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Verfügbare Dienste",
   "settings.recipes.missingService": "Fehlt ein Dienst?",
-  "settings.recipes.nothingFound": "Leider hat kein Dienst zu deinem Suchbegriff gepasst - aber du kannst ihn wahrscheinlich trotzdem über die Option \"Eigene Website\" hinzufügen. Bitte beachte, dass die Website möglicherweise weitere Dienste anzeigt, die seit deiner aktuellen Version zu Ferdi hinzugefügt wurden. Um diese neuen Dienste zu erhalten, erwäge bitte ein Upgrade auf eine neuere Version von Ferdi.",
+  "settings.recipes.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": "Dienst erfolgreich hinzugefügt",
   "settings.searchService": "Dienst suchen",
   "settings.service.error.goBack": "Zurück zu den Diensten",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Helligkeit",
   "settings.service.form.darkReaderContrast": "Dark Reader Kontrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Dienst löschen",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "{name} bearbeiten",
   "settings.service.form.enableAudio": "Audio aktivieren",
   "settings.service.form.enableBadge": "Nachrichten-Badge anzeigen",
@@ -332,17 +321,18 @@
   "settings.service.form.isHibernatedEnabledInfo": "Wenn aktiviert, wird ein Dienst nach einer Zeitspanne heruntergefahren, um Systemressourcen zu sparen.",
   "settings.service.form.isMutedInfo": "Sämtliche Wiedergabe von Tönen wird deaktiviert",
   "settings.service.form.name": "Name",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Öffne darkmode.css",
   "settings.service.form.openUserCss": "Öffne user.css",
   "settings.service.form.openUserJs": "Öffne user.js",
   "settings.service.form.proxy.headline": "HTTP-/HTTPS-Proxy-Einstellungen",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy-Einstellungen werden nicht mit den Ferdi Servern synchronisiert.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Proxy-Server verwenden",
-  "settings.service.form.proxy.password": "Passwort (optional)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
   "settings.service.form.proxy.restartInfo": "Bitte starte Ferdi nach dem Ändern der Proxy-Einstellungen neu.",
-  "settings.service.form.proxy.user": "Benutzer (optional)",
+  "settings.service.form.proxy.user": "User (optional)",
   "settings.service.form.recipeFileInfo": "Deine \"user\" Dateien werden in die Webseite eingefügt, so dass du die Dienste in beliebiger Weise anpassen können. \"user\" Dateien werden nur lokal gespeichert und nicht auf andere Computer, welche das gleiche Konto nutzen, übertragen.",
   "settings.service.form.saveButton": "Dienst speichern",
   "settings.service.form.tabHosted": "Gehostet",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Dienste entdecken",
   "settings.services.headline": "Deine Dienste",
   "settings.services.noServicesAdded": "Beginne indem du einen Dienst hinzufügst.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Dienste konnten nicht geladen werden",
   "settings.services.tooltip.isDisabled": "Dienst ist deaktiviert",
   "settings.services.tooltip.isMuted": "Alle Töne sind deaktiviert",
@@ -362,12 +353,12 @@
   "settings.supportFerdi.aboutIntro": "<p>Ferdi ist eine Open-Source und von der Community-geführte Anwendung.</p><p>Danke an die Personen, die das möglich machen:</p>",
   "settings.supportFerdi.bannerText": "Willst du uns helfen, Ferdi zu verbessern?",
   "settings.supportFerdi.headline": "Ãœber Ferdi",
-  "settings.supportFerdi.openSurvey": "Umfrage öffnen",
+  "settings.supportFerdi.openSurvey": "Open survey",
   "settings.supportFerdi.textDonation": "Wenn du Lust hast, die Entwicklung von Ferdi mit einer Spende zu unterstützen, kannst du dies auf folgenden Seiten tun,",
   "settings.supportFerdi.textDonationAnd": "und",
   "settings.supportFerdi.textExpenses": "Während die meiste Arbeit von Freiwilligen geleistet wird, müssen wir dennoch für Server und Zertifikate bezahlen. Als Community sind wir völlig transparent über die Gelder, die wir sammeln und ausgeben - siehe unsere",
   "settings.supportFerdi.textGitHubSponsors": "GitHub Sponsoren",
-  "settings.supportFerdi.textListContributors": "Vollständige Liste der Mitwirkenden",
+  "settings.supportFerdi.textListContributors": "Full list of contributors",
   "settings.supportFerdi.textListContributorsHere": "hier",
   "settings.supportFerdi.textOpenCollective": "Open Collective",
   "settings.supportFerdi.textSupportWelcome": "Unterstützung ist immer willkommen. Du findest eine Liste über Unterstützungen die wir benötigen",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Non-Profit",
   "settings.user.form.currentPassword": "Aktuelles Passwort",
   "settings.user.form.email": "E-Mail",
-  "settings.user.form.firstname": "Vorname",
-  "settings.user.form.lastname": "Nachname",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Neues Passwort",
   "settings.workspace.add.form.name": "Name",
   "settings.workspace.add.form.submitButton": "Workspace erstellen",
@@ -405,7 +396,7 @@
   "settings.workspaces.tryReloadWorkspaces": "Erneut versuchen",
   "settings.workspaces.updatedInfo": "Deine Änderungen wurden gespeichert",
   "settings.workspaces.workspaceFeatureHeadline": "Weniger ist mehr: Ferdi Workspaces",
-  "settings.workspaces.workspaceFeatureInfo": "Mit Ferdi Workspaces hast du alles im Blick, was gerade wichtig ist - und nur das. Erstelle unterschiedliche Sets von Services, und wechsle jederzeit zwischen ihnen hin und her. Du entscheidest welche Services du wann und wo brauchst, um ungestört arbeiten zu können - oder zu Hause besser abzuschalten.",
+  "settings.workspaces.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": "Workspaces konnte nicht geladen werden",
   "setupAssistant.headline": "Los geht's",
   "setupAssistant.subheadline": "Wähle von unseren meistgenutzten Diensten und bekomm deine Nachrichten wieder in den Griff.",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "Benachrichtigungen & Audio aktivieren",
   "signup.email.label": "E-Mail-Adresse",
   "signup.emailDuplicate": "Es existiert bereits ein Benutzer mit dieser E-Mail Adresse.",
-  "signup.firstname.label": "Vorname",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Anmelden",
-  "signup.lastname.label": "Nachname",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Mit der Erstellung eines Ferdi-Kontos akzeptierst Du die",
   "signup.legal.privacy": "Datenschutzerklärung",
   "signup.legal.terms": "Nutzungsbedingungen",
@@ -430,11 +421,11 @@
   "signup.password.label": "Passwort",
   "signup.submit.label": "Konto erstellen",
   "tabs.item.confirmDeleteService": "Willst du den {serviceName} Dienst wirklich löschen?",
-  "tabs.item.deleteService": "Dienst löschen",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Audio deaktivieren",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Benachrichtigungen deaktivieren",
-  "tabs.item.disableService": "Dienst deaktivieren",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Audio aktivieren",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Benachrichtigungen aktivieren",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Neu laden",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} ist ungültig",
-  "validation.minLength": "{field} muss mindestens {length} Zeichen enthalten",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "Mindestens ein Wert wird benötigt",
-  "validation.required": "{field} wird benötigt",
-  "validation.url": "{field} ist keine gültige URL",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Zurück",
   "webControls.forward": "Vorwärts",
   "webControls.goHome": "Startseite",
@@ -454,12 +445,12 @@
   "webControls.reload": "Neu laden",
   "welcome.loginButton": "Bei Ferdi einloggen",
   "welcome.signupButton": "Kostenloses Konto erstellen",
-  "workspaceDrawer.addNewWorkspaceLabel": "Neuen Workspace hinzufügen",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "Alle Dienste",
   "workspaceDrawer.headline": "Arbeitsbereiche",
   "workspaceDrawer.item.contextMenuEdit": "Bearbeiten",
   "workspaceDrawer.item.noServicesAddedYet": "Noch keine Services hinzugefügt",
-  "workspaceDrawer.workspaceFeatureInfo": "Mit Ferdi Workspaces hast du alles im Blick, was gerade wichtig ist - und nur das. Erstelle unterschiedliche Sets von Services, und wechsle jederzeit zwischen ihnen hin und her. Du entscheidest welche Services du wann und wo brauchst, um ungestört arbeiten zu können - oder zu Hause besser abzuschalten.",
-  "workspaceDrawer.workspacesSettingsTooltip": "Workspaces bearbeiten",
+  "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": "Wechsle zu"
 }
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
deleted file mode 100644
index 3a41c66f6..000000000
--- a/src/i18n/locales/defaultMessages.json
+++ /dev/null
@@ -1,6862 +0,0 @@
-[
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!A new update for Ferdi is available.",
-        "end": {
-          "column": 3,
-          "line": 13
-        },
-        "file": "src/components/AppUpdateInfoBar.js",
-        "id": "infobar.updateAvailable",
-        "start": {
-          "column": 19,
-          "line": 10
-        }
-      },
-      {
-        "defaultMessage": "!!!Changelog",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/components/AppUpdateInfoBar.js",
-        "id": "infobar.buttonChangelog",
-        "start": {
-          "column": 13,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!!Restart & install update",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/AppUpdateInfoBar.js",
-        "id": "infobar.buttonInstallUpdate",
-        "start": {
-          "column": 23,
-          "line": 18
-        }
-      }
-    ],
-    "path": "src/components/AppUpdateInfoBar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Change server",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/auth/ChangeServer.js",
-        "id": "changeserver.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Server",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/auth/ChangeServer.js",
-        "id": "changeserver.label",
-        "start": {
-          "column": 9,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Extra settings offered by Ferdi will not be saved",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/auth/ChangeServer.js",
-        "id": "changeserver.warning",
-        "start": {
-          "column": 11,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Custom server",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/auth/ChangeServer.js",
-        "id": "changeserver.customServerLabel",
-        "start": {
-          "column": 21,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Enter a valid URL",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/auth/ChangeServer.js",
-        "id": "changeserver.urlError",
-        "start": {
-          "column": 12,
-          "line": 31
-        }
-      }
-    ],
-    "path": "src/components/auth/ChangeServer.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Import your Ferdi 4 services",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/auth/Import.js",
-        "id": "import.headline",
-        "start": {
-          "column": 12,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Services not yet supported in Ferdi 5",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/auth/Import.js",
-        "id": "import.notSupportedHeadline",
-        "start": {
-          "column": 24,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Import {count} services",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/auth/Import.js",
-        "id": "import.submit.label",
-        "start": {
-          "column": 21,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!I want to add services manually",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/auth/Import.js",
-        "id": "import.skip.label",
-        "start": {
-          "column": 19,
-          "line": 25
-        }
-      }
-    ],
-    "path": "src/components/auth/Import.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Invite Friends",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "settings.invite.headline",
-        "start": {
-          "column": 20,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Invite 3 of your friends or colleagues",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.headline.friends",
-        "start": {
-          "column": 12,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Name",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.name.label",
-        "start": {
-          "column": 13,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Email address",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.email.label",
-        "start": {
-          "column": 14,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Send invites",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.submit.label",
-        "start": {
-          "column": 21,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!I want to do this later",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.skip.label",
-        "start": {
-          "column": 19,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Invitations sent successfully",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.successInfo",
-        "start": {
-          "column": 21,
-          "line": 40
-        }
-      }
-    ],
-    "path": "src/components/auth/Invite.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Locked",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.headline",
-        "start": {
-          "column": 12,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.info",
-        "start": {
-          "column": 8,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Unlock with Touch ID",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.touchId",
-        "start": {
-          "column": 11,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!unlock via Touch ID",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.touchIdPrompt",
-        "start": {
-          "column": 17,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.password.label",
-        "start": {
-          "column": 17,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Unlock",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.submit.label",
-        "start": {
-          "column": 21,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Unlock with Password",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.unlockWithPassword",
-        "start": {
-          "column": 22,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Password invalid",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.invalidCredentials",
-        "start": {
-          "column": 22,
-          "line": 44
-        }
-      }
-    ],
-    "path": "src/components/auth/Locked.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Sign in",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.headline",
-        "start": {
-          "column": 12,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Email address",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.email.label",
-        "start": {
-          "column": 14,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.password.label",
-        "start": {
-          "column": 17,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Sign in",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.submit.label",
-        "start": {
-          "column": 21,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Email or password not valid",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.invalidCredentials",
-        "start": {
-          "column": 22,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Using a Franz account to log in?",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.customServerQuestion",
-        "start": {
-          "column": 24,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Try importing your Franz account into Ferdi",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.customServerSuggestion",
-        "start": {
-          "column": 26,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Your session expired, please login again.",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.tokenExpired",
-        "start": {
-          "column": 16,
-          "line": 48
-        }
-      },
-      {
-        "defaultMessage": "!!!Your session expired, please login again.",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.serverLogout",
-        "start": {
-          "column": 16,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "!!!Create a free account",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.link.signup",
-        "start": {
-          "column": 14,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "!!!Change server",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.changeServer",
-        "start": {
-          "column": 16,
-          "line": 60
-        }
-      },
-      {
-        "defaultMessage": "!!!Use Ferdi without an Account",
-        "end": {
-          "column": 3,
-          "line": 67
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "services.serverless",
-        "start": {
-          "column": 14,
-          "line": 64
-        }
-      },
-      {
-        "defaultMessage": "!!!Forgot password",
-        "end": {
-          "column": 3,
-          "line": 71
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.link.password",
-        "start": {
-          "column": 16,
-          "line": 68
-        }
-      }
-    ],
-    "path": "src/components/auth/Login.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Forgot password",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Email address",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.email.label",
-        "start": {
-          "column": 14,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Your new password was sent to your email address",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.successInfo",
-        "start": {
-          "column": 15,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!No user affiliated with that email address",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.noUser",
-        "start": {
-          "column": 10,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Create a free account",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.link.signup",
-        "start": {
-          "column": 14,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Sign in to your account",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.link.login",
-        "start": {
-          "column": 13,
-          "line": 35
-        }
-      }
-    ],
-    "path": "src/components/auth/Password.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Invite Friends",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "settings.invite.headline",
-        "start": {
-          "column": 20,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Invite 3 of your friends or colleagues",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.headline.friends",
-        "start": {
-          "column": 12,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Name",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.name.label",
-        "start": {
-          "column": 13,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Email address",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.email.label",
-        "start": {
-          "column": 14,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Send invites",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.submit.label",
-        "start": {
-          "column": 21,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!I want to do this later",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.skip.label",
-        "start": {
-          "column": 19,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Invitations sent successfully",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.successInfo",
-        "start": {
-          "column": 21,
-          "line": 40
-        }
-      }
-    ],
-    "path": "src/components/auth/ServiceAssistant.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Let's get started",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/SetupAssistant.js",
-        "id": "setupAssistant.headline",
-        "start": {
-          "column": 12,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Choose from our most used services and get back on top of your messaging now.",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/auth/SetupAssistant.js",
-        "id": "setupAssistant.subheadline",
-        "start": {
-          "column": 15,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Let's go",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/auth/SetupAssistant.js",
-        "id": "setupAssistant.submit.label",
-        "start": {
-          "column": 21,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Invitations sent successfully",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/components/auth/SetupAssistant.js",
-        "id": "invite.successInfo",
-        "start": {
-          "column": 21,
-          "line": 33
-        }
-      }
-    ],
-    "path": "src/components/auth/SetupAssistant.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Sign up",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.headline",
-        "start": {
-          "column": 12,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Firstname",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.firstname.label",
-        "start": {
-          "column": 18,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Lastname",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.lastname.label",
-        "start": {
-          "column": 17,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Email address",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.email.label",
-        "start": {
-          "column": 14,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.password.label",
-        "start": {
-          "column": 17,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!By creating a Ferdi account you accept the",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.legal.info",
-        "start": {
-          "column": 13,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Terms of service",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.legal.terms",
-        "start": {
-          "column": 9,
-          "line": 48
-        }
-      },
-      {
-        "defaultMessage": "!!!Privacy Statement",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.legal.privacy",
-        "start": {
-          "column": 11,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "!!!Create account",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.submit.label",
-        "start": {
-          "column": 21,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "!!!Already have an account, sign in?",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.link.login",
-        "start": {
-          "column": 13,
-          "line": 60
-        }
-      },
-      {
-        "defaultMessage": "!!!Change server",
-        "end": {
-          "column": 3,
-          "line": 67
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "login.changeServer",
-        "start": {
-          "column": 16,
-          "line": 64
-        }
-      },
-      {
-        "defaultMessage": "!!!Use Ferdi without an Account",
-        "end": {
-          "column": 3,
-          "line": 71
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "services.serverless",
-        "start": {
-          "column": 14,
-          "line": 68
-        }
-      },
-      {
-        "defaultMessage": "!!!A user with that email address already exists",
-        "end": {
-          "column": 3,
-          "line": 75
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.emailDuplicate",
-        "start": {
-          "column": 18,
-          "line": 72
-        }
-      }
-    ],
-    "path": "src/components/auth/Signup.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Create a free account",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/auth/Welcome.js",
-        "id": "welcome.signupButton",
-        "start": {
-          "column": 16,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!Login to your account",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/auth/Welcome.js",
-        "id": "welcome.loginButton",
-        "start": {
-          "column": 15,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Use Ferdi without an Account",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/auth/Welcome.js",
-        "id": "services.serverless",
-        "start": {
-          "column": 14,
-          "line": 19
-        }
-      }
-    ],
-    "path": "src/components/auth/Welcome.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Your services have been updated.",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/layout/AppLayout.js",
-        "id": "infobar.servicesUpdated",
-        "start": {
-          "column": 19,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload services",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/layout/AppLayout.js",
-        "id": "infobar.buttonReloadServices",
-        "start": {
-          "column": 24,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not load services and user information",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/layout/AppLayout.js",
-        "id": "infobar.requiredRequestsFailed",
-        "start": {
-          "column": 26,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-        "end": {
-          "column": 3,
-          "line": 44
-        },
-        "file": "src/components/layout/AppLayout.js",
-        "id": "infobar.authRequestFailed",
-        "start": {
-          "column": 21,
-          "line": 40
-        }
-      }
-    ],
-    "path": "src/components/layout/AppLayout.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Add new service",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.addNewService",
-        "start": {
-          "column": 17,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable notifications & audio",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.muteApp",
-        "start": {
-          "column": 8,
-          "line": 22
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable notifications & audio",
-        "end": {
-          "column": 3,
-          "line": 29
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.unmuteApp",
-        "start": {
-          "column": 10,
-          "line": 26
-        }
-      },
-      {
-        "defaultMessage": "!!!Open workspace drawer",
-        "end": {
-          "column": 3,
-          "line": 33
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.openWorkspaceDrawer",
-        "start": {
-          "column": 23,
-          "line": 30
-        }
-      },
-      {
-        "defaultMessage": "!!!Close workspace drawer",
-        "end": {
-          "column": 3,
-          "line": 37
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.closeWorkspaceDrawer",
-        "start": {
-          "column": 24,
-          "line": 34
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Ferdi Todos",
-        "end": {
-          "column": 3,
-          "line": 41
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.openTodosDrawer",
-        "start": {
-          "column": 19,
-          "line": 38
-        }
-      },
-      {
-        "defaultMessage": "!!!Close Ferdi Todos",
-        "end": {
-          "column": 3,
-          "line": 45
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.closeTodosDrawer",
-        "start": {
-          "column": 20,
-          "line": 42
-        }
-      },
-      {
-        "defaultMessage": "!!!Lock Ferdi",
-        "end": {
-          "column": 3,
-          "line": 49
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.lockFerdi",
-        "start": {
-          "column": 13,
-          "line": 46
-        }
-      }
-    ],
-    "path": "src/components/layout/Sidebar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/services/content/ConnectionBanner.js",
-        "id": "webControls.goHome",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in Browser",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/services/content/ConnectionBanner.js",
-        "id": "webControls.openInBrowser",
-        "start": {
-          "column": 17,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/services/content/ConnectionBanner.js",
-        "id": "webControls.back",
-        "start": {
-          "column": 8,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/services/content/ConnectionBanner.js",
-        "id": "webControls.forward",
-        "start": {
-          "column": 11,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/services/content/ConnectionBanner.js",
-        "id": "webControls.reload",
-        "start": {
-          "column": 10,
-          "line": 29
-        }
-      }
-    ],
-    "path": "src/components/services/content/ConnectionBanner.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/services/content/ConnectionLost.js",
-        "id": "webControls.goHome",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in Browser",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/services/content/ConnectionLost.js",
-        "id": "webControls.openInBrowser",
-        "start": {
-          "column": 17,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/services/content/ConnectionLost.js",
-        "id": "webControls.back",
-        "start": {
-          "column": 8,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/services/content/ConnectionLost.js",
-        "id": "webControls.forward",
-        "start": {
-          "column": 11,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/services/content/ConnectionLost.js",
-        "id": "webControls.reload",
-        "start": {
-          "column": 10,
-          "line": 29
-        }
-      }
-    ],
-    "path": "src/components/services/content/ConnectionLost.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Oh no! Ferdi lost the connection to {name}.",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/services/content/ConnectionLostBanner.js",
-        "id": "connectionLostBanner.message",
-        "start": {
-          "column": 8,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!What happened?",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/services/content/ConnectionLostBanner.js",
-        "id": "connectionLostBanner.informationLink",
-        "start": {
-          "column": 19,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload Service",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/services/content/ConnectionLostBanner.js",
-        "id": "connectionLostBanner.cta",
-        "start": {
-          "column": 7,
-          "line": 21
-        }
-      }
-    ],
-    "path": "src/components/services/content/ConnectionLostBanner.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Oh no!",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-        "id": "service.errorHandler.headline",
-        "start": {
-          "column": 12,
-          "line": 12
-        }
-      },
-      {
-        "defaultMessage": "!!!{name} has failed to load.",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-        "id": "service.errorHandler.text",
-        "start": {
-          "column": 8,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload {name}",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-        "id": "service.errorHandler.action",
-        "start": {
-          "column": 10,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Edit {name}",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-        "id": "service.errorHandler.editAction",
-        "start": {
-          "column": 14,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Error:",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-        "id": "service.errorHandler.message",
-        "start": {
-          "column": 16,
-          "line": 28
-        }
-      }
-    ],
-    "path": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!{name} is disabled",
-        "end": {
-          "column": 3,
-          "line": 12
-        },
-        "file": "src/components/services/content/ServiceDisabled.js",
-        "id": "service.disabledHandler.headline",
-        "start": {
-          "column": 12,
-          "line": 9
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable {name}",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/services/content/ServiceDisabled.js",
-        "id": "service.disabledHandler.action",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      }
-    ],
-    "path": "src/components/services/content/ServiceDisabled.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Welcome to Ferdi",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/services/content/Services.js",
-        "id": "services.welcome",
-        "start": {
-          "column": 11,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Get started",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/services/content/Services.js",
-        "id": "services.getStarted",
-        "start": {
-          "column": 14,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Please login to use Ferdi.",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/services/content/Services.js",
-        "id": "services.login",
-        "start": {
-          "column": 9,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Use Ferdi without an Account",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/services/content/Services.js",
-        "id": "services.serverless",
-        "start": {
-          "column": 14,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!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!",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/services/content/Services.js",
-        "id": "services.serverInfo",
-        "start": {
-          "column": 14,
-          "line": 31
-        }
-      }
-    ],
-    "path": "src/components/services/content/Services.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/services/content/WebControls.js",
-        "id": "webControls.goHome",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in Browser",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/services/content/WebControls.js",
-        "id": "webControls.openInBrowser",
-        "start": {
-          "column": 17,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/services/content/WebControls.js",
-        "id": "webControls.back",
-        "start": {
-          "column": 8,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/services/content/WebControls.js",
-        "id": "webControls.forward",
-        "start": {
-          "column": 11,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/services/content/WebControls.js",
-        "id": "webControls.reload",
-        "start": {
-          "column": 10,
-          "line": 29
-        }
-      }
-    ],
-    "path": "src/components/services/content/WebControls.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Oh no!",
-        "end": {
-          "column": 3,
-          "line": 13
-        },
-        "file": "src/components/services/content/WebviewCrashHandler.js",
-        "id": "service.crashHandler.headline",
-        "start": {
-          "column": 12,
-          "line": 10
-        }
-      },
-      {
-        "defaultMessage": "!!!{name} has caused an error.",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/components/services/content/WebviewCrashHandler.js",
-        "id": "service.crashHandler.text",
-        "start": {
-          "column": 8,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload {name}",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/services/content/WebviewCrashHandler.js",
-        "id": "service.crashHandler.action",
-        "start": {
-          "column": 10,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Trying to automatically restore {name} in {seconds} seconds",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/services/content/WebviewCrashHandler.js",
-        "id": "service.crashHandler.autoReload",
-        "start": {
-          "column": 14,
-          "line": 22
-        }
-      }
-    ],
-    "path": "src/components/services/content/WebviewCrashHandler.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.reload",
-        "start": {
-          "column": 10,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable notifications",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.disableNotifications",
-        "start": {
-          "column": 24,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable notifications",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.enableNotification",
-        "start": {
-          "column": 23,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable audio",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.disableAudio",
-        "start": {
-          "column": 16,
-          "line": 33
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable audio",
-        "end": {
-          "column": 3,
-          "line": 40
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.enableAudio",
-        "start": {
-          "column": 15,
-          "line": 37
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Dark mode",
-        "end": {
-          "column": 3,
-          "line": 44
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.enableDarkMode",
-        "start": {
-          "column": 18,
-          "line": 41
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable Dark mode",
-        "end": {
-          "column": 3,
-          "line": 48
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.disableDarkMode",
-        "start": {
-          "column": 19,
-          "line": 45
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable Service",
-        "end": {
-          "column": 3,
-          "line": 52
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.disableService",
-        "start": {
-          "column": 18,
-          "line": 49
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Service",
-        "end": {
-          "column": 3,
-          "line": 56
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.enableService",
-        "start": {
-          "column": 17,
-          "line": 53
-        }
-      },
-      {
-        "defaultMessage": "!!!Hibernate Service",
-        "end": {
-          "column": 3,
-          "line": 60
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.hibernateService",
-        "start": {
-          "column": 20,
-          "line": 57
-        }
-      },
-      {
-        "defaultMessage": "!!!Wake Up Service",
-        "end": {
-          "column": 3,
-          "line": 64
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.wakeUpService",
-        "start": {
-          "column": 17,
-          "line": 61
-        }
-      },
-      {
-        "defaultMessage": "!!!Delete Service",
-        "end": {
-          "column": 3,
-          "line": 68
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.deleteService",
-        "start": {
-          "column": 17,
-          "line": 65
-        }
-      },
-      {
-        "defaultMessage": "!!!Do you really want to delete the {serviceName} service?",
-        "end": {
-          "column": 3,
-          "line": 73
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.confirmDeleteService",
-        "start": {
-          "column": 24,
-          "line": 69
-        }
-      }
-    ],
-    "path": "src/components/services/tabs/TabItem.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Account",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.headline",
-        "start": {
-          "column": 12,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!Danger Zone",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.headlineDangerZone",
-        "start": {
-          "column": 22,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Edit Account",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.account.editButton",
-        "start": {
-          "column": 21,
-          "line": 22
-        }
-      },
-      {
-        "defaultMessage": "!!Invoices",
-        "end": {
-          "column": 3,
-          "line": 29
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.headlineInvoices",
-        "start": {
-          "column": 18,
-          "line": 26
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not load user information",
-        "end": {
-          "column": 3,
-          "line": 33
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.userInfoRequestFailed",
-        "start": {
-          "column": 25,
-          "line": 30
-        }
-      },
-      {
-        "defaultMessage": "!!!Try again",
-        "end": {
-          "column": 3,
-          "line": 37
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.tryReloadUserInfoRequest",
-        "start": {
-          "column": 28,
-          "line": 34
-        }
-      },
-      {
-        "defaultMessage": "!!!Delete account",
-        "end": {
-          "column": 3,
-          "line": 41
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.deleteAccount",
-        "start": {
-          "column": 17,
-          "line": 38
-        }
-      },
-      {
-        "defaultMessage": "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.deleteInfo",
-        "start": {
-          "column": 14,
-          "line": 42
-        }
-      },
-      {
-        "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.deleteEmailSent",
-        "start": {
-          "column": 19,
-          "line": 47
-        }
-      },
-      {
-        "defaultMessage": "!!!Your Franz License:",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.yourLicense",
-        "start": {
-          "column": 15,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "Account is unavailable",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.accountUnavailable",
-        "start": {
-          "column": 22,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "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.",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.accountUnavailableInfo",
-        "start": {
-          "column": 26,
-          "line": 60
-        }
-      }
-    ],
-    "path": "src/components/settings/account/AccountDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Available services",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.availableServices",
-        "start": {
-          "column": 21,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Your services",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.yourServices",
-        "start": {
-          "column": 16,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Your workspaces",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.yourWorkspaces",
-        "start": {
-          "column": 18,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Account",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.account",
-        "start": {
-          "column": 11,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Manage Team",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.team",
-        "start": {
-          "column": 8,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!About Ferdi",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.supportFerdi",
-        "start": {
-          "column": 16,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Logout",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.logout",
-        "start": {
-          "column": 10,
-          "line": 40
-        }
-      }
-    ],
-    "path": "src/components/settings/navigation/SettingsNavigation.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Available Services",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.headline",
-        "start": {
-          "column": 12,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Search service",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.searchService",
-        "start": {
-          "column": 17,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!All services",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.all",
-        "start": {
-          "column": 14,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Custom Services",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.custom",
-        "start": {
-          "column": 17,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.nothingFound",
-        "start": {
-          "column": 16,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!Service successfully added",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.servicesSuccessfulAddedInfo",
-        "start": {
-          "column": 31,
-          "line": 39
-        }
-      },
-      {
-        "defaultMessage": "!!!Missing a service?",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.missingService",
-        "start": {
-          "column": 18,
-          "line": 43
-        }
-      },
-      {
-        "defaultMessage": "!!!To add a custom service, copy the recipe folder into:",
-        "end": {
-          "column": 3,
-          "line": 50
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.intro",
-        "start": {
-          "column": 21,
-          "line": 47
-        }
-      },
-      {
-        "defaultMessage": "!!!Open directory",
-        "end": {
-          "column": 3,
-          "line": 54
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.openFolder",
-        "start": {
-          "column": 14,
-          "line": 51
-        }
-      },
-      {
-        "defaultMessage": "!!!Developer Documentation",
-        "end": {
-          "column": 3,
-          "line": 58
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.openDevDocs",
-        "start": {
-          "column": 15,
-          "line": 55
-        }
-      },
-      {
-        "defaultMessage": "!!!Custom 3rd Party Recipes",
-        "end": {
-          "column": 3,
-          "line": 62
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.headline.customRecipes",
-        "start": {
-          "column": 25,
-          "line": 59
-        }
-      },
-      {
-        "defaultMessage": "!!!Community 3rd Party Recipes",
-        "end": {
-          "column": 3,
-          "line": 66
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.headline.communityRecipes",
-        "start": {
-          "column": 28,
-          "line": 63
-        }
-      },
-      {
-        "defaultMessage": "!!!Your Development Service Recipes",
-        "end": {
-          "column": 3,
-          "line": 70
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.headline.devRecipes",
-        "start": {
-          "column": 22,
-          "line": 67
-        }
-      }
-    ],
-    "path": "src/components/settings/recipes/RecipesDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Save service",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.saveButton",
-        "start": {
-          "column": 15,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Delete Service",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.deleteButton",
-        "start": {
-          "column": 17,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Open darkmode.css",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.openDarkmodeCss",
-        "start": {
-          "column": 19,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Open user.css",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.openUserCss",
-        "start": {
-          "column": 15,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!Open user.js",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.openUserJs",
-        "start": {
-          "column": 14,
-          "line": 39
-        }
-      },
-      {
-        "defaultMessage": "!!!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.",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.recipeFileInfo",
-        "start": {
-          "column": 18,
-          "line": 43
-        }
-      },
-      {
-        "defaultMessage": "!!!Available services",
-        "end": {
-          "column": 3,
-          "line": 50
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.availableServices",
-        "start": {
-          "column": 21,
-          "line": 47
-        }
-      },
-      {
-        "defaultMessage": "!!!Your services",
-        "end": {
-          "column": 3,
-          "line": 54
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.yourServices",
-        "start": {
-          "column": 16,
-          "line": 51
-        }
-      },
-      {
-        "defaultMessage": "!!!Add {name}",
-        "end": {
-          "column": 3,
-          "line": 58
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.addServiceHeadline",
-        "start": {
-          "column": 22,
-          "line": 55
-        }
-      },
-      {
-        "defaultMessage": "!!!Edit {name}",
-        "end": {
-          "column": 3,
-          "line": 62
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.editServiceHeadline",
-        "start": {
-          "column": 23,
-          "line": 59
-        }
-      },
-      {
-        "defaultMessage": "!!!Hosted",
-        "end": {
-          "column": 3,
-          "line": 66
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.tabHosted",
-        "start": {
-          "column": 13,
-          "line": 63
-        }
-      },
-      {
-        "defaultMessage": "!!!Self hosted ��",
-        "end": {
-          "column": 3,
-          "line": 70
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.tabOnPremise",
-        "start": {
-          "column": 16,
-          "line": 67
-        }
-      },
-      {
-        "defaultMessage": "!!!Use the hosted {name} service.",
-        "end": {
-          "column": 3,
-          "line": 74
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.useHostedService",
-        "start": {
-          "column": 20,
-          "line": 71
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not validate custom {name} server.",
-        "end": {
-          "column": 3,
-          "line": 78
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.customUrlValidationError",
-        "start": {
-          "column": 28,
-          "line": 75
-        }
-      },
-      {
-        "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
-        "end": {
-          "column": 3,
-          "line": 82
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.indirectMessageInfo",
-        "start": {
-          "column": 23,
-          "line": 79
-        }
-      },
-      {
-        "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
-        "end": {
-          "column": 3,
-          "line": 86
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.isMutedInfo",
-        "start": {
-          "column": 15,
-          "line": 83
-        }
-      },
-      {
-        "defaultMessage": "!!!When enabled, a service will be shut down after a period of time to save system resources.",
-        "end": {
-          "column": 3,
-          "line": 90
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.isHibernatedEnabledInfo",
-        "start": {
-          "column": 28,
-          "line": 87
-        }
-      },
-      {
-        "defaultMessage": "!!!Notifications",
-        "end": {
-          "column": 3,
-          "line": 94
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.headlineNotifications",
-        "start": {
-          "column": 25,
-          "line": 91
-        }
-      },
-      {
-        "defaultMessage": "!!!Unread message badges",
-        "end": {
-          "column": 3,
-          "line": 98
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.headlineBadges",
-        "start": {
-          "column": 18,
-          "line": 95
-        }
-      },
-      {
-        "defaultMessage": "!!!General",
-        "end": {
-          "column": 3,
-          "line": 102
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.headlineGeneral",
-        "start": {
-          "column": 19,
-          "line": 99
-        }
-      },
-      {
-        "defaultMessage": "!!!Dark Reader Settings",
-        "end": {
-          "column": 3,
-          "line": 106
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.headlineDarkReaderSettings",
-        "start": {
-          "column": 30,
-          "line": 103
-        }
-      },
-      {
-        "defaultMessage": "!!!Delete",
-        "end": {
-          "column": 3,
-          "line": 110
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.iconDelete",
-        "start": {
-          "column": 14,
-          "line": 107
-        }
-      },
-      {
-        "defaultMessage": "!!!Drop your image, or click here",
-        "end": {
-          "column": 3,
-          "line": 114
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.iconUpload",
-        "start": {
-          "column": 14,
-          "line": 111
-        }
-      },
-      {
-        "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
-        "end": {
-          "column": 3,
-          "line": 118
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.proxy.headline",
-        "start": {
-          "column": 17,
-          "line": 115
-        }
-      },
-      {
-        "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
-        "end": {
-          "column": 3,
-          "line": 122
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.proxy.restartInfo",
-        "start": {
-          "column": 20,
-          "line": 119
-        }
-      },
-      {
-        "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
-        "end": {
-          "column": 3,
-          "line": 126
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.proxy.info",
-        "start": {
-          "column": 13,
-          "line": 123
-        }
-      }
-    ],
-    "path": "src/components/settings/services/EditServiceForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Error",
-        "end": {
-          "column": 3,
-          "line": 13
-        },
-        "file": "src/components/settings/services/ServiceError.js",
-        "id": "settings.service.error.headline",
-        "start": {
-          "column": 12,
-          "line": 10
-        }
-      },
-      {
-        "defaultMessage": "!!!Back to services",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/components/settings/services/ServiceError.js",
-        "id": "settings.service.error.goBack",
-        "start": {
-          "column": 10,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!!Available services",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/settings/services/ServiceError.js",
-        "id": "settings.service.form.availableServices",
-        "start": {
-          "column": 21,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not load service recipe.",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/settings/services/ServiceError.js",
-        "id": "settings.service.error.message",
-        "start": {
-          "column": 16,
-          "line": 22
-        }
-      }
-    ],
-    "path": "src/components/settings/services/ServiceError.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Service is disabled",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/settings/services/ServiceItem.js",
-        "id": "settings.services.tooltip.isDisabled",
-        "start": {
-          "column": 21,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!Notifications are disabled",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/settings/services/ServiceItem.js",
-        "id": "settings.services.tooltip.notificationsDisabled",
-        "start": {
-          "column": 32,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!All sounds are muted",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/services/ServiceItem.js",
-        "id": "settings.services.tooltip.isMuted",
-        "start": {
-          "column": 18,
-          "line": 19
-        }
-      }
-    ],
-    "path": "src/components/settings/services/ServiceItem.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Your services",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Search service",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.searchService",
-        "start": {
-          "column": 17,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Start by adding a service.",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.noServicesAdded",
-        "start": {
-          "column": 19,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.recipes.nothingFound",
-        "start": {
-          "column": 18,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Discover services",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.discoverServices",
-        "start": {
-          "column": 20,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not load your services",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.servicesRequestFailed",
-        "start": {
-          "column": 25,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!Try again",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.account.tryReloadServices",
-        "start": {
-          "column": 21,
-          "line": 39
-        }
-      },
-      {
-        "defaultMessage": "!!!Your changes have been saved",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.updatedInfo",
-        "start": {
-          "column": 15,
-          "line": 43
-        }
-      },
-      {
-        "defaultMessage": "!!!Service has been deleted",
-        "end": {
-          "column": 3,
-          "line": 50
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.deletedInfo",
-        "start": {
-          "column": 15,
-          "line": 47
-        }
-      }
-    ],
-    "path": "src/components/settings/services/ServicesDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!General",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlineGeneral",
-        "start": {
-          "column": 19,
-          "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": 28
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.sentryInfo",
-        "start": {
-          "column": 14,
-          "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": 32
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.hibernateInfo",
-        "start": {
-          "column": 17,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.inactivityLockInfo",
-        "start": {
-          "column": 22,
-          "line": 33
-        }
-      },
-      {
-        "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
-        "end": {
-          "column": 3,
-          "line": 40
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.todoServerInfo",
-        "start": {
-          "column": 18,
-          "line": 37
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 44
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.lockedPassword",
-        "start": {
-          "column": 18,
-          "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": 48
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.lockedPasswordInfo",
-        "start": {
-          "column": 22,
-          "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": 52
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.lockInfo",
-        "start": {
-          "column": 12,
-          "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": 56
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.scheduledDNDTimeInfo",
-        "start": {
-          "column": 24,
-          "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": 60
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.scheduledDNDInfo",
-        "start": {
-          "column": 20,
-          "line": 57
-        }
-      },
-      {
-        "defaultMessage": "!!!Language",
-        "end": {
-          "column": 3,
-          "line": 64
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlineLanguage",
-        "start": {
-          "column": 20,
-          "line": 61
-        }
-      },
-      {
-        "defaultMessage": "!!!Updates",
-        "end": {
-          "column": 3,
-          "line": 68
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlineUpdates",
-        "start": {
-          "column": 19,
-          "line": 65
-        }
-      },
-      {
-        "defaultMessage": "!!!Appearance",
-        "end": {
-          "column": 3,
-          "line": 72
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlineAppearance",
-        "start": {
-          "column": 22,
-          "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": 76
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.universalDarkModeInfo",
-        "start": {
-          "column": 25,
-          "line": 73
-        }
-      },
-      {
-        "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
-        "end": {
-          "column": 3,
-          "line": 80
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.accentColorInfo",
-        "start": {
-          "column": 19,
-          "line": 77
-        }
-      },
-      {
-        "defaultMessage": "!!!Privacy",
-        "end": {
-          "column": 3,
-          "line": 84
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlinePrivacy",
-        "start": {
-          "column": 19,
-          "line": 81
-        }
-      },
-      {
-        "defaultMessage": "!!!Advanced",
-        "end": {
-          "column": 3,
-          "line": 88
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlineAdvanced",
-        "start": {
-          "column": 20,
-          "line": 85
-        }
-      },
-      {
-        "defaultMessage": "!!!Help us to translate Ferdi into your language.",
-        "end": {
-          "column": 3,
-          "line": 92
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.translationHelp",
-        "start": {
-          "column": 19,
-          "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": 96
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.spellCheckerLanguageInfo",
-        "start": {
-          "column": 28,
-          "line": 93
-        }
-      },
-      {
-        "defaultMessage": "!!!Cache",
-        "end": {
-          "column": 3,
-          "line": 100
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.subheadlineCache",
-        "start": {
-          "column": 20,
-          "line": 97
-        }
-      },
-      {
-        "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
-        "end": {
-          "column": 3,
-          "line": 104
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.cacheInfo",
-        "start": {
-          "column": 13,
-          "line": 101
-        }
-      },
-      {
-        "defaultMessage": "!!!Couldn't clear all cache",
-        "end": {
-          "column": 3,
-          "line": 108
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.cacheNotCleared",
-        "start": {
-          "column": 19,
-          "line": 105
-        }
-      },
-      {
-        "defaultMessage": "!!!Clear cache",
-        "end": {
-          "column": 3,
-          "line": 112
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.buttonClearAllCache",
-        "start": {
-          "column": 23,
-          "line": 109
-        }
-      },
-      {
-        "defaultMessage": "!!!Ferdi Profile",
-        "end": {
-          "column": 3,
-          "line": 116
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.subheadlineFerdiProfile",
-        "start": {
-          "column": 27,
-          "line": 113
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Profile folder",
-        "end": {
-          "column": 3,
-          "line": 120
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.buttonOpenFerdiProfileFolder",
-        "start": {
-          "column": 32,
-          "line": 117
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Service Recipes folder",
-        "end": {
-          "column": 3,
-          "line": 124
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.buttonOpenFerdiServiceRecipesFolder",
-        "start": {
-          "column": 39,
-          "line": 121
-        }
-      },
-      {
-        "defaultMessage": "!!!Check for updates",
-        "end": {
-          "column": 3,
-          "line": 128
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.buttonSearchForUpdate",
-        "start": {
-          "column": 25,
-          "line": 125
-        }
-      },
-      {
-        "defaultMessage": "!!!Restart & install update",
-        "end": {
-          "column": 3,
-          "line": 132
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.buttonInstallUpdate",
-        "start": {
-          "column": 23,
-          "line": 129
-        }
-      },
-      {
-        "defaultMessage": "!!!Is searching for update",
-        "end": {
-          "column": 3,
-          "line": 136
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.updateStatusSearching",
-        "start": {
-          "column": 25,
-          "line": 133
-        }
-      },
-      {
-        "defaultMessage": "!!!Update available, downloading...",
-        "end": {
-          "column": 3,
-          "line": 140
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.updateStatusAvailable",
-        "start": {
-          "column": 25,
-          "line": 137
-        }
-      },
-      {
-        "defaultMessage": "!!!You are using the latest version of Ferdi",
-        "end": {
-          "column": 3,
-          "line": 144
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.updateStatusUpToDate",
-        "start": {
-          "column": 24,
-          "line": 141
-        }
-      },
-      {
-        "defaultMessage": "!!!Current version:",
-        "end": {
-          "column": 3,
-          "line": 148
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.currentVersion",
-        "start": {
-          "column": 18,
-          "line": 145
-        }
-      },
-      {
-        "defaultMessage": "!!!Changes require restart",
-        "end": {
-          "column": 3,
-          "line": 152
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.restartRequired",
-        "start": {
-          "column": 22,
-          "line": 149
-        }
-      },
-      {
-        "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
-        "end": {
-          "column": 3,
-          "line": 156
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.languageDisclaimer",
-        "start": {
-          "column": 22,
-          "line": 153
-        }
-      }
-    ],
-    "path": "src/components/settings/settings/EditSettingsForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Close settings",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/settings/SettingsLayout.js",
-        "id": "settings.app.closeSettings",
-        "start": {
-          "column": 17,
-          "line": 11
-        }
-      }
-    ],
-    "path": "src/components/settings/SettingsLayout.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!About Ferdi",
-        "end": {
-          "column": 3,
-          "line": 10
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.headline",
-        "start": {
-          "column": 12,
-          "line": 7
-        }
-      },
-      {
-        "defaultMessage": "!!!Do you like Ferdi?",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.title",
-        "start": {
-          "column": 9,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.aboutIntro",
-        "start": {
-          "column": 14,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Full list of contributor",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textListContributors",
-        "start": {
-          "column": 24,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!here",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textListContributorsHere",
-        "start": {
-          "column": 28,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!The development of Ferdi is done by volunteers. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textVolunteers",
-        "start": {
-          "column": 18,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Support is always welcome. You can find a list of the help we need",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textSupportWelcome",
-        "start": {
-          "column": 22,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!here",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textSupportWelcomeHere",
-        "start": {
-          "column": 26,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!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",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textExpenses",
-        "start": {
-          "column": 16,
-          "line": 39
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Collective",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textOpenCollective",
-        "start": {
-          "column": 22,
-          "line": 43
-        }
-      },
-      {
-        "defaultMessage": "!!!If you feel like supporting Ferdi development with a donation, you can do so on both,",
-        "end": {
-          "column": 3,
-          "line": 50
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textDonation",
-        "start": {
-          "column": 16,
-          "line": 47
-        }
-      },
-      {
-        "defaultMessage": "!!!and",
-        "end": {
-          "column": 3,
-          "line": 54
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textDonationAnd",
-        "start": {
-          "column": 19,
-          "line": 51
-        }
-      },
-      {
-        "defaultMessage": "!!!GitHub Sponsors",
-        "end": {
-          "column": 3,
-          "line": 58
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textGitHubSponsors",
-        "start": {
-          "column": 22,
-          "line": 55
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Survey",
-        "end": {
-          "column": 3,
-          "line": 62
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.openSurvey",
-        "start": {
-          "column": 14,
-          "line": 59
-        }
-      },
-      {
-        "defaultMessage": "!!!Do you want to help us improve Ferdi?",
-        "end": {
-          "column": 3,
-          "line": 66
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.bannerText",
-        "start": {
-          "column": 14,
-          "line": 63
-        }
-      }
-    ],
-    "path": "src/components/settings/supportFerdi/SupportFerdiDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Team",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz Team Management",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.contentHeadline",
-        "start": {
-          "column": 19,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Your are currently using Franz Servers, which is why you have access to Team Management.",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.intro",
-        "start": {
-          "column": 9,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!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.",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.copy",
-        "start": {
-          "column": 8,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Manage your Team on meetfranz.com",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.manageAction",
-        "start": {
-          "column": 16,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Teams are unavailable",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.teamsUnavailable",
-        "start": {
-          "column": 20,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!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.",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.teamsUnavailableInfo",
-        "start": {
-          "column": 24,
-          "line": 39
-        }
-      }
-    ],
-    "path": "src/components/settings/team/TeamDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Account",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Update Profile",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.headlineProfile",
-        "start": {
-          "column": 19,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Account Information",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.headlineAccount",
-        "start": {
-          "column": 19,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Change Password",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.headlinePassword",
-        "start": {
-          "column": 20,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Your changes have been saved",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.successInfo",
-        "start": {
-          "column": 15,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Update profile",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.buttonSave",
-        "start": {
-          "column": 14,
-          "line": 35
-        }
-      }
-    ],
-    "path": "src/components/settings/user/EditUserForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Choose from more than 70 Services",
-        "end": {
-          "column": 3,
-          "line": 11
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.recipes",
-        "start": {
-          "column": 20,
-          "line": 8
-        }
-      },
-      {
-        "defaultMessage": "!!!Account Synchronisation",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.accountSync",
-        "start": {
-          "column": 15,
-          "line": 12
-        }
-      },
-      {
-        "defaultMessage": "!!!Desktop Notifications",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.desktopNotifications",
-        "start": {
-          "column": 24,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Add unlimited services",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.unlimitedServices",
-        "start": {
-          "column": 21,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Spellchecker support",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.spellchecker",
-        "start": {
-          "column": 16,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Workspaces",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.workspaces",
-        "start": {
-          "column": 14,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Add Custom Websites",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.customWebsites",
-        "start": {
-          "column": 18,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!On-premise & other Hosted Services",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.onPremise",
-        "start": {
-          "column": 13,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Install 3rd party services",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.thirdPartyServices",
-        "start": {
-          "column": 22,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Service Proxies",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.serviceProxies",
-        "start": {
-          "column": 18,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Team Management",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.teamManagement",
-        "start": {
-          "column": 18,
-          "line": 48
-        }
-      }
-    ],
-    "path": "src/components/ui/FeatureList.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Hide",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/components/ui/InfoBar.js",
-        "id": "infobar.hide",
-        "start": {
-          "column": 8,
-          "line": 12
-        }
-      }
-    ],
-    "path": "src/components/ui/InfoBar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Dismiss",
-        "end": {
-          "column": 3,
-          "line": 12
-        },
-        "file": "src/components/ui/Infobox.js",
-        "id": "infobox.dismiss",
-        "start": {
-          "column": 11,
-          "line": 9
-        }
-      }
-    ],
-    "path": "src/components/ui/Infobox.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Password toggle",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/ui/Input.js",
-        "id": "settings.app.form.passwordToggle",
-        "start": {
-          "column": 18,
-          "line": 11
-        }
-      }
-    ],
-    "path": "src/components/ui/Input.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Loading {service}",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/ui/WebviewLoader/index.js",
-        "id": "service.webviewLoader.loading",
-        "start": {
-          "column": 11,
-          "line": 11
-        }
-      }
-    ],
-    "path": "src/components/ui/WebviewLoader/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Something went wrong.",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/util/ErrorBoundary/index.js",
-        "id": "app.errorHandler.headline",
-        "start": {
-          "column": 12,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/util/ErrorBoundary/index.js",
-        "id": "app.errorHandler.action",
-        "start": {
-          "column": 10,
-          "line": 15
-        }
-      }
-    ],
-    "path": "src/components/util/ErrorBoundary/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Name",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.name",
-        "start": {
-          "column": 8,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable service",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableService",
-        "start": {
-          "column": 17,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable hibernation",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableHibernation",
-        "start": {
-          "column": 21,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Notifications",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableNotification",
-        "start": {
-          "column": 22,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Show unread message badges",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableBadge",
-        "start": {
-          "column": 15,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable audio",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableAudio",
-        "start": {
-          "column": 15,
-          "line": 48
-        }
-      },
-      {
-        "defaultMessage": "!!!Team",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.team",
-        "start": {
-          "column": 8,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "!!!Service URL",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.customUrl",
-        "start": {
-          "column": 13,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "!!!Show message badge for all new messages",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.indirectMessages",
-        "start": {
-          "column": 20,
-          "line": 60
-        }
-      },
-      {
-        "defaultMessage": "!!!Custom icon",
-        "end": {
-          "column": 3,
-          "line": 67
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.icon",
-        "start": {
-          "column": 8,
-          "line": 64
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Dark Mode",
-        "end": {
-          "column": 3,
-          "line": 71
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableDarkMode",
-        "start": {
-          "column": 18,
-          "line": 68
-        }
-      },
-      {
-        "defaultMessage": "!!!Dark Reader Brightness",
-        "end": {
-          "column": 3,
-          "line": 75
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.darkReaderBrightness",
-        "start": {
-          "column": 24,
-          "line": 72
-        }
-      },
-      {
-        "defaultMessage": "!!!Dark Reader Contrast",
-        "end": {
-          "column": 3,
-          "line": 79
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.darkReaderContrast",
-        "start": {
-          "column": 22,
-          "line": 76
-        }
-      },
-      {
-        "defaultMessage": "!!!Dark Reader Sepia",
-        "end": {
-          "column": 3,
-          "line": 83
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.darkReaderSepia",
-        "start": {
-          "column": 19,
-          "line": 80
-        }
-      },
-      {
-        "defaultMessage": "!!!Use Proxy",
-        "end": {
-          "column": 3,
-          "line": 87
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.proxy.isEnabled",
-        "start": {
-          "column": 15,
-          "line": 84
-        }
-      },
-      {
-        "defaultMessage": "!!!Proxy Host/IP",
-        "end": {
-          "column": 3,
-          "line": 91
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.proxy.host",
-        "start": {
-          "column": 13,
-          "line": 88
-        }
-      },
-      {
-        "defaultMessage": "!!!Port",
-        "end": {
-          "column": 3,
-          "line": 95
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.proxy.port",
-        "start": {
-          "column": 13,
-          "line": 92
-        }
-      },
-      {
-        "defaultMessage": "!!!User",
-        "end": {
-          "column": 3,
-          "line": 99
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.proxy.user",
-        "start": {
-          "column": 13,
-          "line": 96
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 103
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.proxy.password",
-        "start": {
-          "column": 17,
-          "line": 100
-        }
-      }
-    ],
-    "path": "src/containers/settings/EditServiceScreen.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Launch Ferdi on start",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.autoLaunchOnStart",
-        "start": {
-          "column": 21,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in background",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.autoLaunchInBackground",
-        "start": {
-          "column": 26,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Keep Ferdi in background when closing the window",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.runInBackground",
-        "start": {
-          "column": 19,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Start minimized",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.startMinimized",
-        "start": {
-          "column": 18,
-          "line": 44
-        }
-      },
-      {
-        "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": 52
-        }
-      },
-      {
-        "defaultMessage": "!!!Always show Ferdi in Menu Bar",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableMenuBar",
-        "start": {
-          "column": 17,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload Ferdi after system resume",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.reloadAfterResume",
-        "start": {
-          "column": 21,
-          "line": 60
-        }
-      },
-      {
-        "defaultMessage": "!!!Minimize Ferdi to system tray",
-        "end": {
-          "column": 3,
-          "line": 67
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.minimizeToSystemTray",
-        "start": {
-          "column": 24,
-          "line": 64
-        }
-      },
-      {
-        "defaultMessage": "!!!Close Ferdi to system tray",
-        "end": {
-          "column": 3,
-          "line": 71
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.closeToSystemTray",
-        "start": {
-          "column": 21,
-          "line": 68
-        }
-      },
-      {
-        "defaultMessage": "!!!Don't show message content in notifications",
-        "end": {
-          "column": 3,
-          "line": 75
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.privateNotifications",
-        "start": {
-          "column": 24,
-          "line": 72
-        }
-      },
-      {
-        "defaultMessage": "!!!Don't show notifications for clipboard events",
-        "end": {
-          "column": 3,
-          "line": 79
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.clipboardNotifications",
-        "start": {
-          "column": 26,
-          "line": 76
-        }
-      },
-      {
-        "defaultMessage": "!!!Notify TaskBar/Dock on new message",
-        "end": {
-          "column": 3,
-          "line": 83
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.notifyTaskBarOnMessage",
-        "start": {
-          "column": 26,
-          "line": 80
-        }
-      },
-      {
-        "defaultMessage": "!!!Navigation bar behaviour",
-        "end": {
-          "column": 3,
-          "line": 87
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.navigationBarBehaviour",
-        "start": {
-          "column": 26,
-          "line": 84
-        }
-      },
-      {
-        "defaultMessage": "!!!Search engine",
-        "end": {
-          "column": 3,
-          "line": 91
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.searchEngine",
-        "start": {
-          "column": 16,
-          "line": 88
-        }
-      },
-      {
-        "defaultMessage": "!!!Send telemetry data",
-        "end": {
-          "column": 3,
-          "line": 95
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.sentry",
-        "start": {
-          "column": 10,
-          "line": 92
-        }
-      },
-      {
-        "defaultMessage": "!!!Keep services in hibernation on startup",
-        "end": {
-          "column": 3,
-          "line": 99
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.hibernateOnStartup",
-        "start": {
-          "column": 22,
-          "line": 96
-        }
-      },
-      {
-        "defaultMessage": "!!!Hibernation strategy",
-        "end": {
-          "column": 3,
-          "line": 103
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.hibernationStrategy",
-        "start": {
-          "column": 23,
-          "line": 100
-        }
-      },
-      {
-        "defaultMessage": "!!!Wake up strategy",
-        "end": {
-          "column": 3,
-          "line": 107
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.wakeUpStrategy",
-        "start": {
-          "column": 18,
-          "line": 104
-        }
-      },
-      {
-        "defaultMessage": "!!!Todo Server",
-        "end": {
-          "column": 3,
-          "line": 111
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.predefinedTodoServer",
-        "start": {
-          "column": 24,
-          "line": 108
-        }
-      },
-      {
-        "defaultMessage": "!!!Custom TodoServer",
-        "end": {
-          "column": 3,
-          "line": 115
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.customTodoServer",
-        "start": {
-          "column": 20,
-          "line": 112
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Password Lock",
-        "end": {
-          "column": 3,
-          "line": 119
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableLock",
-        "start": {
-          "column": 14,
-          "line": 116
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 123
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.lockPassword",
-        "start": {
-          "column": 16,
-          "line": 120
-        }
-      },
-      {
-        "defaultMessage": "!!!Allow using Touch ID to unlock",
-        "end": {
-          "column": 3,
-          "line": 127
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.useTouchIdToUnlock",
-        "start": {
-          "column": 22,
-          "line": 124
-        }
-      },
-      {
-        "defaultMessage": "!!!Lock after inactivity",
-        "end": {
-          "column": 3,
-          "line": 131
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.inactivityLock",
-        "start": {
-          "column": 18,
-          "line": 128
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
-        "end": {
-          "column": 3,
-          "line": 135
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.scheduledDNDEnabled",
-        "start": {
-          "column": 23,
-          "line": 132
-        }
-      },
-      {
-        "defaultMessage": "!!!From",
-        "end": {
-          "column": 3,
-          "line": 139
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.scheduledDNDStart",
-        "start": {
-          "column": 21,
-          "line": 136
-        }
-      },
-      {
-        "defaultMessage": "!!!To",
-        "end": {
-          "column": 3,
-          "line": 143
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.scheduledDNDEnd",
-        "start": {
-          "column": 19,
-          "line": 140
-        }
-      },
-      {
-        "defaultMessage": "!!!Language",
-        "end": {
-          "column": 3,
-          "line": 147
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.language",
-        "start": {
-          "column": 12,
-          "line": 144
-        }
-      },
-      {
-        "defaultMessage": "!!!Dark Mode",
-        "end": {
-          "column": 3,
-          "line": 151
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.darkMode",
-        "start": {
-          "column": 12,
-          "line": 148
-        }
-      },
-      {
-        "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
-        "end": {
-          "column": 3,
-          "line": 155
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.adaptableDarkMode",
-        "start": {
-          "column": 21,
-          "line": 152
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable universal Dark Mode",
-        "end": {
-          "column": 3,
-          "line": 159
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.universalDarkMode",
-        "start": {
-          "column": 21,
-          "line": 156
-        }
-      },
-      {
-        "defaultMessage": "!!!Sidebar width",
-        "end": {
-          "column": 3,
-          "line": 163
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.serviceRibbonWidth",
-        "start": {
-          "column": 22,
-          "line": 160
-        }
-      },
-      {
-        "defaultMessage": "!!!Service icon size",
-        "end": {
-          "column": 3,
-          "line": 167
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.iconSize",
-        "start": {
-          "column": 12,
-          "line": 164
-        }
-      },
-      {
-        "defaultMessage": "!!!Use horizontal style",
-        "end": {
-          "column": 3,
-          "line": 171
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.useVerticalStyle",
-        "start": {
-          "column": 20,
-          "line": 168
-        }
-      },
-      {
-        "defaultMessage": "!!!Always show workspace drawer",
-        "end": {
-          "column": 3,
-          "line": 175
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.alwaysShowWorkspaces",
-        "start": {
-          "column": 24,
-          "line": 172
-        }
-      },
-      {
-        "defaultMessage": "!!!Accent color",
-        "end": {
-          "column": 3,
-          "line": 179
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.accentColor",
-        "start": {
-          "column": 15,
-          "line": 176
-        }
-      },
-      {
-        "defaultMessage": "!!!Display disabled services tabs",
-        "end": {
-          "column": 3,
-          "line": 183
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.showDisabledServices",
-        "start": {
-          "column": 24,
-          "line": 180
-        }
-      },
-      {
-        "defaultMessage": "!!!Show unread message badge when notifications are disabled",
-        "end": {
-          "column": 3,
-          "line": 187
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.showMessagesBadgesWhenMuted",
-        "start": {
-          "column": 29,
-          "line": 184
-        }
-      },
-      {
-        "defaultMessage": "!!!Show draggable area on window",
-        "end": {
-          "column": 3,
-          "line": 191
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.showDragArea",
-        "start": {
-          "column": 16,
-          "line": 188
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable spell checking",
-        "end": {
-          "column": 3,
-          "line": 195
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableSpellchecking",
-        "start": {
-          "column": 23,
-          "line": 192
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable GPU Acceleration",
-        "end": {
-          "column": 3,
-          "line": 199
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableGPUAcceleration",
-        "start": {
-          "column": 25,
-          "line": 196
-        }
-      },
-      {
-        "defaultMessage": "!!!Include beta versions",
-        "end": {
-          "column": 3,
-          "line": 203
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.beta",
-        "start": {
-          "column": 8,
-          "line": 200
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable updates",
-        "end": {
-          "column": 3,
-          "line": 207
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.automaticUpdates",
-        "start": {
-          "column": 20,
-          "line": 204
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Franz Todos",
-        "end": {
-          "column": 3,
-          "line": 211
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableTodos",
-        "start": {
-          "column": 15,
-          "line": 208
-        }
-      },
-      {
-        "defaultMessage": "!!!Keep all workspaces loaded",
-        "end": {
-          "column": 3,
-          "line": 215
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.keepAllWorkspacesLoaded",
-        "start": {
-          "column": 27,
-          "line": 212
-        }
-      }
-    ],
-    "path": "src/containers/settings/EditSettingsScreen.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Firstname",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.firstname",
-        "start": {
-          "column": 13,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!!Lastname",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.lastname",
-        "start": {
-          "column": 12,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Email",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.email",
-        "start": {
-          "column": 9,
-          "line": 22
-        }
-      },
-      {
-        "defaultMessage": "!!!Account type",
-        "end": {
-          "column": 3,
-          "line": 29
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.accountType.label",
-        "start": {
-          "column": 20,
-          "line": 26
-        }
-      },
-      {
-        "defaultMessage": "!!!Individual",
-        "end": {
-          "column": 3,
-          "line": 33
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.accountType.individual",
-        "start": {
-          "column": 25,
-          "line": 30
-        }
-      },
-      {
-        "defaultMessage": "!!!Non-Profit",
-        "end": {
-          "column": 3,
-          "line": 37
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.accountType.non-profit",
-        "start": {
-          "column": 24,
-          "line": 34
-        }
-      },
-      {
-        "defaultMessage": "!!!Company",
-        "end": {
-          "column": 3,
-          "line": 41
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.accountType.company",
-        "start": {
-          "column": 22,
-          "line": 38
-        }
-      },
-      {
-        "defaultMessage": "!!!Current password",
-        "end": {
-          "column": 3,
-          "line": 45
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.currentPassword",
-        "start": {
-          "column": 19,
-          "line": 42
-        }
-      },
-      {
-        "defaultMessage": "!!!New password",
-        "end": {
-          "column": 3,
-          "line": 49
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.newPassword",
-        "start": {
-          "column": 15,
-          "line": 46
-        }
-      }
-    ],
-    "path": "src/containers/settings/EditUserScreen.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Sign In",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/features/basicAuth/Component.js",
-        "id": "feature.basicAuth.signIn",
-        "start": {
-          "column": 10,
-          "line": 24
-        }
-      }
-    ],
-    "path": "src/features/basicAuth/Component.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Publish debugging information",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/features/debugger/Component.js",
-        "id": "feature.debugger.title",
-        "start": {
-          "column": 9,
-          "line": 16
-        }
-      }
-    ],
-    "path": "src/features/debugger/Component.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Nightly Builds",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/nightlyBuilds/Component.js",
-        "id": "feature.nightlyBuilds.title",
-        "start": {
-          "column": 9,
-          "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": 24
-        },
-        "file": "src/features/nightlyBuilds/Component.js",
-        "id": "feature.nightlyBuilds.info",
-        "start": {
-          "column": 8,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Activate",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/nightlyBuilds/Component.js",
-        "id": "feature.nightlyBuilds.activate",
-        "start": {
-          "column": 12,
-          "line": 25
-        }
-      }
-    ],
-    "path": "src/features/nightlyBuilds/Component.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Publish debug information",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.title",
-        "start": {
-          "column": 9,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!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",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.info",
-        "start": {
-          "column": 8,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.error",
-        "start": {
-          "column": 9,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Privacy policy",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.privacy",
-        "start": {
-          "column": 11,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Terms of service",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.terms",
-        "start": {
-          "column": 9,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!Accept and publish",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.publish",
-        "start": {
-          "column": 11,
-          "line": 39
-        }
-      },
-      {
-        "defaultMessage": "!!!Your debug log was published and is now availible at",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.published",
-        "start": {
-          "column": 13,
-          "line": 43
-        }
-      }
-    ],
-    "path": "src/features/publishDebugInfo/Component.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!QuickSwitch",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/quickSwitch/Component.js",
-        "id": "feature.quickSwitch.title",
-        "start": {
-          "column": 9,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Search...",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/quickSwitch/Component.js",
-        "id": "feature.quickSwitch.search",
-        "start": {
-          "column": 10,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/quickSwitch/Component.js",
-        "id": "feature.quickSwitch.info",
-        "start": {
-          "column": 8,
-          "line": 25
-        }
-      }
-    ],
-    "path": "src/features/quickSwitch/Component.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/features/recipeConnectionLost/components/WebControls.js",
-        "id": "webControls.goHome",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in Browser",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/recipeConnectionLost/components/WebControls.js",
-        "id": "webControls.openInBrowser",
-        "start": {
-          "column": 17,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/recipeConnectionLost/components/WebControls.js",
-        "id": "webControls.back",
-        "start": {
-          "column": 8,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/recipeConnectionLost/components/WebControls.js",
-        "id": "webControls.forward",
-        "start": {
-          "column": 11,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/features/recipeConnectionLost/components/WebControls.js",
-        "id": "webControls.reload",
-        "start": {
-          "column": 10,
-          "line": 29
-        }
-      }
-    ],
-    "path": "src/features/recipeConnectionLost/components/WebControls.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/webControls/components/WebControls.js",
-        "id": "webControls.goHome",
-        "start": {
-          "column": 10,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in Browser",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/webControls/components/WebControls.js",
-        "id": "webControls.openInBrowser",
-        "start": {
-          "column": 17,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/webControls/components/WebControls.js",
-        "id": "webControls.back",
-        "start": {
-          "column": 8,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/features/webControls/components/WebControls.js",
-        "id": "webControls.forward",
-        "start": {
-          "column": 11,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/features/webControls/components/WebControls.js",
-        "id": "webControls.reload",
-        "start": {
-          "column": 10,
-          "line": 33
-        }
-      }
-    ],
-    "path": "src/features/webControls/components/WebControls.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Create workspace",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
-        "id": "settings.workspace.add.form.submitButton",
-        "start": {
-          "column": 16,
-          "line": 12
-        }
-      },
-      {
-        "defaultMessage": "!!!Name",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
-        "id": "settings.workspace.add.form.name",
-        "start": {
-          "column": 8,
-          "line": 16
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/CreateWorkspaceForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Delete workspace",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.buttonDelete",
-        "start": {
-          "column": 16,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Save workspace",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.buttonSave",
-        "start": {
-          "column": 14,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Name",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.name",
-        "start": {
-          "column": 8,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Your workspaces",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.yourWorkspaces",
-        "start": {
-          "column": 18,
-          "line": 33
-        }
-      },
-      {
-        "defaultMessage": "!!!Keep this workspace loaded*",
-        "end": {
-          "column": 3,
-          "line": 40
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.keepLoaded",
-        "start": {
-          "column": 14,
-          "line": 37
-        }
-      },
-      {
-        "defaultMessage": "!!!*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
-        "end": {
-          "column": 3,
-          "line": 45
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.keepLoadedInfo",
-        "start": {
-          "column": 18,
-          "line": 41
-        }
-      },
-      {
-        "defaultMessage": "!!!Services in this Workspace",
-        "end": {
-          "column": 3,
-          "line": 49
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.servicesInWorkspaceHeadline",
-        "start": {
-          "column": 31,
-          "line": 46
-        }
-      },
-      {
-        "defaultMessage": "!!!Start by adding a service.",
-        "end": {
-          "column": 3,
-          "line": 53
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.services.noServicesAdded",
-        "start": {
-          "column": 19,
-          "line": 50
-        }
-      },
-      {
-        "defaultMessage": "!!!Discover services",
-        "end": {
-          "column": 3,
-          "line": 57
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.services.discoverServices",
-        "start": {
-          "column": 20,
-          "line": 54
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/EditWorkspaceForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Workspaces",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!All services",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.allServices",
-        "start": {
-          "column": 15,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Workspaces settings",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.workspacesSettingsTooltip",
-        "start": {
-          "column": 29,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Info about workspace feature",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.workspaceFeatureInfo",
-        "start": {
-          "column": 24,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!add new workspace",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.addNewWorkspaceLabel",
-        "start": {
-          "column": 24,
-          "line": 31
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/WorkspaceDrawer.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!No services added yet",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
-        "id": "workspaceDrawer.item.noServicesAddedYet",
-        "start": {
-          "column": 22,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!edit",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
-        "id": "workspaceDrawer.item.contextMenuEdit",
-        "start": {
-          "column": 19,
-          "line": 15
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/WorkspaceDrawerItem.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Your workspaces",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.headline",
-        "start": {
-          "column": 12,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!You haven't created any workspaces yet.",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.noWorkspacesAdded",
-        "start": {
-          "column": 19,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not load your workspaces",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.workspacesRequestFailed",
-        "start": {
-          "column": 27,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Try again",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.tryReloadWorkspaces",
-        "start": {
-          "column": 23,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Your changes have been saved",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.updatedInfo",
-        "start": {
-          "column": 15,
-          "line": 33
-        }
-      },
-      {
-        "defaultMessage": "!!!Workspace has been deleted",
-        "end": {
-          "column": 3,
-          "line": 40
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.deletedInfo",
-        "start": {
-          "column": 15,
-          "line": 37
-        }
-      },
-      {
-        "defaultMessage": "!!!Info about workspace feature",
-        "end": {
-          "column": 3,
-          "line": 44
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.workspaceFeatureInfo",
-        "start": {
-          "column": 24,
-          "line": 41
-        }
-      },
-      {
-        "defaultMessage": "!!!Less is More: Introducing Ferdi Workspaces",
-        "end": {
-          "column": 3,
-          "line": 48
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.workspaceFeatureHeadline",
-        "start": {
-          "column": 28,
-          "line": 45
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/WorkspacesDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Switching to",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/features/workspaces/components/WorkspaceSwitchingIndicator.js",
-        "id": "workspaces.switchingIndicator.switchingTo",
-        "start": {
-          "column": 15,
-          "line": 12
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/WorkspaceSwitchingIndicator.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Field is required",
-        "end": {
-          "column": 3,
-          "line": 8
-        },
-        "file": "src/helpers/validation-helpers.js",
-        "id": "validation.required",
-        "start": {
-          "column": 12,
-          "line": 5
-        }
-      },
-      {
-        "defaultMessage": "!!!Email not valid",
-        "end": {
-          "column": 3,
-          "line": 12
-        },
-        "file": "src/helpers/validation-helpers.js",
-        "id": "validation.email",
-        "start": {
-          "column": 9,
-          "line": 9
-        }
-      },
-      {
-        "defaultMessage": "!!!Not a valid URL",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/helpers/validation-helpers.js",
-        "id": "validation.url",
-        "start": {
-          "column": 7,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Too few characters",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/helpers/validation-helpers.js",
-        "id": "validation.minLength",
-        "start": {
-          "column": 13,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!At least one is required",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/helpers/validation-helpers.js",
-        "id": "validation.oneRequired",
-        "start": {
-          "column": 15,
-          "line": 21
-        }
-      }
-    ],
-    "path": "src/helpers/validation-helpers.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Can't connect to Ferdi Online Services",
-        "end": {
-          "column": 3,
-          "line": 7
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.api.unhealthy",
-        "start": {
-          "column": 16,
-          "line": 4
-        }
-      },
-      {
-        "defaultMessage": "!!!You are not connected to the internet.",
-        "end": {
-          "column": 3,
-          "line": 11
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.notConnectedToTheInternet",
-        "start": {
-          "column": 29,
-          "line": 8
-        }
-      },
-      {
-        "defaultMessage": "!!!Spell checking language",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.spellchecking.language",
-        "start": {
-          "column": 24,
-          "line": 12
-        }
-      },
-      {
-        "defaultMessage": "!!!Use System Default ({default})",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.spellchecker.useDefault",
-        "start": {
-          "column": 29,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Detect language automatically",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.spellchecking.autodetect",
-        "start": {
-          "column": 34,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Automatic",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.spellchecking.autodetect.short",
-        "start": {
-          "column": 39,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!User Agent",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.userAgentPref",
-        "start": {
-          "column": 17,
-          "line": 28
-        }
-      },
-      {
-        "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.",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.userAgentHelp",
-        "start": {
-          "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"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Edit",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit",
-        "start": {
-          "column": 8,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Undo",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.undo",
-        "start": {
-          "column": 8,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Redo",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.redo",
-        "start": {
-          "column": 8,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Cut",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.cut",
-        "start": {
-          "column": 7,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Copy",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.copy",
-        "start": {
-          "column": 8,
-          "line": 48
-        }
-      },
-      {
-        "defaultMessage": "!!!Paste",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.paste",
-        "start": {
-          "column": 9,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "!!!Paste And Match Style",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.pasteAndMatchStyle",
-        "start": {
-          "column": 22,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "!!!Delete",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.delete",
-        "start": {
-          "column": 10,
-          "line": 60
-        }
-      },
-      {
-        "defaultMessage": "!!!Select All",
-        "end": {
-          "column": 3,
-          "line": 67
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.selectAll",
-        "start": {
-          "column": 13,
-          "line": 64
-        }
-      },
-      {
-        "defaultMessage": "!!!Find in Page",
-        "end": {
-          "column": 3,
-          "line": 71
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.findInPage",
-        "start": {
-          "column": 14,
-          "line": 68
-        }
-      },
-      {
-        "defaultMessage": "!!!Speech",
-        "end": {
-          "column": 3,
-          "line": 75
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.speech",
-        "start": {
-          "column": 10,
-          "line": 72
-        }
-      },
-      {
-        "defaultMessage": "!!!Start Speaking",
-        "end": {
-          "column": 3,
-          "line": 79
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.startSpeaking",
-        "start": {
-          "column": 17,
-          "line": 76
-        }
-      },
-      {
-        "defaultMessage": "!!!Stop Speaking",
-        "end": {
-          "column": 3,
-          "line": 83
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.stopSpeaking",
-        "start": {
-          "column": 16,
-          "line": 80
-        }
-      },
-      {
-        "defaultMessage": "!!!Start Dictation",
-        "end": {
-          "column": 3,
-          "line": 87
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.startDictation",
-        "start": {
-          "column": 18,
-          "line": 84
-        }
-      },
-      {
-        "defaultMessage": "!!!Emoji & Symbols",
-        "end": {
-          "column": 3,
-          "line": 91
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.emojiSymbols",
-        "start": {
-          "column": 16,
-          "line": 88
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Quick Switch",
-        "end": {
-          "column": 3,
-          "line": 95
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.openQuickSwitch",
-        "start": {
-          "column": 19,
-          "line": 92
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 99
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.back",
-        "start": {
-          "column": 8,
-          "line": 96
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 103
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.forward",
-        "start": {
-          "column": 11,
-          "line": 100
-        }
-      },
-      {
-        "defaultMessage": "!!!Actual Size",
-        "end": {
-          "column": 3,
-          "line": 107
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.resetZoom",
-        "start": {
-          "column": 13,
-          "line": 104
-        }
-      },
-      {
-        "defaultMessage": "!!!Zoom In",
-        "end": {
-          "column": 3,
-          "line": 111
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.zoomIn",
-        "start": {
-          "column": 10,
-          "line": 108
-        }
-      },
-      {
-        "defaultMessage": "!!!Zoom Out",
-        "end": {
-          "column": 3,
-          "line": 115
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.zoomOut",
-        "start": {
-          "column": 11,
-          "line": 112
-        }
-      },
-      {
-        "defaultMessage": "!!!Toggle Full Screen",
-        "end": {
-          "column": 3,
-          "line": 119
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleFullScreen",
-        "start": {
-          "column": 20,
-          "line": 116
-        }
-      },
-      {
-        "defaultMessage": "!!!Toggle Dark Mode",
-        "end": {
-          "column": 3,
-          "line": 123
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleDarkMode",
-        "start": {
-          "column": 18,
-          "line": 120
-        }
-      },
-      {
-        "defaultMessage": "!!!Toggle Developer Tools",
-        "end": {
-          "column": 3,
-          "line": 127
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleDevTools",
-        "start": {
-          "column": 18,
-          "line": 124
-        }
-      },
-      {
-        "defaultMessage": "!!!Toggle Todos Developer Tools",
-        "end": {
-          "column": 3,
-          "line": 131
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleTodosDevTools",
-        "start": {
-          "column": 23,
-          "line": 128
-        }
-      },
-      {
-        "defaultMessage": "!!!Toggle Service Developer Tools",
-        "end": {
-          "column": 3,
-          "line": 135
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleServiceDevTools",
-        "start": {
-          "column": 25,
-          "line": 132
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload Service",
-        "end": {
-          "column": 3,
-          "line": 139
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.reloadService",
-        "start": {
-          "column": 17,
-          "line": 136
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload Ferdi",
-        "end": {
-          "column": 3,
-          "line": 143
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.reloadFerdi",
-        "start": {
-          "column": 15,
-          "line": 140
-        }
-      },
-      {
-        "defaultMessage": "!!!Lock Ferdi",
-        "end": {
-          "column": 3,
-          "line": 147
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.lockFerdi",
-        "start": {
-          "column": 13,
-          "line": 144
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload ToDos",
-        "end": {
-          "column": 3,
-          "line": 151
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.reloadTodos",
-        "start": {
-          "column": 15,
-          "line": 148
-        }
-      },
-      {
-        "defaultMessage": "!!!Minimize",
-        "end": {
-          "column": 3,
-          "line": 155
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.window.minimize",
-        "start": {
-          "column": 12,
-          "line": 152
-        }
-      },
-      {
-        "defaultMessage": "!!!Close",
-        "end": {
-          "column": 3,
-          "line": 159
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.window.close",
-        "start": {
-          "column": 9,
-          "line": 156
-        }
-      },
-      {
-        "defaultMessage": "!!!Learn More",
-        "end": {
-          "column": 3,
-          "line": 163
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.learnMore",
-        "start": {
-          "column": 13,
-          "line": 160
-        }
-      },
-      {
-        "defaultMessage": "!!!Changelog",
-        "end": {
-          "column": 3,
-          "line": 167
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.changelog",
-        "start": {
-          "column": 13,
-          "line": 164
-        }
-      },
-      {
-        "defaultMessage": "!!!Import/Export Configuration Data",
-        "end": {
-          "column": 3,
-          "line": 171
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.importExportData",
-        "start": {
-          "column": 20,
-          "line": 168
-        }
-      },
-      {
-        "defaultMessage": "!!!Support",
-        "end": {
-          "column": 3,
-          "line": 175
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.support",
-        "start": {
-          "column": 11,
-          "line": 172
-        }
-      },
-      {
-        "defaultMessage": "!!!Copy Debug Information",
-        "end": {
-          "column": 3,
-          "line": 179
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.debugInfo",
-        "start": {
-          "column": 13,
-          "line": 176
-        }
-      },
-      {
-        "defaultMessage": "!!!Publish Debug Information",
-        "end": {
-          "column": 3,
-          "line": 183
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.publishDebugInfo",
-        "start": {
-          "column": 20,
-          "line": 180
-        }
-      },
-      {
-        "defaultMessage": "!!!Ferdi Debug Information",
-        "end": {
-          "column": 3,
-          "line": 187
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.debugInfoCopiedHeadline",
-        "start": {
-          "column": 27,
-          "line": 184
-        }
-      },
-      {
-        "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
-        "end": {
-          "column": 3,
-          "line": 192
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.debugInfoCopiedBody",
-        "start": {
-          "column": 23,
-          "line": 188
-        }
-      },
-      {
-        "defaultMessage": "!!!Unlock with Touch ID",
-        "end": {
-          "column": 3,
-          "line": 196
-        },
-        "file": "src/lib/Menu.js",
-        "id": "locked.touchId",
-        "start": {
-          "column": 11,
-          "line": 193
-        }
-      },
-      {
-        "defaultMessage": "!!!unlock via Touch ID",
-        "end": {
-          "column": 3,
-          "line": 200
-        },
-        "file": "src/lib/Menu.js",
-        "id": "locked.touchIdPrompt",
-        "start": {
-          "column": 17,
-          "line": 197
-        }
-      },
-      {
-        "defaultMessage": "!!!Terms of Service",
-        "end": {
-          "column": 3,
-          "line": 204
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.tos",
-        "start": {
-          "column": 7,
-          "line": 201
-        }
-      },
-      {
-        "defaultMessage": "!!!Privacy Statement",
-        "end": {
-          "column": 3,
-          "line": 208
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.privacy",
-        "start": {
-          "column": 11,
-          "line": 205
-        }
-      },
-      {
-        "defaultMessage": "!!!File",
-        "end": {
-          "column": 3,
-          "line": 212
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.file",
-        "start": {
-          "column": 8,
-          "line": 209
-        }
-      },
-      {
-        "defaultMessage": "!!!View",
-        "end": {
-          "column": 3,
-          "line": 216
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view",
-        "start": {
-          "column": 8,
-          "line": 213
-        }
-      },
-      {
-        "defaultMessage": "!!!Services",
-        "end": {
-          "column": 3,
-          "line": 220
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.services",
-        "start": {
-          "column": 12,
-          "line": 217
-        }
-      },
-      {
-        "defaultMessage": "!!!Window",
-        "end": {
-          "column": 3,
-          "line": 224
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.window",
-        "start": {
-          "column": 10,
-          "line": 221
-        }
-      },
-      {
-        "defaultMessage": "!!!Help",
-        "end": {
-          "column": 3,
-          "line": 228
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help",
-        "start": {
-          "column": 8,
-          "line": 225
-        }
-      },
-      {
-        "defaultMessage": "!!!About Ferdi",
-        "end": {
-          "column": 3,
-          "line": 232
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.about",
-        "start": {
-          "column": 9,
-          "line": 229
-        }
-      },
-      {
-        "defaultMessage": "!!!Check for updates",
-        "end": {
-          "column": 3,
-          "line": 236
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.checkForUpdates",
-        "start": {
-          "column": 19,
-          "line": 233
-        }
-      },
-      {
-        "defaultMessage": "!!!Hide",
-        "end": {
-          "column": 3,
-          "line": 240
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.hide",
-        "start": {
-          "column": 8,
-          "line": 237
-        }
-      },
-      {
-        "defaultMessage": "!!!Hide Others",
-        "end": {
-          "column": 3,
-          "line": 244
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.hideOthers",
-        "start": {
-          "column": 14,
-          "line": 241
-        }
-      },
-      {
-        "defaultMessage": "!!!Unhide",
-        "end": {
-          "column": 3,
-          "line": 248
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.unhide",
-        "start": {
-          "column": 10,
-          "line": 245
-        }
-      },
-      {
-        "defaultMessage": "!!!Auto-hide menu bar",
-        "end": {
-          "column": 3,
-          "line": 252
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.autohideMenuBar",
-        "start": {
-          "column": 19,
-          "line": 249
-        }
-      },
-      {
-        "defaultMessage": "!!!Add New Service...",
-        "end": {
-          "column": 3,
-          "line": 256
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.services.addNewService",
-        "start": {
-          "column": 17,
-          "line": 253
-        }
-      },
-      {
-        "defaultMessage": "!!!Add New Workspace...",
-        "end": {
-          "column": 3,
-          "line": 260
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.workspaces.addNewWorkspace",
-        "start": {
-          "column": 19,
-          "line": 257
-        }
-      },
-      {
-        "defaultMessage": "!!!Open workspace drawer",
-        "end": {
-          "column": 3,
-          "line": 264
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.workspaces.openWorkspaceDrawer",
-        "start": {
-          "column": 23,
-          "line": 261
-        }
-      },
-      {
-        "defaultMessage": "!!!Close workspace drawer",
-        "end": {
-          "column": 3,
-          "line": 268
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.workspaces.closeWorkspaceDrawer",
-        "start": {
-          "column": 24,
-          "line": 265
-        }
-      },
-      {
-        "defaultMessage": "!!!Activate next service...",
-        "end": {
-          "column": 3,
-          "line": 272
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.services.setNextServiceActive",
-        "start": {
-          "column": 23,
-          "line": 269
-        }
-      },
-      {
-        "defaultMessage": "!!!Activate previous service...",
-        "end": {
-          "column": 3,
-          "line": 276
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.services.activatePreviousService",
-        "start": {
-          "column": 27,
-          "line": 273
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable notifications & audio",
-        "end": {
-          "column": 3,
-          "line": 280
-        },
-        "file": "src/lib/Menu.js",
-        "id": "sidebar.muteApp",
-        "start": {
-          "column": 11,
-          "line": 277
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable notifications & audio",
-        "end": {
-          "column": 3,
-          "line": 284
-        },
-        "file": "src/lib/Menu.js",
-        "id": "sidebar.unmuteApp",
-        "start": {
-          "column": 13,
-          "line": 281
-        }
-      },
-      {
-        "defaultMessage": "!!!Workspaces",
-        "end": {
-          "column": 3,
-          "line": 288
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.workspaces",
-        "start": {
-          "column": 14,
-          "line": 285
-        }
-      },
-      {
-        "defaultMessage": "!!!Default",
-        "end": {
-          "column": 3,
-          "line": 292
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.workspaces.defaultWorkspace",
-        "start": {
-          "column": 20,
-          "line": 289
-        }
-      },
-      {
-        "defaultMessage": "!!!Todos",
-        "end": {
-          "column": 3,
-          "line": 296
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.todos",
-        "start": {
-          "column": 9,
-          "line": 293
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Todos drawer",
-        "end": {
-          "column": 3,
-          "line": 300
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.Todoss.openTodosDrawer",
-        "start": {
-          "column": 19,
-          "line": 297
-        }
-      },
-      {
-        "defaultMessage": "!!!Close Todos drawer",
-        "end": {
-          "column": 3,
-          "line": 304
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.Todoss.closeTodosDrawer",
-        "start": {
-          "column": 20,
-          "line": 301
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Todos",
-        "end": {
-          "column": 3,
-          "line": 308
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.todos.enableTodos",
-        "start": {
-          "column": 15,
-          "line": 305
-        }
-      },
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 312
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.services.goHome",
-        "start": {
-          "column": 17,
-          "line": 309
-        }
-      }
-    ],
-    "path": "src/lib/Menu.json"
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 6964a93f1..4c658297e 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Επαναφό�τωση",
-  "app.errorHandler.headline": "Κάτι δεν λειτου�γεί",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Π�οσα�μοσμένος διακομιστής",
   "changeserver.headline": "Change server",
   "changeserver.label": "Διακομιστής",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "Τι συνέβη;",
   "connectionLostBanner.message": "Ωχ όχι! Ο Ferdi έχασε την επικοινωνία με το",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Εγγ�αφή πλη�οφο�ιών εντοπισμο� σφαλμάτων",
   "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",
@@ -24,8 +23,8 @@
   "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": "Δεν είναι δυνατή η σ�νδεση με τις ζωντανές υπη�εσίες του Ferdi",
-  "global.cancel": "Ακ��ωση",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Επεξε�γασία",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Έχετε αποσυνδεθεί από το Διαδίκτυο",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Ρυθμίσεις",
+  "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": "Υποβολή",
+  "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": "Εισαγάγετε τις υπη�εσίες σας Ferdi 4",
   "import.notSupportedHeadline": "Υπη�εσίες που δεν υποστη�ίζονται ακόμα στο Ferdi 5",
   "import.skip.label": "Θέλω να π�οσθέσω υπη�εσίες χει�οκίνητα",
-  "import.submit.label": "Εισαγωγή υπη�εσιών",
+  "import.submit.label": "Import {count} 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": "Τι νέο υπά�χει;",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Επανεκκίνηση & εγκατάσταση ενημε�ώσεων",
   "infobar.buttonReloadServices": "Ανανέωση υπη�εσιών",
   "infobar.hide": "Απόκ�υψη",
@@ -75,7 +74,7 @@
   "login.email.label": "Διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου",
   "login.headline": "Σ�νδεση",
   "login.invalidCredentials": "Το email ή ο κωδικός π�όσβασης δεν είναι έγκυ�ος",
-  "login.link.password": "Επαναφο�ά κωδικο� π�όσβασης",
+  "login.link.password": "Reset password",
   "login.link.signup": "Δημιου�γία δω�εάν λογα�ιασμο�",
   "login.password.label": "Password",
   "login.serverLogout": "Η συνεδ�ία σας έληξε, συνδεθείτε ξανά.",
@@ -118,7 +117,7 @@
   "menu.help.tos": "Ό�οι Χ�ήσης",
   "menu.services": "Υπη�εσίες",
   "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
   "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Όλες οι υπη�εσίες",
   "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
   "password.email.label": "Διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου",
-  "password.headline": "Επαναφο�ά κωδικο� π�όσβασης",
+  "password.headline": "Reset password",
   "password.link.login": "Σ�νδεση στο λογα�ιασμό σας",
   "password.link.signup": "Δημιου�γία δω�εάν λογα�ιασμο�",
-  "password.noUser": "Δεν β�έθηκε χ�ήστης με τη συγκεκ�ιμένη διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου",
-  "password.successInfo": "Ελέγξτε το 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",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Επαναφό�τωση {name}",
   "service.crashHandler.autoReload": "Γίνεται π�οσπάθεια αυτόματης ανάκτησης του {name} σε {seconds} δευτε�όλεπτα",
   "service.crashHandler.headline": "Ω, όχι!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Καλώς ο�ίσατε στον Ferdi",
-  "settings.account.account.editButton": "Επεξε�γασία λογα�ιασμο�",
+  "settings.account.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": "Ενημέ�ωση π�οφίλ",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Έχετε λάβει ένα email με έναν σ�νδεσμο για την επιβεβαίωση της διαγ�αφής του λογα�ιασμο� σας. Ο λογα�ιασμός και τα δεδομένα σας δεν μπο�ο�ν να ανακτηθο�ν!",
   "settings.account.deleteInfo": "Εάν δεν χ�ειάζεστε πλέον το λογα�ιασμό σας στο Ferdi, μπο�είτε να διαγ�άψετε το λογα�ιασμό σας και όλα τα δεδομένα που σχετίζονται με αυτόν εδώ.",
   "settings.account.headline": "Λογα�ιασμός",
-  "settings.account.headlineAccount": "Πλη�οφο�ίες λογα�ιασμο�",
-  "settings.account.headlineDangerZone": "Επικίνδυνη Ζώνη",
-  "settings.account.headlineInvoices": "Τιμολόγια",
-  "settings.account.headlinePassword": "Αλλαγή κωδικο� π�όσβασης",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Ενημέ�ωση π�οφίλ",
   "settings.account.successInfo": "Οι αλλαγές σας έχουν αποθηκευτεί",
   "settings.account.tryReloadServices": "Δοκιμάστε ξανά",
   "settings.account.tryReloadUserInfoRequest": "Δοκιμάστε ξανά",
   "settings.account.userInfoRequestFailed": "Δεν ήταν δυνατή η φό�τωση πλη�οφο�ιών χ�ήστη",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Καθα�ισμός λανθάνουσας μνήμης",
   "settings.app.buttonInstallUpdate": "Επανεκκίνηση & εγκατάσταση ενημε�ώσεων",
@@ -220,12 +208,12 @@
   "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.darkMode": "Enable Dark Mode",
   "settings.app.form.enableGPUAcceleration": "Ενε�γοποιήση Ενίσχυσης GPU ",
   "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Ενε�γοποίηση ο�θογ�αφικο� ελέγχου",
-  "settings.app.form.enableSystemTray": "Εμφάνιση του Ferdi στη γ�αμμή ειδοποιήσεων",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Π�οβολή κα�τελών των απενε�γοποιημένων υπη�εσιών",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Π�οβολή του εικονιδίου μη αναγνωσμένου μην�ματος όταν οι ειδοποιήσεις είναι απενε�γοποιημένες",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Διαγ�αφή υπη�εσίας",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Επεξε�γασία {name}",
   "settings.service.form.enableAudio": "Ενε�γοποίηση ήχου",
   "settings.service.form.enableBadge": "Εμφάνιση εικονιδίων μη αναγνωσμένου μην�ματος",
@@ -332,12 +321,13 @@
   "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.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Ανακαλ�ψτε υπη�εσίες",
   "settings.services.headline": "Οι υπη�εσίες σας",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "Η υπη�εσία είναι απενε�γοποιημένη",
   "settings.services.tooltip.isMuted": "Όλοι οι ήχοι είναι απενε�γοποιημένοι",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Μη κε�δοσκοπικός",
   "settings.user.form.currentPassword": "Τ�έχων κωδικός π�όσβασης",
   "settings.user.form.email": "Email",
-  "settings.user.form.firstname": "Όνομα",
-  "settings.user.form.lastname": "Επίθετο",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "�έος κωδικός π�όσβασης",
   "settings.workspace.add.form.name": "Όνομα",
   "settings.workspace.add.form.submitButton": "Create workspace",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "Ενε�γοποίηση ειδοποιήσεων & ήχου",
   "signup.email.label": "Διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου",
   "signup.emailDuplicate": "Ένας χ�ήστης με τη συγκεκ�ιμένη διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου υπά�χει ήδη",
-  "signup.firstname.label": "Όνομα",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Εγγ�αφή",
-  "signup.lastname.label": "Επίθετο",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Δημιου�γώντας έναν λογα�ιασμό Ferdi αποδέχεστε τους",
   "signup.legal.privacy": "Δήλωση απο��ήτου",
   "signup.legal.terms": "Ό�οι υπη�εσίας",
@@ -430,11 +421,11 @@
   "signup.password.label": "Password",
   "signup.submit.label": "Δημιου�γία λογα�ιασμο�",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Διαγ�αφή υπη�εσίας",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Απενε�γοποίηση ήχου",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Απενε�γοποίηση ειδοποιήσεων",
-  "tabs.item.disableService": "Απενε�γοποίηση υπη�εσίας",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Ενε�γοποίηση ήχου",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Ενε�γοποίηση ειδοποιήσεων",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Επαναφό�τωση",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} δεν είναι έγκυ�ο",
-  "validation.minLength": "{field} π�έπει να είναι τουλάχιστον {length} χα�ακτή�ες",
+  "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} είναι υποχ�εωτικό",
-  "validation.url": "{field} δεν είναι έγκυ�ος σ�νδεσμος URL",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Back",
   "webControls.forward": "Forward",
   "webControls.goHome": "Home",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index be9bbb961..812ec8c4c 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "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",
@@ -45,7 +44,7 @@
   "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",
+  "import.submit.label": "Import {count} 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",
@@ -118,7 +117,7 @@
   "menu.help.tos": "Terms of Service",
   "menu.services": "Services",
   "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
   "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
@@ -152,18 +151,7 @@
   "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",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
   "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.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",
@@ -220,12 +208,12 @@
   "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.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.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
   "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.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Discover services",
   "settings.services.headline": "Your services",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "Service is disabled",
   "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 9a5c248a2..518e862ba 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Volver a cargar",
-  "app.errorHandler.headline": "Algo salió mal.",
+  "app.errorHandler.headline": "Algo ha fallado.",
   "changeserver.customServerLabel": "Servidor personalizado",
   "changeserver.headline": "Cambiar servidor",
   "changeserver.label": "Servidor",
@@ -9,13 +9,12 @@
   "connectionLostBanner.cta": "Recargar Servicio",
   "connectionLostBanner.informationLink": "¿Qué ocurrió?",
   "connectionLostBanner.message": "¡Oh no! Ferdi perdió la conexión con {name}.",
-  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publica la información de depuración",
+  "feature.basicAuth.signIn": "Iniciar Sesión",
   "feature.nightlyBuilds.activate": "Activar",
   "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.",
-  "feature.publishDebugInfo.info": "Publicar tu información de depuración nos ayuda a encontrar problemas y errores en Ferdi. Al publicar tu información de depuración aceptas la política de privacidad y las condiciones de servicio de Ferdi Debuggger",
+  "feature.publishDebugInfo.info": "Publicar tu información de depuración nos ayuda a encontrar problemas y errores en Ferdi. Al publicar tu información de depuración aceptas la política de privacidad y las condiciones de servicio de depuración de Ferdi",
   "feature.publishDebugInfo.privacy": "Política de Privacidad",
   "feature.publishDebugInfo.publish": "Aceptar y publicar",
   "feature.publishDebugInfo.published": "Su registro de depuración fue publicado y ahora está disponible en",
@@ -23,29 +22,29 @@
   "feature.publishDebugInfo.title": "Publica la información de depuración",
   "feature.quickSwitch.info": "Puede seleccionar un servicio usando TAB, ↑ y ↓. Puede abrir servicio usando ENTER.",
   "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.",
+  "feature.quickSwitch.title": "Cambio rápido",
+  "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.ok": "Aceptar",
+  "global.quit": "Salir",
+  "global.quitConfirmation": "¿Estás seguro de que quieres salir de Ferdi?",
+  "global.save": "Guardar",
   "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.spellchecking.language": "Idioma de corrección ortográfica",
   "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",
+  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (para descubrir) o 'https://developeropers.whatismybrowser.com/useragents/explore/' (para elegir) su agente de usuario deseado y copiarlo aquí.",
+  "global.userAgentPref": "Agente de Usuario",
+  "global.yes": "Sí",
   "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",
-  "import.submit.label": "Importar servicios",
+  "import.submit.label": "Importar {count} servicios",
   "infobar.authRequestFailed": "Error al intentar realizar la solicitud de autenticación. Por favor, cerrar la sesión y volver a entrar si este error persiste.",
   "infobar.buttonChangelog": "¿Qué hay de nuevo?",
   "infobar.buttonInstallUpdate": "Reiniciar e instalar actualización",
@@ -54,15 +53,15 @@
   "infobar.requiredRequestsFailed": "No se han podido cargar los servicios ni la información de usuario",
   "infobar.servicesUpdated": "Tus servicios han sido actualizados.",
   "infobar.updateAvailable": "Una nueva actualización de Ferdi está disponible",
-  "infobox.dismiss": "Descargar",
+  "infobox.dismiss": "Descartar",
   "invite.email.label": "Dirección de correo electrónico",
   "invite.headline.friends": "Invita a 3 de tus amigos o compañeros",
   "invite.name.label": "Nombre",
-  "invite.skip.label": "Lo haré más tarde",
+  "invite.skip.label": "Deseo continuar más tarde",
   "invite.submit.label": "Enviar invitaciones",
   "invite.successInfo": "Invitaciones enviadas correctamente",
   "locked.headline": "Bloqueado",
-  "locked.info": "Ferdi está bloqueado. Debe desbloquear Ferdi con su contraseña para ver mensajes.",
+  "locked.info": "Ferdi está actualmente bloqueado. Por favor, desbloquea Ferdi con tu contraseña para ver tus mensajes.",
   "locked.invalidCredentials": "Contraseña incorrecta",
   "locked.password.label": "Contraseña",
   "locked.submit.label": "Desbloquear",
@@ -70,8 +69,8 @@
   "locked.touchIdPrompt": "desbloquear con Touch ID",
   "locked.unlockWithPassword": "Desbloquear con contraseña",
   "login.changeServer": "Cambiar servidor",
-  "login.customServerQuestion": "Using a custom Ferdi server?",
-  "login.customServerSuggestion": "Try importing your Franz account",
+  "login.customServerQuestion": "¿Utilizar una cuenta de Franz para iniciar sesión?",
+  "login.customServerSuggestion": "Intenta importar tu cuenta de Franz en Ferdi",
   "login.email.label": "Dirección de correo electrónico",
   "login.headline": "Iniciar sesión",
   "login.invalidCredentials": "Correo electrónico o contraseña no válidos ",
@@ -87,30 +86,30 @@
   "menu.app.autohideMenuBar": "Auto-ocultar barra de menú",
   "menu.app.checkForUpdates": "Comprobar actualizaciones",
   "menu.app.hide": "Ocultar",
-  "menu.app.hideOthers": "Hide Others",
-  "menu.app.unhide": "Unhide",
+  "menu.app.hideOthers": "Ocultar otros",
+  "menu.app.unhide": "Mostrar",
   "menu.edit": "Editar",
-  "menu.edit.copy": "Copy",
-  "menu.edit.cut": "Cut",
+  "menu.edit.copy": "Copiar",
+  "menu.edit.cut": "Cortar",
   "menu.edit.delete": "Borrar",
   "menu.edit.emojiSymbols": "Emoji y Símbolos",
   "menu.edit.findInPage": "Buscar en la página",
-  "menu.edit.paste": "Paste",
-  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
-  "menu.edit.redo": "Redo",
-  "menu.edit.selectAll": "Select All",
+  "menu.edit.paste": "Pegar",
+  "menu.edit.pasteAndMatchStyle": "Pegar y ajustar estilo",
+  "menu.edit.redo": "Rehacer",
+  "menu.edit.selectAll": "Seleccionar Todo",
   "menu.edit.speech": "Leer",
   "menu.edit.startDictation": "Empezar dictado",
   "menu.edit.startSpeaking": "Empezar lectura",
   "menu.edit.stopSpeaking": "Detener lectura",
-  "menu.edit.undo": "Undo",
+  "menu.edit.undo": "Deshacer",
   "menu.file": "Archivo",
-  "menu.help": "Help",
+  "menu.help": "Ayuda",
   "menu.help.changelog": "Registro de cambios",
   "menu.help.debugInfo": "Copiar información de depuración",
   "menu.help.debugInfoCopiedBody": "Tu información de depuración ha sido copiada a tu portapapeles",
   "menu.help.debugInfoCopiedHeadline": "Información de depurador de Ferdi",
-  "menu.help.importExportData": "Import/Export Configuration Data",
+  "menu.help.importExportData": "Importar/Exportar datos de configuración",
   "menu.help.learnMore": "Conocer más",
   "menu.help.privacy": "Declaración de privacidad",
   "menu.help.publishDebugInfo": "Escribir información de depuración",
@@ -118,7 +117,7 @@
   "menu.help.tos": "Términos del Servicio",
   "menu.services": "Servicios",
   "menu.services.activatePreviousService": "Activa el servicio previo",
-  "menu.services.addNewService": "Añadir Nuevo Servicio",
+  "menu.services.addNewService": "Añadir Nuevo Servicio...",
   "menu.services.goHome": "Inicio",
   "menu.services.setNextServiceActive": "Activa el siguiente servicio",
   "menu.todos": "Tareas pendientes",
@@ -128,20 +127,20 @@
   "menu.view.forward": "Siguiente",
   "menu.view.lockFerdi": "Bloquear Ferdi",
   "menu.view.openQuickSwitch": "Abrir Cambio Rápido",
-  "menu.view.reloadFerdi": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Recargar Ferdi",
   "menu.view.reloadService": "Recargar Servicio",
   "menu.view.reloadTodos": "Recargar Pendientes",
-  "menu.view.resetZoom": "Actual Size",
+  "menu.view.resetZoom": "Tamaño Real",
   "menu.view.toggleDarkMode": "Cambiar a modo oscuro",
   "menu.view.toggleDevTools": "Activar las Herramientas para Desarrolladores",
-  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleFullScreen": "Cambiar a Pantalla Completa",
   "menu.view.toggleServiceDevTools": "Mostrar Herramientas de Servicios para Desarrolladores",
   "menu.view.toggleTodosDevTools": "Tareas pendientes: Herramientas para desarrolladores",
-  "menu.view.zoomIn": "Zoom In",
-  "menu.view.zoomOut": "Zoom Out",
-  "menu.window": "Window",
-  "menu.window.close": "Close",
-  "menu.window.minimize": "Minimize",
+  "menu.view.zoomIn": "Ampliar",
+  "menu.view.zoomOut": "Reducir",
+  "menu.window": "Ventana",
+  "menu.window.close": "Cerrar",
+  "menu.window.minimize": "Minimizar",
   "menu.workspaces": "Espacios de trabajo",
   "menu.workspaces.addNewWorkspace": "Añadir nuevo espacio de trabajo...",
   "menu.workspaces.closeWorkspaceDrawer": "Cerrar cajón de espacio de trabajo",
@@ -152,18 +151,7 @@
   "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.successInfo": "Por favor revisa tu correo electrónico",
-  "pricing.features.accountSync": "Sincronización de cuenta",
-  "pricing.features.customWebsites": "Agregue sitios personalizados",
-  "pricing.features.desktopNotifications": "Notificaciones de escritorio",
-  "pricing.features.onPremise": "En sitio y otros servicios alojados",
-  "pricing.features.recipes": "Elegir entre más de 70 servicios",
-  "pricing.features.serviceProxies": "Apoderados de Servicio",
-  "pricing.features.spellchecker": "Soporte de corrector ortográfico",
-  "pricing.features.teamManagement": "Administración de Equipo",
-  "pricing.features.thirdPartyServices": "Instalar servicios de terceros",
-  "pricing.features.unlimitedServices": "Agregar servicios ilimitados",
-  "pricing.features.workspaces": "Espacios de trabajo",
+  "password.successInfo": "Tu nueva contraseña ha sido enviada a tu dirección de email",
   "service.crashHandler.action": "Recargar {name}",
   "service.crashHandler.autoReload": "Intentando recuperar automáticamente {name} en {seconds} segundos",
   "service.crashHandler.headline": "¡Oh, no!",
@@ -174,11 +162,11 @@
   "service.errorHandler.editAction": "Editar {name}",
   "service.errorHandler.headline": "¡Oh, no!",
   "service.errorHandler.message": "Error",
-  "service.errorHandler.text": "{name} ha fallado la carga",
+  "service.errorHandler.text": "{name} no ha podido cargar.",
   "service.webviewLoader.loading": "Cargando {service}",
   "services.getStarted": "Primeros pasos",
   "services.login": "Iniciar sesión para usar Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
+  "services.serverInfo": "Opcionalmente, puede cambiar su servidor Ferdi haciendo clic en el engranaje en la esquina inferior izquierda. Si está cambiando (de uno de los servidores alojados) a usar Ferdi sin una cuenta, por favor tenga en cuenta que puede exportar sus datos desde ese servidor y posteriormente importarlos usando el menú Ayuda para restaurar todos sus espacios de trabajo y servicios configurados!",
   "services.serverless": "Usar Ferdi sin una cuenta",
   "services.welcome": "Bienvenido a Ferdi",
   "settings.account.account.editButton": "Editar cuenta",
@@ -198,12 +186,12 @@
   "settings.account.tryReloadServices": "Intentar de nuevo",
   "settings.account.tryReloadUserInfoRequest": "Intentar de nuevo",
   "settings.account.userInfoRequestFailed": "No se pudo cargar la información de usuario",
-  "settings.account.yourLicense": "Su Licencia Ferdi",
+  "settings.account.yourLicense": "Su Licencia Ferdi:",
   "settings.app.accentColorInfo": "Escribe tu color de acento en un formato compatible con CSS. (Predeterminado: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Limpiar caché",
   "settings.app.buttonInstallUpdate": "Reiniciar e instalar actualización",
-  "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder",
-  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
+  "settings.app.buttonOpenFerdiProfileFolder": "Abrir Carpeta de Perfil",
+  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Abrir carpeta de recetas de servicio",
   "settings.app.buttonSearchForUpdate": "Comprobar actualizaciones",
   "settings.app.cacheInfo": "El cache de Ferdi actualmente usa {size} de espacio en disco.",
   "settings.app.cacheNotCleared": "No se ha podido eliminar el cache",
@@ -218,14 +206,14 @@
   "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.confirmOnQuit": "Confirmar al salir de Ferdi",
+  "settings.app.form.customTodoServer": "Servidor de TODO personalizado",
+  "settings.app.form.darkMode": "Habilitar modo oscuro",
   "settings.app.form.enableGPUAcceleration": "Habilitar aceleración de GPU",
   "settings.app.form.enableLock": "Activar bloqueo por contraseña",
   "settings.app.form.enableMenuBar": "Mostrar a Ferdi en la barra de menús",
   "settings.app.form.enableSpellchecking": "Activar corrección ortográfica",
-  "settings.app.form.enableSystemTray": "Mostrar Ferdi en la bandeja del sistema",
+  "settings.app.form.enableSystemTray": "Mostrar siempre icono de Ferdi en la bandeja del sistema",
   "settings.app.form.enableTodos": "Activar Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Mantener los servicios en hibernación al iniciar",
   "settings.app.form.hibernationStrategy": "Estrategia de hibernación",
@@ -237,7 +225,7 @@
   "settings.app.form.minimizeToSystemTray": "Minimizar Ferdi a la bandeja del sistema",
   "settings.app.form.navigationBarBehaviour": "Comportamiento de la barra de navegación",
   "settings.app.form.notifyTaskBarOnMessage": "Notificar en la Barra de tareas / Dock los nuevos mensajes",
-  "settings.app.form.passwordToggle": "Password toggle",
+  "settings.app.form.passwordToggle": "Cambio de contraseña",
   "settings.app.form.predefinedTodoServer": "Servidor de tareas",
   "settings.app.form.privateNotifications": "No mostrar contenido de mensajes en notificaciones",
   "settings.app.form.reloadAfterResume": "Recargar Ferdi después de reanudar el sistema",
@@ -251,11 +239,12 @@
   "settings.app.form.showDisabledServices": "Mostrar pestañas de servicios desactivados",
   "settings.app.form.showDragArea": "Mostrar área arrastrable en la ventana",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas",
+  "settings.app.form.splitMode": "Activar el modo de vista separada",
   "settings.app.form.startMinimized": "Iniciar minimizado",
   "settings.app.form.universalDarkMode": "Activar modo oscuro universal",
   "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.form.useVerticalStyle": "Usar estilo horizontal",
+  "settings.app.form.wakeUpStrategy": "Estrategia para despertar",
   "settings.app.headlineAdvanced": "Avanzado",
   "settings.app.headlineAppearance": "Apariencia",
   "settings.app.headlineGeneral": "General",
@@ -265,16 +254,16 @@
   "settings.app.hibernateInfo": "Por defecto, Ferdi mantendrá todos sus servicios abiertos y cargados en segundo plano para que estén listos cuando los necesite. La hibernación del servicio desactivará los mismos tras el tiempo especificado. Esto es útil para ahorrar RAM y evitar que los servicios ralentizen su sistema.",
   "settings.app.inactivityLockInfo": "Minutos de inactividad, tras los cuales Ferdi debe bloquear automáticamente. Utilice 0 para desactivar",
   "settings.app.languageDisclaimer": "Las traducciones oficiales son en inglés y alemán. Todos los demás idiomas son traducciones basadas en la comunidad.",
-  "settings.app.lockInfo": "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.lockInfo": "El bloqueo de contraseña le permite mantener los mensajes protegidos.\nSi activa el bloqueo de contraseña, se le pedirá introducirla cada vez que inicie o bloquee Ferdi usando el símbolo de la esquina inferior izquierda o bien el acceso directo {lockShortcut}.",
   "settings.app.lockedPassword": "Contraseña",
-  "settings.app.lockedPasswordInfo": "Por favor, asegúrese de recordar la contraseña que establezca.\nSi la perdiera u olvidara, tendría que reinstalar Ferdi.",
+  "settings.app.lockedPasswordInfo": "Por favor, asegúrese de establecer una contraseña que usted pueda recordar.\nSi pierde esta contraseña, tendrá que reinstalar Ferdi.",
   "settings.app.restartRequired": "Los cambios requieren reiniciar",
   "settings.app.scheduledDNDInfo": "El \"No molestar\" programado permite definir un período de tiempo en el que no recibir notificaciones de Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Horas en formato 24 horas. La hora de finalización puede ser anterior a la hora de inicio (por ejemplo, inicio 17:00, final 09:00) para habilitar No molestar la noche.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
+  "settings.app.sentryInfo": "El envío de datos de telemetría nos permite encontrar errores en Ferdi - ¡No enviaremos ninguna información personal como sus mensajes!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi utiliza el corrector ortográfico incluido en su Mac. Si desea cambiar los lenguajes que el corrector ortográfico revisa, lo puede hacer en las Preferencias del Sistema de su Mac.",
   "settings.app.subheadlineCache": "Caché",
-  "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
+  "settings.app.subheadlineFerdiProfile": "Perfil de Ferdi",
   "settings.app.todoServerInfo": "Este servidor se utilizará para la función \"Ferdi Todo\".",
   "settings.app.translationHelp": "Ayúdanos a traducir Ferdi a tu idioma.",
   "settings.app.universalDarkModeInfo": "El Modo Oscuro Universal intenta generar dinámicamente estilos de modo oscuro para servicios que de otro modo no están soportados actualmente.",
@@ -294,7 +283,7 @@
   "settings.recipes.customService.headline.communityRecipes": "Recetas de terceros comunitarios",
   "settings.recipes.customService.headline.customRecipes": "Recetas de terceros comunitarios",
   "settings.recipes.customService.headline.devRecipes": "Sus recetas de Servicio de Desarrollo",
-  "settings.recipes.customService.intro": "Para añadir un servicio personalizado, copia la receta de servicio a:",
+  "settings.recipes.customService.intro": "Para añadir un servicio personalizado, copie la receta de servicio a:",
   "settings.recipes.customService.openDevDocs": "Documentación para desarrolladores",
   "settings.recipes.customService.openFolder": "Abrir carpeta",
   "settings.recipes.headline": "Servicios disponibles",
@@ -332,12 +321,13 @@
   "settings.service.form.isHibernatedEnabledInfo": "Cuando se activa, un servicio se apagará después de un período de tiempo para ahorrar recursos del sistema.",
   "settings.service.form.isMutedInfo": "Cuando estén desactivados, todos los sonidos de notificación y la reproducción de audio serán silenciados",
   "settings.service.form.name": "Nombre",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Solo mostrar Favoritos en el recuento de no leídos",
   "settings.service.form.openDarkmodeCss": "Abrir darkmode.css (modo oscuro)",
   "settings.service.form.openUserCss": "Abrir user.css",
   "settings.service.form.openUserJs": "Abrir user.js",
   "settings.service.form.proxy.headline": "Ajustes Proxy HTTP/HTTPS",
   "settings.service.form.proxy.host": "Servidor/IP Proxy",
-  "settings.service.form.proxy.info": "Las configuraciones de Proxy no se sincronizarán con los servidores de Ferdi.",
+  "settings.service.form.proxy.info": "Las configuraciones del Proxy no se sincronizarán con los servidores de Ferdi.",
   "settings.service.form.proxy.isEnabled": "Utilizar Proxy",
   "settings.service.form.proxy.password": "Contraseña (opcional)",
   "settings.service.form.proxy.port": "Puerto",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Descubrir servicios",
   "settings.services.headline": "Tus servicios",
   "settings.services.noServicesAdded": "Empieze añadiendo un servicio.",
+  "settings.services.nothingFound": "Lo sentimos, pero no pudimos encontrar ningún servicio similar a tu búsqueda, sin embargo: puedes agregarlo utilizando la opción de \"Sitio web personalizado\". \nRecuerda que pueden aparecer más servicios de los que has agregado a Ferdi desde la versión que estás utilizando. Para poder utilizar los nuevos servicios disponibles, considera actualizar a la versión más reciente.",
   "settings.services.servicesRequestFailed": "No pudo cargar tus servicios",
   "settings.services.tooltip.isDisabled": "El servicio está desactivado",
   "settings.services.tooltip.isMuted": "Todos los sonidos están silenciados",
@@ -377,7 +368,7 @@
   "settings.team.contentHeadline": "Administración de Equipo",
   "settings.team.copy": "La gestión de equipos de Franz's te permite administrar suscripciones de Franz para múltiples usuarios. Por favor, ten en cuenta que tener una suscripción a Franz Premium no te dará ninguna ventaja en el uso de Ferdi: la única razón por la que todavía tienes acceso a la Gestión de Equipos es para que puedas gestionar tus equipos de Franz y para que no pierdas ninguna funcionalidad en la gestión de tu cuenta.",
   "settings.team.headline": "Equipo",
-  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "Actualmente estás usando servidores Franz, por lo que tienes acceso a la Gestión de Equipos.",
   "settings.team.manageAction": "Administra tu equipo en meetfranz.com",
   "settings.team.teamsUnavailable": "Los equipos no están disponibles",
   "settings.team.teamsUnavailableInfo": "Los equipos están disponibles actualmente sólo cuando se utiliza el servidor Franz y después de pagar por Franz Professional. Por favor, cambie su servidor a https://api.franz)[video] .com para usar equipos.",
@@ -388,7 +379,7 @@
   "settings.user.form.currentPassword": "Contraseña actual",
   "settings.user.form.email": "Correo electrónico",
   "settings.user.form.firstname": "Nombre",
-  "settings.user.form.lastname": "Apellido",
+  "settings.user.form.lastname": "Apellidos",
   "settings.user.form.newPassword": "Nueva contraseña",
   "settings.workspace.add.form.name": "Nombre",
   "settings.workspace.add.form.submitButton": "Crear un sitio de trabajo",
@@ -405,7 +396,7 @@
   "settings.workspaces.tryReloadWorkspaces": "Intentar de nuevo",
   "settings.workspaces.updatedInfo": "Tus cambios han sido guardados",
   "settings.workspaces.workspaceFeatureHeadline": "Menos es más: Presentación de Ferdi Workspaces",
-  "settings.workspaces.workspaceFeatureInfo": "Los espacios de trabajo Ferdi permiten centrarse en lo que es importante. Configure diferentes conjuntos de servicios y cambie fácilmente entre ellos en cualquier momento. Usted decide qué servicios necesita, cuándo y dónde, para que podamos ayudarte a mantenerte al tanto - o apartarte fácilmente del trabajo cuando asi lo desees.",
+  "settings.workspaces.workspaceFeatureInfo": "Los espacios de trabajo Ferdi permiten centrarse en lo que es importante. Configure diferentes conjuntos de servicios y cambie fácilmente entre ellos en cualquier momento. Usted decide qué servicios necesita, cuándo y dónde, para que podamos ayudarte a mantenerte al tanto - o apartarte fácilmente del trabajo cuando así lo desees.",
   "settings.workspaces.workspacesRequestFailed": "No se han podido cargar sus áreas de trabajo",
   "setupAssistant.headline": "Empecemos",
   "setupAssistant.subheadline": "Elige entre nuestros servicios más utilizados y vuelve a ponerte al tanto de tu mensajería ahora.",
@@ -422,7 +413,7 @@
   "signup.emailDuplicate": "Ya existe un usuario con esa dirección de correo electrónico",
   "signup.firstname.label": "Nombre",
   "signup.headline": "Registrarse",
-  "signup.lastname.label": "Apellido",
+  "signup.lastname.label": "Apellidos",
   "signup.legal.info": "Al crear una cuenta en Ferdi usted acepta",
   "signup.legal.privacy": "Declaración de privacidad",
   "signup.legal.terms": "Términos de servicio",
@@ -432,21 +423,21 @@
   "tabs.item.confirmDeleteService": "¿Estás seguro que quieres elimiar el servicio de {serviceName}?",
   "tabs.item.deleteService": "Eliminar servicio",
   "tabs.item.disableAudio": "Desactivar sonido",
-  "tabs.item.disableDarkMode": "Disable Dark mode",
+  "tabs.item.disableDarkMode": "Desactivar modo oscuro",
   "tabs.item.disableNotifications": "Desactivar notificaciones",
   "tabs.item.disableService": "Desactivar servicio",
   "tabs.item.enableAudio": "Habilitar audio",
-  "tabs.item.enableDarkMode": "Enable Dark mode",
+  "tabs.item.enableDarkMode": "Habilitar modo oscuro",
   "tabs.item.enableNotification": "Activar notificaciones",
   "tabs.item.enableService": "Activar servicio",
-  "tabs.item.hibernateService": "Hibernate service",
+  "tabs.item.hibernateService": "Hibernar servicio",
   "tabs.item.reload": "Volver a cargar",
-  "tabs.item.wakeUpService": "Wake up service",
+  "tabs.item.wakeUpService": "Despertar servicio",
   "validation.email": "{field} no es válido",
   "validation.minLength": "{field} debería tener al menos {length} caracteres",
   "validation.oneRequired": "Al menos uno es requerido",
   "validation.required": "{field} es obligatorio",
-  "validation.url": "{field} no es una URL válida",
+  "validation.url": "{field} no es una dirección URL válida",
   "webControls.back": "Volver",
   "webControls.forward": "Siguiente",
   "webControls.goHome": "Inicio",
@@ -459,7 +450,7 @@
   "workspaceDrawer.headline": "Espacios de trabajo",
   "workspaceDrawer.item.contextMenuEdit": "editar",
   "workspaceDrawer.item.noServicesAddedYet": "Ningún servicio ha sido añadido",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Los espacios de trabajo Ferdi permiten centrarse en lo que es importante. Configure diferentes conjuntos de servicios y cambie fácilmente entre ellos en cualquier momento. </p><p>Usted decide qué servicios necesita, cuándo y dónde, para que podamos ayudarte a mantenerte al tanto - o apartarte fácilmente del trabajo cuando asi lo desees.</p>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Los espacios de trabajo Ferdi permiten centrarse en lo que es importante. Configure diferentes conjuntos de servicios y cambie fácilmente entre ellos en cualquier momento. </p><p>Usted decide qué servicios necesita, cuándo y dónde, para que podamos ayudarte a mantenerte al tanto - o apartarte fácilmente del trabajo cuando así lo desees.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Editar ajustes de áreas de trabajo",
   "workspaces.switchingIndicator.switchingTo": "Cambiando a"
 }
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index 5ccea37e5..e6c756935 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Lataa uudelleen",
-  "app.errorHandler.headline": "Jotain meni pieleen",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Mukautettu palvelin",
   "changeserver.headline": "Vaihda palvelinta",
   "changeserver.label": "Palvelin",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "Mitä tapahtui?",
   "connectionLostBanner.message": "Voi ei! Ferdi menetti yhteyden {name}.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Julkaise virheraportti",
   "feature.nightlyBuilds.activate": "Aktivoi",
   "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",
@@ -24,8 +23,8 @@
   "feature.quickSwitch.info": "Valitse palvelu painamalla TAB, ↑ ja ↓. Avaa palvelu painamalla ENTER.",
   "feature.quickSwitch.search": "Etsi...",
   "feature.quickSwitch.title": "Pikavalitsin",
-  "global.api.unhealthy": "Ferdin verkkopalveluihin ei saada yhteyttä",
-  "global.cancel": "Peruuta",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Muokkaa",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Et ole yhteydessä internetiin.",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Asetukset",
+  "global.settings": "Settings",
   "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.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": "Tuo Ferdin 4 palveluasi",
   "import.notSupportedHeadline": "Palvelut eivät vielä tue Ferdi 5-versiota",
   "import.skip.label": "Haluan lisätä palvelut manuaalisesti",
-  "import.submit.label": "Tuo palveluita",
+  "import.submit.label": "Import {count} services",
   "infobar.authRequestFailed": "Todennuspyynnön suoritamisessa tapahtui virhe. Jos tämä virhe toistuu, ole hyvä ja yritä kirjautua ulos. Kirjaudu sen jälkeen uudestaan sisälle.",
-  "infobar.buttonChangelog": "Mitä uutta?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Käynnistä uudelleen ja asenna päivitys",
   "infobar.buttonReloadServices": "Lataa palvelut uudestaan",
   "infobar.hide": "Piilota",
@@ -75,7 +74,7 @@
   "login.email.label": "Sähköpostiosoite",
   "login.headline": "Kirjaudu sisään",
   "login.invalidCredentials": "Sähköpostiosoite tai salasana ei kelpaa",
-  "login.link.password": "Nollaa salasana",
+  "login.link.password": "Reset password",
   "login.link.signup": "Luo ilmainen tili",
   "login.password.label": "Salasana",
   "login.serverLogout": "Istuntosi on vanhentunut. Kirjaudu uudelleen sisään.",
@@ -117,10 +116,10 @@
   "menu.help.support": "Tuki",
   "menu.help.tos": "Käyttöehdot",
   "menu.services": "Palvelut",
-  "menu.services.activatePreviousService": "Aktivoi edellinen palvelu",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Etusivu",
-  "menu.services.setNextServiceActive": "Aktivoi seuraava palvelu",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos-tehtävät",
   "menu.todos.enableTodos": "Ota Todos käyttöön",
   "menu.view": "Katso",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Kaikki palvelut",
   "menu.workspaces.openWorkspaceDrawer": "Avaa työtilan valikko",
   "password.email.label": "Sähköpostiosoite",
-  "password.headline": "Nollaa salasana",
+  "password.headline": "Reset password",
   "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.successInfo": "Ole hyvä ja tarkista sähköpostisi",
-  "pricing.features.accountSync": "Tilin Synkronointi",
-  "pricing.features.customWebsites": "Lisää mukautettuja sivustoja",
-  "pricing.features.desktopNotifications": "Työpöytäilmoitukset",
-  "pricing.features.onPremise": "Toimitila ja muut Hosting-palvelut",
-  "pricing.features.recipes": "Valitse yli 70 Palvelusta",
-  "pricing.features.serviceProxies": "Palveluiden Välityspalvelimet",
-  "pricing.features.spellchecker": "Oikoluvun tuki",
-  "pricing.features.teamManagement": "Tiimin Hallinta",
-  "pricing.features.thirdPartyServices": "Asenna kolmannen osapuolen palveluita",
-  "pricing.features.unlimitedServices": "Lisää rajattomat palvelut",
-  "pricing.features.workspaces": "Työtilat",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Lataa uudestaan {name}",
   "service.crashHandler.autoReload": "Yritetään palauttaa {name} automaattisesti {seconds} sekunnin kuluttua",
   "service.crashHandler.headline": "Voi ei!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Käytä Ferdia ilman tiliä",
   "services.welcome": "Tervetuloa Ferdiin",
-  "settings.account.account.editButton": "Muokkaa tiliä",
+  "settings.account.account.editButton": "Edit account",
   "settings.account.accountUnavailable": "Tili ei ole käytettävissä",
   "settings.account.accountUnavailableInfo": "Käytät Ferdia ilman tiliä. Jos haluat käyttää Ferdia tilin kanssa ja pitää palvelusi synkronoituna kaikissa asennuksissa, valitse Asetukset-välilehdessä palvelin ja kirjaudu sisään.",
   "settings.account.buttonSave": "Päivitä profiili",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Olet saanut sähköpostiviestissä linkin, jonka kautta voit vahvistaa tilisi poistamisen. Tiliäsi ja tietoja ei voi palauttaa!",
   "settings.account.deleteInfo": "Jos et enää tarvitse Ferdi-tiliäsi, voit poistaa tilisi ja kaikki siihen liittyvät tiedot täältä.",
   "settings.account.headline": "Tili",
-  "settings.account.headlineAccount": "Tilin tiedot",
-  "settings.account.headlineDangerZone": "Vaaravyöhyke",
-  "settings.account.headlineInvoices": "Laskut",
-  "settings.account.headlinePassword": "Vaihda salasana",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Päivitä profiili",
   "settings.account.successInfo": "Tekemäsi muutokset on tallennettu",
   "settings.account.tryReloadServices": "Yritä uudelleen",
   "settings.account.tryReloadUserInfoRequest": "Yritä uudelleen",
   "settings.account.userInfoRequestFailed": "Käyttäjätietoja ei voitu ladata",
-  "settings.account.yourLicense": "Sinun Ferdi-lisenssi",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Tyhjennä välimuisti",
   "settings.app.buttonInstallUpdate": "Käynnistä uudelleen ja asenna päivitys",
@@ -219,13 +207,13 @@
   "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.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Ota tumma tila käyttöön",
   "settings.app.form.enableGPUAcceleration": "Ota Gpu-kiihdytys käyttöön",
   "settings.app.form.enableLock": "Ota Salasanan lukitus käyttöön",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Ota oikoluku käyttöön",
-  "settings.app.form.enableSystemTray": "Näytä Ferdi ilmoitusalueella",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Ota Ferdi Todos käyttöön",
   "settings.app.form.hibernateOnStartup": "Pidä palvelut horrostilassa käynnistettäessä",
   "settings.app.form.hibernationStrategy": "Horrostila-suunnitelma",
@@ -251,9 +239,10 @@
   "settings.app.form.showDisabledServices": "Näytä Estetyt palvelut -välilehdet",
   "settings.app.form.showDragArea": "Näytä ikkunassa siirrettävä alue",
   "settings.app.form.showMessagesBadgesWhenMuted": "Näytä merkki lukemattomasta viestistä kun ilmoitukset on poistettu käytöstä",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Käynnistä pienennettynä",
   "settings.app.form.universalDarkMode": "Ota käyttöön yleinen tumma tila",
-  "settings.app.form.useTouchIdToUnlock": "Salli TouchID:n käyttö Ferdin avaamiseksi",
+  "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": "Lisäasetukset",
@@ -267,7 +256,7 @@
   "settings.app.languageDisclaimer": "Viralliset käännökset ovat englanti ja saksa. Kaikki muut kielet ovat yhteisön kääntämiä.",
   "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Salasana",
-  "settings.app.lockedPasswordInfo": "Varmista, että luot salasanan, jonka muistat.\nJos hukkaat tämän salasanan, sinun täytyy asentaa Ferdi uudelleen.",
+  "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": "Muutokset vaativat uudelleenkäynnistyksen",
   "settings.app.scheduledDNDInfo": "Ajastetun Älä häiritse-tilan avulla voit määritellä ajanjakson, jonka aikana et halua saada ilmoituksia Ferdistä.",
   "settings.app.scheduledDNDTimeInfo": "Ajastin 24 tunnin järjestelmässä. Kun Älä häiritse-tila otetaan yöksi käyttöön, päättymisaika voi olla ennen alkamisaikaa (esim. alku 17:00, loppu 09:00).",
@@ -275,7 +264,7 @@
   "settings.app.spellCheckerLanguageInfo": "Ferdi käyttää Macin sisäänrakennettua oikolukua tarkastaessaan kirjoitusvirheitä. Jos haluat muuttaa tarkastettavaa kieltä, voit tehdä sen Macin järjestelmän asetuksissa.",
   "settings.app.subheadlineCache": "Välimuisti",
   "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
-  "settings.app.todoServerInfo": "Tätä palvelinta käytetään \"Ferdi Todo\" -toiminnossa.",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Auta meitä kääntämään Ferdi omalle kielellesi.",
   "settings.app.universalDarkModeInfo": "Yleinen Tumma-tila yrittää luoda palveluille tyylejä, joita ei tueta tällä hetkellä.",
   "settings.app.updateStatusAvailable": "Päivitys saatavilla, ladataan...",
@@ -294,9 +283,9 @@
   "settings.recipes.customService.headline.communityRecipes": "Yhteisön Kolmannen osapuolen Ohjeet",
   "settings.recipes.customService.headline.customRecipes": "Kolmannen osapuolen ohjeet",
   "settings.recipes.customService.headline.devRecipes": "Ohjeet palvelun kehittämiseen",
-  "settings.recipes.customService.intro": "Jos haluat lisätä mukautetun palvelun, kopioi palvelun ohje:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
   "settings.recipes.customService.openDevDocs": "Ohjelmoijan dokumentaatio",
-  "settings.recipes.customService.openFolder": "Avaa kansio",
+  "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Käytettävissä olevat palvelut",
   "settings.recipes.missingService": "Palvelu puuttuu?",
   "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.",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Tumman tilan kirkkaus",
   "settings.service.form.darkReaderContrast": "Tumman tilan kontrasti",
   "settings.service.form.darkReaderSepia": "Tumman tilan seepia",
-  "settings.service.form.deleteButton": "Poista palvelu",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Muokkaa {name}",
   "settings.service.form.enableAudio": "Ota ääni käyttöön",
   "settings.service.form.enableBadge": "Näytä lukemattomat viestit",
@@ -332,17 +321,18 @@
   "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": "Kun poistettu käytöstä, kaikki ilmoitusäänet ja äänentoisto on mykistetty",
   "settings.service.form.name": "Nimi",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Avaa darkmode.css",
   "settings.service.form.openUserCss": "Avaa user.css",
   "settings.service.form.openUserJs": "Avaa user.js",
   "settings.service.form.proxy.headline": "Http/Https välityspalvelimen asetukset",
   "settings.service.form.proxy.host": "Välityspalvelimen Host/IP",
-  "settings.service.form.proxy.info": "Välityspalvelimen asetukset eivät synkronoidu Ferdin palvelimiin.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Käytä välityspalvelinta",
-  "settings.service.form.proxy.password": "Salasana (valinnainen)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Portti",
   "settings.service.form.proxy.restartInfo": "Käynnistä Ferdi välityspalvelimen asetusten vaihtamisen jälkeen.",
-  "settings.service.form.proxy.user": "Käyttäjä (valinnainen)",
+  "settings.service.form.proxy.user": "User (optional)",
   "settings.service.form.recipeFileInfo": "Käyttäjän tiedostot lisätään web-sivulle, jotta voit muokata palveluita millä tahansa tavalla. Käyttäjätiedostot tallennetaan vain paikallisesti eikä niitä siirretä muille tietokoneille käyttäen samaa tiliä.",
   "settings.service.form.saveButton": "Tallenna palvelu",
   "settings.service.form.tabHosted": "Hosted",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Selaa palveluita",
   "settings.services.headline": "Sinun palvelusi",
   "settings.services.noServicesAdded": "Aloita lisäämällä palvelu.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Palveluita ei voitu ladata",
   "settings.services.tooltip.isDisabled": "Palvelu poistettu käytöstä",
   "settings.services.tooltip.isMuted": "Kaikki äänet on mykistetty",
@@ -362,12 +353,12 @@
   "settings.supportFerdi.aboutIntro": "<p>Ferdi on yhteisöjohtoinen ja avoimen lähdekoodin sovellus.</p><p>Kiitos henkilöille, jotka tekevät tämän mahdolliseksi:</p>",
   "settings.supportFerdi.bannerText": "Haluatko auttaa meitä kehittämään Ferdiä?",
   "settings.supportFerdi.headline": "Tietoja Ferdistä",
-  "settings.supportFerdi.openSurvey": "Avaa mielipidekysely",
+  "settings.supportFerdi.openSurvey": "Open survey",
   "settings.supportFerdi.textDonation": "Jos haluat tukea Ferdin kehitystä lahjoituksella, voit tehdä niin molemmilla tavoilla,",
   "settings.supportFerdi.textDonationAnd": "ja",
   "settings.supportFerdi.textExpenses": "Vaikka vapaaehtoiset tekevät suurimman osan työstä, meidän on silti maksettava palvelemista ja sertifikaateista. Olemme yhteisönä täysin läpinäkyviä keräämiämme ja käyttämiemme varojen suhteen",
   "settings.supportFerdi.textGitHubSponsors": "GitHub sponsorit",
-  "settings.supportFerdi.textListContributors": "Täydellinen luettelo tukijoista",
+  "settings.supportFerdi.textListContributors": "Full list of contributors",
   "settings.supportFerdi.textListContributorsHere": "tästä",
   "settings.supportFerdi.textOpenCollective": "Avoin Kollektiivi",
   "settings.supportFerdi.textSupportWelcome": "Tuki on aina tervetullutta. Voit saada listan tarvitsemastamme avusta",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Voittoa tavoittelematon",
   "settings.user.form.currentPassword": "Nykyinen salasana",
   "settings.user.form.email": "Sähköposti",
-  "settings.user.form.firstname": "Etunimi",
-  "settings.user.form.lastname": "Sukunimi",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Uusi salasana",
   "settings.workspace.add.form.name": "Nimi",
   "settings.workspace.add.form.submitButton": "Luo työtila",
@@ -405,7 +396,7 @@
   "settings.workspaces.tryReloadWorkspaces": "Yritä uudelleen",
   "settings.workspaces.updatedInfo": "Tekemäsi muutokset on tallennettu",
   "settings.workspaces.workspaceFeatureHeadline": "Vähemmän on enemmän: Esittelyssä Ferdi Työtilat",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi Työtilat antavat sinun keskittyä siihen, mikä on tärkeää juuri nyt. Määritä erilaisia palveluja ja vaihda helposti niiden välillä milloin tahansa. Sinä päätät mitä palveluita tarvitset milloin ja missä, jotta voimme auttaa sinua pysymään töissä - tai helposti pois töistä aina kun haluat.",
+  "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": "Työtiloja ei voitu ladata",
   "setupAssistant.headline": "Let's get started",
   "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -420,9 +411,9 @@
   "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",
-  "signup.firstname.label": "Etunimi",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Kirjaudu",
-  "signup.lastname.label": "Sukunimi",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Luomalla Ferdi-tilin hyväksyt",
   "signup.legal.privacy": "Tietosuojalauseke",
   "signup.legal.terms": "Käyttöehdot",
@@ -430,11 +421,11 @@
   "signup.password.label": "Salasana",
   "signup.submit.label": "Luo tili",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Poista palvelu",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Poista ääni käytöstä",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Poista ilmoitukset käytöstä",
-  "tabs.item.disableService": "Poista palvelu",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Ota ääni käyttöön",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Ota ilmoitukset käyttöön",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Lataa uudelleen",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} ei ole kelvollinen",
-  "validation.minLength": "{field} pitää olla vähintään {length} kirjainta",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "Vähintään yksi kohde valittava",
-  "validation.required": "{field} on pakollinen",
-  "validation.url": "{field} ei ole kelvollinen URL-osoite",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Takaisin",
   "webControls.forward": "Eteenpäin",
   "webControls.goHome": "Etusivu",
@@ -454,12 +445,12 @@
   "webControls.reload": "Lataa uudelleen",
   "welcome.loginButton": "Kirjaudu tilillesi",
   "welcome.signupButton": "Luo ilmainen tili",
-  "workspaceDrawer.addNewWorkspaceLabel": "Lisää uusi työtila",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "Kaikki palvelut",
   "workspaceDrawer.headline": "Työtilat",
   "workspaceDrawer.item.contextMenuEdit": "muokkaa",
   "workspaceDrawer.item.noServicesAddedYet": "Palveluja ei ole vielä lisätty",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces auttaa sinun keskittymään mikä on tärkeää juuri nyt. Määritä erilaisia palvelukokonaisuuksia ja vaihda helposti niiden välillä milloin tahansa.</p><p>Sinä päätät mitä palveluita tarvitset milloin ja missä, jotta voimme auttaa sinua pysymään työsi äärellä - tai helpottamaan poistumista aina kun haluat.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Muokkaa työtilojen asetuksia",
+  "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": "Vaihdetaan"
 }
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index d81d23d79..80b32f495 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Actualiser",
-  "app.errorHandler.headline": "On dirait que quelque chose ne va pas",
+  "app.errorHandler.headline": "Quelque chose a mal tourné.",
   "changeserver.customServerLabel": "Serveur personnalisé",
   "changeserver.headline": "Changer de serveur",
   "changeserver.label": "Serveur",
@@ -9,8 +9,7 @@
   "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.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publier les informations de débogage",
+  "feature.basicAuth.signIn": "Connexion",
   "feature.nightlyBuilds.activate": "Activer",
   "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",
@@ -27,27 +26,27 @@
   "global.api.unhealthy": "Impossible de se connecter aux services en ligne de Ferdi",
   "global.cancel": "Annuler",
   "global.edit": "Éditer",
-  "global.no": "No",
+  "global.no": "Non",
   "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.quit": "Quitter",
+  "global.quitConfirmation": "Voulez-vous vraiment quitter Ferdi ?",
+  "global.save": "Sauver",
   "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.submit": "Envoyer",
+  "global.userAgentHelp": "Utilisez 'https://whatmyuseragent.com/' (pour découvrir) ou 'https://developers.whatismybrowser.com/useragents/explore/' (pour choisir) votre agent utilisateur désiré et copier-coller ici.",
   "global.userAgentPref": "User Agent",
-  "global.yes": "Yes",
+  "global.yes": "Oui",
   "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",
-  "import.submit.label": "Importer des services",
+  "import.submit.label": "Importer {count} services",
   "infobar.authRequestFailed": "Il y a eu des erreurs pendant l'authentification demandée. Essayer de vous déconnecter et de vous reconnecter pour voir si cette erreur persiste.",
-  "infobar.buttonChangelog": "Nouveautés?",
+  "infobar.buttonChangelog": "Quoi de neuf ?",
   "infobar.buttonInstallUpdate": "Redémarrer et installer la mise à jour",
   "infobar.buttonReloadServices": "Recharger les services",
   "infobar.hide": "Masquer",
@@ -75,7 +74,7 @@
   "login.email.label": "Adresse Email",
   "login.headline": "S'identifier",
   "login.invalidCredentials": "Email ou mot de passe invalide",
-  "login.link.password": "Réinitialiser le mot de passe",
+  "login.link.password": "Reset password",
   "login.link.signup": "Créer un compte gratuit",
   "login.password.label": "Mot de passe",
   "login.serverLogout": "Votre session a expiré. Reconnectez-vous s'il vous plaît.",
@@ -117,10 +116,10 @@
   "menu.help.support": "Assistance",
   "menu.help.tos": "Conditions d'utilisation",
   "menu.services": "Services",
-  "menu.services.activatePreviousService": "Activer le service précédent",
-  "menu.services.addNewService": "Ajouter un nouveau service",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Accueil",
-  "menu.services.setNextServiceActive": "Activer le service suivant",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Activer Todos",
   "menu.view": "Aperçu",
@@ -131,39 +130,28 @@
   "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Redémarrer le service",
   "menu.view.reloadTodos": "Recharger les Todos",
-  "menu.view.resetZoom": "Actual Size",
+  "menu.view.resetZoom": "Taille actuelle",
   "menu.view.toggleDarkMode": "Activer le mode sombre",
   "menu.view.toggleDevTools": "Activer les outils de développeur",
-  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleFullScreen": "Activer/désactiver le mode plein écran",
   "menu.view.toggleServiceDevTools": "Activer les outils de développeur du service",
   "menu.view.toggleTodosDevTools": "Activer les outils de développeur Todos",
-  "menu.view.zoomIn": "Zoom In",
-  "menu.view.zoomOut": "Zoom Out",
-  "menu.window": "Window",
-  "menu.window.close": "Close",
-  "menu.window.minimize": "Minimize",
+  "menu.view.zoomIn": "Zoom avant",
+  "menu.view.zoomOut": "Zoom arrière",
+  "menu.window": "Fenêtre",
+  "menu.window.close": "Fermer",
+  "menu.window.minimize": "Réduire",
   "menu.workspaces": "Espace de travail",
   "menu.workspaces.addNewWorkspace": "Ajouter un nouvel espace de travail...",
   "menu.workspaces.closeWorkspaceDrawer": "Fermer l'espace de travail",
   "menu.workspaces.defaultWorkspace": "Tous les services",
   "menu.workspaces.openWorkspaceDrawer": "Ouvrir l'espace de travail",
   "password.email.label": "Adresse Email",
-  "password.headline": "Réinitialiser le mot de passe",
+  "password.headline": "Reset password",
   "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.successInfo": "Merci de consulter vos emails",
-  "pricing.features.accountSync": "Synchronisation de compte",
-  "pricing.features.customWebsites": "Ajouter des sites web modifiés",
-  "pricing.features.desktopNotifications": "Notifications de bureau",
-  "pricing.features.onPremise": "Services hébergés sur place et autres",
-  "pricing.features.recipes": "Choisissez parmi de plus de 70 services",
-  "pricing.features.serviceProxies": "Service Proxy",
-  "pricing.features.spellchecker": "Support du correcteur orthographique",
-  "pricing.features.teamManagement": "Gestion d'équipe",
-  "pricing.features.thirdPartyServices": "Installer des services tiers",
-  "pricing.features.unlimitedServices": "Ajouter des services illimités",
-  "pricing.features.workspaces": "Espace de travail",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Recharger {name}",
   "service.crashHandler.autoReload": "Tentative de restauration automatique de {name} dans {seconds} secondes",
   "service.crashHandler.headline": "Oh non!",
@@ -190,7 +178,7 @@
   "settings.account.deleteInfo": "Si vous n'avez plus besoin de votre compte Ferdi, vous pouvez le supprimer avec toutes ses données associées.",
   "settings.account.headline": "Compte",
   "settings.account.headlineAccount": "Informations sur le compte",
-  "settings.account.headlineDangerZone": "Zone dangereuse",
+  "settings.account.headlineDangerZone": "Zone à risque",
   "settings.account.headlineInvoices": "Factures",
   "settings.account.headlinePassword": "Changer le mot de passe",
   "settings.account.headlineProfile": "Mettre à jour le profil",
@@ -198,16 +186,16 @@
   "settings.account.tryReloadServices": "Réessayer",
   "settings.account.tryReloadUserInfoRequest": "Réessayer",
   "settings.account.userInfoRequestFailed": "Impossible de charger les informations de l'utilisateur",
-  "settings.account.yourLicense": "Votre licence Ferdi",
+  "settings.account.yourLicense": "Votre licence Ferdi :",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Vider le cache",
   "settings.app.buttonInstallUpdate": "Redémarrer et installer la mise à jour",
-  "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder",
+  "settings.app.buttonOpenFerdiProfileFolder": "Afficher le dossier du profil",
   "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
   "settings.app.buttonSearchForUpdate": "Vérifier les mises à jour",
   "settings.app.cacheInfo": "Le cache de Ferdi occupe actuellement {size} en espace disque.",
   "settings.app.cacheNotCleared": "Impossible de vider toute la cache",
-  "settings.app.closeSettings": "Close settings",
+  "settings.app.closeSettings": "Fermer les paramètres",
   "settings.app.currentVersion": "Version actuelle :",
   "settings.app.form.accentColor": "Couleur d'accentuation",
   "settings.app.form.adaptableDarkMode": "Synchroniser le mode sombre avec l'option mode sombre du système",
@@ -219,13 +207,13 @@
   "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.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Activer le mode sombre",
   "settings.app.form.enableGPUAcceleration": "Activer l'accélération GPU",
   "settings.app.form.enableLock": "Activer le verrouillage par mot de passe",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Activer la vérification orthographique",
-  "settings.app.form.enableSystemTray": "Afficher Ferdi dans la barre d'état système",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Activer Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Garder les services en veille prolongée au démarrage",
   "settings.app.form.hibernationStrategy": "Stratégie d'hibernation",
@@ -251,9 +239,10 @@
   "settings.app.form.showDisabledServices": "Afficher les onglets des services désactivés",
   "settings.app.form.showDragArea": "Afficher les zones de glisser-déposer dans la fenêtre",
   "settings.app.form.showMessagesBadgesWhenMuted": "Afficher les badges de messages non lus quand les notifications sont désactivées",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Démarrage minimisé",
   "settings.app.form.universalDarkMode": "Activer le mode sombre universel",
-  "settings.app.form.useTouchIdToUnlock": "Autoriser l'utilisation de TouchID pour déverrouiller Ferdi",
+  "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": "Paramètres avancés",
@@ -267,7 +256,7 @@
   "settings.app.languageDisclaimer": "Les traductions officielles sont l'anglais et l'allemand. Toutes les autres langues sont des traductions faites par la communauté.",
   "settings.app.lockInfo": "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": "Mot de passe",
-  "settings.app.lockedPasswordInfo": "S'il vous plaît soyez sûre de mettre un mot de passe que vous allez vous rappelez.\nSi vous perdez ce mot de passe vous allez devoir réinstaller Ferdi.",
+  "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": "Les modifications nécessitent un redémarrage",
   "settings.app.scheduledDNDInfo": "Planifier le Ne-pas-Déranger vous permet de définir une période de temps dans lequel vous ne voulez pas de notifications de Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Le temps est en format 24 heures. La fin du temps peut être avant le début du temps (ex: début 17:00, fin 09:00) pour activer le Ne-pas-Déranger durant la nuit.",
@@ -275,7 +264,7 @@
   "settings.app.spellCheckerLanguageInfo": "Ferdi utilise le correcteur orthographique intégré de votre Mac pour vérifier les fautes de frappe. Si vous voulez changer les langues pour lesquelles le correcteur vérifie l'orthographe, vous pouvez le faire dans les préférences système de votre Mac.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
-  "settings.app.todoServerInfo": "Ce serveur sera utilisé pour la fonctionnalité \"Ferdi Todo\".",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Aidez-nous à traduire Ferdi dans votre langue.",
   "settings.app.universalDarkModeInfo": "Le mode sombre universel tente de générer dynamiquement des styles de mode sombre pour les services qui ne sont pas encore supportés.",
   "settings.app.updateStatusAvailable": "Mise à jour disponible, téléchargement en cours...",
@@ -294,9 +283,9 @@
   "settings.recipes.customService.headline.communityRecipes": "Recettes tiers communautaire",
   "settings.recipes.customService.headline.customRecipes": "Recettes tiers modifiées",
   "settings.recipes.customService.headline.devRecipes": "Vos recettes de service de développement",
-  "settings.recipes.customService.intro": "Pour ajouter un service modifié, copié la recette à:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
   "settings.recipes.customService.openDevDocs": "Documentation de Développeur",
-  "settings.recipes.customService.openFolder": "Ouvrir le dossier",
+  "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Services disponibles",
   "settings.recipes.missingService": "Un service est manquant?",
   "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.",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Luminosité de Dark Reader",
   "settings.service.form.darkReaderContrast": "Contraste de Dark Reader",
   "settings.service.form.darkReaderSepia": "Sepia de Dark Reader",
-  "settings.service.form.deleteButton": "Supprimer le service",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Modifier {name}",
   "settings.service.form.enableAudio": "Activer l'audio",
   "settings.service.form.enableBadge": "Afficher le badge des messages non lus",
@@ -332,17 +321,18 @@
   "settings.service.form.isHibernatedEnabledInfo": "Quand activé, les services seront éteints après un moment pour économiser les ressources systèmes.",
   "settings.service.form.isMutedInfo": "Lorsque désactivé, tous les sons de notifications ainsi que l'audio sont coupés",
   "settings.service.form.name": "Nom",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Ouvrir darkmode.css",
   "settings.service.form.openUserCss": "Ouvrir user.css",
   "settings.service.form.openUserJs": "Ouvrir user.js",
   "settings.service.form.proxy.headline": "Paramètres proxy HTTP/HTTPS",
   "settings.service.form.proxy.host": "Hôte/IP du proxy",
-  "settings.service.form.proxy.info": "Les paramètres de proxy ne seront pas synchronisés avec les serveurs de Ferdi.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Utiliser un proxy",
-  "settings.service.form.proxy.password": "Mot de passe (facultatif)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
   "settings.service.form.proxy.restartInfo": "Veuillez redémarrer Ferdi après avoir modifié les paramètres proxy.",
-  "settings.service.form.proxy.user": "Utilisateur (facultatif)",
+  "settings.service.form.proxy.user": "User (optional)",
   "settings.service.form.recipeFileInfo": "Vos fichiers utilisateur seront insérés dans la page Web afin que vous puissiez personnaliser les services comme vous le souhaitez. Les fichiers utilisateurs sont stockés localement et ne sont pas transférés à d'autres ordinateurs en utilisant le même compte.",
   "settings.service.form.saveButton": "Enregistrer le service",
   "settings.service.form.tabHosted": "Hébergé",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Découvrir les services",
   "settings.services.headline": "Vos services",
   "settings.services.noServicesAdded": "Commencez par ajouter un service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Impossible de charger vos services",
   "settings.services.tooltip.isDisabled": "Ce service est désactivé",
   "settings.services.tooltip.isMuted": "Tous les sons sont coupés",
@@ -362,12 +353,12 @@
   "settings.supportFerdi.aboutIntro": "<p>Ferdi est une application open-source et dirigée par la communauté.</p><p>Merci à toutes les personnes qui rendent cela possible :</p>",
   "settings.supportFerdi.bannerText": "Voulez-vous nous aider à améliorer Ferdi ?",
   "settings.supportFerdi.headline": "À propos de Ferdi",
-  "settings.supportFerdi.openSurvey": "Ouvrir l'enquête",
+  "settings.supportFerdi.openSurvey": "Open survey",
   "settings.supportFerdi.textDonation": "Si vous avez envie de soutenir le développement de Ferdi par un don, vous pouvez le faire via",
   "settings.supportFerdi.textDonationAnd": "et",
   "settings.supportFerdi.textExpenses": "Bien que les bénévoles fassent la majeure partie du travail, nous avons besoin de payer pour les serveurs et les certificats. En tant que communauté, nous sommes totalement transparents sur les fonds que nous collectons et dépensons - voir nos",
   "settings.supportFerdi.textGitHubSponsors": "Sponsors sur GitHub",
-  "settings.supportFerdi.textListContributors": "Liste complète des contributeurs",
+  "settings.supportFerdi.textListContributors": "Full list of contributors",
   "settings.supportFerdi.textListContributorsHere": "ici",
   "settings.supportFerdi.textOpenCollective": "Open Collective",
   "settings.supportFerdi.textSupportWelcome": "Toute aide est toujours la bienvenue. Vous pouvez trouver une liste de l'aide dont nous avons besoin",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Non-lucratif",
   "settings.user.form.currentPassword": "Mot de passe actuel",
   "settings.user.form.email": "Email",
-  "settings.user.form.firstname": "Prénom",
-  "settings.user.form.lastname": "Nom",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Nouveau mot de passe",
   "settings.workspace.add.form.name": "Nom",
   "settings.workspace.add.form.submitButton": "Créer l'espace de travail",
@@ -405,7 +396,7 @@
   "settings.workspaces.tryReloadWorkspaces": "Réessayer",
   "settings.workspaces.updatedInfo": "Vos modifications ont été enregistrées",
   "settings.workspaces.workspaceFeatureHeadline": "Présentation des Espaces de travail de Ferdi",
-  "settings.workspaces.workspaceFeatureInfo": "Les Espaces de travail de Ferdi vous permettant de rester concentré sur ce qui est important. Créez différents groupes de services et naviguez facilement entre eux à n'importe quel moment. Vous décidez de quels services vous avez besoin, où et quand, ainsi nous pouvons vous aider à rester concentré sur votre travail - ou à le quitter dès que vous le souhaitez.",
+  "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": "Impossible de charger vos espaces de travail",
   "setupAssistant.headline": "Commençons",
   "setupAssistant.subheadline": "Choisissez parmi nos services les plus utilisés et revenez maintenant sur votre messagerie.",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "Activer les notifications et les sons",
   "signup.email.label": "Adresse Email",
   "signup.emailDuplicate": "Cette adresse email est déjà utilisée",
-  "signup.firstname.label": "Prénom",
+  "signup.firstname.label": "First Name",
   "signup.headline": "S'inscrire",
-  "signup.lastname.label": "Nom",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "En créant un compte Ferdi, vous acceptez la",
   "signup.legal.privacy": "Déclaration de confidentialité",
   "signup.legal.terms": "Conditions d'utilisation",
@@ -430,11 +421,11 @@
   "signup.password.label": "Mot de passe",
   "signup.submit.label": "Créer un compte",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Supprimer le service",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Désactiver l'audio",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Désactiver les notifications",
-  "tabs.item.disableService": "Désactiver le service",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Activer l'audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Activer les notifications",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Actualiser",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} n'est pas valide",
-  "validation.minLength": "{field} doit contenir au moins {length} caractère(s)",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "Au moins un de ces champs est requis",
-  "validation.required": "{field} est requis",
-  "validation.url": "{field} n'est pas une URL valide",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Revenir",
   "webControls.forward": "Avancer",
   "webControls.goHome": "Accueil",
@@ -454,12 +445,12 @@
   "webControls.reload": "Actualiser",
   "welcome.loginButton": "Se connecter sur son compte",
   "welcome.signupButton": "Créer un compte gratuit",
-  "workspaceDrawer.addNewWorkspaceLabel": "Ajouter un nouvel espace de travail",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "Tous les services",
   "workspaceDrawer.headline": "Espace de travail",
   "workspaceDrawer.item.contextMenuEdit": "Modifier",
   "workspaceDrawer.item.noServicesAddedYet": "Aucun services ajoutés pour l'instant",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Les Espaces de travail de Ferdi vous permettant de rester concentré sur ce qui est important. Créez différents groupes de services et naviguez facilement entre eux à n'importe quel moment.</p><p>Vous décidez de quels services vous avez besoin, où et quand, ainsi nous pouvons vous aider à rester concentré sur votre travail - ou à le quitter dès que vous le souhaitez.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Éditer les paramètres de l'espace de travail",
+  "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": "Changement vers"
 }
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index a78c90771..46dc1acc4 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Athlódáil",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Freastalaí saincheaptha",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "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",
@@ -24,8 +23,8 @@
   "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": "Ní féidir nascadh le seirbhísí Ferdi ar líne",
-  "global.cancel": "Cealaigh",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Cuir in eagar",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Níl tú nasctha leis an Idirlíon.",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Socruithe",
+  "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": "Cuir isteach",
+  "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": "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",
-  "import.submit.label": "Iompórtáil seirbhísí",
+  "import.submit.label": "Import {count} 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": "Cad atá nua?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Atosaigh � suiteáil nuashonrú",
   "infobar.buttonReloadServices": "Athlódáil seirbhísí",
   "infobar.hide": "Cuir Ferdi i bhfolach",
@@ -75,7 +74,7 @@
   "login.email.label": "Seoladh ríomhphoist",
   "login.headline": "Logáil isteach",
   "login.invalidCredentials": "Seoladh ríomhphoist nó pasfhocal neamhbhailí",
-  "login.link.password": "Athshocraigh pasfhocal",
+  "login.link.password": "Reset password",
   "login.link.signup": "Cruthaigh cuntas saor in aisce",
   "login.password.label": "Password",
   "login.serverLogout": "D'éag do sheisiún, logáil isteach arís le do thoil.",
@@ -118,7 +117,7 @@
   "menu.help.tos": "Téarmaí tagartha",
   "menu.services": "Seirbhísí",
   "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
   "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Gach seirbhís",
   "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
   "password.email.label": "Seoladh ríomhphoist",
-  "password.headline": "Athshocraigh pasfhocal",
+  "password.headline": "Reset password",
   "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.successInfo": "Seiceáil do chuid ríomhphoist le do thoil",
-  "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",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Athlódáil {name}",
   "service.crashHandler.autoReload": "Ag iarraidh {name} a thabhairt ar ais go huathoibríoch i gceann {seconds} shoicind",
   "service.crashHandler.headline": "Oró, ní hea!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Fáilte go Ferdi",
-  "settings.account.account.editButton": "Cuir cuntas in eagar",
+  "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": "Nuashonraigh próifíl",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Fuair tú ríomhphost chun scriosadh do chuntais a dheimhniú. Ní féidir do chuntas agus do chuid sonraí a thabhairt ar ais!",
   "settings.account.deleteInfo": "Más rud é nár ghá cuntas Ferdi a bheith agat a thuilleadh, is féidir do chuntas agus gach sonraí riachtanach a scriosadh anseo.",
   "settings.account.headline": "Cuntas",
-  "settings.account.headlineAccount": "Eolas faoin gcuntas",
-  "settings.account.headlineDangerZone": "Scrios cuntas",
-  "settings.account.headlineInvoices": "Sonraisc",
-  "settings.account.headlinePassword": "Athraigh pasfhocal",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Nuashonraigh próifíl",
   "settings.account.successInfo": "Sábháladh do chuid athruithe",
   "settings.account.tryReloadServices": "Atriail",
   "settings.account.tryReloadUserInfoRequest": "Atriail",
   "settings.account.userInfoRequestFailed": "Ní féidir eolas úsáideora a lódáil",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Glan taisce",
   "settings.app.buttonInstallUpdate": "Atosaigh � suiteáil nuashonrú",
@@ -220,12 +208,12 @@
   "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.darkMode": "Enable Dark Mode",
   "settings.app.form.enableGPUAcceleration": "Cumasaigh luasghéarú APG",
   "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Cumasaigh seiceáil litrithe",
-  "settings.app.form.enableSystemTray": "Taispeáin Ferdi i dtráidire an chórais",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Taispeáin tabanna do sheirbhísí dhíchumasaithe",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Taispeáin teachtaireachtaí neamhléite, nuair a dhíchumasaítear fógraí",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Scrios seirbhís",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Cuir {name} in eagar",
   "settings.service.form.enableAudio": "Cumasaigh fuaim",
   "settings.service.form.enableBadge": "Taispeáin comhartha do theachtaireachtaí neamhléite",
@@ -332,12 +321,13 @@
   "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": "Tachtar gach fuaim fógraí agus athchasadh fuaime",
   "settings.service.form.name": "Ainm",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Aimsigh seirbhísí",
   "settings.services.headline": "Do sheirbhísí",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "Seirbhís díchumasaithe",
   "settings.services.tooltip.isMuted": "Tachtar gach fuaim",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Neamhbhrabúis",
   "settings.user.form.currentPassword": "Pasfhocal reatha",
   "settings.user.form.email": "Ríomhphost",
-  "settings.user.form.firstname": "Céadainm",
-  "settings.user.form.lastname": "Sloinne",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Pasfhocal nua",
   "settings.workspace.add.form.name": "Ainm",
   "settings.workspace.add.form.submitButton": "Create workspace",
@@ -420,9 +411,9 @@
   "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",
-  "signup.firstname.label": "Céadainm",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Cláraigh",
-  "signup.lastname.label": "Sloinne",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Agus tú ag cruthú cuntas Ferdi glacann tú le",
   "signup.legal.privacy": "Ráiteas phríobháideachais",
   "signup.legal.terms": "Tearmaí seirbhíse",
@@ -430,11 +421,11 @@
   "signup.password.label": "Password",
   "signup.submit.label": "Cruthaigh cuntas",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Scrios seirbhís",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Díchumasaigh fuaim",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Díchumasaigh fógraí",
-  "tabs.item.disableService": "Díchumasaigh seirbhís",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Cumasaigh fuaim",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Cumasaigh fógraí",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Athlódáil",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "Níl {field} neamhbhailí",
-  "validation.minLength": "Ba cheart go mbeadh {field} ar a laghad {length} charactar fada",
+  "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": "Tá {field} de dhíth",
-  "validation.url": "Ní AAA bhailí é {field}",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Back",
   "webControls.forward": "Forward",
   "webControls.goHome": "Home",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 79e1532b5..5bec0bf13 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "רענן",
-  "app.errorHandler.headline": "משהו השתבש",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "שרת מות�� �ישית",
   "changeserver.headline": "החלף שרת",
   "changeserver.label": "שרת",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "מה קרה?",
   "connectionLostBanner.message": "הו ל�! פרדי �יבד �ת החיבור ל {name}.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "פרס� �ת פרטי ניפוי השגי�ות",
   "feature.nightlyBuilds.activate": "הפעל",
   "feature.nightlyBuilds.info": "גרס�ות נייטלי ה� גרס�ות נסיוניות ביותר של פרדי, העשויות להכיל פיצ'רי� בלתי גמורי�. גרס�ות �לה מיועדות בעיקר לשימוש מפתחי� על מנת לנסות �ת הפיצ'רי� החדשי� הנמצ�י� בפיתוח - לפני הכנסת� לגרסה הסופית. �� �תה ל� יודע מה �תה עושה, �נו ממליצי� של� תפעיל �ת ה�ופציה הז�ת.",
   "feature.nightlyBuilds.title": "גרס�ות נייטלי",
@@ -24,8 +23,8 @@
   "feature.quickSwitch.info": "בחר שירות ע� מקש ה TAB, ↑ ו ↓. פתח שירות ב�מצעות מקש ה ENTER.",
   "feature.quickSwitch.search": "חיפוש...",
   "feature.quickSwitch.title": "החלפה מהירה",
-  "global.api.unhealthy": "ל� ניתן להתחבר לשרותי ה�ינטרנת של Ferdi",
-  "global.cancel": "בטל",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "ערוך",
   "global.no": "No",
   "global.notConnectedToTheInternet": "נר�ה ש�תה ל� מחובר ל�ינטרנט.",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "הגדרות",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "השתמש בברירת המחדל של המערכת ({default})",
   "global.spellchecking.autodetect": "זהה שפה ב�ופן �וטומטי",
   "global.spellchecking.autodetect.short": "�וטומטי",
   "global.spellchecking.language": "שפה לבדיקת �יות",
-  "global.submit": "שלח",
+  "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": "סוכן משתמש",
   "global.yes": "Yes",
   "import.headline": "ייב� �ת השירותי� שלך מפרדי גרסה 4",
   "import.notSupportedHeadline": "השירות עדיין �ינו נתמך בפרדי גרסה 5",
   "import.skip.label": "�ני רוצה להוסיף שירותי� ב�ופן ידני",
-  "import.submit.label": "ייב� שירותי�",
+  "import.submit.label": "Import {count} services",
   "infobar.authRequestFailed": "�ירעה שגי�ה בניסיון ההתחברות. נסה להתנתק ולהתחבר מחדש.",
-  "infobar.buttonChangelog": "מה חדש?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "הפעל מחדש והתקן עדכוני�",
   "infobar.buttonReloadServices": "טען מחדש �ת השירותי�",
   "infobar.hide": "הסתר",
@@ -75,7 +74,7 @@
   "login.email.label": "כתובת דו�\"ל",
   "login.headline": "התחבר",
   "login.invalidCredentials": "כתובת הדו�\"ל �ו הסיסמ� �ינ� תקיני�",
-  "login.link.password": "�יפוס סיסמה",
+  "login.link.password": "Reset password",
   "login.link.signup": "צור חשבון חדש בחינ�",
   "login.password.label": "סיסמ�",
   "login.serverLogout": "פג תוקף ההתחברות, �נ� התחבר שוב.",
@@ -117,10 +116,10 @@
   "menu.help.support": "תמיכה",
   "menu.help.tos": "תנ�י שימוש",
   "menu.services": "שירותי�",
-  "menu.services.activatePreviousService": "הפעל �ת השירות הקוד�",
-  "menu.services.addNewService": "הוסף שירות חדש",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "בית",
-  "menu.services.setNextServiceActive": "הפעל �ת השירות הב�",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "משימות",
   "menu.todos.enableTodos": "�פשר משימות",
   "menu.view": "הצג",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "כל השירותי�",
   "menu.workspaces.openWorkspaceDrawer": "פתח �ת סרגל סביבות העבודה",
   "password.email.label": "כתובת דו�\"ל",
-  "password.headline": "�יפוס סיסמה",
+  "password.headline": "Reset password",
   "password.link.login": "היכנס לחשבונך",
   "password.link.signup": "צור חשבון חדש בחינ�",
-  "password.noUser": "ל� נמצ� משתמש ע� כתובת הדו�\"ל הז�ת",
-  "password.successInfo": "�נ� בדוק �ת הדו�\"ל שלך",
-  "pricing.features.accountSync": "סנכון החשבון",
-  "pricing.features.customWebsites": "הוסף �תרי� מות�מי� �ישית",
-  "pricing.features.desktopNotifications": "התר�ות שולחן העבודה",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "בחר מתוך יותר מ 70 שירותי�",
-  "pricing.features.serviceProxies": "פרוקסי לשירותי�",
-  "pricing.features.spellchecker": "תמיכה בבדיקת �יות",
-  "pricing.features.teamManagement": "ניהול צוות",
-  "pricing.features.thirdPartyServices": "התקן שירותי צד שלישי",
-  "pricing.features.unlimitedServices": "הוסף שירותי� בלי הגבלה",
-  "pricing.features.workspaces": "סביבות עבודה",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "טען מחדש {name}",
   "service.crashHandler.autoReload": "מנסה לשחזר �ת {name} ב�ופן �וטומטי בעוד {seconds} שניות",
   "service.crashHandler.headline": "הו, ל�!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "השתמש בפרדי לל� חשבון",
   "services.welcome": "ברוך הב� לפרדי",
-  "settings.account.account.editButton": "ערוך �ת החשבון",
+  "settings.account.account.editButton": "Edit account",
   "settings.account.accountUnavailable": "החשבון �ינו זמין",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "עדכן פרופיל",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
   "settings.account.deleteInfo": "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
   "settings.account.headline": "חשבון",
-  "settings.account.headlineAccount": "פרטי חשבון",
-  "settings.account.headlineDangerZone": "�זור מסוכן",
-  "settings.account.headlineInvoices": "חשבוניות",
-  "settings.account.headlinePassword": "שנה סיסמה",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "עדכן פרופיל",
   "settings.account.successInfo": "השינויי� שלך נשמרו",
   "settings.account.tryReloadServices": "נסה שוב",
   "settings.account.tryReloadUserInfoRequest": "נסה שוב",
   "settings.account.userInfoRequestFailed": "�י �פשר לטעון �ת פרטי המשתמש",
-  "settings.account.yourLicense": "רישיון הפרדי שלך",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "ניקוי המטמון",
   "settings.app.buttonInstallUpdate": "הפעל מחדש והתקן עדכוני�",
@@ -219,13 +207,13 @@
   "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.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "�פשר מצב לילה",
   "settings.app.form.enableGPUAcceleration": "�פשר ה�צת חומרה (GPU)",
   "settings.app.form.enableLock": "�פשר נעילה ב�מצעות סיסמ�",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "הפעל בדיקת �יות",
-  "settings.app.form.enableSystemTray": "הצג �ת פרדי בסרגל הכלי�",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "�פשר �ת רשימת המשימות של Ferdi",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "התחלה במצב ממוזער",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -296,7 +285,7 @@
   "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": "תיעוד למפתחי�",
-  "settings.recipes.customService.openFolder": "פתח תיקיה",
+  "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "שירותי� זמיני�",
   "settings.recipes.missingService": "ל� מוצ� �ת השירות שלך?",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "מחק שירות",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "ערוך {name}",
   "settings.service.form.enableAudio": "�פשר �ודיו",
   "settings.service.form.enableBadge": "הצג חיווי על הודעות של� נקר�ו",
@@ -332,17 +321,18 @@
   "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
   "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
   "settings.service.form.name": "ש�",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "פתח �ת darkmode.css",
   "settings.service.form.openUserCss": "פתח �ת user.css",
   "settings.service.form.openUserJs": "פתח �ת user.js",
   "settings.service.form.proxy.headline": "הגדרות פרוקסי ל HTTP/HTTPS",
   "settings.service.form.proxy.host": "מ�רח\\IP פרוקסי",
-  "settings.service.form.proxy.info": "הגדרות הפרוקסי ל� יסונכרנו ע� שרתי פרדי.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "השתמש בפרוקסי",
-  "settings.service.form.proxy.password": "סיסמה (�ופציונלית)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "פורט",
   "settings.service.form.proxy.restartInfo": "�נ� הפעל מחדש �ת פרדי �חרי שינוי הגדרות פרוקסי.",
-  "settings.service.form.proxy.user": "משתמש (�ופציונלי)",
+  "settings.service.form.proxy.user": "User (optional)",
   "settings.service.form.recipeFileInfo": "קבצי המשתמש שלך יוכנסו לתוך דף ה�ינטרנט על מנת שתוכל להת�י� �ת השירותי� שלך כפי שתרצה. קבצי משתמש מ�וחסני� לוק�לית ו�ינ� מועברי� למחשבי� �חרי� המשתמשי� ב�ותו חשבון.",
   "settings.service.form.saveButton": "שמור שירות",
   "settings.service.form.tabHosted": "Hosted",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "גלה שירותי� חדשי�",
   "settings.services.headline": "השירותי� שלך",
   "settings.services.noServicesAdded": "התחל להוסיף שירותי�.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "ל� נית לטעון �ת השירותי� שלך",
   "settings.services.tooltip.isDisabled": "השירות מושבת",
   "settings.services.tooltip.isMuted": "כל הצלילי� מושתקי�",
@@ -362,12 +353,12 @@
   "settings.supportFerdi.aboutIntro": "<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>",
   "settings.supportFerdi.bannerText": "ה�� תרצה לעזור לנו לשפר �ת פרדי?",
   "settings.supportFerdi.headline": "�ודות פרדי",
-  "settings.supportFerdi.openSurvey": "פתח סקר",
+  "settings.supportFerdi.openSurvey": "Open survey",
   "settings.supportFerdi.textDonation": "�� תרצה לתמוך בפרדי ב�מצעות תרומה, �תה יכול לעשות ז�ת ג�,",
   "settings.supportFerdi.textDonationAnd": "וג�",
   "settings.supportFerdi.textExpenses": "While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our",
   "settings.supportFerdi.textGitHubSponsors": "תומכי� בגיטה�ב",
-  "settings.supportFerdi.textListContributors": "רשימת התומכי� המל�ה",
+  "settings.supportFerdi.textListContributors": "Full list of contributors",
   "settings.supportFerdi.textListContributorsHere": "כ�ן",
   "settings.supportFerdi.textOpenCollective": "Open Collective",
   "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
@@ -387,8 +378,8 @@
   "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.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "סיסמ� חדשה",
   "settings.workspace.add.form.name": "ש�",
   "settings.workspace.add.form.submitButton": "צור סביבת עבודה",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "�פשר התר�ות ו�ודיו",
   "signup.email.label": "כתובת דו�\"ל",
   "signup.emailDuplicate": "כבר קיי� חשבון ע� כתובת דו�\"ל זו",
-  "signup.firstname.label": "ש� פרטי",
+  "signup.firstname.label": "First Name",
   "signup.headline": "הרש�",
-  "signup.lastname.label": "ש� משפחה",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "ביצירת חשבון פרדי �תה מסכי� ל",
   "signup.legal.privacy": "הצהרת פרטיות",
   "signup.legal.terms": "תנ�י שימוש",
@@ -430,11 +421,11 @@
   "signup.password.label": "סיסמ�",
   "signup.submit.label": "צור חשבון",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "מחק שירות",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "כבה �ודיו",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "כבה התר�ות",
-  "tabs.item.disableService": "כבה שירות",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "�פשר �ודיו",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "�פשר התר�ות",
@@ -454,12 +445,12 @@
   "webControls.reload": "רענן",
   "welcome.loginButton": "התחבר לחשבון שלך",
   "welcome.signupButton": "צור חשבון חדש בחינ�",
-  "workspaceDrawer.addNewWorkspaceLabel": "הוסף סביבת עבודה חדשה",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "כל השירותי�",
   "workspaceDrawer.headline": "סביבות עבודה",
   "workspaceDrawer.item.contextMenuEdit": "ערוך",
   "workspaceDrawer.item.noServicesAddedYet": "ל� נוספו שירותי�…",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "הגדרות סביבת עבודה",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "מעבר ל"
 }
diff --git a/src/i18n/locales/hi.json b/src/i18n/locales/hi.json
index be9bbb961..812ec8c4c 100644
--- a/src/i18n/locales/hi.json
+++ b/src/i18n/locales/hi.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "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",
@@ -45,7 +44,7 @@
   "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",
+  "import.submit.label": "Import {count} 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",
@@ -118,7 +117,7 @@
   "menu.help.tos": "Terms of Service",
   "menu.services": "Services",
   "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
   "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
@@ -152,18 +151,7 @@
   "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",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
   "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.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",
@@ -220,12 +208,12 @@
   "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.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.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
   "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.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Discover services",
   "settings.services.headline": "Your services",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "Service is disabled",
   "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index f7e046ed9..6dcd65032 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Ponovno u�itavanje",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Prilagođen server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "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",
@@ -24,8 +23,8 @@
   "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": "Nije se moguće povezati na Francove on-line servise. ",
-  "global.cancel": "Odustani",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Uredi",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Sada ste povezani s internetom. ",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Postavke",
+  "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": "Pošalji",
+  "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": "Uvezite svoje Franc 4 servise. ",
   "import.notSupportedHeadline": "Franc 5 trenutno ne podržava taj servis",
   "import.skip.label": "Želim ru�no dodati ove usluge",
-  "import.submit.label": "Uvezi servise",
+  "import.submit.label": "Import {count} 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": "Å ta je novo?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Ponovo pokreni i instaliraj ažuriranje",
   "infobar.buttonReloadServices": "Ponovo u�itaj servise",
   "infobar.hide": "Hide",
@@ -75,7 +74,7 @@
   "login.email.label": "Vaša e-adresa:",
   "login.headline": "Prijavite se",
   "login.invalidCredentials": "E-mail ili lozinka nisu to�ni",
-  "login.link.password": "Stvaranje nove lozinke",
+  "login.link.password": "Reset password",
   "login.link.signup": "Stvorite besplatan ra�un",
   "login.password.label": "Password",
   "login.serverLogout": "Vaša sesija je istekla, prijavite se ponovo.",
@@ -118,7 +117,7 @@
   "menu.help.tos": "Terms of Service",
   "menu.services": "Services",
   "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
   "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Sve usluge",
   "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
   "password.email.label": "Vaša e-adresa:",
-  "password.headline": "Stvaranje nove lozinke",
+  "password.headline": "Reset password",
   "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.successInfo": "Molimo Vas da provjerite svoju e-mail adresu",
-  "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",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Osvježi okvir",
   "service.crashHandler.autoReload": "Pokušati ću automatski povratiti {name} u {seconds} sekundi",
   "service.crashHandler.headline": "O, ne! ",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Dobrodošli u Ferdi",
-  "settings.account.account.editButton": "Uredi ra�un",
+  "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": "Ažuriraj profil",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Dobili ste email s linkom putem kojeg ćete potvrditi brisanje ra�una. Vaš ra�un i podatke neće biti moguće vratiti. ",
   "settings.account.deleteInfo": "Ako više ne trebate Ferdi ra�un, ovdje možete obrisati sve vezane podatke kao i ra�un.",
   "settings.account.headline": "Korisni�ki ra�un",
-  "settings.account.headlineAccount": "Informacije o ra�unu",
-  "settings.account.headlineDangerZone": "Opasnost",
-  "settings.account.headlineInvoices": "Fakture",
-  "settings.account.headlinePassword": "Promijenite lozinku",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Ažuriraj profil",
   "settings.account.successInfo": "Vaše promjene su spremljene",
   "settings.account.tryReloadServices": "Pokušajte ponovno",
   "settings.account.tryReloadUserInfoRequest": "Pokušajte ponovno",
   "settings.account.userInfoRequestFailed": "Nije moguće u�itati informacije o korisniku",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "O�isti memoriju",
   "settings.app.buttonInstallUpdate": "Ponovo pokreni i instaliraj ažuriranje",
@@ -220,12 +208,12 @@
   "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.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": "Omogući provjeru pravopisa",
-  "settings.app.form.enableSystemTray": "Prikaži aplikaciju u sustavskoj traci",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Prikaži plo�e s onemogućenim servisima",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Pokaži nepro�itane zna�ke poruka kad se obavještenja onemoguće",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Izbriši uslugu",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Uredite {name}",
   "settings.service.form.enableAudio": "Omogućite zvuk",
   "settings.service.form.enableBadge": "Show unread message badges",
@@ -332,12 +321,13 @@
   "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": "Kada je onemogućeno, sve obavijesti, svi zvukovi i sva pozadinska podrška će biti ne�ujna. ",
   "settings.service.form.name": "Ime",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Pronađite usluge",
   "settings.services.headline": "Vaše usluge",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "Usluga je onemogućena. ",
   "settings.services.tooltip.isMuted": "Svi zvukovi su onemogućeni. ",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Neprofitno ",
   "settings.user.form.currentPassword": "Trenutna lozinka:",
   "settings.user.form.email": "E-pošta",
-  "settings.user.form.firstname": "Ime",
-  "settings.user.form.lastname": "Prezime",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Nova lozinka",
   "settings.workspace.add.form.name": "Ime",
   "settings.workspace.add.form.submitButton": "Create workspace",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "Omogući obavijesti i zvuk",
   "signup.email.label": "Vaša e-adresa:",
   "signup.emailDuplicate": "Već postoji korisnik s tom e-mail adresom",
-  "signup.firstname.label": "Ime",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Prijava",
-  "signup.lastname.label": "Prezime",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Prilikom stvaranja Ferdi ra�una, slažete se sa sljedećim stavkama:",
   "signup.legal.privacy": "Izjava o privatnosti ",
   "signup.legal.terms": "Uvjeti korištenja",
@@ -430,11 +421,11 @@
   "signup.password.label": "Password",
   "signup.submit.label": "Napravite novi ra�un",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Izbriši uslugu",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Onemogući zvuk",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Onemogući obavijesti",
-  "tabs.item.disableService": "Onemogući servis",
+  "tabs.item.disableService": "Disable service",
   "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 84c8496b8..8d83fea42 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Újratöltés",
-  "app.errorHandler.headline": "Valami nem jött össze",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Egyéni szerver",
   "changeserver.headline": "Szerver megváltoztatása",
   "changeserver.label": "Szerver",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "Mi történt?",
   "connectionLostBanner.message": "Ja ne! Ferdi nem tud kapcsolodni {name}-hez.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Hibakeresési napló publikálása",
   "feature.nightlyBuilds.activate": "Aktiválás",
   "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",
@@ -24,30 +23,30 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "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.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Szerkesztés",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Nincs hálózati kapcsolat.",
   "global.ok": "Ok",
-  "global.quit": "Kilépés",
+  "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Beállítások",
+  "global.settings": "Settings",
   "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.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á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",
-  "import.submit.label": "Szolgáltatások importálása",
+  "import.submit.label": "Import {count} 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": "Mi változott?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Újraindítás és frissítés telepítése",
   "infobar.buttonReloadServices": "Szolgáltatások újratöltése",
   "infobar.hide": "Elrejt",
@@ -75,7 +74,7 @@
   "login.email.label": "Email cím",
   "login.headline": "Bejelentkezés",
   "login.invalidCredentials": "Hibás email cím vagy jelszó",
-  "login.link.password": "Jelszó visszaállítás",
+  "login.link.password": "Reset password",
   "login.link.signup": "Új fiók létrehozása",
   "login.password.label": "Jelszó",
   "login.serverLogout": "A munkamenet lejárt, kérlek lépj be újra.",
@@ -117,10 +116,10 @@
   "menu.help.support": "Támogatás",
   "menu.help.tos": "Felhasználói feltételek",
   "menu.services": "Szolgáltatások",
-  "menu.services.activatePreviousService": "Előző szolgáltatás",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Kezdőlap",
-  "menu.services.setNextServiceActive": "Következő szolgáltatás",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Tennivalók",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Nézet",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Összes szolgáltatás",
   "menu.workspaces.openWorkspaceDrawer": "Munkaterület panel kinyitása",
   "password.email.label": "Email cím",
-  "password.headline": "Jelszó visszaállítás",
+  "password.headline": "Reset password",
   "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.successInfo": "Ellenőrizd az email fiókodat",
-  "pricing.features.accountSync": "Fiók szinkronizálás",
-  "pricing.features.customWebsites": "Egyéni weboldalak megadása",
-  "pricing.features.desktopNotifications": "Asztali értesítések",
-  "pricing.features.onPremise": "Helyi és egyéb távoli szolgáltatások",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Szolgáltatás Proxy-k",
-  "pricing.features.spellchecker": "Helyesírás-ellenőrzés támogatás",
-  "pricing.features.teamManagement": "Csapatkezelés",
-  "pricing.features.thirdPartyServices": "Harmadik féltől származó szolgáltatások használata",
-  "pricing.features.unlimitedServices": "Korlátlan szolgáltatások felvitele",
-  "pricing.features.workspaces": "Munkaterületek",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "{name} újratöltése",
   "service.crashHandler.autoReload": "{name} automatikusan helyreállítása {seconds} másodpercen belül",
   "service.crashHandler.headline": "Jajj ne!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Üdvözöl a Ferdi",
-  "settings.account.account.editButton": "Fiók szerkesztése",
+  "settings.account.account.editButton": "Edit account",
   "settings.account.accountUnavailable": "A Fiók nem érhető el",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Profil frissítése",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "A fiókod törléséhez egy e-mailt küldtük a törlést megerősítő linkkel. A linkre kattintást követően a fiókod és az adatait már nem állíthatók vissza többé!",
   "settings.account.deleteInfo": "Ha még nem szeretnéd fenntartani a Ferdi-fiókodat, akkor itt törölheted minden hozzá kapcsolódó adattal együtt.",
   "settings.account.headline": "Fiók",
-  "settings.account.headlineAccount": "Fiókinformációk",
-  "settings.account.headlineDangerZone": "Veszélyes terület",
-  "settings.account.headlineInvoices": "Számlák",
-  "settings.account.headlinePassword": "Jelszócsere",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Profil frissítése",
   "settings.account.successInfo": "A módosításokat elmentettük",
   "settings.account.tryReloadServices": "Próbáld újra",
   "settings.account.tryReloadUserInfoRequest": "Próbáld újra",
   "settings.account.userInfoRequestFailed": "A felhasználói adatok betöltése sikertelen",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Gyorsítótár törlése",
   "settings.app.buttonInstallUpdate": "Újraindítás és frissítés telepítése",
@@ -225,7 +213,7 @@
   "settings.app.form.enableLock": "Jelszavas zár engedélyezése",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Helyesírás-ellenőrzés engedélyezése",
-  "settings.app.form.enableSystemTray": "Ferdi mutatása a tálcán",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Ferdi Tennivalók bekapcsolása",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Letiltott szolgáltatások megjelenítése",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mutassa az 'olvasatlan üzenet' jelzést, amikor az értesítések le vannak tiltva",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Indítás minimalizálva",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -294,9 +283,9 @@
   "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
   "settings.recipes.customService.headline.customRecipes": "Egyéni, harmadik féltől származó receptek",
   "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
-  "settings.recipes.customService.intro": "Az egyéni szolgáltatás hozzáadásához, másoljuk be annak receptjét:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
   "settings.recipes.customService.openDevDocs": "Fejlesztői dokumentáció",
-  "settings.recipes.customService.openFolder": "Könyvtár megnyitása",
+  "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Elérhető szolgáltatások",
   "settings.recipes.missingService": "Hiányzik egy szolgáltatás?",
   "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.",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Szolgáltatás törlése",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "{name} szerkesztése",
   "settings.service.form.enableAudio": "Hang engedélyezése",
   "settings.service.form.enableBadge": "Mutasd az olvasatlan jelzéseket",
@@ -332,17 +321,18 @@
   "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": "Ha kikapcsolod, minden értesítési és lejátszott hang némításra kerül",
   "settings.service.form.name": "Név",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "User.css megnyitása",
   "settings.service.form.openUserJs": "User.js megnyitása",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy beállítások",
   "settings.service.form.proxy.host": "Proxy hoszt/IP",
-  "settings.service.form.proxy.info": "Proxy beállítások nem szinkronizálódnak a Ferdi kiszolgálókkal.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Proxy használata",
-  "settings.service.form.proxy.password": "Jelszó (opcionális)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
   "settings.service.form.proxy.restartInfo": "Kérjük indítsd újra a Ferdi-ot a proxy beállítások megváltoztatása után.",
-  "settings.service.form.proxy.user": "Felhasználó (opcionális)",
+  "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": "Szolgáltatás mentése",
   "settings.service.form.tabHosted": "Ãœzemeltetett",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Szolgáltatások felfedezése",
   "settings.services.headline": "Szolgáltatásaid",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Szolgáltatásaid betöltése sikertelen",
   "settings.services.tooltip.isDisabled": "A szolgáltatás le van tiltva",
   "settings.services.tooltip.isMuted": "Minden hang lenémítva",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Nonprofit",
   "settings.user.form.currentPassword": "Jelenlegi jelszó",
   "settings.user.form.email": "Email",
-  "settings.user.form.firstname": "Keresztnév",
-  "settings.user.form.lastname": "Vezetéknév",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Új jelszó",
   "settings.workspace.add.form.name": "Név",
   "settings.workspace.add.form.submitButton": "Új munkaterület",
@@ -405,7 +396,7 @@
   "settings.workspaces.tryReloadWorkspaces": "Próbáld újra",
   "settings.workspaces.updatedInfo": "A módosításokat elmentettük",
   "settings.workspaces.workspaceFeatureHeadline": "A kevesebb több: Bemutatjuk a Ferdi Munkaterületeket",
-  "settings.workspaces.workspaceFeatureInfo": "A Ferdi Munkaterületek lehetővé teszik, hogy összpontosíts a jelenleg fontos dolgokra. �llítsd be a különböző szolgáltatáskészleteket és könnyedén válthatsz közöttük bármikor. Te döntöd el, hogy mely szolgáltatásokra van szükséged, mikor és hol, így segíthetünk abban, hogy a teljesítményed csúcsán maradhass, vagy ha csak akarod, egyszerűen kikapcsold a munkával kapcsolatos dolgokat.",
+  "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": "Nem sikerült betölteni a munkaterületeket",
   "setupAssistant.headline": "Let's get started",
   "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -420,9 +411,9 @@
   "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ó",
-  "signup.firstname.label": "Keresztnév",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Regisztráció",
-  "signup.lastname.label": "Vezetéknév",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "A Ferdi fiók létrehozásával elfogadod az",
   "signup.legal.privacy": "Adatvédelmi Nyilatkozatot",
   "signup.legal.terms": "Felhasználási Feltételeket",
@@ -430,23 +421,23 @@
   "signup.password.label": "Jelszó",
   "signup.submit.label": "Fiók létrehozása",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Szolgáltatás törlése",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Hang letiltása",
   "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.disableService": "Disable service",
   "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",
   "tabs.item.enableService": "Szolgáltatás engedélyezése",
-  "tabs.item.hibernateService": "Szlgáltatás hibernálása",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Újratöltés",
-  "tabs.item.wakeUpService": "Szolgáltatás felébresztése",
-  "validation.email": "{field} nem érvényes",
-  "validation.minLength": "{field} mezőnek legalább {length} karakter hosszúnak kell lennie",
+  "tabs.item.wakeUpService": "Wake up service",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "Legalább egy kitöltése szükséges",
-  "validation.required": "{field} kitöltése kötelező",
-  "validation.url": "{field} nem érvényes URL",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Vissza",
   "webControls.forward": "Előre",
   "webControls.goHome": "Kezdőlap",
@@ -454,12 +445,12 @@
   "webControls.reload": "Újratöltés",
   "welcome.loginButton": "Jelentkezz be a fiókodba",
   "welcome.signupButton": "Új fiók létrehozása",
-  "workspaceDrawer.addNewWorkspaceLabel": "Munkaterület hozzáadása",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "Összes szolgáltatás",
   "workspaceDrawer.headline": "Munkaterületek",
   "workspaceDrawer.item.contextMenuEdit": "szerkeszt",
   "workspaceDrawer.item.noServicesAddedYet": "Még nincsenek hozzáadott szolgáltatások",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>A Ferdi Munkaterületek lehetővé teszik, hogy összpontosíts a jelenleg fontos dolgokra. �llítsd be a különböző szolgáltatáskészleteket és könnyedén válthatsz közöttük bármikor.</p><p>Te döntöd el, hogy mely szolgáltatásokra van szükséged, mikor és hol, így segíthetünk abban, hogy a teljesítményed csúcsán maradhass, vagy ha csak akarod, egyszerűen kikapcsold a munkával kapcsolatos dolgokat.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Munkaterület beállítások szerkesztése",
+  "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": "Váltás"
 }
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 7a716a00c..5a2aa1ea7 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Muat Ulang",
-  "app.errorHandler.headline": "Terjadi kesalahan",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Server khusus",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "Ada apa ini?",
   "connectionLostBanner.message": "Yah! Ferdi terputus dari {name}.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Terbitkan informasi debug",
   "feature.nightlyBuilds.activate": "Mengaktifkan",
   "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",
@@ -24,8 +23,8 @@
   "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": "Tidak dapat tersambung ke layanan Ferdi",
-  "global.cancel": "Batalkan",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Edit",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Anda tidak tersambung ke internet.",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Pengaturan",
+  "global.settings": "Settings",
   "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.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": "Impor layanan Ferdi 4 Anda",
   "import.notSupportedHeadline": "Layanan belum didukung di Ferdi 5",
   "import.skip.label": "Saya ingin menambahkan layanan secara manual",
-  "import.submit.label": "Impor layanan",
+  "import.submit.label": "Import {count} 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": "Yang baru",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Mulai ulang & instal pembaruan",
   "infobar.buttonReloadServices": "Muat ulang layanan",
   "infobar.hide": "Sembunyikan",
@@ -75,7 +74,7 @@
   "login.email.label": "Alamat email",
   "login.headline": "Masuk",
   "login.invalidCredentials": "Email atau kata sandi tidak valid",
-  "login.link.password": "Setel ulang sandi",
+  "login.link.password": "Reset password",
   "login.link.signup": "Buat akun gratis",
   "login.password.label": "Password",
   "login.serverLogout": "Sesi Anda telah berakhir, silakan masuk kembali.",
@@ -117,10 +116,10 @@
   "menu.help.support": "Dukungan",
   "menu.help.tos": "Ketentuan Layanan",
   "menu.services": "Layanan",
-  "menu.services.activatePreviousService": "Aktifkan layanan sebelumnya",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
-  "menu.services.setNextServiceActive": "Aktifkan layanan berikutnya",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Tampilan",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Semua layanan",
   "menu.workspaces.openWorkspaceDrawer": "Buka laci ruang kerja",
   "password.email.label": "Alamat email",
-  "password.headline": "Setel ulang sandi",
+  "password.headline": "Reset password",
   "password.link.login": "Masuk ke akun Anda",
   "password.link.signup": "Buat akun gratis",
-  "password.noUser": "Tidak ditemukan pengguna dengan email tersebut",
-  "password.successInfo": "Periksa email Anda",
-  "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": "Ruang kerja",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Muat Ulang {name}",
   "service.crashHandler.autoReload": "Mencoba memulihkan {name} secara otomatis dalam {seconds} detik",
   "service.crashHandler.headline": "Ya Ampun!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Selamat datang di Ferdi",
-  "settings.account.account.editButton": "Edit akun",
+  "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": "Perbarui profil",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Anda menerima email dengan tautan untuk mengonfirmasi penghapusan akun. Akun dan data Anda tidak bisa dipulihkan!",
   "settings.account.deleteInfo": "Jika Anda tidak membutuhkan akun Ferdi lagi, Anda bisa menghapus akun dan semua data terkait di sini.",
   "settings.account.headline": "Akun",
-  "settings.account.headlineAccount": "Informasi akun",
-  "settings.account.headlineDangerZone": "Wilayah Berbahaya",
-  "settings.account.headlineInvoices": "Tagihan",
-  "settings.account.headlinePassword": "Ubah sandi",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Perbarui profil",
   "settings.account.successInfo": "Perubahan Anda telah disimpan",
   "settings.account.tryReloadServices": "Coba lagi",
   "settings.account.tryReloadUserInfoRequest": "Coba lagi",
   "settings.account.userInfoRequestFailed": "Gagal memuat informasi pengguna",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Bersihkan singgahan",
   "settings.app.buttonInstallUpdate": "Mulai ulang & instal pembaruan",
@@ -220,12 +208,12 @@
   "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.darkMode": "Aktifkan Mode Gelap",
   "settings.app.form.enableGPUAcceleration": "Aktifkan Akselerasi GPU",
   "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Aktifkan pemeriksaan ejaan",
-  "settings.app.form.enableSystemTray": "Tampilkan Ferdi di baki sistem",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Tampilkan tab layanan yang dinonaktifkan",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Tampilkan lencana pesan belum dibaca saat pemberitahuan dinonaktifkan",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Hapus layanan",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Aktifkan audio",
   "settings.service.form.enableBadge": "Tampilkan lencana pesan belum dibaca",
@@ -332,17 +321,18 @@
   "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": "Saat dinonaktifkan, semua suara pemberitahuan dan pemutaran audio akan dibisukan",
   "settings.service.form.name": "Nama",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "Pengaturan Proxy HTTP/HTTPS",
   "settings.service.form.proxy.host": "Host/IP Proksi",
-  "settings.service.form.proxy.info": "Pengaturan proksi tidak akan disinkronkan dengan server Ferdi.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Gunakan Proksi",
-  "settings.service.form.proxy.password": "Sandi (opsional)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
   "settings.service.form.proxy.restartInfo": "Silahkan mulai ulang Ferdi setelah mengubah Setelan proxy",
-  "settings.service.form.proxy.user": "Pengguna (opsional)",
+  "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": "Simpan layanan",
   "settings.service.form.tabHosted": "Hosted",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Temukan layanan",
   "settings.services.headline": "Layanan Anda",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Tidak dapat memuat layanan Anda",
   "settings.services.tooltip.isDisabled": "Layanan dinonaktifkan",
   "settings.services.tooltip.isMuted": "Semua suara dibisukan",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Nirlaba",
   "settings.user.form.currentPassword": "Sandi saat ini",
   "settings.user.form.email": "Email",
-  "settings.user.form.firstname": "Nama Depan",
-  "settings.user.form.lastname": "Nama Belakang",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Sandi baru",
   "settings.workspace.add.form.name": "Nama",
   "settings.workspace.add.form.submitButton": "Buat ruang kerja",
@@ -405,7 +396,7 @@
   "settings.workspaces.tryReloadWorkspaces": "Coba lagi",
   "settings.workspaces.updatedInfo": "Perubahan Anda telah disimpan",
   "settings.workspaces.workspaceFeatureHeadline": "Sedikit Namun Banyak: Memperkenalkan Ruang Kerja Ferdi",
-  "settings.workspaces.workspaceFeatureInfo": "Ruang Kerja Ferdi dapat digunakan untuk tetap fokus pada hal penting saat ini. Siapkan sekelompok layanan yang berbeda dan dengan mudah beralih ke yang lain. Anda yang memutuskan layanan mana yang Anda perlukan dan kapan, agar kami bisa membantu Anda tetap berada di garis depan - atau dengan mudah mengakhiri hari kerja kapan saja Anda inginkan.",
+  "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": "Tidak dapat memuat ruang kerja Anda",
   "setupAssistant.headline": "Let's get started",
   "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "Aktifkan pemberitahuan",
   "signup.email.label": "Alamat email",
   "signup.emailDuplicate": "Pengguna dengan alamat email ini sudah ada",
-  "signup.firstname.label": "Nama Depan",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Daftar",
-  "signup.lastname.label": "Nama Belakang",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Dengan membuat akun Ferdi, Anda menyetujui",
   "signup.legal.privacy": "Pernyataan Privasi",
   "signup.legal.terms": "Ketentuan layanan",
@@ -430,11 +421,11 @@
   "signup.password.label": "Password",
   "signup.submit.label": "Buat akun",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Hapus layanan",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Nonaktifkan audio",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Nonaktifkan pemberitahuan",
-  "tabs.item.disableService": "Nonaktifkan layanan",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Aktifkan audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktifkan pemberitahuan",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Muat Ulang",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} tidak benar",
-  "validation.minLength": "{field} setidaknya harus {length} karakter",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "Setidaknya diperlukan satu",
-  "validation.required": "{field} wajib diisi",
-  "validation.url": "{field} bukan URL yang benar",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Back",
   "webControls.forward": "Forward",
   "webControls.goHome": "Home",
@@ -454,12 +445,12 @@
   "webControls.reload": "Muat Ulang",
   "welcome.loginButton": "Masuk ke akun Anda",
   "welcome.signupButton": "Buat akun gratis",
-  "workspaceDrawer.addNewWorkspaceLabel": "Tambah ruang kerja baru",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "Semua layanan",
   "workspaceDrawer.headline": "Ruang kerja",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "Belum ada layanan yang ditambahkan",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ruang Kerja Ferdi dapat digunakan untuk tetap fokus pada hal penting saat ini. Siapkan sekelompok layanan yang berbeda dan dengan mudah beralih ke yang lain.</p><p>Anda yang memutuskan layanan mana yang Anda perlukan dan kapan, agar kami bisa membantu Anda tetap berada di garis depan - atau dengan mudah mengakhiri hari kerja kapan saja Anda inginkan.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Edit setelan ruang kerja",
+  "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": "Beralih ke"
 }
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index d5539aa30..004bd2d26 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Ricarica",
-  "app.errorHandler.headline": "Qualcosa è andato storto",
+  "app.errorHandler.headline": "Qualcosa è andato storto.",
   "changeserver.customServerLabel": "Server personalizzato",
   "changeserver.headline": "Cambia Server",
   "changeserver.label": "Server",
@@ -9,8 +9,7 @@
   "connectionLostBanner.cta": "Ricarica Servizio",
   "connectionLostBanner.informationLink": "Cos'è successo?",
   "connectionLostBanner.message": "Oh no! Ferdi ha perso la connessione con {name}.",
-  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Pubblica informazioni di debug",
+  "feature.basicAuth.signIn": "Accedi",
   "feature.nightlyBuilds.activate": "Attivato",
   "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",
@@ -30,9 +29,9 @@
   "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.quit": "Esci",
+  "global.quitConfirmation": "Sei sicuro di voler uscire da Ferdi?",
+  "global.save": "Salva",
   "global.settings": "Impostazioni",
   "global.spellchecker.useDefault": "Usa le impostazioni predefinite di sistema ({default})",
   "global.spellchecking.autodetect": "Rileva automaticamente la lingua",
@@ -41,11 +40,11 @@
   "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",
+  "global.yes": "Si",
   "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",
-  "import.submit.label": "Importa servizi",
+  "import.submit.label": "Importa {count} servizi",
   "infobar.authRequestFailed": "Si sono verificati errori durante il tentativo di eseguire una richiesta autenticata. Si prega di provare a disconnettersi e tornare indietro se questo errore persiste.",
   "infobar.buttonChangelog": "Cosa c'è di nuovo?",
   "infobar.buttonInstallUpdate": "Riavvia e installa l'aggiornamento",
@@ -87,30 +86,30 @@
   "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.unhide": "Unhide",
+  "menu.app.hideOthers": "Nascondi altri",
+  "menu.app.unhide": "Mostra",
   "menu.edit": "Modifica",
-  "menu.edit.copy": "Copy",
-  "menu.edit.cut": "Cut",
+  "menu.edit.copy": "Copia",
+  "menu.edit.cut": "Taglia",
   "menu.edit.delete": "Elimina",
   "menu.edit.emojiSymbols": "Emoji e simboli",
   "menu.edit.findInPage": "Trova nella pagina",
-  "menu.edit.paste": "Paste",
-  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
-  "menu.edit.redo": "Redo",
-  "menu.edit.selectAll": "Select All",
+  "menu.edit.paste": "Incolla",
+  "menu.edit.pasteAndMatchStyle": "Incolla e abbina stile",
+  "menu.edit.redo": "Ripeti",
+  "menu.edit.selectAll": "Seleziona Tutto",
   "menu.edit.speech": "Sintesi Vocale",
   "menu.edit.startDictation": "Avvia Dettatura",
   "menu.edit.startSpeaking": "Avvia Pronuncia",
   "menu.edit.stopSpeaking": "Interrompi Pronuncia",
-  "menu.edit.undo": "Undo",
+  "menu.edit.undo": "Annulla",
   "menu.file": "File",
-  "menu.help": "Help",
+  "menu.help": "Aiuto",
   "menu.help.changelog": "Changelog",
   "menu.help.debugInfo": "Copia informazioni di debug",
   "menu.help.debugInfoCopiedBody": "Le tue informazioni di debug sono state copiate nella tua clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Informazioni di debug di Ferdi",
-  "menu.help.importExportData": "Import/Export Configuration Data",
+  "menu.help.importExportData": "Importa/Esporta Dati Di Configurazione",
   "menu.help.learnMore": "Maggiori Informazioni",
   "menu.help.privacy": "Dichiarazione della Privacy",
   "menu.help.publishDebugInfo": "Pubblica le informazioni di debug",
@@ -118,7 +117,7 @@
   "menu.help.tos": "Termini di Servizio",
   "menu.services": "Servizi",
   "menu.services.activatePreviousService": "Attiva servizio precedente",
-  "menu.services.addNewService": "Aggiungi un Nuovo Servizio",
+  "menu.services.addNewService": "Aggiungi nuovo servizio...",
   "menu.services.goHome": "Home",
   "menu.services.setNextServiceActive": "Attiva servizio seguente",
   "menu.todos": "Todo",
@@ -128,20 +127,20 @@
   "menu.view.forward": "Avanti",
   "menu.view.lockFerdi": "Blocca Ferdi",
   "menu.view.openQuickSwitch": "Apri Cambio Rapido",
-  "menu.view.reloadFerdi": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Ricarica Ferdi",
   "menu.view.reloadService": "Ricarica Servizio",
   "menu.view.reloadTodos": "Ricarica ToDos",
-  "menu.view.resetZoom": "Actual Size",
+  "menu.view.resetZoom": "Dimensione attuale",
   "menu.view.toggleDarkMode": "Attiva la modalità scura",
   "menu.view.toggleDevTools": "Attiva/Disattiva Strumenti Sviluppo",
-  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleFullScreen": "Attiva/Disattiva Schermo Intero",
   "menu.view.toggleServiceDevTools": "Attiva/Disattiva Strumenti per Sviluppatori di Servizi",
   "menu.view.toggleTodosDevTools": "Attiva/Disattiva gli strumenti di sviluppo delle Attività",
-  "menu.view.zoomIn": "Zoom In",
-  "menu.view.zoomOut": "Zoom Out",
-  "menu.window": "Window",
-  "menu.window.close": "Close",
-  "menu.window.minimize": "Minimize",
+  "menu.view.zoomIn": "Aumenta zoom",
+  "menu.view.zoomOut": "Diminuisci Zoom",
+  "menu.window": "Finestra",
+  "menu.window.close": "Chiudi",
+  "menu.window.minimize": "Riduzione a icona",
   "menu.workspaces": "Aree di lavoro",
   "menu.workspaces.addNewWorkspace": "Aggiungi un'area di lavoro...",
   "menu.workspaces.closeWorkspaceDrawer": "Chiudi il menu dei workspace",
@@ -152,18 +151,7 @@
   "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.successInfo": "Per favore controlla la tua email",
-  "pricing.features.accountSync": "Sincronizzazione account",
-  "pricing.features.customWebsites": "Aggiungi siti web personalizzati",
-  "pricing.features.desktopNotifications": "Notifiche desktop",
-  "pricing.features.onPremise": "Servizi ospitati & on-premise",
-  "pricing.features.recipes": "Scegli tra più di 70 Servizi",
-  "pricing.features.serviceProxies": "Proxy di servizio",
-  "pricing.features.spellchecker": "Supporto per il correttore ortografico",
-  "pricing.features.teamManagement": "Gestione del team",
-  "pricing.features.thirdPartyServices": "Installa servizi di terze parti",
-  "pricing.features.unlimitedServices": "Aggiungi servizi illimitati",
-  "pricing.features.workspaces": "Aree di lavoro",
+  "password.successInfo": "Una nuova password è stata inviata al tuo indirizzo email",
   "service.crashHandler.action": "Ricarica {name}",
   "service.crashHandler.autoReload": "Tentativo di ripristino automatico di {name} in {seconds} secondi",
   "service.crashHandler.headline": "Oh no!",
@@ -178,7 +166,7 @@
   "service.webviewLoader.loading": "Caricamento {service}",
   "services.getStarted": "Iniziamo",
   "services.login": "Effettua il login per utlizzare Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
+  "services.serverInfo": "Facoltativamente, puoi cambiare il tuo server Ferdi cliccando l'ingranaggio nell'angolo in basso a sinistra. Se stai passando (da uno dei server ospitati) ad usare Ferdi senza un account, sappi che puoi esportare i tuoi dati da quel server e successivamente importarli usando il menu Aiuto per ripristinare tutti i tuoi spazi di lavoro e servizi configurati!",
   "services.serverless": "Usa Ferdi senza account",
   "services.welcome": "Benvenuto su Ferdi",
   "settings.account.account.editButton": "Modifica account",
@@ -198,12 +186,12 @@
   "settings.account.tryReloadServices": "Riprova",
   "settings.account.tryReloadUserInfoRequest": "Riprova",
   "settings.account.userInfoRequestFailed": "Impossibile caricare le informazioni dell'utente.",
-  "settings.account.yourLicense": "La tua licenza Ferdi",
+  "settings.account.yourLicense": "La tua licenza Ferdi:",
   "settings.app.accentColorInfo": "Inserisci il tuo colore in risalto in un formato compatibile con CSS. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Svuota la cache",
   "settings.app.buttonInstallUpdate": "Riavvia e installa l'aggiornamento",
-  "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder",
-  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
+  "settings.app.buttonOpenFerdiProfileFolder": "Apri cartella del profilo utente",
+  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Apri cartella ricette dei servizi",
   "settings.app.buttonSearchForUpdate": "Controlla aggiornamenti",
   "settings.app.cacheInfo": "Ferdi sta utilizzando {size} di spazio su disco.",
   "settings.app.cacheNotCleared": "Impossibile eliminare tutta la cache",
@@ -218,14 +206,14 @@
   "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.confirmOnQuit": "Conferma quando esci da Ferdi",
   "settings.app.form.customTodoServer": "Server Todo personalizzato",
-  "settings.app.form.darkMode": "Attiva modalità scura",
+  "settings.app.form.darkMode": "Attiva la modalità scura.",
   "settings.app.form.enableGPUAcceleration": "Attiva Accelerazione GPU",
   "settings.app.form.enableLock": "Abilita blocco con password",
   "settings.app.form.enableMenuBar": "Mostra sempre Ferdi nella barra dei menù",
   "settings.app.form.enableSpellchecking": "Attiva controllo ortografico",
-  "settings.app.form.enableSystemTray": "Mostra Ferdi nell'area di notifica",
+  "settings.app.form.enableSystemTray": "Mostra sempre icona Ferdi in area di notifica",
   "settings.app.form.enableTodos": "Abilità le Attività Ferdi",
   "settings.app.form.hibernateOnStartup": "Mantieni i servizi in ibernazione all'avvio",
   "settings.app.form.hibernationStrategy": "Strategia di ibernazione",
@@ -251,11 +239,12 @@
   "settings.app.form.showDisabledServices": "Mostra schede servizi disattivati",
   "settings.app.form.showDragArea": "Mostra area trascinabile nella finestra",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostra l'etichetta dei messaggi non letti quando le notifiche sono disattivate",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Avvio ridotto a icona",
   "settings.app.form.universalDarkMode": "Abilita la modalità scura universale",
   "settings.app.form.useTouchIdToUnlock": "Consenti l'utilizzo di TouchID per sbloccare Ferdi",
-  "settings.app.form.useVerticalStyle": "Use horizontal style",
-  "settings.app.form.wakeUpStrategy": "Wake up strategy",
+  "settings.app.form.useVerticalStyle": "Usa stile orizzontale",
+  "settings.app.form.wakeUpStrategy": "Strategia di risveglio",
   "settings.app.headlineAdvanced": "Avanzate",
   "settings.app.headlineAppearance": "Aspetto",
   "settings.app.headlineGeneral": "Generale",
@@ -265,17 +254,17 @@
   "settings.app.hibernateInfo": "Per impostazione predefinita, Ferdi manterrà tutti i servizi aperti e caricati in background in modo che siano pronti quando si desidera utilizzarli. Il servizio Hibernation sospenderà i servizi dopo un tempo specificato. Questo è utile per risparmiare RAM o per evitare che i servizi rallentino il computer.",
   "settings.app.inactivityLockInfo": "Minuti di inattività oltre i quali Ferdi si bloccherà automaticamente, 0 per disabilitare",
   "settings.app.languageDisclaimer": "Le traduzioni ufficiali sono in Inglese e Tedesco. Tutte le altre lingue sono tradotte dalla community.",
-  "settings.app.lockInfo": "Password Lock 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.lockInfo": "Password Lock ti permette di mantenere i tuoi messaggi protetti. Usando Password Lock, ti verrà richiesto di inserire la tua password ogni volta che avvii Ferdi o di bloccare Ferdi stesso usando il simbolo del lucchetto nell'angolo in basso a sinistra o la scorciatoia {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Assicurati di impostare una password che ricordi.\nSe perdi questa password, dovrai reinstallare Ferdi.",
   "settings.app.restartRequired": "Le modifiche richiedono un riavvio",
   "settings.app.scheduledDNDInfo": "I Do-not-Disturb pianificati consentono di definire un periodo di tempo nel quale le notifiche da Ferdi saranno disabilitate.",
   "settings.app.scheduledDNDTimeInfo": "Ora in formato 24 ore. L'ora di fine può essere prima dell'ora di inizio (ad esempio inizio 17:00, fine 09:00) per abilitare Do-not-Disturb durante la notte.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
+  "settings.app.sentryInfo": "L'invio dei dati di telemetria ci permette di trovare errori in Ferdi - non invieremo nessuna informazione personale come i dati del tuo messaggio!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi utilizza il controllo ortografico del tuo Mac per verificare la presenza di errori. Se si desidera modificare le lingue del controllo ortografico, è possibile farlo nelle preferenze di sistema del vostro Mac.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
-  "settings.app.todoServerInfo": "Questo server verrà usato per le funzionalità 'Ferdi Todo'.",
+  "settings.app.subheadlineFerdiProfile": "Profilo Ferdi",
+  "settings.app.todoServerInfo": "Questo server sarà utilizzato per la funzione \"Ferdi Todo\".",
   "settings.app.translationHelp": "Aiutaci a tradurre Ferdi nella tua lingua.",
   "settings.app.universalDarkModeInfo": "La modalità 'Dark Mode' universale cerca di generare dinamicamente uno stile di visualizzazione a sfondo scuro per quei servizi che non lo supportano nativamente.",
   "settings.app.updateStatusAvailable": "Aggiornamento disponibile, download in corso...",
@@ -294,12 +283,12 @@
   "settings.recipes.customService.headline.communityRecipes": "'Recipe' (istruzioni) per applicazioni di terze parti della community",
   "settings.recipes.customService.headline.customRecipes": "'Recipe' (istruzioni) per applicazioni di terze parti personalizzate",
   "settings.recipes.customService.headline.devRecipes": "Le tue 'Recipe' (istruzioni) per applicazioni",
-  "settings.recipes.customService.intro": "Per aggiungere un servizio personalizzato copia la sua 'recipe' (istruzioni) in:",
+  "settings.recipes.customService.intro": "Per aggiungere un servizio personalizzato copia la sua 'recipe' in:",
   "settings.recipes.customService.openDevDocs": "Documentazione per sviluppatori",
   "settings.recipes.customService.openFolder": "Apri cartella",
   "settings.recipes.headline": "Servizi disponibili",
   "settings.recipes.missingService": "Manca un servizio?",
-  "settings.recipes.nothingFound": "Ci scusiamo, ma nessun servizio corrisponde ai tuoi termini di ricerca - tuttavia è probabile che tu possa aggiungerlo in ogni caso utilizzando l'opzione \"Sito Web Personalizzato\". Ti informiamo che il sito web ufficiale potrebbe mostrare un numero maggiore di servizi rispetto alla versione attualmente in uso. Per ottenere tali servizi, è consigliato l'aggiornamento a una versione più recente di Ferdi.",
+  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Servizio aggiunto con successo",
   "settings.searchService": "Cerca servizio",
   "settings.service.error.goBack": "Torna ai servizi",
@@ -332,12 +321,13 @@
   "settings.service.form.isHibernatedEnabledInfo": "Quando abilitato, un servizio verrà disattivato dopo un lasso di tempo per preservare le risorse del sistema.",
   "settings.service.form.isMutedInfo": "Se disattivato, tutte le notifiche sonore e le riproduzioni audio saranno mutate",
   "settings.service.form.name": "Nome",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Apri 'darkmode.css'",
   "settings.service.form.openUserCss": "Apri user.css",
   "settings.service.form.openUserJs": "Apri il file 'user.js'",
   "settings.service.form.proxy.headline": "Impostazioni Proxy HTTP/HTTPS",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Le impostazioni proxy non verranno sincronizzate con i server Ferdi.",
+  "settings.service.form.proxy.info": "Le impostazioni proxy non saranno sincronizzate con i server Ferdi.",
   "settings.service.form.proxy.isEnabled": "Usa un Proxy",
   "settings.service.form.proxy.password": "Password (opzionale)",
   "settings.service.form.proxy.port": "Porta",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Scopri servizi",
   "settings.services.headline": "I tuoi servizi",
   "settings.services.noServicesAdded": "Inizia aggiungendo un servizio.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Impossibile caricare il servizio",
   "settings.services.tooltip.isDisabled": "Il servizio è disattivato",
   "settings.services.tooltip.isMuted": "Tutti i suoni sono disattivati",
@@ -362,12 +353,12 @@
   "settings.supportFerdi.aboutIntro": "<p>Ferdi è un'applicazione open source sviluppata dalla community.</p><p>Un ringraziamento a tutti coloro che hanno reso questo possibile:</p>",
   "settings.supportFerdi.bannerText": "Vuoi aiutarci a migliorare Ferdi?",
   "settings.supportFerdi.headline": "Info su Ferdi",
-  "settings.supportFerdi.openSurvey": "Sondaggio aperto",
+  "settings.supportFerdi.openSurvey": "Apri sondaggio",
   "settings.supportFerdi.textDonation": "Se vuoi aiutare lo sviluppo di Ferdi con una donazione, puoi farlo",
   "settings.supportFerdi.textDonationAnd": "e",
   "settings.supportFerdi.textExpenses": "Nonostante la maggior parte del lavoro sia svolto da volontari è comunque necessario pagare per la gestione di server e certificati. Essendo una comunità vogliamo essere completamente trasparenti rispetto a come raccogliamo e spendiamo fondi",
   "settings.supportFerdi.textGitHubSponsors": "Sponsor GitHub",
-  "settings.supportFerdi.textListContributors": "Elenco dei contributori",
+  "settings.supportFerdi.textListContributors": "Elenco completo dei contributori",
   "settings.supportFerdi.textListContributorsHere": "qui",
   "settings.supportFerdi.textOpenCollective": "Open Collective",
   "settings.supportFerdi.textSupportWelcome": "Il tuo supporto è il benvenuto. Puoi trovare un elenco degli aiuti che ci servono",
@@ -377,7 +368,7 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Il gestore di Team di Franz (Franz's Team Management) ti consente di gestire gli abbonamenti Franz (Franz Subscriptions) per più utenti. È importante ricordare che possedere un abbonamento Premium Franz non dà alcun beneficio nell'usare Ferdi. L'unico motivo per cui hai accesso al gestore di Team è perchè tu posa gestire i tuoi Team di Franz creati in precedenza così da non perdere alcuna funzionalità nella gestione del tuo account.",
   "settings.team.headline": "Gruppo",
-  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "Attualmente stai usando server di Franz, ed è per questo che hai accesso al Team Management.",
   "settings.team.manageAction": "Gestisci i tuoi Team su meetfranz.com",
   "settings.team.teamsUnavailable": "I Teams non sono disponibili",
   "settings.team.teamsUnavailableInfo": "I Team sono disponibili esclusivamente usando Franz Server e dopo aver attivato Franz Professional (a pagamento). Per poter utilizzare i Team è necessario modificare il server in https://api.franzinfra.com.",
@@ -432,20 +423,20 @@
   "tabs.item.confirmDeleteService": "Vuoi davvero eliminare il servizio {serviceName}?",
   "tabs.item.deleteService": "Elimina servizio",
   "tabs.item.disableAudio": "Disattiva audio",
-  "tabs.item.disableDarkMode": "Disable Dark mode",
+  "tabs.item.disableDarkMode": "Disattiva modalità scura",
   "tabs.item.disableNotifications": "Disattiva notifiche",
   "tabs.item.disableService": "Disattiva servizio",
   "tabs.item.enableAudio": "Attiva audio",
-  "tabs.item.enableDarkMode": "Enable Dark mode",
+  "tabs.item.enableDarkMode": "Attiva modalità scura",
   "tabs.item.enableNotification": "Attiva le notifiche",
   "tabs.item.enableService": "Attiva il servizio",
-  "tabs.item.hibernateService": "Hibernate service",
+  "tabs.item.hibernateService": "Iberna servizio",
   "tabs.item.reload": "Ricarica",
-  "tabs.item.wakeUpService": "Wake up service",
+  "tabs.item.wakeUpService": "Risveglia servizio",
   "validation.email": "{field} non valido",
   "validation.minLength": "{field} dovrebbe contenere almeno {length} caratteri",
   "validation.oneRequired": "Almeno un campo è richiesto",
-  "validation.required": "{field} è necessario",
+  "validation.required": "{field} è obbligatorio",
   "validation.url": "{field} non è un URL valido",
   "webControls.back": "Indietro",
   "webControls.forward": "Avanti",
@@ -459,7 +450,7 @@
   "workspaceDrawer.headline": "Aree di lavoro",
   "workspaceDrawer.item.contextMenuEdit": "Modifica",
   "workspaceDrawer.item.noServicesAddedYet": "Nessun servizio aggiunto",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>I workspace di Ferdi ti permettono di concentrarti su ciò che è importante. Configura diversi insiemi di servizi e passa facilmente da uno all’altro quando vuoi.</p><p>Decidi di quali servizi hai bisogno quando e dove, così che ti possiamo aiutare a dare sempre il massimo - o semplicemente staccare dal lavoro quando ne hai bisogno.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Modifica le impostazioni dei workspace",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Le aree di lavoro di Ferdi ti permettono di concentrarti su ciò che è importante. Configura diversi insiemi di servizi e passa facilmente da uno all’altro quando vuoi.</p><p> Decidi di quali servizi hai bisogno quando e dove, così che ti possiamo aiutare a dare sempre il massimo - o semplicemente staccare dal lavoro quando ne hai bisogno.</p>",
+  "workspaceDrawer.workspacesSettingsTooltip": "Modifica le impostazioni dell'area di lavoro",
   "workspaces.switchingIndicator.switchingTo": "Passa a "
 }
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 118a2fb8e..d07ed53af 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "�読�込�",
-  "app.errorHandler.headline": "間����る部分��り��",
+  "app.errorHandler.headline": "�題�発生����。",
   "changeserver.customServerLabel": "独自サー�ー",
   "changeserver.headline": "サー�ー�変更",
   "changeserver.label": "サー�ー",
@@ -9,8 +9,7 @@
   "connectionLostBanner.cta": "サービスをリロード�る",
   "connectionLostBanner.informationLink": "何�起�����？",
   "connectionLostBanner.message": "{name}��接続�切断�れ���。",
-  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "デ�ッグ情報�記録",
+  "feature.basicAuth.signIn": "サインイン",
   "feature.nightlyBuilds.activate": "有効化",
   "feature.nightlyBuilds.info": "Nightlyビルド�未検証や未完��機能���れる�常�実験的��ージョン��。���ージョン��主�新機能�テストや最新ビルド��検証を行�開発者�使用�るも���。�れを�解�����方��Nightlyビルドを有効化�����を�������。",
   "feature.nightlyBuilds.title": "Nightlyビルド",
@@ -27,12 +26,12 @@
   "global.api.unhealthy": "Ferdi�オンラインサービス�接続����ん。",
   "global.cancel": "キャンセル",
   "global.edit": "編集",
-  "global.no": "No",
+  "global.no": "���",
   "global.notConnectedToTheInternet": "インター�ット�接続�れ����ん。",
-  "global.ok": "Ok",
+  "global.ok": "��",
   "global.quit": "終了",
-  "global.quitConfirmation": "Do you really want to quit Ferdi?",
-  "global.save": "Save",
+  "global.quitConfirmation": "Ferdiを本当�終了����？",
+  "global.save": "�存",
   "global.settings": "設定",
   "global.spellchecker.useDefault": "システムデフォルトを使用�る({default})",
   "global.spellchecking.autodetect": "言語を自動的�検出�る",
@@ -41,13 +40,13 @@
   "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",
+  "global.yes": "��",
   "import.headline": "Ferdi 4�サービスをイン�ート��下��",
   "import.notSupportedHeadline": "Ferdi 5����サービス���対応�����ん",
   "import.skip.label": "手動�サービスを追加�る",
-  "import.submit.label": "サービスをイン�ート��下��",
+  "import.submit.label": "{count}個�サービスをイン�ート�る",
   "infobar.authRequestFailed": "�証済�リクエスト�実行中�エラー�発生����。��エラー�何度も発生�る場���ログアウト���度�試�����。",
-  "infobar.buttonChangelog": "更新履歴を見る",
+  "infobar.buttonChangelog": "新�情報",
   "infobar.buttonInstallUpdate": "�起動��更新をインストール�る",
   "infobar.buttonReloadServices": "サービス��読�込�",
   "infobar.hide": "隠�",
@@ -57,7 +56,7 @@
   "infobox.dismiss": "閉�る",
   "invite.email.label": "メールアドレス",
   "invite.headline.friends": "�����人や�僚�方を3���Ferdi�招待����",
-  "invite.name.label": "��",
+  "invite.name.label": "��",
   "invite.skip.label": "後�",
   "invite.submit.label": "招待を�る",
   "invite.successInfo": "招待�無事��信�れ���",
@@ -118,7 +117,7 @@
   "menu.help.tos": "サービス利用�約",
   "menu.services": "サービス",
   "menu.services.activatePreviousService": "��サービスを有効��る",
-  "menu.services.addNewService": "サービスを追加",
+  "menu.services.addNewService": "サービスを追加...",
   "menu.services.goHome": "ホーム",
   "menu.services.setNextServiceActive": "次�サービスを有効��る",
   "menu.todos": "ToDo",
@@ -151,19 +150,8 @@
   "password.headline": "パスワードをリセット",
   "password.link.login": "サインイン",
   "password.link.signup": "無料アカウントを作�",
-  "password.noUser": "��メールアドレス���登録�れ����ん",
-  "password.successInfo": "メールを確���下��",
-  "pricing.features.accountSync": "アカウント��期",
-  "pricing.features.customWebsites": "カスタムサイトを追加",
-  "pricing.features.desktopNotifications": "デスクトップ通知",
-  "pricing.features.onPremise": "オンプレミス�よ���他�ホスティングサービス",
-  "pricing.features.recipes": "70以上�サービス�ら�択",
-  "pricing.features.serviceProxies": "サービスプロキシ",
-  "pricing.features.spellchecker": "スペル�ェック�サ�ート",
-  "pricing.features.teamManagement": "�ーム管�",
-  "pricing.features.thirdPartyServices": "サードパーティ製サービスをインストール",
-  "pricing.features.unlimitedServices": "無制��サービスを追加",
-  "pricing.features.workspaces": "ワークスペース",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "{name}を�読�込�",
   "service.crashHandler.autoReload": "{seconds}秒後�自動的�{name}�復旧を試���",
   "service.crashHandler.headline": "�����",
@@ -181,7 +169,7 @@
   "services.serverInfo": "オプション����左下�歯車をクリック��Ferdiサー�ーを変更�る�������。他�ホスト�れ�サー��らアカウント���Ferdiを使�よ��変更�る場�����サー��らデータをエクス�ート����後ヘルプメニューを使��イン�ート�る�������ワークスペース�設定��サービスを復元��る�������。",
   "services.serverless": "アカウント���Ferdiを使用�る",
   "services.welcome": "Ferdi�よ���",
-  "settings.account.account.editButton": "アカウント�編集",
+  "settings.account.account.editButton": "アカウントを編集",
   "settings.account.accountUnavailable": "アカウント�利用����ん",
   "settings.account.accountUnavailableInfo": "アカウント���Ferdiを使用�����。 Ferdi�アカウントを使用��コンピューター間�サービスを�期��る場�� 設定タブ�サー�ーを�択��ログイン������。",
   "settings.account.buttonSave": "プロフィール�更新",
@@ -190,7 +178,7 @@
   "settings.account.deleteInfo": "今後Ferdi�アカウント�必���れ����ら�アカウント�関連�る情報を削除����。",
   "settings.account.headline": "アカウント",
   "settings.account.headlineAccount": "アカウント情報",
-  "settings.account.headlineDangerZone": "注��",
+  "settings.account.headlineDangerZone": "�険��作",
   "settings.account.headlineInvoices": "請求書",
   "settings.account.headlinePassword": "パスワード�変更",
   "settings.account.headlineProfile": "プロフィール�更新",
@@ -198,7 +186,7 @@
   "settings.account.tryReloadServices": "も�一度試�",
   "settings.account.tryReloadUserInfoRequest": "も�一度試�",
   "settings.account.userInfoRequestFailed": "ユーザ情報を読�込���ん���",
-  "settings.account.yourLicense": "�利用中�Ferdiライセンス",
+  "settings.account.yourLicense": "�利用中�Ferdiライセンス:",
   "settings.app.accentColorInfo": "CSSフォーマット�アクセントカラーを記述������。(デフォルト: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "キャッシュを消去�る",
   "settings.app.buttonInstallUpdate": "�起動��更新をインストール�る",
@@ -218,14 +206,14 @@
   "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.confirmOnQuit": "Ferdi�終了時�確��る",
   "settings.app.form.customTodoServer": "カスタムToDoサー�ー",
   "settings.app.form.darkMode": "ダークモードを有効��る",
   "settings.app.form.enableGPUAcceleration": "GPUアクセラレーションを有効��る",
   "settings.app.form.enableLock": "パスワードロックを有効��る",
   "settings.app.form.enableMenuBar": "Ferdi内�メニュー�ーを常時表示�る",
   "settings.app.form.enableSpellchecking": "スペル�ェックを有効��る",
-  "settings.app.form.enableSystemTray": "Ferdiをシステムトレイ�表示�る",
+  "settings.app.form.enableSystemTray": "Ferdiを常時システムトレイ�表示�る",
   "settings.app.form.enableTodos": "Ferdi ToDoを有効��る",
   "settings.app.form.hibernateOnStartup": "起動時�サービスを休止状態��る",
   "settings.app.form.hibernationStrategy": "休止状態�方法",
@@ -251,10 +239,11 @@
   "settings.app.form.showDisabledServices": "無効化�れ�サービス�タブを表示�る",
   "settings.app.form.showDragArea": "ドラッグ�能�領域をウィンドウ�表示",
   "settings.app.form.showMessagesBadgesWhenMuted": "通知�無効時�未読メッセージ件数を表示�る",
+  "settings.app.form.splitMode": "分割表示モードを有効��る",
   "settings.app.form.startMinimized": "最�化��起動",
   "settings.app.form.universalDarkMode": "ユニ�ーサルダークモードを有効��る",
-  "settings.app.form.useTouchIdToUnlock": "Touch IDを使用��Ferdi�ロックを解除�る",
-  "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.useTouchIdToUnlock": "Ferdi�ロックを解除�Touch IDを使用��るよ���る",
+  "settings.app.form.useVerticalStyle": "水平レイアウトを使用�る",
   "settings.app.form.wakeUpStrategy": "起動方法",
   "settings.app.headlineAdvanced": "詳細",
   "settings.app.headlineAppearance": "表示スタイル",
@@ -265,9 +254,9 @@
   "settings.app.hibernateInfo": "デフォルト���Ferdi�����サービスを�ックグラウンド�開��読�込ん������使���������使���。 サービス休止機能�設定��時間�経���ら読�込ん�サービスを解放���。�れ�RAMを節約��り�サービス�コンピューター�動作����る�を防���役立���。",
   "settings.app.inactivityLockInfo": "休止状態���時間(分)���時間�経�後Ferdi�自動�ロック���。0�無効化",
   "settings.app.languageDisclaimer": "公��言語�英語�ドイツ語��。他�言語�コミュニティ�よる翻訳��。",
-  "settings.app.lockInfo": "パスワードロック�メッセージを�護����。\nパスワードロックを使用�る��Ferdi�起動時����自分�左下�ロックボタンを押��ショートカット{lockShortcut}�Ferdiをロック��������都度パスワード�入力�求�られ��。",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "パスワード",
-  "settings.app.lockedPasswordInfo": "覚�られるパスワードを設定�るよ��������。\nパスワードを紛失�る��Ferdi��インストール�必���り��。",
+  "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": "変更���起動�必���",
   "settings.app.scheduledDNDInfo": "集中モード�スケジュールを有効��る��Ferdi�ら�通知を���ら��時間帯を設定�る�������。",
   "settings.app.scheduledDNDTimeInfo": "24時間形��入力������。終了時刻を開始時刻よりも早�設定�る�(例: 17:00開始�9:00終了)�集中モードを一晩中有効�����。",
@@ -275,7 +264,7 @@
   "settings.app.spellCheckerLanguageInfo": "Ferdi�スペル�ェック�macOSシステム�スペル�ェッカーを使用�����。スペル�ェッカー��ェック�る言語を変更�る���macOS�システム環境設定�ら行������。",
   "settings.app.subheadlineCache": "キャッシュ",
   "settings.app.subheadlineFerdiProfile": "Ferdiプロフィール",
-  "settings.app.todoServerInfo": "��サー�ー�「Ferdi ToDo��機能�使用�れ��。",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Ferdi�翻訳作業���力を�願����。",
   "settings.app.universalDarkModeInfo": "ユニ�ーサルダークモード���在ダークモード�サ�ート�れ����サービス���ダークモードを動的�生����。",
   "settings.app.updateStatusAvailable": "更新�見��り���。ダウンロード�����...",
@@ -294,12 +283,12 @@
   "settings.recipes.customService.headline.communityRecipes": "コミュニティ�サードパーティレシピ",
   "settings.recipes.customService.headline.customRecipes": "カスタムサードパーティレシピ",
   "settings.recipes.customService.headline.devRecipes": "開発サービス�レシピ",
-  "settings.recipes.customService.intro": "カスタムサービスを追加�る���サービスレシピを以下�コピー���:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
   "settings.recipes.customService.openDevDocs": "開発者ドキュメント",
   "settings.recipes.customService.openFolder": "フォルダーを開�",
   "settings.recipes.headline": "利用�能�サービス",
   "settings.recipes.missingService": "使���サービス�一覧��り��ん�?",
-  "settings.recipes.nothingFound": "残念��ら�検索語�一致�るサービス��り��ん���。����「カスタムウェブサイト��オプションを使用��追加�る�������。新���ージョン�Ferdi��ウェブサイト�紹介�れ��るよ���より多��サービス�追加�れ��る����り��。�れら�新��サービスを追加�る���Ferdi�アップデートを�検討����。",
+  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "サービス�追加�れ���",
   "settings.searchService": "サービスを検索",
   "settings.service.error.goBack": "サービス�戻る",
@@ -331,18 +320,19 @@
   "settings.service.form.indirectMessages": "����新�メッセージ�����ッジを表示�る",
   "settings.service.form.isHibernatedEnabledInfo": "有効��る��システムリソースを節約�る���一定時間後�サービス�閉�られ��。",
   "settings.service.form.isMutedInfo": "無効化�れ��る場��全��通知音やオーディオ�生�無音��り��",
-  "settings.service.form.name": "��",
+  "settings.service.form.name": "��",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "darkmode.cssを開�",
   "settings.service.form.openUserCss": "user.cssを開�",
   "settings.service.form.openUserJs": "user.jsを開�",
   "settings.service.form.proxy.headline": "HTTP/HTTPS�プロキシ設定",
   "settings.service.form.proxy.host": "プロキシサー�ー/IP",
-  "settings.service.form.proxy.info": "プロキシ設定�Ferdi アカウント��期�れ��ん。",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "プロキシ設定を有効��る",
-  "settings.service.form.proxy.password": "パスワード（任�）",
+  "settings.service.form.proxy.password": "パスワード(オプション)",
   "settings.service.form.proxy.port": "�ート",
   "settings.service.form.proxy.restartInfo": "プロキシ設定を変更���ら�Ferdiを�起動������",
-  "settings.service.form.proxy.user": "ユーザー�（任�）",
+  "settings.service.form.proxy.user": "ユーザー(オプション)",
   "settings.service.form.recipeFileInfo": "ユーザーファイル�ウェブページ�挿入�れる���任��方法�サービスをカスタマイズ����。 ユーザーファイル�ローカル����存�れ���アカウントを使用�る他�コンピューター��転��れ��ん。",
   "settings.service.form.saveButton": "サービス��存",
   "settings.service.form.tabHosted": "ホスト",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "サービスを探�",
   "settings.services.headline": "利用中�サービス",
   "settings.services.noServicesAdded": "���サービスを追加���。",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "サービスを読�込む�������ん���",
   "settings.services.tooltip.isDisabled": "サービス�無効��",
   "settings.services.tooltip.isMuted": "無音�������",
@@ -367,7 +358,7 @@
   "settings.supportFerdi.textDonationAnd": "�",
   "settings.supportFerdi.textExpenses": "ボランティア���り�部分�作業を行����������もサー�ー代�証明書を支払������り��ん。コミュニティ��様�������支�全�公開�れ����。以下を�照������。",
   "settings.supportFerdi.textGitHubSponsors": "GitHub Sponsors",
-  "settings.supportFerdi.textListContributors": "全��貢献者�リスト",
+  "settings.supportFerdi.textListContributors": "全��貢献者リスト",
   "settings.supportFerdi.textListContributorsHere": "��",
   "settings.supportFerdi.textOpenCollective": "Open Collective",
   "settings.supportFerdi.textSupportWelcome": "支�����も歓迎��。����必�����る支��リスト��り��",
@@ -390,13 +381,13 @@
   "settings.user.form.firstname": "�",
   "settings.user.form.lastname": "姓",
   "settings.user.form.newPassword": "新��パスワード",
-  "settings.workspace.add.form.name": "��",
+  "settings.workspace.add.form.name": "��",
   "settings.workspace.add.form.submitButton": "ワークスペースを作�",
   "settings.workspace.form.buttonDelete": "ワークスペースを削除",
   "settings.workspace.form.buttonSave": "ワークスペースを�存",
   "settings.workspace.form.keepLoaded": "��ワークスペースを読�込ん��������*",
   "settings.workspace.form.keepLoadedInfo": "*��オプション�グロー�ル�「����ワークスペースをロード������る�オプション�よ��上書��れ��。",
-  "settings.workspace.form.name": "��",
+  "settings.workspace.form.name": "��",
   "settings.workspace.form.servicesInWorkspaceHeadline": "��ワークスペース�サービス",
   "settings.workspace.form.yourWorkspaces": "利用中�ワークスペース",
   "settings.workspaces.deletedInfo": "ワークスペースを削除����",
@@ -405,7 +396,7 @@
   "settings.workspaces.tryReloadWorkspaces": "も�一度試�",
   "settings.workspaces.updatedInfo": "変更内容��存�れ���",
   "settings.workspaces.workspaceFeatureHeadline": "ヒント: Ferdiワークスペース�紹介",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdiワークスペースを使用�る�����������集中����。異�るサービス群を設定�����も簡��切り替�る�������。 必��サービスを�必��時��必��場所��利用���������仕事�集中�る��も�好��時�仕事�ら離れる��も�能��。",
+  "settings.workspaces.workspaceFeatureInfo": "Ferdiワークスペースを使用�る�����������集中����。様々�サービス�セットを設定�����も簡��切り替�る�������。 必��サービスを�必��時��必��場所��利用���������仕事�集中�る��も�好��時�仕事�ら離れる��も�能��。",
   "settings.workspaces.workspacesRequestFailed": "ワークスペースを読�込���ん���",
   "setupAssistant.headline": "始���ょ�",
   "setupAssistant.subheadline": "最も使用�れ��るサービス�中�ら�択�����メッセージング�最新�やり�り�戻������。",
@@ -434,7 +425,7 @@
   "tabs.item.disableAudio": "オーディオ�無効化",
   "tabs.item.disableDarkMode": "ダークモードを無効��る",
   "tabs.item.disableNotifications": "通知を無効��る",
-  "tabs.item.disableService": "サービスを無効��る",
+  "tabs.item.disableService": "サービス�無効化",
   "tabs.item.enableAudio": "オーディオを有効��る",
   "tabs.item.enableDarkMode": "ダークモードを有効��る",
   "tabs.item.enableNotification": "通知を有効��る",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "サービス�休止",
   "tabs.item.reload": "�読�込�",
   "tabs.item.wakeUpService": "サービス�起動",
-  "validation.email": "{field}�正���り��ん",
-  "validation.minLength": "{field}�少���も{length}文字以上���れ��り��ん",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "少���も1��必���",
-  "validation.required": "{field}�必須��",
-  "validation.url": "{field}�正��URL���り��ん",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "戻る",
   "webControls.forward": "次�",
   "webControls.goHome": "ホーム",
@@ -459,7 +450,7 @@
   "workspaceDrawer.headline": "ワークスペース",
   "workspaceDrawer.item.contextMenuEdit": "編集",
   "workspaceDrawer.item.noServicesAddedYet": "��サービス�追加�れ����ん",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdiワークスペースを使用�る�����������集中����。異�るサービス群を設定�����も簡��切り替�る�������。</p><p> 必��サービスを�必��時��必��場所��利用���������仕事�集中�る��も�好��時�仕事�ら離れる��も�能��。</p>",
+  "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": "ワークスペース�設定を編集�る",
   "workspaces.switchingIndicator.switchingTo": "切り替�先:"
 }
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index cc5a04aff..f327c1e51 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "ჩ�ტვირთვ�",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "კერძ� სერვერი",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "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",
@@ -24,8 +23,8 @@
   "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": "Ferdi-ის �ნლ�ინ სერვისთ�ნ დ�კ�ვშირებ� ვერ მ�ხერხდ�",
-  "global.cancel": "გ�უქმებ�",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "რედ�ქტირებ�",
   "global.no": "No",
   "global.notConnectedToTheInternet": "თქვენ �რ ხ�რთ ინტერნეტთ�ნ დ�კ�ვშირებული.",
@@ -33,19 +32,19 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "პ�რ�მეტრები",
+  "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": "დ�დ�სტურებ�",
+  "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": "შემ�იტ�ნე Ferdi 4-ის სერვისები",
   "import.notSupportedHeadline": "სერვისები ჯერ �რ �რის მხ�რდ�ჭერილი Ferdi 5-ში",
   "import.skip.label": "I want to add services manually",
-  "import.submit.label": "მ�წვევის გ�გზ�ვნ�",
+  "import.submit.label": "Import {count} 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": "გ�დ�ტვირთეთ დ� დ��ყენეთ გ�ნ�ხლებ�",
@@ -75,7 +74,7 @@
   "login.email.label": "მეილი",
   "login.headline": "შესვლ�",
   "login.invalidCredentials": "მეილი �ნ პ�რ�ლი �რ�სწ�რი�",
-  "login.link.password": "პ�რ�ლის �ღდგენ�",
+  "login.link.password": "Reset password",
   "login.link.signup": "�ნგ�რიშის შექმნ�",
   "login.password.label": "Password",
   "login.serverLogout": "თქვენს სესი�ს ვ�დ� გ�უვიდ�, შედით �ნგ�რიშში ხელ�ხლ�.",
@@ -118,7 +117,7 @@
   "menu.help.tos": "Terms of Service",
   "menu.services": "Services",
   "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
   "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "ყველ� სერვისი",
   "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
   "password.email.label": "მეილი",
-  "password.headline": "პ�რ�ლის �ღდგენ�",
+  "password.headline": "Reset password",
   "password.link.login": "შედით თქვენს �ნგ�რიშში",
   "password.link.signup": "�ნგ�რიშის შექმნ�",
-  "password.noUser": "მ�მხმ�რებელი მითითებული მეილით ვერ მ�იძებნ�",
-  "password.successInfo": "გთხ�ვთ შე�მ�წმეთ მეილი",
-  "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",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "მ�გეს�ლმებით Ferdi-ზე",
-  "settings.account.account.editButton": "�ნგ�რიშის მ�რთვ�",
+  "settings.account.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": "პრ�ფილის გ�ნ�ხლებ�",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
   "settings.account.deleteInfo": "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
   "settings.account.headline": "�ნგ�რიში",
-  "settings.account.headlineAccount": "�ნგ�რიშის ინფ�რმ�ცი�",
+  "settings.account.headlineAccount": "Account information",
   "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "ინვ�ისები",
-  "settings.account.headlinePassword": "პ�რ�ლის შეცვლ�",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "პრ�ფილის გ�ნ�ხლებ�",
   "settings.account.successInfo": "თქვენი ცვლილებები შენ�ხული�",
   "settings.account.tryReloadServices": "სც�დეთ ხელ�ხლ�",
   "settings.account.tryReloadUserInfoRequest": "სც�დეთ ხელ�ხლ�",
   "settings.account.userInfoRequestFailed": "მ�მხმ�რებლის ინფ�რმ�ციის ჩ�ტვირთვ� ვერ მ�ხერხდ�",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "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": "გ�დ�ტვირთეთ დ� დ��ყენეთ გ�ნ�ხლებ�",
@@ -220,12 +208,12 @@
   "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.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": "�ჩვენეთ Ferdi სისტემის უჯრ�ში",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "სერვისის წ�შლ�",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "შე�სწ�რე {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
@@ -332,12 +321,13 @@
   "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
   "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
   "settings.service.form.name": "ს�ხელი ",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "�ღმ��ჩინეთ სერვისები",
   "settings.services.headline": "თქვენი სერვისები",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "სერვისი გ�თიშული�",
   "settings.services.tooltip.isMuted": "All sounds are muted",
@@ -430,11 +421,11 @@
   "signup.password.label": "Password",
   "signup.submit.label": "�ნგ�რიშის შექმნ�",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "სერვისის წ�შლ�",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "შეტყ�ბინებების გ�მ�რთვ�",
-  "tabs.item.disableService": "სერვისის გ�უქმებ�",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "შეტყ�ბინებების ჩ�რთვ�",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index dfbfd63a3..3be2b27ff 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "새로고침",
-  "app.errorHandler.headline": "문제가 발�했습니다",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "사용� 정� 서버",
   "changeserver.headline": "서버 번경",
   "changeserver.label": "서버",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "무슨 ��가요?",
   "connectionLostBanner.message": "오 저런! Ferdi가 {name} 과 연결� �겼습니다.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "디버깅 정보 공개",
   "feature.nightlyBuilds.activate": "활성화",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "나�틀리 빌드",
@@ -24,8 +23,8 @@
   "feature.quickSwitch.info": "서비스를 TAB, ↑, ↓� �용해 선�할 수 있습니다. ENTER를 �용하여 서비스를 열 수 있습니다.",
   "feature.quickSwitch.search": "검색...",
   "feature.quickSwitch.title": "빠른 검색",
-  "global.api.unhealthy": "Ferdi 온�� 서비스� 연결할 수 없습니다.",
-  "global.cancel": "취소",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "편집",
   "global.no": "No",
   "global.notConnectedToTheInternet": "�터넷� 연결할 수 없습니다.",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "설정",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "시스템 기본 사용 ({default})",
   "global.spellchecking.autodetect": "언어 �� �색",
   "global.spellchecking.autodetect.short": "��",
   "global.spellchecking.language": "철� 검사",
-  "global.submit": "제출",
+  "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": "Ferdi 5�서 아� 지��지 않는 서비스입니다.",
   "import.skip.label": "수�으로 서비스 추가",
-  "import.submit.label": "서비스 가져오기",
+  "import.submit.label": "Import {count} 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": "새로운 기능",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "재시작 후 업��트 설치",
   "infobar.buttonReloadServices": "서비스 재시작",
   "infobar.hide": "숨기기",
@@ -75,7 +74,7 @@
   "login.email.label": "�메� 주소",
   "login.headline": "로그�",
   "login.invalidCredentials": "�메� �는 비밀번호가 �치하지 않습니다",
-  "login.link.password": "비밀번호 초기화",
+  "login.link.password": "Reset password",
   "login.link.signup": "무료 계정 �성",
   "login.password.label": "비밀번호",
   "login.serverLogout": "세션� 만료�었습니다. 다시 로그� 하세요.",
@@ -117,10 +116,10 @@
   "menu.help.support": "지�",
   "menu.help.tos": "�용 약관",
   "menu.services": "서비스",
-  "menu.services.activatePreviousService": "�전 서비스 활성화",
-  "menu.services.addNewService": "새로운 서비스 추가",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "홈",
-  "menu.services.setNextServiceActive": "다� 서비스 활성화",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Todos 허용",
   "menu.view": "View",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "모든 서비스",
   "menu.workspaces.openWorkspaceDrawer": "작업�역 서� 열기",
   "password.email.label": "�메� 주소",
-  "password.headline": "비밀번호 초기화",
+  "password.headline": "Reset password",
   "password.link.login": "계정� 로그�하세요.",
   "password.link.signup": "무료 계정 �성",
-  "password.noUser": "해당 �메�� 사용하는 유저를 찾� 수 없습니다.",
-  "password.successInfo": "�메�� 확�해 주세요.",
-  "pricing.features.accountSync": "계정 �기화",
-  "pricing.features.customWebsites": "사용� 지정 웹사�트 추가",
-  "pricing.features.desktopNotifications": "�스�탑 알림",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "서비스 프�시",
-  "pricing.features.spellchecker": "철� 검사 지�",
-  "pricing.features.teamManagement": "팀 관리",
-  "pricing.features.thirdPartyServices": "�드파티 서비스 설치",
-  "pricing.features.unlimitedServices": "무제한 서비스 추가",
-  "pricing.features.workspaces": "작업 공간",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "재시작 {name}",
   "service.crashHandler.autoReload": "{seconds} 초내� ��으로 {name} � 복�합니다.",
   "service.crashHandler.headline": "�런!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "계정없� Ferdi 사용하기",
   "services.welcome": "Ferdi� 오신 것� 환�합니다.",
-  "settings.account.account.editButton": "계정 편집",
+  "settings.account.account.editButton": "Edit account",
   "settings.account.accountUnavailable": "계정� 사용할 수 없습니다.",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "프로필 수정",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "받� �메�� 있는 ��를 통해 계정 삭제를 확�했다면 계정과 ��터는 복구�지 않습니다.",
   "settings.account.deleteInfo": "� �� Ferdi 계정� 필요하지 않다면 여기서 모든 관련한 ��터와 계정� 삭제할 수 있습니다.",
   "settings.account.headline": "계정",
-  "settings.account.headlineAccount": "계정 정보",
-  "settings.account.headlineDangerZone": "위험 설정",
-  "settings.account.headlineInvoices": "청구서",
-  "settings.account.headlinePassword": "비밀번호 변경",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "프로필 수정",
   "settings.account.successInfo": "변경사항� 저장�었습니다.",
   "settings.account.tryReloadServices": "다시 시�하세요.",
   "settings.account.tryReloadUserInfoRequest": "다시 시�하세요.",
   "settings.account.userInfoRequestFailed": "사용� 정보를 불러올 수 없습니다.",
-  "settings.account.yourLicense": "Ferdi ��센스",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "�시 지우기",
   "settings.app.buttonInstallUpdate": "재시작 후 업��트 설치",
@@ -225,7 +213,7 @@
   "settings.app.form.enableLock": "암호 잠금 활성화",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "맞춤법 검사 활성화",
-  "settings.app.form.enableSystemTray": "Ferdi 시스템 트레�� 표시",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "하�버네�션 전략",
@@ -251,9 +239,10 @@
   "settings.app.form.showDisabledServices": "사용하지 않는 서비스 출력",
   "settings.app.form.showDragArea": "드래그 가능 �역 보기",
   "settings.app.form.showMessagesBadgesWhenMuted": "알림� 비활성화잉ㄹ 때 �지 않� 메세지 배지 표시",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "최소화 � �태로 시작",
   "settings.app.form.universalDarkMode": "전체 다� 모드 활성화",
-  "settings.app.form.useTouchIdToUnlock": "TouchID로 Ferdi 여는 것� 허용",
+  "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": "고급",
@@ -267,7 +256,7 @@
   "settings.app.languageDisclaimer": "공� 지우너 언어는 �어와 ��어�며 �외 언어들� 커뮤니티� �해 번역�고 있습니다.",
   "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "비밀번호",
-  "settings.app.lockedPasswordInfo": "기억할 수 있는 비밀번호로 설정해주세요.\n만약 비밀번호를 잃어버리면 Ferdi 재설치를 해야합니다.",
+  "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": "변경사항� �용하기 위해 재시작",
   "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.",
@@ -296,7 +285,7 @@
   "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": "개발 문서",
-  "settings.recipes.customService.openFolder": "�� 열기",
+  "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "사용가능 한 서비스",
   "settings.recipes.missingService": "서비스가 보�지 않습니까?",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "서비스 삭제",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "편집 {name}",
   "settings.service.form.enableAudio": "오디오 활성화",
   "settings.service.form.enableBadge": "�지 않� 메세지 배지 표시",
@@ -332,17 +321,18 @@
   "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.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "darkmode.css 열기",
   "settings.service.form.openUserCss": "user.css 열기",
   "settings.service.form.openUserJs": "user.js 열기",
   "settings.service.form.proxy.headline": "HTTP/HTTPS 프�시 설정",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "프�시 설정� Ferdi 서버와 �기화�지 않았습니다.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "프�시 사용하기",
-  "settings.service.form.proxy.password": "비밀번호 (선�)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "�트",
   "settings.service.form.proxy.restartInfo": "프�시 설정 변경 후 Ferdi를 재시작 해주세요.",
-  "settings.service.form.proxy.user": "사용� 옵션",
+  "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": "서비스 저장",
   "settings.service.form.tabHosted": "Hosted",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "서비스 발견",
   "settings.services.headline": "서비스",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "서비스를 불러올 수 없습니다.",
   "settings.services.tooltip.isDisabled": "서비스를 사용할 수 없습니다.",
   "settings.services.tooltip.isMuted": "모든 소리가 꺼져있습니다.",
@@ -362,12 +353,12 @@
   "settings.supportFerdi.aboutIntro": "<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>",
   "settings.supportFerdi.bannerText": "Ferdi 서비스 향�� �움� 주기를 �하십니까?",
   "settings.supportFerdi.headline": "Ferdi� 대해",
-  "settings.supportFerdi.openSurvey": "설문조사 열기",
+  "settings.supportFerdi.openSurvey": "Open survey",
   "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,",
   "settings.supportFerdi.textDonationAnd": "그리고",
   "settings.supportFerdi.textExpenses": "While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our",
   "settings.supportFerdi.textGitHubSponsors": "깃허브 후��",
-  "settings.supportFerdi.textListContributors": "기여� 전체 목�",
+  "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",
@@ -387,8 +378,8 @@
   "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.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "새로운 비밀번호",
   "settings.workspace.add.form.name": "�름",
   "settings.workspace.add.form.submitButton": "새로운 작업�역 �성하기",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "알림과 오디오 활성화",
   "signup.email.label": "�메� 주소",
   "signup.emailDuplicate": "해당 �메�� 가진 사용�가 �미 존재합니다",
-  "signup.firstname.label": "�름(성 제외)",
+  "signup.firstname.label": "First Name",
   "signup.headline": "회� 가입",
-  "signup.lastname.label": "성",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "By creating a Ferdi account you accept the",
   "signup.legal.privacy": "개�정보보호정책",
   "signup.legal.terms": "�용 약관",
@@ -430,11 +421,11 @@
   "signup.password.label": "비밀번호",
   "signup.submit.label": "계정 만들기",
   "tabs.item.confirmDeleteService": "{serviceName} 서비스를 정�로 삭제하시겠습니까?",
-  "tabs.item.deleteService": "서비스 삭제",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "오디오 비활성화",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "알림 비활성화",
-  "tabs.item.disableService": "서비스 비활성화",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "오디오 활성화",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "알림 허용",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "새로고침",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} 는 유효하지 않습니다.",
-  "validation.minLength": "{field} 는 최소한 {length} 보다 길어야 합니다.",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "�어� 하나는 필요 합니다.",
-  "validation.required": "{field} 는 필수입니다.",
-  "validation.url": "{field} 는 유효하지 않� URL입니다.",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "뒤로가기",
   "webControls.forward": "앞으로 가기",
   "webControls.goHome": "홈",
@@ -454,12 +445,12 @@
   "webControls.reload": "새로고침",
   "welcome.loginButton": "계정� 로그�하세요.",
   "welcome.signupButton": "무료 계정 �성",
-  "workspaceDrawer.addNewWorkspaceLabel": "새 작업�역� 만듭니다.",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "모든 서비스",
   "workspaceDrawer.headline": "작업 공간",
   "workspaceDrawer.item.contextMenuEdit": "편집",
   "workspaceDrawer.item.noServicesAddedYet": "추가� 서비스가 없습니다.",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "작업공간 설정 편집",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
 }
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index b9ca228ba..5104d1bc2 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Herladen",
-  "app.errorHandler.headline": "Er ging iets mis",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Aangepaste server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "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",
@@ -24,8 +23,8 @@
   "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": "Kan geen verbinding maken met de Ferdi services",
-  "global.cancel": "Annuleren",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Bewerken",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Je hebt geen internet verbinding.",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Instellingen",
+  "global.settings": "Settings",
   "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.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": "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",
-  "import.submit.label": "Importeer services",
+  "import.submit.label": "Import {count} 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": "Wat is er nieuw?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Opnieuw opstarten & update installeren",
   "infobar.buttonReloadServices": "Services opnieuw laden",
   "infobar.hide": "Verbergen",
@@ -75,7 +74,7 @@
   "login.email.label": "E-mailadres",
   "login.headline": "Inloggen",
   "login.invalidCredentials": "E-mailadres of wachtwoord ongeldig",
-  "login.link.password": "Wachtwoord resetten",
+  "login.link.password": "Reset password",
   "login.link.signup": "Maak een gratis account aan",
   "login.password.label": "Password",
   "login.serverLogout": "De sessie is verlopen, log opnieuw in alsjeblieft.",
@@ -117,10 +116,10 @@
   "menu.help.support": "Ondersteuning",
   "menu.help.tos": "Servicevoorwaarden",
   "menu.services": "Services",
-  "menu.services.activatePreviousService": "Vorige dienst activeren",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
-  "menu.services.setNextServiceActive": "Volgende dienst activeren",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Weergave",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Alle services",
   "menu.workspaces.openWorkspaceDrawer": "Werkruimtepagina openen",
   "password.email.label": "E-mailadres",
-  "password.headline": "Wachtwoord resetten",
+  "password.headline": "Reset password",
   "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.successInfo": "Controleer alsjeblieft je e-mail",
-  "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": "Werkruimten",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "{naam} herladen",
   "service.crashHandler.autoReload": "Ga proberen om {name} te herstellen over {seconds} seconden",
   "service.crashHandler.headline": "Oh nee!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Welkom bij Ferdi",
-  "settings.account.account.editButton": "Account bewerken",
+  "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": "Profiel bijwerken",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "U heeft een email ontvangen met een bevestiginslink om uw account te verwijderen. Uw account en de bijhorende gegevens kunnen niet meer worden herstel na deze actie!",
   "settings.account.deleteInfo": "Indien u uw Ferdi account niet meer nodig heeft, kan u hier uw account en alle gerelateerde gegevens verwijderen.",
   "settings.account.headline": "Account",
-  "settings.account.headlineAccount": "Account informatie",
-  "settings.account.headlineDangerZone": "Gevarenzone",
-  "settings.account.headlineInvoices": "Facturen",
-  "settings.account.headlinePassword": "Wijzig wachtwoord",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Profiel bijwerken",
   "settings.account.successInfo": "Je wijzigingen zijn opgeslagen",
   "settings.account.tryReloadServices": "Probeer opnieuw",
   "settings.account.tryReloadUserInfoRequest": "Probeer opnieuw",
   "settings.account.userInfoRequestFailed": "Kon gebruikersinformatie niet laden",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Cache wissen",
   "settings.app.buttonInstallUpdate": "Opnieuw opstarten & update installeren",
@@ -220,12 +208,12 @@
   "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.darkMode": "Dark Mode aanzetten",
   "settings.app.form.enableGPUAcceleration": "GPU Acceleratie Activeren",
   "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Spellingcontrole inschakelen",
-  "settings.app.form.enableSystemTray": "Toon Ferdi in de systeembalk",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Toon uitgeschakelde services",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Service verwijderen",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Bewerk {name}",
   "settings.service.form.enableAudio": "Audio inschakelen",
   "settings.service.form.enableBadge": "Toon badges met ongelezen berichten",
@@ -332,17 +321,18 @@
   "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": "Indien uitgeschakeld zullen alle meldingsgeluiden en afgespeelde audio uitgeschakeld zijn",
   "settings.service.form.name": "Naam",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Instellingen",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy instellingen worden niet gesynchroniseerd met de Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Proxy gebruiken",
-  "settings.service.form.proxy.password": "Wachtwoord (optioneel)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Poort",
   "settings.service.form.proxy.restartInfo": "Start Ferdi opnieuw op na het aanpassen van proxy Instellingen.",
-  "settings.service.form.proxy.user": "Gebruiker (optioneel)",
+  "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": "Service opslaan",
   "settings.service.form.tabHosted": "Gehost",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Services ontdekken",
   "settings.services.headline": "Jouw services",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Kan je diensten niet laden",
   "settings.services.tooltip.isDisabled": "Service is uitgeschakeld",
   "settings.services.tooltip.isMuted": "Alle geluiden zijn uitgeschakeld",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Non-Profit",
   "settings.user.form.currentPassword": "Huidig wachtwoord",
   "settings.user.form.email": "Email",
-  "settings.user.form.firstname": "Voornaam",
-  "settings.user.form.lastname": "Achternaam",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Nieuw wachtwoord",
   "settings.workspace.add.form.name": "Naam",
   "settings.workspace.add.form.submitButton": "Maak werkruimte aan",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "Berichten & geluid inschakelen",
   "signup.email.label": "E-mailadres",
   "signup.emailDuplicate": "Er bestaat al een gebruiker met dat e-mailadres",
-  "signup.firstname.label": "Voornaam",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Registreren",
-  "signup.lastname.label": "Achternaam",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Door een account aan te maken aanvaard je de",
   "signup.legal.privacy": "Privacyverklaring",
   "signup.legal.terms": "Servicevoorwaarden",
@@ -430,11 +421,11 @@
   "signup.password.label": "Password",
   "signup.submit.label": "Account aanmaken",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Service verwijderen",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Audio uitschakelen",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Notificaties uitschakelen",
-  "tabs.item.disableService": "Service uitschakelen",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Audio inschakelen",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Notificaties aanzetten",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Herladen",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} is niet geldig",
-  "validation.minLength": "{field} moet minimaal {length} karakters lang zijn",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "Ten minste één is vereist",
-  "validation.required": "{field} is vereist",
-  "validation.url": "{field} is niet een geldige URL",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Back",
   "webControls.forward": "Forward",
   "webControls.goHome": "Home",
@@ -454,12 +445,12 @@
   "webControls.reload": "Herladen",
   "welcome.loginButton": "Inloggen op je account",
   "welcome.signupButton": "Maak een gratis account aan",
-  "workspaceDrawer.addNewWorkspaceLabel": "Voeg een nieuwe werkruimte toe",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "Alle services",
   "workspaceDrawer.headline": "Werkruimten",
   "workspaceDrawer.item.contextMenuEdit": "bewerken",
   "workspaceDrawer.item.noServicesAddedYet": "Nog geen diensten toegevoegd",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Pas werkruimte instellingen aan",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Overschakelen naar"
 }
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index eac72627f..6899e02ee 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Herladen",
-  "app.errorHandler.headline": "Er is iets mis gegaan",
+  "app.errorHandler.headline": "Er is iets mis gegaan.",
   "changeserver.customServerLabel": "Aangepaste server",
   "changeserver.headline": "Server wijzigen",
   "changeserver.label": "Server",
@@ -9,13 +9,12 @@
   "connectionLostBanner.cta": "Een service opnieuw laden",
   "connectionLostBanner.informationLink": "Wat gebeurde er?",
   "connectionLostBanner.message": "Oh nee! Ferdi heeft de verbinding met {name} verloren.",
-  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Foutopsporingsinformatie publiceren",
+  "feature.basicAuth.signIn": "Log in",
   "feature.nightlyBuilds.activate": "Activeren",
-  "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.info": "Nachtelijke builds zijn zeer experimentele versies van Ferdi die ongepolijste of onvoltooide functies kunnen bevatten. Deze nightly builds worden voornamelijk gebruikt door ontwikkelaars om hun nieuwe functies te testen en hoe ze zullen presteren in de finale build. Als je niet weet wat je aan het doen bent, raden we aan om nachtelijke versies niet te activeren.",
   "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.",
-  "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
+  "feature.publishDebugInfo.info": "Publiceren van uw debug informatie helpt ons problemen en fouten te vinden in Ferdi. Door uw debug informatie te publiceren, accepteert u het privacybeleid en de gebruiksvoorwaarden van Ferdi Debugger",
   "feature.publishDebugInfo.privacy": "Privacybeleid",
   "feature.publishDebugInfo.publish": "Accepteren en publiceren",
   "feature.publishDebugInfo.published": "Je foutopsporingslogboek is gepubliceerd en is nu beschikbaar op",
@@ -23,30 +22,30 @@
   "feature.publishDebugInfo.title": "Foutopsporingsinformatie publiceren",
   "feature.quickSwitch.info": "Selecteer een service met TAB, ↑ en ↓. Open een service met ENTER.",
   "feature.quickSwitch.search": "Zoeken...",
-  "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "Kan geen verbinding maken met de Ferdi-services.",
+  "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.no": "Nee",
   "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.ok": "Oké",
+  "global.quit": "Afsluiten",
+  "global.quitConfirmation": "Wil je echt stoppen?",
+  "global.save": "Opslaan",
   "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.userAgentHelp": "Gebruik 'https://whatmyuseragent.com/' om te ontdekken of 'https://developers.whatismybrowser.com/useragents/explore/' om je gewenste user-agent te kiezen en het hier te kopiëren en plakken.",
   "global.userAgentPref": "User Agent",
-  "global.yes": "Yes",
+  "global.yes": "Ja",
   "import.headline": "Importeer uw Ferdi 4-services",
   "import.notSupportedHeadline": "Services die (nog) niet ondersteund worden in Ferdi 5",
   "import.skip.label": "Ik wil diensten handmatig toevoegen",
-  "import.submit.label": "Importeer services",
-  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
+  "import.submit.label": "Importeer {count} diensten",
+  "infobar.authRequestFailed": "Er zijn fouten opgetreden tijdens het uitvoeren van een geverifieerd verzoek. Probeer opnieuw in te loggen als deze fout zich blijft voordoen.",
   "infobar.buttonChangelog": "Wat is er nieuw?",
   "infobar.buttonInstallUpdate": "Opnieuw opstarten & update installeren",
   "infobar.buttonReloadServices": "Services opnieuw laden",
@@ -54,7 +53,7 @@
   "infobar.requiredRequestsFailed": "Kan de services en gebruikersinformatie niet laden",
   "infobar.servicesUpdated": "Je services zijn bijgewerkt.",
   "infobar.updateAvailable": "Een nieuwe update voor Ferdi is beschikbaar.",
-  "infobox.dismiss": "Dismiss",
+  "infobox.dismiss": "Negeren",
   "invite.email.label": "E-mailadres",
   "invite.headline.friends": "Nodig 3 vrienden of collega's uit",
   "invite.name.label": "Naam",
@@ -75,95 +74,84 @@
   "login.email.label": "E-mailadres",
   "login.headline": "Inloggen",
   "login.invalidCredentials": "E-mailadres of wachtwoord ongeldig",
-  "login.link.password": "Wachtwoord vergeten",
+  "login.link.password": "Wachtwoord opnieuw instellen",
   "login.link.signup": "Maak een gratis account aan",
   "login.password.label": "Wachtwoord",
   "login.serverLogout": "De sessie is verlopen, log alsjeblieft opnieuw in.",
   "login.submit.label": "Inloggen",
   "login.tokenExpired": "De sessie is verlopen, log alsjeblieft opnieuw in.",
-  "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
-  "menu.Todoss.openTodosDrawer": "Open Todos drawer",
+  "menu.Todoss.closeTodosDrawer": "Sluit Todos overzicht",
+  "menu.Todoss.openTodosDrawer": "Open Todos overzicht",
   "menu.app.about": "Over Ferdi",
   "menu.app.autohideMenuBar": "Menubalk automatisch verbergen",
   "menu.app.checkForUpdates": "Controleer op updates",
   "menu.app.hide": "Verbergen",
-  "menu.app.hideOthers": "Hide Others",
-  "menu.app.unhide": "Unhide",
+  "menu.app.hideOthers": "Verberg overigen",
+  "menu.app.unhide": "Weergeven",
   "menu.edit": "Bewerk",
-  "menu.edit.copy": "Copy",
-  "menu.edit.cut": "Cut",
+  "menu.edit.copy": "Kopiëren",
+  "menu.edit.cut": "Knippen",
   "menu.edit.delete": "Verwijderen",
   "menu.edit.emojiSymbols": "Emoji's en symbolen",
   "menu.edit.findInPage": "Zoeken op pagina",
-  "menu.edit.paste": "Paste",
-  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
-  "menu.edit.redo": "Redo",
-  "menu.edit.selectAll": "Select All",
+  "menu.edit.paste": "Plakken",
+  "menu.edit.pasteAndMatchStyle": "Plakken en opmaak behouden",
+  "menu.edit.redo": "Opnieuw",
+  "menu.edit.selectAll": "Alles selecteren",
   "menu.edit.speech": "Spraak",
   "menu.edit.startDictation": "Beginnen met dicteren",
   "menu.edit.startSpeaking": "Begin met spreken",
   "menu.edit.stopSpeaking": "Stop met spreken",
-  "menu.edit.undo": "Undo",
+  "menu.edit.undo": "Ongedaan maken",
   "menu.file": "Bestand",
   "menu.help": "Help",
   "menu.help.changelog": "Wijzigingenlogboek",
-  "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.debugInfo": "Debug informatie kopiëren",
+  "menu.help.debugInfoCopiedBody": "Uw debug informatie is gekopieerd naar uw klembord.",
+  "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Informatie",
+  "menu.help.importExportData": "Import/Export Configuratie Data",
   "menu.help.learnMore": "Meer informatie",
   "menu.help.privacy": "Privacyvoorwaarden",
-  "menu.help.publishDebugInfo": "Publish Debug Information",
+  "menu.help.publishDebugInfo": "Publiceer Debug Informatie",
   "menu.help.support": "Ondersteuning",
   "menu.help.tos": "Servicevoorwaarden",
   "menu.services": "Services",
   "menu.services.activatePreviousService": "Activeer vorige service",
-  "menu.services.addNewService": "Nieuwe service toevoegen",
+  "menu.services.addNewService": "Nieuwe service toevoegen...",
   "menu.services.goHome": "Home",
   "menu.services.setNextServiceActive": "Activeer volgende service",
   "menu.todos": "Taken",
-  "menu.todos.enableTodos": "Enable Todos",
+  "menu.todos.enableTodos": "Todos inschakelen",
   "menu.view": "Weergave",
   "menu.view.back": "Terug",
-  "menu.view.forward": "Forward",
+  "menu.view.forward": "Doorsturen",
   "menu.view.lockFerdi": "Ferdi vergrendelen",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFerdi": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Ferdi opnieuw laden",
   "menu.view.reloadService": "Een service opnieuw laden",
-  "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Actual Size",
+  "menu.view.reloadTodos": "ToDos opnieuw laden",
+  "menu.view.resetZoom": "Werkelijke grootte",
   "menu.view.toggleDarkMode": "Donkere modus aan/uit",
   "menu.view.toggleDevTools": "Ontwikkelaarstools aan/uit",
-  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleFullScreen": "Volledig scherm in-/uitschakelen",
   "menu.view.toggleServiceDevTools": "Service ontwikkelaarstools aan/uit",
-  "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.view.toggleTodosDevTools": "Todos Developer Tools in-/uitschakelen",
+  "menu.view.zoomIn": "Inzoomen",
+  "menu.view.zoomOut": "Uitzoomen",
+  "menu.window": "Venster",
+  "menu.window.close": "Sluiten",
+  "menu.window.minimize": "Minimaliseren",
   "menu.workspaces": "Werkruimtes",
   "menu.workspaces.addNewWorkspace": "Voeg nieuwe werkruimte toe...",
   "menu.workspaces.closeWorkspaceDrawer": "Werkruimtepagina sluiten",
   "menu.workspaces.defaultWorkspace": "Alle services",
   "menu.workspaces.openWorkspaceDrawer": "Werkruimtepagina openen",
   "password.email.label": "E-mailadres",
-  "password.headline": "Wachtwoord vergeten",
+  "password.headline": "Wachtwoord opnieuw instellen",
   "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.successInfo": "Controleer je e-mail",
-  "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 ondersteuning",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Installeer diensten van derden",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Werkruimtes",
+  "password.noUser": "Er is geen gebruiker met dit e-mailadres gevonden",
+  "password.successInfo": "Uw nieuwe wachtwoord is verzonden naar uw e-mailadres",
   "service.crashHandler.action": "Laad {name} opnieuw",
   "service.crashHandler.autoReload": "Bezig om {name} te herstellen over {seconds} seconden",
   "service.crashHandler.headline": "Oh nee!",
@@ -177,80 +165,81 @@
   "service.errorHandler.text": "{name} kon niet geladen worden.",
   "service.webviewLoader.loading": "{service} wordt geladen",
   "services.getStarted": "Begin",
-  "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.login": "Log alstublieft in om Ferdi te gebruiken.",
+  "services.serverInfo": "U kunt ook uw Ferdi server veranderen door op het tandwieltje in de linker onderhoek te klikken. Als u overschakelt (van een van de gehoste servers) naar Ferdi zonder account wees u ervan bewust dat u uw gegevens van de server kunt exporteren en deze vervolgens kunt importeren via het Help-menu om al uw werkruimtes en geconfigureerde diensten weer te genereren!",
+  "services.serverless": "Gebruik Ferdi zonder account",
   "services.welcome": "Welkom bij Ferdi",
-  "settings.account.account.editButton": "Bewerk 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.account.editButton": "Account bewerken",
+  "settings.account.accountUnavailable": "Account is niet beschikbaar",
+  "settings.account.accountUnavailableInfo": "U gebruikt Ferdi zonder account. Als u Ferdi wilt gebruiken met een account en uw services gesynchroniseerd wilt houden tussen installaties, selecteer een server in het tabblad Instellingen en log in.",
   "settings.account.buttonSave": "Update profiel",
   "settings.account.deleteAccount": "Verwijder account",
   "settings.account.deleteEmailSent": "Je hebt een e-mail ontvangen met een link om het verwijderen van je account te bevestigen. Je accountgegevens en -data kunnen na verwijderen niet meer worden teruggehaald!",
   "settings.account.deleteInfo": "Wanneer je je Ferdi-account niet langer wilt gebruiken, kun je je account en alle gerelateerde data verwijderen.",
   "settings.account.headline": "Account",
-  "settings.account.headlineAccount": "Accountinformatie",
+  "settings.account.headlineAccount": "Account informatie",
   "settings.account.headlineDangerZone": "Gevarenzone",
   "settings.account.headlineInvoices": "Facturen",
-  "settings.account.headlinePassword": "Wijzig wachtwoord",
+  "settings.account.headlinePassword": "Wachtwoord wijzigen",
   "settings.account.headlineProfile": "Update profiel",
   "settings.account.successInfo": "Je wijzigingen zijn opgeslagen",
   "settings.account.tryReloadServices": "Probeer opnieuw",
   "settings.account.tryReloadUserInfoRequest": "Probeer opnieuw",
   "settings.account.userInfoRequestFailed": "Kon gebruikersinformatie niet laden",
-  "settings.account.yourLicense": "Your Ferdi License",
-  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
+  "settings.account.yourLicense": "Uw Ferdi licentie:",
+  "settings.app.accentColorInfo": "Schrijf uw accentkleur in een CSS-compatibel formaat (standaard: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Cache legen",
   "settings.app.buttonInstallUpdate": "Opnieuw opstarten & update installeren",
-  "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder",
-  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
+  "settings.app.buttonOpenFerdiProfileFolder": "Profielmap openen",
+  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open de map servicerecepten",
   "settings.app.buttonSearchForUpdate": "Controleer op updates",
   "settings.app.cacheInfo": "Ferdi gebruikt op dit moment {size} schijfruimte aan tijdelijke bestanden.",
-  "settings.app.cacheNotCleared": "Couldn't clear all cache",
-  "settings.app.closeSettings": "Close settings",
+  "settings.app.cacheNotCleared": "Kon alle cache niet legen",
+  "settings.app.closeSettings": "Instellingen sluiten",
   "settings.app.currentVersion": "Huidige versie:",
-  "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.accentColor": "Accent kleur",
+  "settings.app.form.adaptableDarkMode": "Donkere modus synchroniseren met de instelling van mijn OS",
+  "settings.app.form.alwaysShowWorkspaces": "Werkruimte lade altijd weergeven",
   "settings.app.form.autoLaunchInBackground": "Open op de achtergrond",
   "settings.app.form.autoLaunchOnStart": "Open Ferdi bij opstarten",
-  "settings.app.form.automaticUpdates": "Enable updates",
+  "settings.app.form.automaticUpdates": "Updates inschakelen",
   "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.clipboardNotifications": "Meldingen voor klembord niet weergeven",
+  "settings.app.form.closeToSystemTray": "Minimaliseer Ferdi naar systeemvak",
+  "settings.app.form.confirmOnQuit": "Bevestigen bij het sluiten van Ferdi",
+  "settings.app.form.customTodoServer": "Aangepaste Todo Server",
+  "settings.app.form.darkMode": "Dark mode aanzetten",
   "settings.app.form.enableGPUAcceleration": "Schakel videokaart-acceleratie in ",
-  "settings.app.form.enableLock": "Enable Password Lock",
-  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
+  "settings.app.form.enableLock": "Wachtwoordvergrendeling inschakelen",
+  "settings.app.form.enableMenuBar": "Altijd Ferdi weergeven in de menubalk",
   "settings.app.form.enableSpellchecking": "Zet spellingcontrole aan",
-  "settings.app.form.enableSystemTray": "Pictogram voor Ferdi in systeemvak tonen",
-  "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.enableSystemTray": "Laat Ferdi altijd in systeembalk zien",
+  "settings.app.form.enableTodos": "Ferdi Todos inschakelen",
+  "settings.app.form.hibernateOnStartup": "Diensten in slaapstand houden bij opstarten",
+  "settings.app.form.hibernationStrategy": "Slaapstand strategie",
+  "settings.app.form.iconSize": "Service icoongrootte",
+  "settings.app.form.inactivityLock": "Vergrendel na inactiviteit",
+  "settings.app.form.keepAllWorkspacesLoaded": "Houd alle werkruimtes geladen",
   "settings.app.form.language": "Taal",
   "settings.app.form.lockPassword": "Wachtwoord",
   "settings.app.form.minimizeToSystemTray": "Minimaliseer Ferdi naar systeemvak",
-  "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.navigationBarBehaviour": "Navigatiebalk gedrag",
+  "settings.app.form.notifyTaskBarOnMessage": "Informeer TakenBalk / Dock op een nieuw bericht",
+  "settings.app.form.passwordToggle": "Wachtwoord wijzigen",
+  "settings.app.form.predefinedTodoServer": "Taak Server",
   "settings.app.form.privateNotifications": "Toon geen bericht-inhoud in meldingen",
-  "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
+  "settings.app.form.reloadAfterResume": "Herlaad Ferdi na systeem hervatten",
   "settings.app.form.runInBackground": "Houd Ferdi open op de achtergrond wanneer het venster gesloten wordt",
-  "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
+  "settings.app.form.scheduledDNDEnabled": "Activeer geplande niet-storen modus",
   "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.scheduledDNDStart": "Van",
+  "settings.app.form.searchEngine": "Zoekmachine",
+  "settings.app.form.sentry": "Verzend telemetrie gegevens",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Toon uitgeschakelde services",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -267,7 +256,7 @@
   "settings.app.languageDisclaimer": "Ferdi spreekt officieel Engels en Duits. Alle andere talen worden beheerd door de community.",
   "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Wachtwoord",
-  "settings.app.lockedPasswordInfo": "Zorg ervoor dat je een wachtwoord instelt dat je niet vergeet.\nAls je dit wachtwoord verliest, moet je Ferdi opnieuw installeren.",
+  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Deze wijziging heeft een herstart nodig",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Verwijder service",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Bewerk {name}",
   "settings.service.form.enableAudio": "Audio inschakelen",
   "settings.service.form.enableBadge": "Toon badges met ongelezen berichten",
@@ -332,18 +321,19 @@
   "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": "Indien uitgeschakeld, worden meldingen en audio niet afgespeeld",
   "settings.service.form.name": "Naam",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy instellingen",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy instellingen worden niet gesynchroniseerd met de Ferdi servers",
+  "settings.service.form.proxy.info": "Proxy instellingen worden niet gesynchroniseerd met de Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Proxy gebruiken",
   "settings.service.form.proxy.password": "Wachtwoord (optioneel)",
   "settings.service.form.proxy.port": "Poort",
   "settings.service.form.proxy.restartInfo": "Start Ferdi opnieuw na het aanpassen van proxy instellingen.",
   "settings.service.form.proxy.user": "Gebruiker (optioneel)",
-  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
+  "settings.service.form.recipeFileInfo": "Je gebruikersbestanden worden op de webpagina ingevoegd zodat je diensten op elke manier kunt aanpassen. Gebruikersbestanden worden alleen lokaal opgeslagen en worden niet overgebracht naar andere computers met hetzelfde account.",
   "settings.service.form.saveButton": "Service opslaan",
   "settings.service.form.tabHosted": "Gehost",
   "settings.service.form.tabOnPremise": "Zelf-gehost ��",
@@ -353,7 +343,8 @@
   "settings.services.deletedInfo": "Service is verwijderd",
   "settings.services.discoverServices": "Ontdek services",
   "settings.services.headline": "Jouw services",
-  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.noServicesAdded": "Start met een service toe te voegen.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Kan jouw services niet laden",
   "settings.services.tooltip.isDisabled": "Service is uitgeschakeld",
   "settings.services.tooltip.isMuted": "Geluid is uitgeschakeld",
@@ -384,7 +375,7 @@
   "settings.user.form.accountType.company": "Bedrijf",
   "settings.user.form.accountType.individual": "Individueel",
   "settings.user.form.accountType.label": "Accounttype",
-  "settings.user.form.accountType.non-profit": "Non-Profit",
+  "settings.user.form.accountType.non-profit": "Non-profit",
   "settings.user.form.currentPassword": "Huidige wachtwoord",
   "settings.user.form.email": "E-mailadres",
   "settings.user.form.firstname": "Voornaam",
@@ -405,13 +396,13 @@
   "settings.workspaces.tryReloadWorkspaces": "Probeer opnieuw",
   "settings.workspaces.updatedInfo": "Je wijzigingen zijn opgeslagen",
   "settings.workspaces.workspaceFeatureHeadline": "Less is More: Zie hier Ferdi Werkruimtes",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi werkruimtes laat je aandacht geven aan wat nu belangrijk is. Maak verschillende sets van services aan en schakel wanneer je wilt tussen de verschillende sets. Jij beslist welke services je wanneer en waar nodig hebt. Zo helpen wij jou je focus te behouden - of net zo gemakkelijk te switchen van werk naar ontspanning.",
+  "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": "Kan jouw werkruimtes niet laden",
-  "setupAssistant.headline": "Let's get started",
+  "setupAssistant.headline": "Laten we beginnen",
   "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": "Voeg service toe",
-  "sidebar.closeTodosDrawer": "Close Ferdi Todos",
+  "sidebar.closeTodosDrawer": "Sluit Ferdi Todos",
   "sidebar.closeWorkspaceDrawer": "Werkruimtepagina sluiten",
   "sidebar.lockFerdi": "Ferdi vergrendelen",
   "sidebar.muteApp": "Berichten & geluid uitschakelen",
@@ -430,36 +421,36 @@
   "signup.password.label": "Wachtwoord",
   "signup.submit.label": "Account aanmaken",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Verwijder service",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Audio uitschakelen",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Meldingen uitschakelen",
   "tabs.item.disableService": "Service uitschakelen",
   "tabs.item.enableAudio": "Audio inschakelen",
-  "tabs.item.enableDarkMode": "Enable Dark mode",
+  "tabs.item.enableDarkMode": "Donkere modus inschakelen",
   "tabs.item.enableNotification": "Meldingen inschakelen",
   "tabs.item.enableService": "Service inschakelen",
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Herladen",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} is niet geldig",
-  "validation.minLength": "{field} dient minimaal {length} karakters lang te zijn",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "Minstens één vereist",
-  "validation.required": "{field} is vereist",
+  "validation.required": "{field} is required",
   "validation.url": "{field} is geen geldige URL",
   "webControls.back": "Terug",
-  "webControls.forward": "Forward",
+  "webControls.forward": "Doorsturen",
   "webControls.goHome": "Home",
-  "webControls.openInBrowser": "Open in Browser",
+  "webControls.openInBrowser": "Openen in Browser",
   "webControls.reload": "Herladen",
   "welcome.loginButton": "Log in op je account",
   "welcome.signupButton": "Maak een gratis account aan",
-  "workspaceDrawer.addNewWorkspaceLabel": "Voeg een nieuwe werkruimte toe",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "Alle services",
   "workspaceDrawer.headline": "Werkruimtes",
   "workspaceDrawer.item.contextMenuEdit": "bewerken",
   "workspaceDrawer.item.noServicesAddedYet": "Nog geen services toegevoegd",
-  "workspaceDrawer.workspaceFeatureInfo": "Ferdi werkruimtes laat je aandacht geven aan wat nu belangrijk is. Maak verschillende sets van services aan en schakel wanneer je wilt tussen de verschillende sets. Jij beslist welke services je wanneer en waar nodig hebt. Zo helpen wij jou je focus te behouden - of net zo gemakkelijk te switchen van werk naar ontspanning.",
-  "workspaceDrawer.workspacesSettingsTooltip": "Werkruimte instellingen aanpassen",
+  "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": "Overschakelen naar"
 }
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index 548cba3ce..cfa523a35 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Last inn på nytt",
-  "app.errorHandler.headline": "Noe gikk galt",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Egendefinert tjener",
   "changeserver.headline": "Bytt tjener",
   "changeserver.label": "Tjener",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "Hva skjedde?",
   "connectionLostBanner.message": "Ã… nei! Ferdi mistet forbindelsen til {name}.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publiser feilsøkingsinformasjon",
   "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",
@@ -24,8 +23,8 @@
   "feature.quickSwitch.info": "Velg en tjeneste med TAB, ↑ og ↓. Åpne en tjeneste med ENTER.",
   "feature.quickSwitch.search": "Søk...",
   "feature.quickSwitch.title": "Hurtigbytte",
-  "global.api.unhealthy": "Kan ikke koble til Ferdi online-tjenester",
-  "global.cancel": "Avbryt",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Rediger",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Du er ikke koblet til Internett.",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Innstillinger",
+  "global.settings": "Settings",
   "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.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 Ferdi 4-tjenestene dine",
   "import.notSupportedHeadline": "Tjenester som ikke støttes enda i Ferdi 5",
   "import.skip.label": "Jeg ønsker å legge til tjenester manuelt",
-  "import.submit.label": "Importer tjenester",
+  "import.submit.label": "Import {count} services",
   "infobar.authRequestFailed": "Det oppstod en feil under forsøket med en autentisert forespørsel. Prøv å logge ut og inn igjen om denne feilen vedvarer.",
-  "infobar.buttonChangelog": "Hva er nytt?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Start på nytt og installer oppdatering",
   "infobar.buttonReloadServices": "Last inn tjenestene på nytt",
   "infobar.hide": "Skjul",
@@ -75,7 +74,7 @@
   "login.email.label": "E-postadresse",
   "login.headline": "Logg inn",
   "login.invalidCredentials": "E-posten eller passordet er ikke gyldig",
-  "login.link.password": "Tilbakestill passord",
+  "login.link.password": "Reset password",
   "login.link.signup": "Opprett en gratis konto",
   "login.password.label": "Passord",
   "login.serverLogout": "Din økt er utløpet, vennligst logg inn igjen.",
@@ -117,10 +116,10 @@
   "menu.help.support": "Brukerstøtte",
   "menu.help.tos": "Vilkår for bruk",
   "menu.services": "Tjenester",
-  "menu.services.activatePreviousService": "Aktiver forrige tjeneste",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Hjem",
-  "menu.services.setNextServiceActive": "Aktiver neste tjeneste",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Gjøremål",
   "menu.todos.enableTodos": "Aktiver gjøremål",
   "menu.view": "Vis",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Alle tjenester",
   "menu.workspaces.openWorkspaceDrawer": "Åpne skuff for arbeidsområder",
   "password.email.label": "E-postadresse",
-  "password.headline": "Tilbakestill passord",
+  "password.headline": "Reset password",
   "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.successInfo": "Vennligst sjekk e-posten din",
-  "pricing.features.accountSync": "Konto synkronisering",
-  "pricing.features.customWebsites": "Legg til egendefinerte nettsteder",
-  "pricing.features.desktopNotifications": "Skrivebord varsler",
-  "pricing.features.onPremise": "On-premise og andre selvbetjente tjenester",
-  "pricing.features.recipes": "Velg fra mer enn 70 tjenester",
-  "pricing.features.serviceProxies": "Mellomtjenere for tjenester",
-  "pricing.features.spellchecker": "Støtte for stavekontroll",
-  "pricing.features.teamManagement": "Team-administrasjon",
-  "pricing.features.thirdPartyServices": "Installer tredjepartstjenester",
-  "pricing.features.unlimitedServices": "Legg til ubegrenset antall tjenester",
-  "pricing.features.workspaces": "Arbeidsområder",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Last {name} inn på nytt",
   "service.crashHandler.autoReload": "Prøver å automatisk gjenopprette {name} om {seconds} sekunder",
   "service.crashHandler.headline": "Ã… nei!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Bruk Ferdi uten en konto",
   "services.welcome": "Velkommen til Ferdi",
-  "settings.account.account.editButton": "Rediger konto",
+  "settings.account.account.editButton": "Edit account",
   "settings.account.accountUnavailable": "Kontoen er ikke tilgjengelig",
   "settings.account.accountUnavailableInfo": "Du bruker Ferdi uten en konto. Hvis du ønsker å bruke Ferdi med en konto og hold tjenestene dine synkronisert på tvers av installasjoner, velg en tjener i fanen innstillinger og logg inn.",
   "settings.account.buttonSave": "Oppdater profil",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Du har mottatt en e-post med en lenke for å bekrefte sletting av kontoen din. Din konto og dine data kan ikke gjenopprettes!",
   "settings.account.deleteInfo": "Hvis du ikke trenger Ferdi-kontoen din lenger, så kan du slette kontoen din og alle de relaterte dataene her.",
   "settings.account.headline": "Konto",
-  "settings.account.headlineAccount": "Kontoinformasjon",
-  "settings.account.headlineDangerZone": "Faresone",
-  "settings.account.headlineInvoices": "Fakturaer",
-  "settings.account.headlinePassword": "Endre passord",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Oppdater profil",
   "settings.account.successInfo": "Dine endringer har blitt lagret",
   "settings.account.tryReloadServices": "Prøv igjen",
   "settings.account.tryReloadUserInfoRequest": "Prøv igjen",
   "settings.account.userInfoRequestFailed": "Kunne ikke laste brukerinformasjonen",
-  "settings.account.yourLicense": "Din Ferdi lisens",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Tøm hurtiglager",
   "settings.app.buttonInstallUpdate": "Start på nytt og installer oppdatering",
@@ -219,13 +207,13 @@
   "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.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Aktiver mørkt tema",
   "settings.app.form.enableGPUAcceleration": "Aktiver GPU-akselerasjon",
   "settings.app.form.enableLock": "Aktiver passordlås",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Aktiver stavekontroll",
-  "settings.app.form.enableSystemTray": "Vis Ferdi i systemstatusfeltet",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Aktiver Ferdi gjøremål",
   "settings.app.form.hibernateOnStartup": "Hold tjenestene i dvalemodus ved oppstart",
   "settings.app.form.hibernationStrategy": "Dvalemodus-strategi",
@@ -251,9 +239,10 @@
   "settings.app.form.showDisabledServices": "Vis deaktiverte tjenestefaner",
   "settings.app.form.showDragArea": "Vis flyttbart område i vinduet",
   "settings.app.form.showMessagesBadgesWhenMuted": "Vis uleste meldingsetiketter når varsler er deaktivert",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimert",
   "settings.app.form.universalDarkMode": "Aktiver universelt mørkt tema",
-  "settings.app.form.useTouchIdToUnlock": "Tillat å bruke TouchID for å låse opp Ferdi",
+  "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": "Avansert",
@@ -267,7 +256,7 @@
   "settings.app.languageDisclaimer": "Offisielle oversettelser er engelsk & tysk. Alle andre språk er samfunnsbaserte oversettelser.",
   "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Passord",
-  "settings.app.lockedPasswordInfo": "Vennligst angi et passord du vil huske.\nHvis du mister dette passordet må du installere Ferdi på nytt.",
+  "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": "Endringer krever omstart",
   "settings.app.scheduledDNDInfo": "Planlagt ikke-forstyrr lar deg definere en tidsperiode hvor du ikke vil få varsler fra Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Tider i 24-Hour-Format. Sluttiden kan være før starttiden (f.eks start 17:00, slutt 09:00) for å aktivere ikke-forstyrr over natten.",
@@ -275,7 +264,7 @@
   "settings.app.spellCheckerLanguageInfo": "Ferdi bruker Mac'en sin innebygde stavekontroll, for å se etter skrivefeil. Hvis du vil endre språket på stavekontrollen, så kan du gjøre det under Mac'ens system-innstillinger.",
   "settings.app.subheadlineCache": "Hurtiglager",
   "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
-  "settings.app.todoServerInfo": "Denne tjeneren vil ble brukt for \"Ferdi gjøremål\" funksjonen.",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Hjelp oss med å oversette Ferdi til ditt språk.",
   "settings.app.universalDarkModeInfo": "Universelt mørkt tema prøver å dynamisk generere mørke stiler for tjenester som ikke har denne støtten enda.",
   "settings.app.updateStatusAvailable": "Oppdatering tilgjengelig, laster ned...",
@@ -294,9 +283,9 @@
   "settings.recipes.customService.headline.communityRecipes": "Fellesskap 3. parts oppskrifter",
   "settings.recipes.customService.headline.customRecipes": "Tilpassede 3. parts oppskrifter",
   "settings.recipes.customService.headline.devRecipes": "Dine utviklingstjeneste oppskrifter",
-  "settings.recipes.customService.intro": "Hvis du vil legge til en egendefinert tjeneste, så kan du kopiere oppskriften for tjenesten til:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
   "settings.recipes.customService.openDevDocs": "Utviklerdokumentasjon",
-  "settings.recipes.customService.openFolder": "Ã…pne mappe",
+  "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Tilgjengelige tjenester",
   "settings.recipes.missingService": "Mangler en tjeneste?",
   "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.",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Lysstyrke for lesing i mørket",
   "settings.service.form.darkReaderContrast": "Kontrast for lesing i mørket",
   "settings.service.form.darkReaderSepia": "Sepia for lesing i mørket",
-  "settings.service.form.deleteButton": "Slett tjeneste",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Rediger {name}",
   "settings.service.form.enableAudio": "Aktiver lyd",
   "settings.service.form.enableBadge": "Vis uleste meldingsetiketter",
@@ -332,17 +321,18 @@
   "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": "NÃ¥r deaktivert, blir alle varslingslyder og lydavspillinger dempet",
   "settings.service.form.name": "Navn",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Ã…pne darkmode.css",
   "settings.service.form.openUserCss": "Ã…pne user.css",
   "settings.service.form.openUserJs": "Ã…pne user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS mellomtjener-innstillinger",
   "settings.service.form.proxy.host": "Mellomtjener vert/IP",
-  "settings.service.form.proxy.info": "Mellomtjener-innstillinger vil ikke blir synkronisert med Ferdi tjenerne.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Bruk mellomtjener",
-  "settings.service.form.proxy.password": "Passord (valgfritt)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
   "settings.service.form.proxy.restartInfo": "Vennligst start Ferdig på nytt etter å ha endre mellomtjener-innstillingene.",
-  "settings.service.form.proxy.user": "Bruker (valgfritt)",
+  "settings.service.form.proxy.user": "User (optional)",
   "settings.service.form.recipeFileInfo": "Brukerfilene dine vil bli plassert på nettsiden slik at du kan tilpasse tjenestene på alle måter du ønsker. Brukerfilene lagres bare lokalt og overføres ikke til andre datamaskiner som bruker samme konto.",
   "settings.service.form.saveButton": "Lagre tjeneste",
   "settings.service.form.tabHosted": "Selvbetjent",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Oppdag tjenester",
   "settings.services.headline": "Dine tjenester",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Kunne ikke laste dine tjenester",
   "settings.services.tooltip.isDisabled": "Tjenesten er deaktivert",
   "settings.services.tooltip.isMuted": "Alle lyder er dempet",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Ikke-profittbasert",
   "settings.user.form.currentPassword": "Nåværende passord",
   "settings.user.form.email": "E-post",
-  "settings.user.form.firstname": "Fornavn",
-  "settings.user.form.lastname": "Etternavn",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Nytt passord",
   "settings.workspace.add.form.name": "Navn",
   "settings.workspace.add.form.submitButton": "Opprett arbeidsområde",
@@ -405,7 +396,7 @@
   "settings.workspaces.tryReloadWorkspaces": "Prøv igjen",
   "settings.workspaces.updatedInfo": "Dine endringer har blitt lagret",
   "settings.workspaces.workspaceFeatureHeadline": "Mindre er mer: Vi innfører Ferdi arbeidsområder",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi arbeidsområder lar deg fokusere på hva som er viktig akkurat nå. Sett opp forskjellige sett av tjenester, og veksle enkelt mellom dem når som helst. Du bestemmer hvilke tjenester du trenger når og hvor, så vi kan hjelpe deg med å bli best i spillet - eller enkelt koble av fra jobb når du måtte trenge det.",
+  "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": "Kunne ikke laste dine arbeidsområder",
   "setupAssistant.headline": "Let's get started",
   "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "Aktiver varsler og lyd",
   "signup.email.label": "E-postadresse",
   "signup.emailDuplicate": "Det finnes allerede en bruker med den e-postadressen",
-  "signup.firstname.label": "Fornavn",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Registrer deg",
-  "signup.lastname.label": "Etternavn",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Ved å opprette en Ferdi-konto godtar du",
   "signup.legal.privacy": "Personvernerklæring",
   "signup.legal.terms": "Vilkår for bruk",
@@ -430,11 +421,11 @@
   "signup.password.label": "Passord",
   "signup.submit.label": "Opprett konto",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Slett tjeneste",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Deaktiver lyd",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Deaktiver varslinger",
-  "tabs.item.disableService": "Deaktiver tjeneste",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Aktiver lyd",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktiver varsler",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Last inn på nytt",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} er ikke gyldig",
-  "validation.minLength": "{field} bør være minst {length} tegn",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "Minst en er påkrevd",
-  "validation.required": "{field} er påkrevd",
-  "validation.url": "{field} er ikke en gyldig nettadresse",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Tilbake",
   "webControls.forward": "Videresend",
   "webControls.goHome": "Hjem",
@@ -454,12 +445,12 @@
   "webControls.reload": "Last inn på nytt",
   "welcome.loginButton": "Logg på kontoen din",
   "welcome.signupButton": "Opprett en gratis konto",
-  "workspaceDrawer.addNewWorkspaceLabel": "Opprett nytt arbeidsområde",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "Alle tjenester",
   "workspaceDrawer.headline": "Arbeidsområder",
   "workspaceDrawer.item.contextMenuEdit": "rediger",
   "workspaceDrawer.item.noServicesAddedYet": "Ingen tjenester er lagt til ennå",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi arbeidsområder lar deg fokusere på hva som er viktig akkurat nå. Sett opp forskjellige sett av tjenester, og veksle enkelt mellom dem når som helst.</p><p>Du bestemmer hvilke tjenester du trenger når og hvor, så vi kan hjelpe deg med å bli best i spillet - eller enkelt koble av fra jobb når du måtte trenge det.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Rediger innstillinger for arbeidsområder",
+  "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": "Bytter til"
 }
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index ea37ec76c..a19c7c444 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Odśwież",
-  "app.errorHandler.headline": "Coś poszło nie tak",
+  "app.errorHandler.headline": "Coś poszło nie tak.",
   "changeserver.customServerLabel": "Spersonalizowany serwer",
   "changeserver.headline": "Zmień serwer",
   "changeserver.label": "Serwer",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "Co się stało?",
   "connectionLostBanner.message": "O nie! Ferdi stracił połączenie z {name}.",
   "feature.basicAuth.signIn": "Zaloguj siÄ™",
-  "feature.debugger.title": "Opublikuj dane diagnostyczne",
   "feature.nightlyBuilds.activate": "Aktywuj",
   "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",
@@ -23,15 +22,15 @@
   "feature.publishDebugInfo.title": "Opublikuj dane diagnostyczne",
   "feature.quickSwitch.info": "Wybierz usługę naciskając TAB, ↑ oraz ↓. Otwórz usługę naciskając ENTER.",
   "feature.quickSwitch.search": "Szukaj...",
-  "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "Nie można połączyć się z usługami Ferdi online",
+  "feature.quickSwitch.title": "Szybkie przełączenie",
+  "global.api.unhealthy": "Nie można połączyć z usługami Ferdi",
   "global.cancel": "Anuluj",
   "global.edit": "Edytuj",
   "global.no": "Nie",
   "global.notConnectedToTheInternet": "Nie masz połączenia z Internetem.",
   "global.ok": "Ok",
   "global.quit": "Wyjdź",
-  "global.quitConfirmation": "Czy napewno chcesz wyjść z Ferdi?",
+  "global.quitConfirmation": "Czy chcesz wyjść z Ferdi?",
   "global.save": "Zapisz",
   "global.settings": "Ustawienia",
   "global.spellchecker.useDefault": "Użyj domyślnego dla systemu ({default})",
@@ -45,7 +44,7 @@
   "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",
-  "import.submit.label": "Zaimportuj usługi",
+  "import.submit.label": "Importuj {count} usług",
   "infobar.authRequestFailed": "Pojawiły się błędy podczas próby uwierzytelniania. Proszę spróbuj się wylogować i zalogować ponownie, jeśli ten błąd będzie się powtarzał.",
   "infobar.buttonChangelog": "Co nowego?",
   "infobar.buttonInstallUpdate": "Uruchom ponownie i zainstaluj aktualizacjÄ™",
@@ -70,13 +69,13 @@
   "locked.touchIdPrompt": "odblokuj przez Touch ID",
   "locked.unlockWithPassword": "Odblokuj hasłem",
   "login.changeServer": "Zmień serwer",
-  "login.customServerQuestion": "Using a custom Ferdi server?",
-  "login.customServerSuggestion": "Try importing your Franz account",
+  "login.customServerQuestion": "Używasz niestandardowego serwera Ferdi?",
+  "login.customServerSuggestion": "Spróbuj zaimportować konto Franz",
   "login.email.label": "Adres email",
   "login.headline": "Zaloguj siÄ™",
   "login.invalidCredentials": "Adres email lub hasło są błędne",
-  "login.link.password": "Zresetuj hasło",
-  "login.link.signup": "Załóż darmowe konto",
+  "login.link.password": "Resetuj hasło",
+  "login.link.signup": "Załóż konto",
   "login.password.label": "Hasło",
   "login.serverLogout": "Twoja sesja wygasła, zaloguj się ponownie.",
   "login.submit.label": "Zaloguj siÄ™",
@@ -117,17 +116,17 @@
   "menu.help.support": "Wsparcie",
   "menu.help.tos": "Warunki użytkowania",
   "menu.services": "Usługi",
-  "menu.services.activatePreviousService": "Poprzednia usługa",
-  "menu.services.addNewService": "Dodaj nową usługę",
+  "menu.services.activatePreviousService": "Aktywuj poprzednią usługę",
+  "menu.services.addNewService": "Dodaj nową usługę...",
   "menu.services.goHome": "Strona główna",
-  "menu.services.setNextServiceActive": "Następna usługa",
+  "menu.services.setNextServiceActive": "Aktywuj następną usługę",
   "menu.todos": "Lista zadań",
   "menu.todos.enableTodos": "Włącz listę zadań",
   "menu.view": "Widok",
   "menu.view.back": "Wstecz",
   "menu.view.forward": "Prześlij dalej",
   "menu.view.lockFerdi": "Zablokuj Ferdi",
-  "menu.view.openQuickSwitch": "Otwórz Quick Switch",
+  "menu.view.openQuickSwitch": "Otwórz szybki wybór",
   "menu.view.reloadFerdi": "Przeładuj Ferdi",
   "menu.view.reloadService": "Przeładuj usługę",
   "menu.view.reloadTodos": "Odśwież Zadania",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Wszystkie usługi",
   "menu.workspaces.openWorkspaceDrawer": "Otwórz edytor obszaru roboczego",
   "password.email.label": "Adres email",
-  "password.headline": "Zresetuj hasło",
+  "password.headline": "Resetuj hasło",
   "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.successInfo": "Proszę sprawdzić swój email",
-  "pricing.features.accountSync": "Synchronizacja konta",
-  "pricing.features.customWebsites": "Dodawanie dowolnych stron internetowych",
-  "pricing.features.desktopNotifications": "Powiadomienia na pulpicie",
-  "pricing.features.onPremise": "Lokalne i inne hostowane usługi",
-  "pricing.features.recipes": "Wybierz spośród ponad 70 usług",
-  "pricing.features.serviceProxies": "Proxy usługi",
-  "pricing.features.spellchecker": "Obsługa sprawdzania pisowni",
-  "pricing.features.teamManagement": "Zarządzanie zespołem",
-  "pricing.features.thirdPartyServices": "Instalacja zewnętrznych usług",
-  "pricing.features.unlimitedServices": "Dodawanie nielimitowanych usług",
-  "pricing.features.workspaces": "Obszary robocze",
+  "password.noUser": "Użytkownik z podanym adresem email nie istnieje",
+  "password.successInfo": "Twoje nowe hasło zostało wysłane na Twoją skrzynkę mailową",
   "service.crashHandler.action": "Przeładuj {name}",
   "service.crashHandler.autoReload": "Próba automatycznego odnowienia {name} za {seconds} sekund/y",
   "service.crashHandler.headline": "O nie!",
@@ -178,10 +166,10 @@
   "service.webviewLoader.loading": "Wczytywanie {service}",
   "services.getStarted": "Zacznij",
   "services.login": "Zaloguj się, aby używać Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
+  "services.serverInfo": "Opcjonalnie możesz zmienić swój serwer Ferdi klikając zębatkę w lewym dolnym rogu. Jeżeli przełączasz się (z jednego z hostowanych serwerów) do serwerów Ferdi bez konta, pamiętaj, że możesz wyeksportować swoje dane z tego serwera a następnie zaimportować je używając opcji Pomoc w menu aby przywrócić swoje obszary robocze i skonfigurowane usługi!",
   "services.serverless": "Używaj Ferdi bez konta",
   "services.welcome": "Witaj w programie Ferdi",
-  "settings.account.account.editButton": "Modyfikuj konta",
+  "settings.account.account.editButton": "Edytuj konto",
   "settings.account.accountUnavailable": "Konto jest niedostępne",
   "settings.account.accountUnavailableInfo": "Używasz Ferdi bez konta. Jeśli chcesz używać Ferdi z kontem i synchronizować swoje usługi pomiędzy klientami, wybierz serwer w zakładce Ustawienia i zaloguj się.",
   "settings.account.buttonSave": "Uaktualnij profil",
@@ -190,7 +178,7 @@
   "settings.account.deleteInfo": "Jeżeli nie potrzebujesz już konta Ferdi, możesz je usunąć oraz wszystkie dane na nim zapisane.",
   "settings.account.headline": "Konto",
   "settings.account.headlineAccount": "Informacje o koncie",
-  "settings.account.headlineDangerZone": "Niebezpieczna strefa",
+  "settings.account.headlineDangerZone": "Strefa niebezpieczna",
   "settings.account.headlineInvoices": "Faktury",
   "settings.account.headlinePassword": "Zmień hasło",
   "settings.account.headlineProfile": "Uaktualnij profil",
@@ -198,12 +186,12 @@
   "settings.account.tryReloadServices": "Spróbuj ponownie",
   "settings.account.tryReloadUserInfoRequest": "Spróbuj ponownie",
   "settings.account.userInfoRequestFailed": "Nie można wczytać informacji o użytkowniku",
-  "settings.account.yourLicense": "Twoja licencja Ferdi",
+  "settings.account.yourLicense": " Twoja licencja Ferdi:",
   "settings.app.accentColorInfo": "Zdefiniuj kolor akcentu w formacie zgodnym z CSS. (Domyślnie: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Wyczyść pamięć podręczną (cache)",
   "settings.app.buttonInstallUpdate": "Uruchom ponownie i zainstaluj aktualizacjÄ™",
   "settings.app.buttonOpenFerdiProfileFolder": "Pokaż folder z profilami",
-  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
+  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Otwórz folder usług",
   "settings.app.buttonSearchForUpdate": "Sprawdź aktualizacje",
   "settings.app.cacheInfo": "Pamięć podręczna zajmuje obecnie {size} przestrzeni dyskowej",
   "settings.app.cacheNotCleared": "Błąd czyszczenia pamięci podręcznej",
@@ -219,24 +207,24 @@
   "settings.app.form.clipboardNotifications": "Nie wyświetlaj powiadomień dla schowka",
   "settings.app.form.closeToSystemTray": "Zminimalizuj Ferdi do paska zadań",
   "settings.app.form.confirmOnQuit": "Potwierdź podczas opuszczania Ferdi",
-  "settings.app.form.customTodoServer": "Własny serwer listy zadań",
-  "settings.app.form.darkMode": "WÅ‚Ä…cz tryb ciemny",
+  "settings.app.form.customTodoServer": "Niestandardowy serwer Todo",
+  "settings.app.form.darkMode": "WÅ‚Ä…cz Ciemny motyw",
   "settings.app.form.enableGPUAcceleration": "WÅ‚Ä…cz akceleracjÄ™ GPU",
   "settings.app.form.enableLock": "Włącz blokadę hasłem",
   "settings.app.form.enableMenuBar": "Zawsze wyświetlaj Ferdi na pasku zadań",
   "settings.app.form.enableSpellchecking": "WÅ‚Ä…cz sprawdzanie pisowni",
-  "settings.app.form.enableSystemTray": "Pokaż Ferdia w obszarze powiadomień",
+  "settings.app.form.enableSystemTray": "Zawsze pokazuj Ferdi na pasku zadań",
   "settings.app.form.enableTodos": "WÅ‚Ä…cz Zadania Ferdi",
   "settings.app.form.hibernateOnStartup": "Hibernacja usług po starcie systemu",
   "settings.app.form.hibernationStrategy": "Strategia hibernacji",
   "settings.app.form.iconSize": "Rozmiar ikony usługi",
   "settings.app.form.inactivityLock": "Zablokuj przy braku aktywności",
-  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
+  "settings.app.form.keepAllWorkspacesLoaded": "Trzymaj wszystkie pola robocze załadowane",
   "settings.app.form.language": "Język",
   "settings.app.form.lockPassword": "Hasło",
   "settings.app.form.minimizeToSystemTray": "Zminimalizuj aplikacjÄ™ Ferdi",
   "settings.app.form.navigationBarBehaviour": "Zachowanie paska nawigacji",
-  "settings.app.form.notifyTaskBarOnMessage": "Notify TaskBar/Dock on new message",
+  "settings.app.form.notifyTaskBarOnMessage": "Powiadom na pasku zadań o nowej wiadomości",
   "settings.app.form.passwordToggle": "Przełącznik hasła",
   "settings.app.form.predefinedTodoServer": "Serwer Todo",
   "settings.app.form.privateNotifications": "Nie pokazuj treści wiadomości w powiadomieniach",
@@ -249,11 +237,12 @@
   "settings.app.form.sentry": "Wysyłaj dane telemetrii",
   "settings.app.form.serviceRibbonWidth": "Szerokość paska bocznego",
   "settings.app.form.showDisabledServices": "Wyświetlaj karty wyłączonych usług",
-  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showDragArea": "Pokaż obszar do przeciągania w oknie",
   "settings.app.form.showMessagesBadgesWhenMuted": "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone",
+  "settings.app.form.splitMode": "Aktywuj tryb podzielonego widoku",
   "settings.app.form.startMinimized": "Uruchom zminimalizowany",
   "settings.app.form.universalDarkMode": "WÅ‚Ä…cz uniwersalny tryb ciemny",
-  "settings.app.form.useTouchIdToUnlock": "Zezwól na odblokowanie Ferdi przez Touch ID",
+  "settings.app.form.useTouchIdToUnlock": "Zawsze używaj TouchID do odblokowania Ferdi",
   "settings.app.form.useVerticalStyle": "Użyj stylu poziomego",
   "settings.app.form.wakeUpStrategy": "Strategia wybudzania",
   "settings.app.headlineAdvanced": "Zaawansowane",
@@ -262,8 +251,8 @@
   "settings.app.headlineLanguage": "Język",
   "settings.app.headlinePrivacy": "Prywatność",
   "settings.app.headlineUpdates": "Aktualizacje",
-  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
-  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
+  "settings.app.hibernateInfo": "Domyślnie, Ferdi trzyma wszystkie Twoje usługi włączone w tle, aby były gotowe w momencie kiedy będziesz ich potrzebował. Hibernacja usług odłączy Twoje usługi po określonym czasie. Dzięki temu zachowasz pamięć RAM lub zachowasz usługi od spowolnienia komputera.",
+  "settings.app.inactivityLockInfo": "Minut do dezaktywacji, po których Ferdi automatycznie zablokuje. Wybierz 0 aby dezaktywować",
   "settings.app.languageDisclaimer": "Oficjalnymi językami są Angielski i Niemiecki. Inne języki są tłumaczone przez społeczność Ferdi.",
   "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Hasło",
@@ -296,7 +285,7 @@
   "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": "Dokumentacja deweloperska",
-  "settings.recipes.customService.openFolder": "Otwórz folder",
+  "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Dostępne usługi",
   "settings.recipes.missingService": "Brak usługi?",
   "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.",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Usuń usługę",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Edytuj {name}",
   "settings.service.form.enableAudio": "Włącz dźwięk",
   "settings.service.form.enableBadge": "Pokaż znacznik nieprzeczytanych wiadomości",
@@ -332,17 +321,18 @@
   "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": "Kiedy nieaktywne, wszystkie dźwięki powiadomień są wyciszone",
   "settings.service.form.name": "ImiÄ™",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Otwórz darkmode.css",
   "settings.service.form.openUserCss": "Otwórz user.css",
   "settings.service.form.openUserJs": "Otwórz user.js",
   "settings.service.form.proxy.headline": "Ustawienia Proxy HTTP/HTTPS",
   "settings.service.form.proxy.host": "Host Proxy/IP",
-  "settings.service.form.proxy.info": "Ustawienia proxy nie będą zsynchronizowane z serwerami Ferdia.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Użyj Proxy",
-  "settings.service.form.proxy.password": "Hasło (opcjonalnie)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
   "settings.service.form.proxy.restartInfo": "Uruchom ponownie Ferdi po zmianie ustawień proxy.",
-  "settings.service.form.proxy.user": "Użytkownik (opcjonalnie)",
+  "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": "Zapisz usługę",
   "settings.service.form.tabHosted": "Hostowane",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Przeglądaj usługi",
   "settings.services.headline": "Twoje usługi",
   "settings.services.noServicesAdded": "Rozpocznij od dodania usługi.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Nie udało się załadować twoich usług",
   "settings.services.tooltip.isDisabled": "Usługa jest nieaktywna",
   "settings.services.tooltip.isMuted": "Wszystkie dźwięki są wyciszone",
@@ -362,12 +353,12 @@
   "settings.supportFerdi.aboutIntro": "<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>",
   "settings.supportFerdi.bannerText": "Do you want to help us improve Ferdi?",
   "settings.supportFerdi.headline": "O Ferdi",
-  "settings.supportFerdi.openSurvey": "Otwarta ankieta",
+  "settings.supportFerdi.openSurvey": "Open survey",
   "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,",
   "settings.supportFerdi.textDonationAnd": "i",
   "settings.supportFerdi.textExpenses": "While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our",
   "settings.supportFerdi.textGitHubSponsors": "Sponsor na Guthub",
-  "settings.supportFerdi.textListContributors": "Pełna lista współtwórców",
+  "settings.supportFerdi.textListContributors": "Full list of contributors",
   "settings.supportFerdi.textListContributorsHere": "tutaj",
   "settings.supportFerdi.textOpenCollective": "Open Collective",
   "settings.supportFerdi.textSupportWelcome": "Doceniamy każde wsparcie. Listę rzeczy, z którymi potrzebujemy pomocy znajdziesz",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Non-Profit",
   "settings.user.form.currentPassword": "Obecne hasło",
   "settings.user.form.email": "Adres email",
-  "settings.user.form.firstname": "ImiÄ™",
-  "settings.user.form.lastname": "Nazwisko",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Nowe hasło",
   "settings.workspace.add.form.name": "ImiÄ™",
   "settings.workspace.add.form.submitButton": "Stwórz obszar roboczy",
@@ -405,7 +396,7 @@
   "settings.workspaces.tryReloadWorkspaces": "Spróbuj ponownie",
   "settings.workspaces.updatedInfo": "Twoje zmiany zostały zapisane",
   "settings.workspaces.workspaceFeatureHeadline": "Mniej znaczy więcej: Wprowadzenie do obszarów roboczych Ferdi",
-  "settings.workspaces.workspaceFeatureInfo": "Obszary robocze programu Ferdi pozawala Ci na skupieniu się na tym co ważne w danym momencie. Ustaw różne zestawy usług i przełączaj się między nimi w łatwiejszy sposób w dowolnym momencie. Decyduj, które usługi potrzebujesz  , więc pomagamy Ci pozostawać na szczycie gry - lub łatwiej wyłączyć się z pracy kiedy tego potrzebujesz.",
+  "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": "Nie można załadować obszaru roboczego",
   "setupAssistant.headline": "Zaczynajmy",
   "setupAssistant.subheadline": "Wybierz spośród naszych najczęściej używanych usług i powróć do rutynowej komunikacji.",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "Włącz powiadomienia i dźwięki",
   "signup.email.label": "Adres email",
   "signup.emailDuplicate": "Użytkownik z takim adresem email już istnieje",
-  "signup.firstname.label": "ImiÄ™",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Zarejestruj siÄ™",
-  "signup.lastname.label": "Nazwisko",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Poprzez utworzenie konta Ferdi akceptujesz",
   "signup.legal.privacy": "Polityka prywatności",
   "signup.legal.terms": "Warunki świadczenia usług",
@@ -430,23 +421,23 @@
   "signup.password.label": "Hasło",
   "signup.submit.label": "Stwórz konto",
   "tabs.item.confirmDeleteService": "Czy na pewno chcesz usunąć usługę {serviceName}?",
-  "tabs.item.deleteService": "Usuń usługę",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Wyłącz dźwięk",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Wyłącz powiadomienia",
-  "tabs.item.disableService": "Wyłącz usługę",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Włącz dźwięk",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktywuj powiadomienia",
   "tabs.item.enableService": "Aktywuj usługę",
-  "tabs.item.hibernateService": "Hibernuj usługę",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Odśwież",
-  "tabs.item.wakeUpService": "Wybudź usługę",
-  "validation.email": "Pole {field} nie jest poprawne",
-  "validation.minLength": "Pole {field} powinno składać się z co najmniej {length} znaków",
+  "tabs.item.wakeUpService": "Wake up service",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "Przynajmniej jeden jest wymagany",
-  "validation.required": "Pole {field} jest wymagane",
-  "validation.url": "Pole {field} nie jest poprawnym ciÄ…giem URL.",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Wstecz",
   "webControls.forward": "Prześlij dalej",
   "webControls.goHome": "Strona główna",
@@ -454,12 +445,12 @@
   "webControls.reload": "Odśwież",
   "welcome.loginButton": "Zaloguj siÄ™ na swoje konto",
   "welcome.signupButton": "Załóż darmowe konto",
-  "workspaceDrawer.addNewWorkspaceLabel": "Dodaj nowy obszar roboczy",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "Wszystkie usługi",
   "workspaceDrawer.headline": "Obszary robocze",
   "workspaceDrawer.item.contextMenuEdit": "Edycja",
   "workspaceDrawer.item.noServicesAddedYet": "Żadne usługi nie zostały jeszcze dodane",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Obszary robocze programu Ferdi pozawala Ci na skupieniu się na tym co ważne w danym momencie. Ustaw różne zestawy usług i przełączaj się między nimi w łatwiejszy sposób w dowolnym momencie. </p><p>Decyduj, które usługi potrzebujesz  , więc pomagamy Ci pozostawać na szczycie gry - lub łatwiej wyłączyć się z pracy kiedy tego potrzebujesz.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Edytuj ustawienia obszaru roboczego",
+  "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": "Przełącz do"
 }
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 7760834a4..1d068e87e 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Recarregar",
-  "app.errorHandler.headline": "Algo deu errado",
+  "app.errorHandler.headline": "Algo deu errado.",
   "changeserver.customServerLabel": "Servidor personalizado",
   "changeserver.headline": "Alterar servidor",
   "changeserver.label": "Servidor",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "O que aconteceu?",
   "connectionLostBanner.message": "Ah não! Ferdi perdeu a conexão com {name}.",
   "feature.basicAuth.signIn": "Acessar",
-  "feature.debugger.title": "Publicar informações de depuração",
   "feature.nightlyBuilds.activate": "Ativar",
   "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",
@@ -24,7 +23,7 @@
   "feature.quickSwitch.info": "Selecione um serviço com TAB, ↑ e ↓. Abra um serviço com ENTER.",
   "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.api.unhealthy": "Não foi possível conectar ao serviço FreeCite",
   "global.cancel": "Cancelar",
   "global.edit": "Editar",
   "global.no": "Não",
@@ -45,7 +44,7 @@
   "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",
-  "import.submit.label": "Importar serviços",
+  "import.submit.label": "Importar {count} serviços",
   "infobar.authRequestFailed": "Ocorreram erros ao tentar autenticar. Por favor, tente desconectar e autenticar novamente se o erro persistir.",
   "infobar.buttonChangelog": "O que há de novo?",
   "infobar.buttonInstallUpdate": "Reiniciar e instalar atualizações",
@@ -75,7 +74,7 @@
   "login.email.label": "Endereço de e-mail",
   "login.headline": "Iniciar Sessão",
   "login.invalidCredentials": "O email ou a palavra-passe incorretos",
-  "login.link.password": "Repor a minha palavra-passe",
+  "login.link.password": "Redefinir senha",
   "login.link.signup": "Criar uma conta gratuita",
   "login.password.label": "Senha",
   "login.serverLogout": "A sua sessão expirou, inicie sessão novamente.",
@@ -118,7 +117,7 @@
   "menu.help.tos": "Termos do Serviço",
   "menu.services": "Serviços",
   "menu.services.activatePreviousService": "Ativar o serviço anterior",
-  "menu.services.addNewService": "Adicionar Novo Serviço",
+  "menu.services.addNewService": "Adicionar Novo Serviço...",
   "menu.services.goHome": "Início",
   "menu.services.setNextServiceActive": "Ativar o próximo serviço",
   "menu.todos": "Tarefas",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Todos os serviços",
   "menu.workspaces.openWorkspaceDrawer": "Abrir a janela da �rea de trabalho",
   "password.email.label": "Endereço de e-mail",
-  "password.headline": "Repor a minha palavra-passe",
+  "password.headline": "Redefinir senha",
   "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.successInfo": "Por favor, verifique seu e-mail",
-  "pricing.features.accountSync": "Sincronização da conta",
-  "pricing.features.customWebsites": "Adicionar Websites Personalizados",
-  "pricing.features.desktopNotifications": "Notificações no ambiente de trabalho",
-  "pricing.features.onPremise": "On-Premise & Outros serviços hospedados",
-  "pricing.features.recipes": "Escolha entre mais de 70 serviços",
-  "pricing.features.serviceProxies": "Serviços de proxy",
-  "pricing.features.spellchecker": "Suporte ao corretor ortográfico",
-  "pricing.features.teamManagement": "Gestão de Equipes",
-  "pricing.features.thirdPartyServices": "Instalar serviços de terceiros",
-  "pricing.features.unlimitedServices": "Instalar serviços ilimitados",
-  "pricing.features.workspaces": "�reas de trabalho",
+  "password.successInfo": "Uma nova senha foi enviada a seu endereço de e-mail",
   "service.crashHandler.action": "Recarregar {name}",
   "service.crashHandler.autoReload": "A tentar restaurar automaticamente {name} em {seconds} segundos",
   "service.crashHandler.headline": "Oh não!",
@@ -198,7 +186,7 @@
   "settings.account.tryReloadServices": "Tentar novamente",
   "settings.account.tryReloadUserInfoRequest": "Tentar novamente",
   "settings.account.userInfoRequestFailed": "Não é possível carregar a informação do utilizador",
-  "settings.account.yourLicense": "Sua lincença Ferdi",
+  "settings.account.yourLicense": "Sua lincença Ferdi:",
   "settings.app.accentColorInfo": "Informe sua cor de destaque em um formato compatível com CSS. (Padrão: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Limpar cache",
   "settings.app.buttonInstallUpdate": "Reiniciar e instalar atualizações",
@@ -220,12 +208,12 @@
   "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.darkMode": "Ativar o Tema Escuro",
   "settings.app.form.enableGPUAcceleration": "Ativar Aceleração de GPU",
   "settings.app.form.enableLock": "Habilitar bloqueio por senha",
   "settings.app.form.enableMenuBar": "Sempre exibir Ferdi na Barra de Menu",
   "settings.app.form.enableSpellchecking": "Ativar verificação ortográfica",
-  "settings.app.form.enableSystemTray": "Mostrar o Ferdi na barra do sistema",
+  "settings.app.form.enableSystemTray": "Sempre mostrar o ícone na Bandeja de Sistema",
   "settings.app.form.enableTodos": "Ativar Tarefas",
   "settings.app.form.hibernateOnStartup": "Manter os serviços em hibernação ao inicializar",
   "settings.app.form.hibernationStrategy": "Estratégia de Hibernação",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Apresentar separadores de serviços desativados",
   "settings.app.form.showDragArea": "Mostrar área arrastável na janela",
   "settings.app.form.showMessagesBadgesWhenMuted": "Apresentar emblema com o número de mensagens não lidas quando as notificações estão desativadas",
+  "settings.app.form.splitMode": "Ativar modo de visualização dividida",
   "settings.app.form.startMinimized": "Iniciar minimizado",
   "settings.app.form.universalDarkMode": "Habilitar modo noturno universal",
   "settings.app.form.useTouchIdToUnlock": "Permitir usar TouchID para desbloquear Ferdi",
@@ -265,9 +254,9 @@
   "settings.app.hibernateInfo": "Por padrão, Ferdi manterá todos seus serviços abertos e carregados, assim eles estarão disponíveis quando você for usá-los. O Serviço de Hibernação irá finalizar seus serviços após um período específico. Isso é útil para evitar consumo excessivo de memória RAM evitando também que seu computador fique lento.",
   "settings.app.inactivityLockInfo": "Minutos de inatividade, após este tempo Ferdi irá automaticamente bloquear. Utilize 0 para desabilitar",
   "settings.app.languageDisclaimer": "As traduções oficiais são em inglês e alemão. As demais traduções são baseadas na ajuda da comunidade.",
-  "settings.app.lockInfo": "O bloqueio por senha permite a você proteger suas mensagens.\nUsando o bloqueio por senha, será necessário informar sua senha toda vez que o Ferdi for iniciado ou você solicite o bloqueio.",
+  "settings.app.lockInfo": "O bloqueio por senha permite a você proteger suas mensagens.\nUsando o bloqueio por senha, será necessário informar sua senha toda vez que o Ferdi for iniciado ou você solicite o bloqueio {lockShortcut}.",
   "settings.app.lockedPassword": "Senha",
-  "settings.app.lockedPasswordInfo": "Tenha certeza que a senha definida será lembrada.\nCaso você esqueça a senha, será necessário reinstalar o Ferdi.",
+  "settings.app.lockedPasswordInfo": "Por favor certifique-se de definir uma senha que você se lembrará.\nSe você perder esta senha, você terá que reinstalar o Ferdi.",
   "settings.app.restartRequired": "Essa alteração requer uma reinicialização",
   "settings.app.scheduledDNDInfo": "O modo Não perturbe agendado permite definir um período de tempo em que você não deseja receber notificações do Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Horários no formato de 24 horas. O horário de término pode ser anterior ao horário de início (por exemplo, início às 17:00 e término às 09:00) para ativar a opção Não perturbe da noite para o dia.",
@@ -294,12 +283,12 @@
   "settings.recipes.customService.headline.communityRecipes": "Serviços da comunidade",
   "settings.recipes.customService.headline.customRecipes": "Serviços personalizados",
   "settings.recipes.customService.headline.devRecipes": "Serviços em Desenvolvimento",
-  "settings.recipes.customService.intro": "Para adicionar um serviço personalizado, copie o serviço para:",
+  "settings.recipes.customService.intro": "Para adicionar um serviço personalizado, copie os dados do serviço para:",
   "settings.recipes.customService.openDevDocs": "Documentação do Desenvolvedor",
   "settings.recipes.customService.openFolder": "Abrir pasta",
   "settings.recipes.headline": "Serviços disponíveis",
   "settings.recipes.missingService": "Falta um serviço?",
-  "settings.recipes.nothingFound": "Desculpe, nenhum serviço corresponde ao seu termo de pesquisa - mas você provavelmente pode adicioná-lo usando a opção \"Site personalizado\". Por favor, note que o site pode mostrar mais serviços que foram adicionados ao Ferdi desde a versão em que você está atualmente. Para obter esses novos serviços, por favor, considere atualizar para uma versão mais recente da Ferdi.",
+  "settings.recipes.nothingFound": "Desculpe, mas nenhum serviço corresponde ao seu termo de pesquisa - mas você provavelmente pode adicioná-lo usando a opção \"Site personalizado\". Por favor, note que o site pode mostrar mais serviços que foram adicionados ao Ferdi desde a versão em que você está atualmente. Para obter esses novos serviços, por favor, considere atualizar para uma versão mais recente do Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Serviço adicionado com sucesso",
   "settings.searchService": "Pesquisar serviço",
   "settings.service.error.goBack": "Voltar aos serviços",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Brilho do Dark Reader",
   "settings.service.form.darkReaderContrast": "Contraste do Dark Reader",
   "settings.service.form.darkReaderSepia": "Sépia do Dark Reader",
-  "settings.service.form.deleteButton": "Apagar serviço",
+  "settings.service.form.deleteButton": "Deletar serviço",
   "settings.service.form.editServiceHeadline": "Editar {name}",
   "settings.service.form.enableAudio": "Ativar áudio",
   "settings.service.form.enableBadge": "Mostrar emblemas de mensagens não lidas",
@@ -332,17 +321,18 @@
   "settings.service.form.isHibernatedEnabledInfo": "Quando ativado, o serviço será encerrado após um período de tempo para poupar recursos do sistema.",
   "settings.service.form.isMutedInfo": "Quando desativado, todos os sons e reproduções de áudio serão silenciados",
   "settings.service.form.name": "Nome",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Mostrar apenas os Favoritos na contagem de não lidos",
   "settings.service.form.openDarkmodeCss": "Abrir darkmode.css",
   "settings.service.form.openUserCss": "Abrir user.css",
   "settings.service.form.openUserJs": "Abrir user.js",
   "settings.service.form.proxy.headline": "Definições HTTP/HTTPS Proxy",
   "settings.service.form.proxy.host": "Host/IP proxy",
-  "settings.service.form.proxy.info": "As definições do proxy não serão guardadas nos servidores do Ferdi.",
+  "settings.service.form.proxy.info": "Os ajustes de proxy não serão sincronizados com os servidores do Ferdi.",
   "settings.service.form.proxy.isEnabled": "Usar Proxy",
-  "settings.service.form.proxy.password": "Palavra-chave (opcional)",
+  "settings.service.form.proxy.password": "Senha (opcional)",
   "settings.service.form.proxy.port": "Porta",
   "settings.service.form.proxy.restartInfo": "Reinicie, por favor, após atualizar as definições do Ferdi",
-  "settings.service.form.proxy.user": "Utilizador (opcional)",
+  "settings.service.form.proxy.user": "Usuário (opcional)",
   "settings.service.form.recipeFileInfo": "Seus arquivos de usuário serão inseridos na página web para que você possa personalizar os serviços da forma que preferir. Os arquivos de usuário são armazenados localmente e não são transferidos para outros computadores utilizando a mesma conta.",
   "settings.service.form.saveButton": "Salvar serviço",
   "settings.service.form.tabHosted": "Com domínio",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Descobrir serviços",
   "settings.services.headline": "Seus serviços",
   "settings.services.noServicesAdded": "Comece adicionando um serviço.",
+  "settings.services.nothingFound": "Desculpe, mas nenhum serviço corresponde ao seu termo de pesquisa - mas você provavelmente pode adicioná-lo usando a opção \"Site personalizado\". Por favor, note que o site pode mostrar mais serviços que foram adicionados ao Ferdi desde a versão em que você está atualmente. Para obter esses novos serviços, por favor, considere atualizar para uma versão mais recente do Ferdi.",
   "settings.services.servicesRequestFailed": "Não foi possível ler os seus serviços",
   "settings.services.tooltip.isDisabled": "O serviço está desativado",
   "settings.services.tooltip.isMuted": "Todos os sons estão silenciados",
@@ -377,7 +368,7 @@
   "settings.team.contentHeadline": "Gerenciamento de Equipe Franz",
   "settings.team.copy": "O Gerenciamento de Equipes de Franz permite gerenciar assinaturas do Franz para múltiplos usuários. Por favor, entenda que ter uma assinatura Franz Premium não lhe dará nenhuma vantagem em usar o Ferdi. A única razão em manter o acesso ao Gerenciamento de Equipes é permitir o gerenciamento de suas equipes legadas e não perder nenhuma funcionalidade no gerenciamento da sua conta.",
   "settings.team.headline": "Equipa",
-  "settings.team.intro": "Você está atualmente usando os Servidores de Franz, por isso tem acesso ao Gerenciamento de Times.",
+  "settings.team.intro": "Você está atualmente usando os Servidores do Franz, por isso tem acesso ao Gerenciamento de Times.",
   "settings.team.manageAction": "Gerencie sua Equipe em meetfranz.com",
   "settings.team.teamsUnavailable": "A funcionalidade de Equipes está indisponível",
   "settings.team.teamsUnavailableInfo": "Atualmente a funcionalidade de Equipes está disponível apenas utilizando o servidor Franz após adquirir um plano Franz Profissional. Por favor altere o seridor par https://api.franzinfra.com para utilizar esta funcionalidade.",
@@ -388,7 +379,7 @@
   "settings.user.form.currentPassword": "Palavra-passe atual",
   "settings.user.form.email": "E-mail",
   "settings.user.form.firstname": "Primeiro Nome",
-  "settings.user.form.lastname": "Último Nome",
+  "settings.user.form.lastname": "Sobrenome",
   "settings.user.form.newPassword": "Nova palavra-passe",
   "settings.workspace.add.form.name": "Nome",
   "settings.workspace.add.form.submitButton": "Nova �rea de Trabalho",
@@ -405,7 +396,7 @@
   "settings.workspaces.tryReloadWorkspaces": "Tentar novamente",
   "settings.workspaces.updatedInfo": "As suas alterações foram efetuadas com sucesso",
   "settings.workspaces.workspaceFeatureHeadline": "Menos é Mais: Introduzindo as �reas de trabalho Ferdi",
-  "settings.workspaces.workspaceFeatureInfo": "As áreas de trabalho do Ferdi permite você focar no que realmente é importante agora. Configure diferentes conjuntos de serviços e alterne entre eles facilmente em qualquer momento. Você decide quais serviços você precisa e onde deseja colocá-los, então nós podemos te ajudar a aumentar a produtividade de suas tarefas. Ou facilmente deletar os aplicativos que você nunca irá precisar.",
+  "settings.workspaces.workspaceFeatureInfo": "Os espaços de trabalho do Ferdi te ajudam a focar no que realmente é importante agora. Configure diferente conjuntos de serviços e mude entre eles facilmente em qualquer momento. Você decide quais serviços precisa e onde deseja posicioná-los, e então nós podemos te ajudar a aumentar a sua produtividade - ou facilmente desconectá-lo do trabalho quando você quiser.",
   "settings.workspaces.workspacesRequestFailed": "Não foi possível carregar suas áreas de trabalho",
   "setupAssistant.headline": "Vamos começar",
   "setupAssistant.subheadline": "Escolha entre os serviços mais usados e volte a ter o controle das suas mensagens agora.",
@@ -422,7 +413,7 @@
   "signup.emailDuplicate": "Já existe uma conta associada a este endereço de email",
   "signup.firstname.label": "Primeiro Nome",
   "signup.headline": "Criar conta",
-  "signup.lastname.label": "Último Nome",
+  "signup.lastname.label": "Sobrenome",
   "signup.legal.info": "Ao criar uma conta Ferdi, aceita",
   "signup.legal.privacy": "Declaração de privacidade",
   "signup.legal.terms": "Termos do Serviço",
@@ -430,7 +421,7 @@
   "signup.password.label": "Senha",
   "signup.submit.label": "Criar uma conta",
   "tabs.item.confirmDeleteService": "Tem certeza de que deseja excluir o serviço {serviceName}?",
-  "tabs.item.deleteService": "Apagar serviço",
+  "tabs.item.deleteService": "Deletar serviço",
   "tabs.item.disableAudio": "Desativar áudio",
   "tabs.item.disableDarkMode": "Desativar o modo escuro",
   "tabs.item.disableNotifications": "Desativar notificações",
@@ -446,7 +437,7 @@
   "validation.minLength": "{field} deveria ter pelo menos {length} caracteres",
   "validation.oneRequired": "É necessário pelo menos um",
   "validation.required": "{field} é obrigatório",
-  "validation.url": "{field} não é uma hiperligação válida",
+  "validation.url": "{field} não é uma URL válida",
   "webControls.back": "Anterior",
   "webControls.forward": "Próximo",
   "webControls.goHome": "Início",
@@ -454,12 +445,12 @@
   "webControls.reload": "Recarregar",
   "welcome.loginButton": "Iniciar sessão",
   "welcome.signupButton": "Criar uma conta gratuita",
-  "workspaceDrawer.addNewWorkspaceLabel": "Adicionar uma nova área de trabalho",
+  "workspaceDrawer.addNewWorkspaceLabel": "Adicionar novo espaço de trabalho",
   "workspaceDrawer.allServices": "Todos os serviços",
   "workspaceDrawer.headline": "�reas de trabalho",
   "workspaceDrawer.item.contextMenuEdit": "editar",
   "workspaceDrawer.item.noServicesAddedYet": "Nenhum serviço foi adicionado",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>As áreas de trabalho do Ferdi te ajuda a focar no que realmente é importante agora. Configure diferente cenários para serviços e mude entre eles facilmente em qualquer momento. </p><p>Você decide quais serviços precisa e onde deseja posicioná-los, e então nós iremos te ajudar em aumentar a sua produtividade. Você pode desligar os serviços que não são úteis para você.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Editar configurações das áreas de trabalho",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Os espaços de trabalho do Ferdi te ajuda a focar no que realmente é importante agora. Configure diferente conjuntos de serviços e mude entre eles facilmente em qualquer momento.</p><p>Você decide quais serviços precisa e onde deseja posicioná-los, e então nós podemos te ajudar a aumentar a sua produtividade - ou facilmente desconectá-lo do trabalho quando você quiser.</p>",
+  "workspaceDrawer.workspacesSettingsTooltip": "Editar configurações dos espaços de trabalho",
   "workspaces.switchingIndicator.switchingTo": "Trocando para"
 }
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index da431f4e3..9675d5d77 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Atualizar",
-  "app.errorHandler.headline": "Alguma coisa correu mal",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Servidor personalizado",
   "changeserver.headline": "Alterar servidor",
   "changeserver.label": "Servidor",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "O que aconteceu?",
   "connectionLostBanner.message": "Oh não! O Ferdi perdeu a ligação com {name}.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publicar informações de depuração",
   "feature.nightlyBuilds.activate": "Activar",
   "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",
@@ -24,8 +23,8 @@
   "feature.quickSwitch.info": "Seleccione um serviço com TAB, ↑ e ↓. Abra um serviço com ENTER.",
   "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.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Editar",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Não está ligado à internet.",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Configurações",
+  "global.settings": "Settings",
   "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.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": "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",
-  "import.submit.label": "Importar serviços",
+  "import.submit.label": "Import {count} services",
   "infobar.authRequestFailed": "Houve erros na autenticaçao. Se este erro persistir, por favor, tente desligar e autenticar novamente.",
-  "infobar.buttonChangelog": "O que há de novo?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Reiniciar e instalar atualizações",
   "infobar.buttonReloadServices": "Reiniciar serviços",
   "infobar.hide": "Ocultar",
@@ -75,7 +74,7 @@
   "login.email.label": "Endereço de E-mail",
   "login.headline": "Entrar",
   "login.invalidCredentials": "E-mail ou palavra-passe inválidos",
-  "login.link.password": "Redefinir palavra-passe",
+  "login.link.password": "Reset password",
   "login.link.signup": "Criar uma conta gratuita",
   "login.password.label": "Palavra-passe",
   "login.serverLogout": "A sua sessão expirou, faça login novamente.",
@@ -117,10 +116,10 @@
   "menu.help.support": "Suporte",
   "menu.help.tos": "Termos de Serviço",
   "menu.services": "Serviços",
-  "menu.services.activatePreviousService": "Ativar serviço anterior",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Início",
-  "menu.services.setNextServiceActive": "Ativar próximo serviço",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Tarefas",
   "menu.todos.enableTodos": "Ativar Tarefas",
   "menu.view": "Visualizar",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Todos os serviços",
   "menu.workspaces.openWorkspaceDrawer": "Abrir a barra lateral da área de trabalho",
   "password.email.label": "Endereço de E-mail",
-  "password.headline": "Redefinir palavra-passe",
+  "password.headline": "Reset password",
   "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.successInfo": "Por favor, verifique o seu e-mail",
-  "pricing.features.accountSync": "Sincronização de conta",
-  "pricing.features.customWebsites": "Adicionar Websites Personalizados",
-  "pricing.features.desktopNotifications": "Notificações no ambiente de trabalho",
-  "pricing.features.onPremise": "En sitio y otros servicios alojados",
-  "pricing.features.recipes": "Escolha entre mais de 70 serviços",
-  "pricing.features.serviceProxies": "Proxies de Serviço",
-  "pricing.features.spellchecker": "Suporte de correção ortográfica",
-  "pricing.features.teamManagement": "Gestão de Equipa",
-  "pricing.features.thirdPartyServices": "Instalar serviços de terceiros",
-  "pricing.features.unlimitedServices": "Adicionar serviços ilimitados",
-  "pricing.features.workspaces": "�reas de trabalho",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Recarregar {name}",
   "service.crashHandler.autoReload": "A tentar restabelecer {name} automaticamente em {seconds} segundos",
   "service.crashHandler.headline": "Oh não!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi sem conta",
   "services.welcome": "Bem-vindo ao Ferdi",
-  "settings.account.account.editButton": "Editar conta",
+  "settings.account.account.editButton": "Edit account",
   "settings.account.accountUnavailable": "Conta indisponível",
   "settings.account.accountUnavailableInfo": "Está a usar o Ferdi sem uma conta. Se deseja usar o Ferdi com uma conta e manter os seus serviços sincronizados entre instalações, por favor, selecione um servidor no separador Configurações e faça a autenticação.",
   "settings.account.buttonSave": "Atualizar perfil",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Recebeu um e-mail com um link para confirmar o cancelamento da sua conta. Atenção! A sua conta e dados não poderão ser restaurados!",
   "settings.account.deleteInfo": "Se não precisa mais de sua conta Ferdi, pode apagá-la juntamente com toda a sua informação aqui.",
   "settings.account.headline": "Conta",
-  "settings.account.headlineAccount": "Informações de conta",
-  "settings.account.headlineDangerZone": "Zona Perigosa",
-  "settings.account.headlineInvoices": "Recibos",
-  "settings.account.headlinePassword": "Mudar palavra-passe",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Atualizar perfil",
   "settings.account.successInfo": "As suas alterações foram gravadas",
   "settings.account.tryReloadServices": "Tente novamente",
   "settings.account.tryReloadUserInfoRequest": "Tente novamente",
   "settings.account.userInfoRequestFailed": "Não foi possível carregar as informações de utilizador",
-  "settings.account.yourLicense": "A sua licença Ferdi",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Limpar cache",
   "settings.app.buttonInstallUpdate": "Reiniciar e instalar atualizações",
@@ -219,13 +207,13 @@
   "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.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Ativar modo noturno",
   "settings.app.form.enableGPUAcceleration": "Ativar Aceleração de GPU",
   "settings.app.form.enableLock": "Ativar palavra-passe",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Ativar correção ortográfica",
-  "settings.app.form.enableSystemTray": "Mostrar Ferdi na barra de sistema",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Ativar Tarefas Ferdi",
   "settings.app.form.hibernateOnStartup": "Manter os serviços em hibernação durante a inicialização",
   "settings.app.form.hibernationStrategy": "Estratégia de hibernação",
@@ -251,9 +239,10 @@
   "settings.app.form.showDisabledServices": "Mostrar separadores de serviços desativados",
   "settings.app.form.showDragArea": "Mostrar área arrastável na janela",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar ícone de mensagem não lida quando as notificações estiverem desativadas",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Iniciar minimizado",
   "settings.app.form.universalDarkMode": "Ativar o Modo Noturno Universal",
-  "settings.app.form.useTouchIdToUnlock": "Permite usar o TouchID para desbloquear Ferdi",
+  "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": "Avançado",
@@ -267,7 +256,7 @@
   "settings.app.languageDisclaimer": "As traduções oficiais são Inglês e Alemão. Todas as outras traduções são feitas pela comunidade.",
   "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Palavra-passe",
-  "settings.app.lockedPasswordInfo": "Por favor certifique-se de definir uma palavra-passe que se lembre.\nSe perder esta palavra-passe, terá que reinstalar Ferdi.",
+  "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": "As mudanças requerem reinício de sistema",
   "settings.app.scheduledDNDInfo": "O Não Incomodar permite definir um período de tempo em que não quer receber notificações.",
   "settings.app.scheduledDNDTimeInfo": "Horas em formato 24h. Pode definir a hora do fim antes da hora de início (p. ex. início 17:00, fim 09:00) para ativar o modo \"Não incomodar\" durante a noite.",
@@ -275,7 +264,7 @@
   "settings.app.spellCheckerLanguageInfo": "Ferdi usa o corretor ortográfico do seu Mac para verificar se há erros ortográficos. Se você quiser alterar os idiomas que o corretor ortográfico verifica, pode fazê-lo nas Preferências do Sistema do Mac.",
   "settings.app.subheadlineCache": "Memória cache",
   "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
-  "settings.app.todoServerInfo": "Este servidor será usado para a funcionalidade \"Tarefas Ferdi\".",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Ajude-nos a traduzir o Ferdi para o seu idioma.",
   "settings.app.universalDarkModeInfo": "O Modo Noturno Universal tenta gerar dinamicamente os estilos do modo noturno para serviços que não o suportem de outra forma atualmente.",
   "settings.app.updateStatusAvailable": "Atualização disponível, a fazer download...",
@@ -294,9 +283,9 @@
   "settings.recipes.customService.headline.communityRecipes": "Receitas da comunidade de terceiros",
   "settings.recipes.customService.headline.customRecipes": "Receitas personalizadas de terceiros",
   "settings.recipes.customService.headline.devRecipes": "As suas Receitas de Serviço de Desenvolvimento",
-  "settings.recipes.customService.intro": "Para adicionar um serviço personalizado, copie a receita do serviço para:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
   "settings.recipes.customService.openDevDocs": "Documentação para programadores",
-  "settings.recipes.customService.openFolder": "Abrir pasta",
+  "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Serviços disponíveis",
   "settings.recipes.missingService": "Sente falta de algum serviço?",
   "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.",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Brilho do Leitor Escuro",
   "settings.service.form.darkReaderContrast": "Contraste do Leitor Noturno",
   "settings.service.form.darkReaderSepia": "Leitor Noturno Sépia",
-  "settings.service.form.deleteButton": "Apagar serviço",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Editar {name}",
   "settings.service.form.enableAudio": "Ativar áudio",
   "settings.service.form.enableBadge": "Mostrar aviso de mensagens não lidas",
@@ -332,17 +321,18 @@
   "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": "Quando desativado, as notificações sonoras e áudio serão silenciados",
   "settings.service.form.name": "Nome",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Abrir darkmode.css",
   "settings.service.form.openUserCss": "Abrir user.css",
   "settings.service.form.openUserJs": "Abrir user.js",
   "settings.service.form.proxy.headline": "Configurações de HTTP/HTTPS Proxy",
   "settings.service.form.proxy.host": "Servidor/IP Proxy",
-  "settings.service.form.proxy.info": "As configurações de proxy não serão sincronizadas com os servidores de Ferdi.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Usar Proxy",
-  "settings.service.form.proxy.password": "Palavra-passe (opcional)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Porta",
   "settings.service.form.proxy.restartInfo": "Por favor, reinicie o Ferdi após alterar as configurações de proxy.",
-  "settings.service.form.proxy.user": "Utilizador (opcional)",
+  "settings.service.form.proxy.user": "User (optional)",
   "settings.service.form.recipeFileInfo": "Os seus ficheiros serão inseridos na página da web para que possa personalizar os serviços da maneira que desejar. Os ficheiros são apenas armazenados localmente e não são transferidos para outros computadores usando a mesma conta.",
   "settings.service.form.saveButton": "Gravar serviço",
   "settings.service.form.tabHosted": "Alojado",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Descobrir serviços",
   "settings.services.headline": "Os seus serviços",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Não foi possível carregar os seus serviços",
   "settings.services.tooltip.isDisabled": "O serviço está desativado",
   "settings.services.tooltip.isMuted": "Sem som",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Sem fins lucrativos",
   "settings.user.form.currentPassword": "Palavra-passe atual",
   "settings.user.form.email": "E-mail",
-  "settings.user.form.firstname": "Nome",
-  "settings.user.form.lastname": "Apelido",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Nova palavra-passe",
   "settings.workspace.add.form.name": "Nome",
   "settings.workspace.add.form.submitButton": "Criar área de trabalho",
@@ -405,7 +396,7 @@
   "settings.workspaces.tryReloadWorkspaces": "Tente novamente",
   "settings.workspaces.updatedInfo": "As suas alterações foram gravadas",
   "settings.workspaces.workspaceFeatureHeadline": "Menos é Mais: Apresentando áreas de trabalho Ferdi",
-  "settings.workspaces.workspaceFeatureInfo": "As áreas de trabalho do Ferdi permitem que se concentre no que realmente é importante. Configure diferentes conjuntos de serviços e mude-os facilmente e a qualquer momento. Você decide quais os serviços que precisa e onde colocá-los, para que o possamos ajudar a estar no seu melhor. - Ou desligar do trabalho quando quiser.",
+  "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": "Não foi possível carregar suas áreas de trabalho",
   "setupAssistant.headline": "Let's get started",
   "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -420,9 +411,9 @@
   "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",
-  "signup.firstname.label": "Nome",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Entrar",
-  "signup.lastname.label": "Apelido",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Ao criar uma conta Ferdi, você aceita os",
   "signup.legal.privacy": "Declaração de Privacidade",
   "signup.legal.terms": "Termos de serviço",
@@ -430,11 +421,11 @@
   "signup.password.label": "Palavra-passe",
   "signup.submit.label": "Criar conta",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Apagar serviço",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Desativar áudio",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Desativar notificações",
-  "tabs.item.disableService": "Desativar serviço",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Ativar áudio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Ativar notificações",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Atualizar",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} é inválido",
-  "validation.minLength": "{field} deve ter pelo menos {length} caracteres",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "É necessário pelo menos um",
-  "validation.required": "{field} é obrigatório",
-  "validation.url": "{field} não é um URL válido",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Anterior",
   "webControls.forward": "Seguinte",
   "webControls.goHome": "Início",
@@ -454,12 +445,12 @@
   "webControls.reload": "Atualizar",
   "welcome.loginButton": "Entrar na sua conta",
   "welcome.signupButton": "Criar uma conta gratuita",
-  "workspaceDrawer.addNewWorkspaceLabel": "Adicionar nova área de trabalho",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "Todos os serviços",
   "workspaceDrawer.headline": "�reas de trabalho",
   "workspaceDrawer.item.contextMenuEdit": "editar",
   "workspaceDrawer.item.noServicesAddedYet": "Nenhum serviço adicionado",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>As áreas de trabalho do Ferdi permitem que se concentre no que realmente é importante. Configure diferentes conjuntos de serviços e mude-os facilmente e a qualquer momento.</p><p>Você decide quais os serviços que precisa e onde colocá-los, para que o possamos ajudar a estar no seu melhor. - Ou desligar do trabalho quando quiser.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Editar configurações das áreas de trabalho",
+  "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": "A mudar para"
 }
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index 6e2ee4c19..fad6dae82 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Reîncărcare",
-  "app.errorHandler.headline": "Ceva nu a funcționat corect",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "Ce s-a întâmplat?",
   "connectionLostBanner.message": "Oh nu! Ferdi a pierdut conexiunea cu {name}.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activare",
   "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",
@@ -24,7 +23,7 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Căutare...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "Nu se pot conecta la Ferdi servicii online",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
   "global.cancel": "Cancel",
   "global.edit": "Edit",
   "global.no": "No",
@@ -45,7 +44,7 @@
   "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",
-  "import.submit.label": "Import services",
+  "import.submit.label": "Import {count} 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",
@@ -118,7 +117,7 @@
   "menu.help.tos": "Terms of Service",
   "menu.services": "Services",
   "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
   "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
@@ -152,18 +151,7 @@
   "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",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
   "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.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",
@@ -220,12 +208,12 @@
   "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.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.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
   "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.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Discover services",
   "settings.services.headline": "Your services",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "Service is disabled",
   "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 4a7222914..f7d25e08b 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Перезагрузить",
-  "app.errorHandler.headline": "Что-то пошло не так",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Пользователь�кий �ервер",
   "changeserver.headline": "Изменить �ервер",
   "changeserver.label": "Сервер",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "Что �лучило�ь?",
   "connectionLostBanner.message": "О нет! Ферди потер�л �в�зь � {name}.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Опубликовать отладочную информацию",
   "feature.nightlyBuilds.activate": "�ктивировать",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,8 +23,8 @@
   "feature.quickSwitch.info": "Выберите �ерви� � Tab, вверх и вниз. Откройте �ерви� нажав на ENTER.",
   "feature.quickSwitch.search": "Пои�к...",
   "feature.quickSwitch.title": "Бы�трое переключение",
-  "global.api.unhealthy": "�евозможно подключить�� к онлайн-�ерви�ам Ferdi",
-  "global.cancel": "Отмена",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Правка",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Вы не подключены к �ети Интернет",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "�а�тройки",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "И�пользовать �и�темные параметры по умолчанию ({default})",
   "global.spellchecking.autodetect": "�айти �зык автоматиче�ки",
   "global.spellchecking.autodetect.short": "�вто",
   "global.spellchecking.language": "Проверка правопи�ани�",
-  "global.submit": "Прин�ть",
+  "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": "Импортировать ваши �ерви�ы из Ferdi 4",
   "import.notSupportedHeadline": "Серви�ы пока ещё не поддерживают�� в Ferdi 5",
   "import.skip.label": "Я хочу добавить �ерви�ы вручную",
-  "import.submit.label": "Импортировать �ерви�ы",
+  "import.submit.label": "Import {count} services",
   "infobar.authRequestFailed": "При попытке выполнить запро� на аутентификацию произошли ошибки. Пожалуй�та, попробуйте выйти из �и�темы и вернуть�� назад, е�ли �та ошибка повтор�ет��.",
-  "infobar.buttonChangelog": "Что новенького?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Перезапу�тить и у�тановить обновлени�",
   "infobar.buttonReloadServices": "Перезагрузить �ерви�ы",
   "infobar.hide": "Скрыть",
@@ -75,7 +74,7 @@
   "login.email.label": "�дре� �лектронной почты",
   "login.headline": "Вход",
   "login.invalidCredentials": "�еправильный адре� �лектронной почты или пароль",
-  "login.link.password": "Во��тановить пароль",
+  "login.link.password": "Reset password",
   "login.link.signup": "Создать бе�платный аккаунт",
   "login.password.label": "Пароль",
   "login.serverLogout": "Се��и� у�тарела, пожалуй�та, войдите �нова.",
@@ -117,10 +116,10 @@
   "menu.help.support": "Поддержка",
   "menu.help.tos": "У�лови� и�пользовани�",
   "menu.services": "Серви�",
-  "menu.services.activatePreviousService": "�ктивировать предыдущий �ервич",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Домой",
-  "menu.services.setNextServiceActive": "�ктивировать �ледующий �ерви�",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Задачи",
   "menu.todos.enableTodos": "Включить задачи",
   "menu.view": "Вид",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "В�е �ерви�ы",
   "menu.workspaces.openWorkspaceDrawer": "Открыть меню окружений",
   "password.email.label": "�дре� �лектронной почты",
-  "password.headline": "Во��тановить пароль",
+  "password.headline": "Reset password",
   "password.link.login": "Вход",
   "password.link.signup": "Создать бе�платный аккаунт",
-  "password.noUser": "�е найдено пользовател� � таким адре�ом �лектронной почты",
-  "password.successInfo": "Проверьте вашу �лектронную почту",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Добавить пользователь�кие веб-�айты",
-  "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": "Прок�и �ерви�а",
-  "pricing.features.spellchecker": "Поддержка Spellchecker",
-  "pricing.features.teamManagement": "Команда управлени�",
-  "pricing.features.thirdPartyServices": "У�тановить �торонние �ерви�ы",
-  "pricing.features.unlimitedServices": "Добавить неограниченные �ерви�ы",
-  "pricing.features.workspaces": "Окружение",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Перезагрузить {name}",
   "service.crashHandler.autoReload": "Пытаю�ь автоматиче�ки во��тановить {name} в течение {seconds} �екунд",
   "service.crashHandler.headline": "О, нет!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Добро пожаловать во Ferdi",
-  "settings.account.account.editButton": "Редактировать аккаунт",
+  "settings.account.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": "Обновить профиль",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Вам вы�лано пи�ьмо � ��ылкой дл� подтверждени� удалени� аккаунта. По�ле �того ваш аккаунт и данные не �могут быть во��тановлены!",
   "settings.account.deleteInfo": "Е�ли вам больше не нужна ваша учетна� запи�ь в Ferdi, вы можете удалить аккаунт и в�ю �в�занную � ней информацию.",
   "settings.account.headline": "�ккаунт",
-  "settings.account.headlineAccount": "Информаци� аккаунта",
-  "settings.account.headlineDangerZone": "Запретна� Зона",
-  "settings.account.headlineInvoices": "Счета",
-  "settings.account.headlinePassword": "Сменить пароль",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Обновить профиль",
   "settings.account.successInfo": "Ваши изменени� были �охранены",
   "settings.account.tryReloadServices": "Попробовать �нова",
   "settings.account.tryReloadUserInfoRequest": "Попробовать �нова",
   "settings.account.userInfoRequestFailed": "�евозможно загрузить информацию пользовател�",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Очи�тить к�ш",
   "settings.app.buttonInstallUpdate": "Перезапу�тить и у�тановить обновлени�",
@@ -220,12 +208,12 @@
   "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.darkMode": "Включить Тёмный режим",
   "settings.app.form.enableGPUAcceleration": "Включить у�корение GPU",
   "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Включить проверку правопи�ани�",
-  "settings.app.form.enableSystemTray": "Показывать Ferdi в �и�темном трее",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Показывать вкладки отключённых �лужб",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Показывать значок непрочитанного �ообщени� при отключённых уведомлени�х",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Запу�кать �вернутым",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -294,9 +283,9 @@
   "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
   "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes",
   "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
-  "settings.recipes.customService.intro": "Чтобы добавить пользователь�кий �ерви�, �копируйте файлы �ерви�а:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
   "settings.recipes.customService.openDevDocs": "Документаци� дл� разработчиков",
-  "settings.recipes.customService.openFolder": "Открыть папку",
+  "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "До�тупные �ерви�ы",
   "settings.recipes.missingService": "�е можете найти �ерви�?",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Удалить �ерви�",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Редактирование {name}",
   "settings.service.form.enableAudio": "Включить звук",
   "settings.service.form.enableBadge": "Показывать иконку непрочитанных �ообщений",
@@ -332,17 +321,18 @@
   "settings.service.form.isHibernatedEnabledInfo": "Когда включено, �лужба будет отключена по и�течении времени, чтобы �охранить �и�темные ре�ур�ы.",
   "settings.service.form.isMutedInfo": "Когда выключено, в�е звуковые уведомлени� будут отключены",
   "settings.service.form.name": "Им�",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Открыть user.css",
   "settings.service.form.openUserJs": "Открыть user.js",
   "settings.service.form.proxy.headline": "�а�тройки Прок�и HTTP/HTTPS",
   "settings.service.form.proxy.host": "Прок�и Host/IP",
-  "settings.service.form.proxy.info": "�а�тройки прок�и не будут �инхронизированны � �ерверами Ferdi",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "И�пользовать прок�и",
-  "settings.service.form.proxy.password": "Пароль (опционально)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Порт",
   "settings.service.form.proxy.restartInfo": "Пожалуй�та перезапу�тите Ferdi по�ле изменени� на�троек прок�и.",
-  "settings.service.form.proxy.user": "Пользователь (опционально)",
+  "settings.service.form.proxy.user": "User (optional)",
   "settings.service.form.recipeFileInfo": "Ваши пользователь�кие файлы будут в�тавлены на веб-�траницу, чтобы вы могли на�троить �ерви�ы в любом удобном вам виде. Файлы пользователей хран�т�� только локально и не передают�� на другие компьютеры, и�пользующие ту же учетную запи�ь.",
   "settings.service.form.saveButton": "Сохранить �ерви�",
   "settings.service.form.tabHosted": "Размещено",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "�айти �ерви�ы",
   "settings.services.headline": "Ваши �ерви�ы",
   "settings.services.noServicesAdded": "�ачните � добавлени� �ерви�а.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Ошибка загрузки �ерви�ов",
   "settings.services.tooltip.isDisabled": "Серви� отключен",
   "settings.services.tooltip.isMuted": "В�е звуки отключены",
@@ -362,12 +353,12 @@
   "settings.supportFerdi.aboutIntro": "<p>Ферди �вл�ет�� приложением � открытым и�ходным кодом и разрабатывает�� �ообще�твом.</p><p>Спа�ибо люд�м, которые делают �то возможным:</p>",
   "settings.supportFerdi.bannerText": "Вы хотите помочь нам улучшить Ферди?",
   "settings.supportFerdi.headline": "О Ferdi",
-  "settings.supportFerdi.openSurvey": "Открыть опро�",
+  "settings.supportFerdi.openSurvey": "Open survey",
   "settings.supportFerdi.textDonation": "Е�ли вы хотите поддержать развитие Ферди � пожертвованием, вы можете �делать �то двум� �по�обами,",
   "settings.supportFerdi.textDonationAnd": "и",
   "settings.supportFerdi.textExpenses": "While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our",
   "settings.supportFerdi.textGitHubSponsors": "Спон�оры на Github",
-  "settings.supportFerdi.textListContributors": "Полный �пи�ок уча�тников",
+  "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",
@@ -387,8 +378,8 @@
   "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.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "�овый пароль",
   "settings.workspace.add.form.name": "Им�",
   "settings.workspace.add.form.submitButton": "Создать окружение",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "Включить уведомлени� и звук",
   "signup.email.label": "�дре� �лектронной почты",
   "signup.emailDuplicate": "Пользователь � таким адре�ом �лектронной почты уже �уще�твует",
-  "signup.firstname.label": "Им�",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Реги�траци�",
-  "signup.lastname.label": "Фамили�",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Создава� аккаунт Ferdi, вы принимаете",
   "signup.legal.privacy": "Политика конфиденциально�ти",
   "signup.legal.terms": "У�лови� об�луживани�",
@@ -430,11 +421,11 @@
   "signup.password.label": "Пароль",
   "signup.submit.label": "Создать аккаунт",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Удалить �ерви�",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Отключить звук",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Отключить уведомлени�",
-  "tabs.item.disableService": "Отключить �ерви�",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Включить звук",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Включить уведомлени�",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Перезагрузить",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} недей�твительно",
-  "validation.minLength": "{field} должно быть не менее {length} �имволов",
+  "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} об�зательно",
-  "validation.url": "{field} �вл�ет�� недей�твительной ��ылкой",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "�азад",
   "webControls.forward": "Пере�лать",
   "webControls.goHome": "Домой",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 7e84088d1..02d325afd 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Obnoviť",
-  "app.errorHandler.headline": "Nie�o sa pokazilo",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Vlastný server",
   "changeserver.headline": "Zmeniť server",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "ÄŒo sa stalo?",
   "connectionLostBanner.message": "Oh nie! Ferdi stratil pripojenie k {name}.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Zverejniť informácie ladenia",
   "feature.nightlyBuilds.activate": "Aktivovať",
   "feature.nightlyBuilds.info": "Tzv. \"no�né verzie\" sú vysoko experimentálne verzie Ferdi, ktoré môžu obsahovať nedoladená alebo nedokon�ené funkcie. Tieto verzie sú používané predovšetkým vývojármi, aby otestovali novo-vyvíjané funkcie a spôsob, akým sa budú správať vo finálnej verzii. Ak neviete �o robíte, navrhujeme neaktivovať tieto experimentálne verzie.",
   "feature.nightlyBuilds.title": "Vývojárske verzie",
@@ -24,8 +23,8 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "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.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Upraviť",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Nie ste pripojení k internetu.",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Nastavenia",
+  "global.settings": "Settings",
   "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.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": "Importovať vaše služby z Ferdi 4",
   "import.notSupportedHeadline": "Služby zatiaľ nie sú podporované vo verzii Ferdi 5",
   "import.skip.label": "Chcem pridať služby ru�ne",
-  "import.submit.label": "Importovať služby",
+  "import.submit.label": "Import {count} 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": "Čo je nového?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Reštartovať a nainštalovať aktualizáciu",
   "infobar.buttonReloadServices": "Obnoviť služby",
   "infobar.hide": "Skryť",
@@ -75,7 +74,7 @@
   "login.email.label": "E-mailová adresa",
   "login.headline": "Prihlásiť sa",
   "login.invalidCredentials": "E-mail alebo heslo nesúhlasia",
-  "login.link.password": "Obnoviť heslo",
+  "login.link.password": "Reset password",
   "login.link.signup": "Vytvoriť používateľský ú�et zdarma",
   "login.password.label": "Heslo",
   "login.serverLogout": "Vaša relácia vypršala, prihláste sa prosím znovu.",
@@ -117,10 +116,10 @@
   "menu.help.support": "Podpora",
   "menu.help.tos": "Podmienky použitia",
   "menu.services": "Služby",
-  "menu.services.activatePreviousService": "Aktivovať predchádzajúcu službu",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Úvod",
-  "menu.services.setNextServiceActive": "Aktivujte �alšiu službu",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Zobraziť",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Všetky služby",
   "menu.workspaces.openWorkspaceDrawer": "Otvoriť workspace záložku",
   "password.email.label": "E-mailová adresa",
-  "password.headline": "Obnoviť heslo",
+  "password.headline": "Reset password",
   "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.successInfo": "Skontrolujte prosím váš e-mail",
-  "pricing.features.accountSync": "Synchronizácia ú�tu",
-  "pricing.features.customWebsites": "Pridať vlastnú webstránku",
-  "pricing.features.desktopNotifications": "Upozornenie na ploche",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Proxy servery",
-  "pricing.features.spellchecker": "Podpora kontroly pravopisu",
-  "pricing.features.teamManagement": "Manažment tímu",
-  "pricing.features.thirdPartyServices": "Inštalovať inú službu",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Pracovný priestor",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Znovu na�ítať {name}",
   "service.crashHandler.autoReload": "Najbližší pokus o automatické obnovenie {name} o {seconds} sekúnd",
   "service.crashHandler.headline": "Ale nie!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Vítajte v aplikácii Ferdi",
-  "settings.account.account.editButton": "Upraviť ú�et",
+  "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": "Aktualizovať profil",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Bol vám odoslaný e-mail s odkazom pre potvrdenie odstránenia vášho ú�tu. Váš ú�et a údaje sa nebudú dať obnoviť!",
   "settings.account.deleteInfo": "Ak už nepotrebujete váš Ferdi ú�et, tu ho môžete zmazať spolu so všetkými prislúchajúcimi údajmi.",
   "settings.account.headline": "Ú�et",
-  "settings.account.headlineAccount": "Informácie o ú�te",
-  "settings.account.headlineDangerZone": "Nebezpe�ná zóna",
-  "settings.account.headlineInvoices": "Faktúry",
-  "settings.account.headlinePassword": "Zmeniť heslo",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Aktualizovať profil",
   "settings.account.successInfo": "Vaše zmeny boli uložené",
   "settings.account.tryReloadServices": "Skúsiť znova",
   "settings.account.tryReloadUserInfoRequest": "Skúsiť znova",
   "settings.account.userInfoRequestFailed": "Nebolo možné na�ítať informácie o používateľovi",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Vy�istiť vyrovnávaciu pamäť",
   "settings.app.buttonInstallUpdate": "Reštartovať a nainštalovať aktualizáciu",
@@ -220,12 +208,12 @@
   "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.darkMode": "Zapnúť Dark Mode",
   "settings.app.form.enableGPUAcceleration": "Zapnúť GPU zrýchlenie",
   "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Zapnúť kontrolu pravopisu",
-  "settings.app.form.enableSystemTray": "Zobrazovať Ferdi v systémovej lište",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Zobraziť záložky vypnutých služieb",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Zobraziť symbol pre nepre�ítané správy, ke� sú vypnuté upozornenia",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -296,7 +285,7 @@
   "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": "Otvoriť prie�inok",
+  "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Dostupné služby",
   "settings.recipes.missingService": "Chýba vám služba?",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Odstrániť službu",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Upraviť {name}",
   "settings.service.form.enableAudio": "Zapnúť zvuk",
   "settings.service.form.enableBadge": "Zobraziť symboly nepre�ítaných správ",
@@ -332,17 +321,18 @@
   "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": "Ak je vypnuté, všetky zvuky oznámení a iné prehrávania budú stíšené",
   "settings.service.form.name": "Meno",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Nastavenia servera proxy sa nebudú synchronizovať so servermi Ferdi.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Použiť Proxy",
-  "settings.service.form.proxy.password": "Heslo (voliteľné)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
   "settings.service.form.proxy.restartInfo": "Po zmene nastavení servera proxy reštartujte Ferdi.",
-  "settings.service.form.proxy.user": "Používateľ (voliteľné)",
+  "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": "Uložiť službu",
   "settings.service.form.tabHosted": "Hostované",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Preskúmať služby",
   "settings.services.headline": "Vaše služby",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Nepodarilo sa na�ítať vaše služby",
   "settings.services.tooltip.isDisabled": "Služba je vypnutá",
   "settings.services.tooltip.isMuted": "Všetky zvuky sú stíšené",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Nezisková organizácia",
   "settings.user.form.currentPassword": "Sú�asné heslo",
   "settings.user.form.email": "E-mail",
-  "settings.user.form.firstname": "Krstné meno",
-  "settings.user.form.lastname": "Priezvisko",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Nové heslo",
   "settings.workspace.add.form.name": "Meno",
   "settings.workspace.add.form.submitButton": "Vytvoriť pracovný priestor",
@@ -405,7 +396,7 @@
   "settings.workspaces.tryReloadWorkspaces": "Skúsiť znova",
   "settings.workspaces.updatedInfo": "Vaše zmeny boli uložené",
   "settings.workspaces.workspaceFeatureHeadline": "Menej je viac: Predstavenie Ferdi Pracovné priestory",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspace vám umožňujú sústrediť sa na to, �o je práve dôležité. Nastavte si rozli�né skupiny služieb a jednoducho medzi nimi kedykoľvek prepínajte. Vy rozhodujete ktoré služby, kedy a kde potrebujete, a my vám potom vieme pomôcť sústrediť sa na prácu - alebo jednoducho prepnúť z práce na �okoľvek iné.",
+  "settings.workspaces.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": "Nebolo možné na�ítať vaše workspace",
   "setupAssistant.headline": "Let's get started",
   "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "Povoliť oznámenia a zvuky",
   "signup.email.label": "E-mailová adresa",
   "signup.emailDuplicate": "Používateľ s touto e-mailovou adresou už jestvuje",
-  "signup.firstname.label": "Krstné meno",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Prihlásiť sa",
-  "signup.lastname.label": "Priezvisko",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Vytvorením ú�tu Ferdi súhlasíte s",
   "signup.legal.privacy": "Vyhlásenie o ochrane súkromia",
   "signup.legal.terms": "Podmienky služby",
@@ -430,11 +421,11 @@
   "signup.password.label": "Heslo",
   "signup.submit.label": "Vytvoriť ú�et",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Odstrániť službu",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Vypnúť zvuk",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Zakázať oznámenia",
-  "tabs.item.disableService": "Vypnúť službu",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Zapnúť zvuk",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Povoliť oznámenia",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Obnoviť",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} je neplatný",
-  "validation.minLength": "{field} by malo byť dlhé aspoň {length} znakov",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "Je nutné zadať aspoň jeden",
-  "validation.required": "{field} je povinné",
-  "validation.url": "{field} nie je platné URL",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Naspäť",
   "webControls.forward": "Forward",
   "webControls.goHome": "Úvod",
@@ -454,12 +445,12 @@
   "webControls.reload": "Obnoviť",
   "welcome.loginButton": "Prihlásiť sa do vášho ú�tu",
   "welcome.signupButton": "Vytvoriť používateľský ú�et zdarma",
-  "workspaceDrawer.addNewWorkspaceLabel": "Pridať nový workspace",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "Všetky služby",
   "workspaceDrawer.headline": "Pracovný priestor",
   "workspaceDrawer.item.contextMenuEdit": "Upraviť",
   "workspaceDrawer.item.noServicesAddedYet": "Zatiaľ žiadne služby",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspace vám umožňujú sústrediť sa na to, �o je práve dôležité. Nastavte si rozli�né skupiny služieb a jednoducho medzi nimi kedykoľvek prepínajte.</p><p>Vy rozhodujete ktoré služby, kedy a kde potrebujete, a my vám potom vieme pomôcť sústrediť sa na prácu - alebo jednoducho prepnúť z práce na �okoľvek iné. </p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Upraviť nastavenia workspace",
+  "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": "Prepínanie na"
 }
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index 2c145d6f4..041b02632 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "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",
@@ -45,7 +44,7 @@
   "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",
+  "import.submit.label": "Import {count} 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",
@@ -118,7 +117,7 @@
   "menu.help.tos": "Terms of Service",
   "menu.services": "Services",
   "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
   "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
@@ -152,18 +151,7 @@
   "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",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
   "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.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",
@@ -220,12 +208,12 @@
   "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.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.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
   "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.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Discover services",
   "settings.services.headline": "Your services",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "Service is disabled",
   "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 8ee9417f6..85068ee5c 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Ponovno u�itavanje",
-  "app.errorHandler.headline": "Дошло је до грешке",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Prilagođen server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Сервер",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "Шта �е де�ило?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "�ктивирај",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,8 +23,8 @@
   "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": "Nije moguće pristupiti Ferdi-ovim on-line servisima. ",
-  "global.cancel": "Odustani",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Uredi",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Niste povezani sa serverom.",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Postavke",
+  "global.settings": "Settings",
   "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.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": "Uvezite svoje Ferdi 4 servise",
   "import.notSupportedHeadline": "Servis trenutno nije podržan u Ferdi 5",
   "import.skip.label": "Желим да додам у�луге ручно",
-  "import.submit.label": "Uvezi servise",
+  "import.submit.label": "Import {count} 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": "Å ta je novo? ",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Ponovo pokreni i instaliraj ažuriranje ",
   "infobar.buttonReloadServices": "Ponovo u�itaj servise ",
   "infobar.hide": "Sakrij",
@@ -75,7 +74,7 @@
   "login.email.label": "Vaša e-adresa",
   "login.headline": "Prijavite se",
   "login.invalidCredentials": "E-mail ili lozinka nisu to�ni",
-  "login.link.password": "Stvaranje nove lozinke",
+  "login.link.password": "Reset password",
   "login.link.signup": "Stvorite besplatan ra�un",
   "login.password.label": "Лозинка",
   "login.serverLogout": "Vaša sesija je istekla, prijavite se ponovo.",
@@ -118,7 +117,7 @@
   "menu.help.tos": "У�лови коришћења у�луге",
   "menu.services": "Usluge",
   "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
   "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Sve usluge",
   "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
   "password.email.label": "Vaša e-adresa",
-  "password.headline": "Stvaranje nove lozinke",
+  "password.headline": "Reset password",
   "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.successInfo": "Molimo Vas da provjerite vašu e-mail adresu",
-  "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",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Osvježi {name}",
   "service.crashHandler.autoReload": "Pokušaću automatski povratiti {name} u {seconds} sekundi",
   "service.crashHandler.headline": "O, ne! ",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Dobrodošli u Ferdi",
-  "settings.account.account.editButton": "Uredi ra�un",
+  "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": "Ažuriraj profil",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Добили �те имејл �а линком путем којег потврђујете бри�ање �вог налога. Ваш налог и подаци не могу бити повраћени!",
   "settings.account.deleteInfo": "Уколико Вам више није потребан Франз налог, овде можете обри�ати �вој налог и �ве податке везане за и�ти.",
   "settings.account.headline": "Korisni�ki nalog",
-  "settings.account.headlineAccount": "Podaci o nalogu",
-  "settings.account.headlineDangerZone": "Зона опреза",
-  "settings.account.headlineInvoices": "Fakture",
-  "settings.account.headlinePassword": "Promijenite lozinku",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Ažuriraj profil",
   "settings.account.successInfo": "Vaše promjene su spremljene",
   "settings.account.tryReloadServices": "Pokušajte ponovno",
   "settings.account.tryReloadUserInfoRequest": "Pokušajte ponovno",
   "settings.account.userInfoRequestFailed": "Nije moguće u�itati informacije o korisniku",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Очи�ти кеш",
   "settings.app.buttonInstallUpdate": "Ponovo pokreni i instaliraj ažuriranje ",
@@ -220,12 +208,12 @@
   "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.darkMode": "Enable Dark Mode",
   "settings.app.form.enableGPUAcceleration": "Омогући убрзање графичке јединице",
   "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Omogući provjeru pravopisa",
-  "settings.app.form.enableSystemTray": "Prikaži aplikaciju u sustavskoj traci",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Prikaži plo�e s onemogućenim servisima",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Покажи беџ за непрочитане поруке када �у обавештења онемогућена",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Izbriši uslugu",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Uredite {name}",
   "settings.service.form.enableAudio": "Omogućite zvuk",
   "settings.service.form.enableBadge": "Покажи беџеве за непрочитане поруке",
@@ -332,12 +321,13 @@
   "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": "Kada je onemogućeno, sve obavijesti, svi zvukovi i sva pozadinska podrška će biti ne�ujna.",
   "settings.service.form.name": "Ime",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Pronađite usluge",
   "settings.services.headline": "Vaše usluge",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "Usluga je onemogućena.",
   "settings.services.tooltip.isMuted": "Svi zvukovi su onemogućeni.",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Neprofitno",
   "settings.user.form.currentPassword": "Trenutna lozinka",
   "settings.user.form.email": "E-pošta",
-  "settings.user.form.firstname": "Ime",
-  "settings.user.form.lastname": "Prezime",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Nova lozinka",
   "settings.workspace.add.form.name": "Ime",
   "settings.workspace.add.form.submitButton": "Create workspace",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "И�кључи обавештења и звукове",
   "signup.email.label": "Vaša e-adresa",
   "signup.emailDuplicate": "Već postoji korisnik s tom e-mail adresom",
-  "signup.firstname.label": "Ime",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Prijava",
-  "signup.lastname.label": "Prezime",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Prilikom stvaranja Ferdi ra�una, slažete se sa sljedećim stavkama",
   "signup.legal.privacy": "Izjava o privatnosti",
   "signup.legal.terms": "Uvjeti korištenja",
@@ -430,11 +421,11 @@
   "signup.password.label": "Лозинка",
   "signup.submit.label": "Napravite novi ra�un",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Izbriši uslugu",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Onemogući zvuk",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Onemogući obavijesti",
-  "tabs.item.disableService": "Onemogući servis",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Omogućite zvuk",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Omogućite obavijesti",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Ponovno u�itavanje",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} није валидно",
-  "validation.minLength": "{field} треба да буде најмање {length} карактера дугачко",
+  "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} је неопходно",
-  "validation.url": "{field} није валидан УРЛ",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Back",
   "webControls.forward": "Forward",
   "webControls.goHome": "Home",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index 87b92e398..ef254fc5d 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Ladda om",
-  "app.errorHandler.headline": "NÃ¥gonting gick snett",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Anpassad server",
   "changeserver.headline": "Byt server",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "Vad hände?",
   "connectionLostBanner.message": "Åh nej! Ferdi förlorade anslutningen till {name}.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Skicka felsökningsinformation",
   "feature.nightlyBuilds.activate": "Aktivera",
   "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",
@@ -24,8 +23,8 @@
   "feature.quickSwitch.info": "Välj en tjänst med TAB, ↑ and ↓. Öppna en tjänst med ENTER.",
   "feature.quickSwitch.search": "Sök...",
   "feature.quickSwitch.title": "Snabbväxling",
-  "global.api.unhealthy": "Kan inte ansluta till Ferdis onlinetjänster",
-  "global.cancel": "Avbryt",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Redigera",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Du är inte ansluten till Internet.",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Inställningar",
+  "global.settings": "Settings",
   "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.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": "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",
-  "import.submit.label": "Importera tjänster",
+  "import.submit.label": "Import {count} services",
   "infobar.authRequestFailed": "Det uppstod fel vid försök då en autentiserad begäran utfördes. Prova att logga ut och in igen om felet kvarstår.",
-  "infobar.buttonChangelog": "Vad nytt har hänt?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Starta om & installera uppdatering",
   "infobar.buttonReloadServices": "Ladda om tjänster",
   "infobar.hide": "Dölj",
@@ -75,7 +74,7 @@
   "login.email.label": "E-postadress",
   "login.headline": "Logga in",
   "login.invalidCredentials": "E-post eller lösenord är felaktigt",
-  "login.link.password": "Återställ lösenord",
+  "login.link.password": "Reset password",
   "login.link.signup": "Skapa ett gratis konto",
   "login.password.label": "Lösenord",
   "login.serverLogout": "Din session har gått ut. Vänligen logga in på nytt.",
@@ -117,10 +116,10 @@
   "menu.help.support": "Support",
   "menu.help.tos": "Användarvillkor",
   "menu.services": "Tjänster",
-  "menu.services.activatePreviousService": "Aktivera föregående tjänst",
-  "menu.services.addNewService": "Lägg till ny tjänst",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Hem",
-  "menu.services.setNextServiceActive": "Aktivera nästa tjänst",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Aktivera Todos",
   "menu.view": "Visa",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Alla tjänster",
   "menu.workspaces.openWorkspaceDrawer": "Öppna arbetsytan",
   "password.email.label": "E-postadress",
-  "password.headline": "Återställ lösenord",
+  "password.headline": "Reset password",
   "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.successInfo": "Vänligen kontrollera din e-post",
-  "pricing.features.accountSync": "Synkronisering av konto",
-  "pricing.features.customWebsites": "Lägg till egna webbplatser",
-  "pricing.features.desktopNotifications": "Skrivbordsaviseringar",
-  "pricing.features.onPremise": "Lokala tjänster och andra värdtjänster",
-  "pricing.features.recipes": "Välj mellan fler än 70 tjänster",
-  "pricing.features.serviceProxies": "Tjänstens proxies",
-  "pricing.features.spellchecker": "Stöd för stavningskontroll",
-  "pricing.features.teamManagement": "Hantera grupp",
-  "pricing.features.thirdPartyServices": "Installera tjänster från tredje part",
-  "pricing.features.unlimitedServices": "Lägg till obegränsat antal tjänster",
-  "pricing.features.workspaces": "Arbetsytor",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Ladda om {name}",
   "service.crashHandler.autoReload": "Försöker automatiskt återställa {name} om {seconds} sekunder",
   "service.crashHandler.headline": "Ã…h nej!",
@@ -181,7 +169,7 @@
   "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": "Använd Ferdi utan ett konto",
   "services.welcome": "Välkommen till Ferdi",
-  "settings.account.account.editButton": "Redigera konto",
+  "settings.account.account.editButton": "Edit account",
   "settings.account.accountUnavailable": "Kontot är inte tillgängligt",
   "settings.account.accountUnavailableInfo": "Du använder Ferdi utan ett konto. Om du vill använda Ferdi med ett konto och hålla dina tjänster synkroniserade mellan installationer, välj en server i fliken Inställningar och logga in.",
   "settings.account.buttonSave": "Uppdatera profil",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Du har fått ett e-postmeddelande med en länk för att bekräfta raderingen av ditt konto. Ditt konto och data kan inte återställas!",
   "settings.account.deleteInfo": "Om du inte behöver ditt Ferdi-konto längre, kan du ta bort ditt konto och all anknuten information här.",
   "settings.account.headline": "Konto",
-  "settings.account.headlineAccount": "Kontoinformation",
-  "settings.account.headlineDangerZone": "Högrisksområde",
-  "settings.account.headlineInvoices": "Fakturor",
-  "settings.account.headlinePassword": "Ändra lösenord",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Uppdatera profil",
   "settings.account.successInfo": "Dina ändringar har sparats",
   "settings.account.tryReloadServices": "Försök igen",
   "settings.account.tryReloadUserInfoRequest": "Försök igen",
   "settings.account.userInfoRequestFailed": "Kunde inte ladda användarinformation",
-  "settings.account.yourLicense": "Din Ferdi-licens",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Rensa cache",
   "settings.app.buttonInstallUpdate": "Starta om & installera uppdatering",
@@ -219,13 +207,13 @@
   "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.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Aktivera mörkt läge",
   "settings.app.form.enableGPUAcceleration": "Aktivera GPU-hårdvaruacceleration",
   "settings.app.form.enableLock": "Aktivera lösenordslås",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Aktivera stavningskontroll",
-  "settings.app.form.enableSystemTray": "Visa Ferdi i systemfältet",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Aktivera Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Strategi för vila",
@@ -251,9 +239,10 @@
   "settings.app.form.showDisabledServices": "Visa flikar för inaktiverade tjänster",
   "settings.app.form.showDragArea": "Visa dragbart område i fönstret",
   "settings.app.form.showMessagesBadgesWhenMuted": "Visa antal olästa meddelanden när aviseringar är inaktiverade",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Starta i minimerat läge",
   "settings.app.form.universalDarkMode": "Aktivera globalt mörkt läge",
-  "settings.app.form.useTouchIdToUnlock": "Tillåt att TouchID används för att låsa upp Ferdi",
+  "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": "Avancerat",
@@ -267,7 +256,7 @@
   "settings.app.languageDisclaimer": "Engelska och tyska är officella översättningar. Övriga språk har översatts av gemenskapen.",
   "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": "Lösenord",
-  "settings.app.lockedPasswordInfo": "Se till att du anger ett lösenord du kommer att komma ihåg.\nOm du tappar bort detta lösenord måste du installera om Ferdi.",
+  "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": "Ändringar kräver omstart",
   "settings.app.scheduledDNDInfo": "Schemalagd \"Stör ej\" låter dig definiera en tidsperiod inom vilken du inte vill få meddelanden från Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Tid i 24-timmarsformat. Sluttid kan vara före starttid (t.ex. start 17:00, slut 09:00) för att aktivera \"Stör ej\" över natten.",
@@ -275,7 +264,7 @@
   "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": "Denna server kommer att användas för \"Ferdi Todo\"-funktionen.",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Hjälp oss att översätta Ferdi till ditt språk.",
   "settings.app.universalDarkModeInfo": "Globalt mörkt läge försöker att dynamiskt generera en mörk stil för tjänster som ännu inte stöds.",
   "settings.app.updateStatusAvailable": "Uppdatering tillgänglig, laddar ner...",
@@ -294,9 +283,9 @@
   "settings.recipes.customService.headline.communityRecipes": "Tredjepartsrecept från gemenskapen",
   "settings.recipes.customService.headline.customRecipes": "Egna tredjepartsrecept",
   "settings.recipes.customService.headline.devRecipes": "Dina recept för utvecklingsservice",
-  "settings.recipes.customService.intro": "För att lägga till en anpassad tjänst, kopiera receptet för tjänsten till:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
   "settings.recipes.customService.openDevDocs": "Dokumentation för utvecklare",
-  "settings.recipes.customService.openFolder": "Öppna mapp",
+  "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Tillgängliga tjänster",
   "settings.recipes.missingService": "Saknar du en tjänst?",
   "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.",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Ta bort tjänst",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Redigera {name}",
   "settings.service.form.enableAudio": "Aktivera ljud",
   "settings.service.form.enableBadge": "Visa olästa meddelandemärken",
@@ -332,17 +321,18 @@
   "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": "Om inaktiverad kommer alla aviseringsljud och ljuduppspelning att tystas",
   "settings.service.form.name": "Namn",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Öppna darkmode.css",
   "settings.service.form.openUserCss": "Öppna user.css",
   "settings.service.form.openUserJs": "Öppna user.js",
   "settings.service.form.proxy.headline": "Inställningar för HTTP/HTTPS-proxy",
   "settings.service.form.proxy.host": "Proxy-värd/IP",
-  "settings.service.form.proxy.info": "Proxyinställningar kommer inte att synkroniseras med Ferdi-servrarna.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Använd proxy",
-  "settings.service.form.proxy.password": "Lösenord (frivilligt)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
   "settings.service.form.proxy.restartInfo": "Vänligen starta om Ferdi efter att du ändrat proxyinställningar.",
-  "settings.service.form.proxy.user": "Användare (valfritt)",
+  "settings.service.form.proxy.user": "User (optional)",
   "settings.service.form.recipeFileInfo": "Dina användarfiler kommer att infogas i webbsidan så att du kan anpassa tjänsterna hur du vill. Användarfiler lagras endast lokalt och överförs inte till andra datorer som använer samma konto.",
   "settings.service.form.saveButton": "Spara tjänst",
   "settings.service.form.tabHosted": "Värd",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Upptäck tjänster",
   "settings.services.headline": "Dina tjänster",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Kunde inte ladda dina tjänster",
   "settings.services.tooltip.isDisabled": "Tjänsten är inaktiverad",
   "settings.services.tooltip.isMuted": "Alla ljud är avstängda",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Ideell organisation",
   "settings.user.form.currentPassword": "Nuvarande lösenord",
   "settings.user.form.email": "E-post",
-  "settings.user.form.firstname": "Förnamn",
-  "settings.user.form.lastname": "Efternamn",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Nytt lösenord",
   "settings.workspace.add.form.name": "Namn",
   "settings.workspace.add.form.submitButton": "Skapa arbetsyta",
@@ -405,7 +396,7 @@
   "settings.workspaces.tryReloadWorkspaces": "Försök igen",
   "settings.workspaces.updatedInfo": "Dina ändringar har sparats",
   "settings.workspaces.workspaceFeatureHeadline": "\"Less is more\": Vi presenterar Ferdi-arbetsytor",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi-arbetsytor låter dig fokusera på det som är viktigt just nu. Konfigurera olika uppsättningar av tjänster och växla enkelt mellan dem när som helst. Du bestämmer vilka tjänster du behöver när och var, så att vi kan hjälpa dig att hålla koll på läget - eller enkelt koppla bort från jobbet när du vill.",
+  "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": "Kunde inte ladda dina arbetsytor",
   "setupAssistant.headline": "Let's get started",
   "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "Aktivera aviseringar och ljud",
   "signup.email.label": "E-postadress",
   "signup.emailDuplicate": "En användare med den e-postadressen finns redan",
-  "signup.firstname.label": "Förnamn",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Registrera dig",
-  "signup.lastname.label": "Efternamn",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Genom att skapa ett Ferdi konto accepterar du",
   "signup.legal.privacy": "Integritetspolicy",
   "signup.legal.terms": "Användarvillkor",
@@ -430,11 +421,11 @@
   "signup.password.label": "Lösenord",
   "signup.submit.label": "Skapa konto",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Ta bort tjänst",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Inaktivera ljud",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Inaktivera aviseringar",
-  "tabs.item.disableService": "Inaktivera tjänst",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Aktivera ljud",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktivera aviseringar",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Ladda om",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} är felaktig",
-  "validation.minLength": "{field} bör vara minst {length} tecken lång",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "Minst en krävs",
-  "validation.required": "{field} är obligatoriskt",
-  "validation.url": "{field} är inte en giltig URL",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Tillbaka",
   "webControls.forward": "Framåt",
   "webControls.goHome": "Hem",
@@ -454,12 +445,12 @@
   "webControls.reload": "Ladda om",
   "welcome.loginButton": "Logga in på ditt konto",
   "welcome.signupButton": "Skapa ett gratis konto",
-  "workspaceDrawer.addNewWorkspaceLabel": "Skapa ny arbetsyta",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "Alla tjänster",
   "workspaceDrawer.headline": "Arbetsytor",
   "workspaceDrawer.item.contextMenuEdit": "redigera",
   "workspaceDrawer.item.noServicesAddedYet": "Inga tjänster har lagts till",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi-arbetsytor låter dig fokusera på det som är viktigt just nu. Konfigurera olika uppsättningar av tjänster och växla enkelt mellan dem när som helst.</p><p>Du bestämmer vilka tjänster du behöver när och var, så att vi kan hjälpa dig att hålla koll på läget - eller enkelt koppla bort från jobbet när du vill.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Redigera inställningar för arbetsytor",
+  "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": "Byter till"
 }
diff --git a/src/i18n/locales/te.json b/src/i18n/locales/te.json
index be9bbb961..812ec8c4c 100644
--- a/src/i18n/locales/te.json
+++ b/src/i18n/locales/te.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "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",
@@ -45,7 +44,7 @@
   "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",
+  "import.submit.label": "Import {count} 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",
@@ -118,7 +117,7 @@
   "menu.help.tos": "Terms of Service",
   "menu.services": "Services",
   "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
   "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
@@ -152,18 +151,7 @@
   "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",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
   "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.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",
@@ -220,12 +208,12 @@
   "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.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.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
   "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.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Discover services",
   "settings.services.headline": "Your services",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "Service is disabled",
   "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 3b91dfad0..b0368a18a 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Yenile",
-  "app.errorHandler.headline": "Bir terslik çıktı",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Özel sunucu",
   "changeserver.headline": "Sunucuyu deÄŸiÅŸtir",
   "changeserver.label": "Sunucu",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "Ne oldu?",
   "connectionLostBanner.message": "Nayır, nolamaz! Ferdi {name} ile bağlantısını yitirdi.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Hata ayıklama bilgisini yayımla",
   "feature.nightlyBuilds.activate": "EtkinleÅŸtir",
   "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",
@@ -24,30 +23,30 @@
   "feature.quickSwitch.info": "TAB, ↑ ve ↓ ile bir servis seç. ENTER ile bir servisi aç.",
   "feature.quickSwitch.search": "Ara...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "Ferdi hizmetlerine ÅŸu anda eriÅŸilemiyor",
-  "global.cancel": "Ä°ptal",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Düzenle",
   "global.no": "No",
   "global.notConnectedToTheInternet": "İnternete bağlı değilsiniz.",
   "global.ok": "Ok",
-  "global.quit": "Çık",
+  "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Ayarlar",
+  "global.settings": "Settings",
   "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.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": "Ferdi 4 servislerinizi içeri aktarın",
   "import.notSupportedHeadline": "Henüz Ferdi 5'te desteklenmeyen servisler",
   "import.skip.label": "Servisleri kendim eklemek istiyorum",
-  "import.submit.label": "Servisleri içe aktar",
+  "import.submit.label": "Import {count} services",
   "infobar.authRequestFailed": "Yetkili bir işlem yapılmaya çalışırken hatalar ortaya çıktı. Lütfen bu hata tekrarlarsa çıkış yapıp tekrar girmeyi dene.",
-  "infobar.buttonChangelog": "Yeni ne var?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Yeniden Başlat ve Güncelleştirmeleri Kur",
   "infobar.buttonReloadServices": "Hizmetleri yeniden yükle",
   "infobar.hide": "Gizle",
@@ -75,7 +74,7 @@
   "login.email.label": "E-posta adresi",
   "login.headline": "Oturum Aç",
   "login.invalidCredentials": "Yanlış parola ya da e-posta adresi",
-  "login.link.password": "Parola sıfırla",
+  "login.link.password": "Reset password",
   "login.link.signup": "Ãœcretsiz hesap oluÅŸtur",
   "login.password.label": "Åžifre",
   "login.serverLogout": "Oturum süreniz dolmuş, lütfen tekrar giriş yapın.",
@@ -117,10 +116,10 @@
   "menu.help.support": "Destek",
   "menu.help.tos": "Kullanım Şartları",
   "menu.services": "Hizmetler",
-  "menu.services.activatePreviousService": "Bir önceki servisi aktive et",
-  "menu.services.addNewService": "Yeni Servis Ekle",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Ana Sayfa",
-  "menu.services.setNextServiceActive": "Bir sonraki servisi aktive et",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Yapılacaklar",
   "menu.todos.enableTodos": "Yapılacaklar Listesi'ni Aç",
   "menu.view": "Görünüm",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Tüm servisler",
   "menu.workspaces.openWorkspaceDrawer": "Çalışma alanı çekmecesini aç",
   "password.email.label": "E-posta adresi",
-  "password.headline": "Parola sıfırla",
+  "password.headline": "Reset password",
   "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.successInfo": "E-postanızı kontrol ediniz",
-  "pricing.features.accountSync": "Hesap EÅŸitleme",
-  "pricing.features.customWebsites": "Özel Siteler Ekle",
-  "pricing.features.desktopNotifications": "Masaüstü Bildirimleri",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Servis proxy'leri",
-  "pricing.features.spellchecker": "Yazım denetimi desteği",
-  "pricing.features.teamManagement": "Takım yönetimi",
-  "pricing.features.thirdPartyServices": "3. parti servisleri yükleme",
-  "pricing.features.unlimitedServices": "Sınırsız servis ekleme",
-  "pricing.features.workspaces": "Çalışma Alanları",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "{name} yeniden yükle",
   "service.crashHandler.autoReload": "{name}'i {seconds} saniye içerisinde otomatik onarmayı deniyoruz",
   "service.crashHandler.headline": "Olamaz!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Ferdi'yi bir hesap olmadan kullan",
   "services.welcome": "Ferdi'a HoÅŸgeldiniz",
-  "settings.account.account.editButton": "Hesabı düzenle",
+  "settings.account.account.editButton": "Edit account",
   "settings.account.accountUnavailable": "Hesap kullanılamıyor",
   "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": "Profili güncelle",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Hesabınızın silinmesini onaylamanız için e-posta adresinize gönderilen bağlantıya tıklayınız. Bu işlem sonrasında hesabınız ve bilgileriniz geri getirilemez!",
   "settings.account.deleteInfo": "Ferdi hesabınıza artık ihtiyaç duymuyorsanız, hesabınızı ve buradaki bütün bağlantılı bilgilerinizi silebilirsiniz.",
   "settings.account.headline": "Hesap",
-  "settings.account.headlineAccount": "Hesap bilgileri",
-  "settings.account.headlineDangerZone": "Tehlike Bölgesi",
-  "settings.account.headlineInvoices": "Faturalar",
-  "settings.account.headlinePassword": "Parolayı değiştir",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Profili güncelle",
   "settings.account.successInfo": "DeÄŸiÅŸikliklerin kaydedildi",
   "settings.account.tryReloadServices": "Tekrar deneyin",
   "settings.account.tryReloadUserInfoRequest": "Tekrar deneyin",
   "settings.account.userInfoRequestFailed": "Kullanıcı bilgisi yüklenemedi",
-  "settings.account.yourLicense": "Ferdi Lisansınız",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Önbelleği temizle",
   "settings.app.buttonInstallUpdate": "Yeniden Başlat ve Güncelleştirmeleri Kur",
@@ -220,12 +208,12 @@
   "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.darkMode": "Karanlık modu aç",
   "settings.app.form.enableGPUAcceleration": "Grafik İşlemci Ünitesi (GPU) Hızlandırıcısını Aktif et",
   "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Yazım denetimini etkinleştir",
-  "settings.app.form.enableSystemTray": "Ferdi'ı sistem tepsisinde göster",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Devre dışı bırakılan servis sekmelerini göster",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Bildirimler kapalı iken okunmamış mesaj sayısını göster",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -296,7 +285,7 @@
   "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": "Klasör aç",
+  "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Mevcut servisler",
   "settings.recipes.missingService": "Aradığın servisi bulamadın mı?",
   "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.",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Servisi sil",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "{name} düzenle",
   "settings.service.form.enableAudio": "Sesi etkinleÅŸtirin",
   "settings.service.form.enableBadge": "Okunmamış mesajları göster",
@@ -332,17 +321,18 @@
   "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": "Devre dışı bırakıldığında, tüm bildirim sesleri sessize alınır",
   "settings.service.form.name": "Ad",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Ayarları",
   "settings.service.form.proxy.host": "Proxy Sunucusu/IP",
-  "settings.service.form.proxy.info": "Proxy ayarları Ferdi serverlarına yüklenmeyecektir.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Proxy Kullan",
-  "settings.service.form.proxy.password": "Parola (opsiyonel)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
   "settings.service.form.proxy.restartInfo": "Proxy ayarlarını değiştirdikten sonra Ferdi'ı yeniden başlatınız.",
-  "settings.service.form.proxy.user": "Kullanıcı (opsiyonel)",
+  "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": "Servisi kaydet",
   "settings.service.form.tabHosted": "Barındırılan",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Servisleri keÅŸfet",
   "settings.services.headline": "Servislerin",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Hizmetiniz yüklenemedi",
   "settings.services.tooltip.isDisabled": "Servis devre dışı",
   "settings.services.tooltip.isMuted": "Tüm sesler kapalı",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Kar amacı gütmeyen",
   "settings.user.form.currentPassword": "Mevcut ÅŸifre",
   "settings.user.form.email": "E-posta",
-  "settings.user.form.firstname": "Ad",
-  "settings.user.form.lastname": "Soyad",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Yeni ÅŸifre",
   "settings.workspace.add.form.name": "Ad",
   "settings.workspace.add.form.submitButton": "Create workspace",
@@ -420,9 +411,9 @@
   "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",
-  "signup.firstname.label": "Ad",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Hesap oluÅŸtur",
-  "signup.lastname.label": "Soyad",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Ferdi'ı hesabı oluşturark kabul ediyorsun",
   "signup.legal.privacy": "Gizlilik Sözleşmesi",
   "signup.legal.terms": "Kullanım Koşulları",
@@ -430,11 +421,11 @@
   "signup.password.label": "Åžifre",
   "signup.submit.label": "Hesap oluÅŸtur",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Servisi sil",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Sesi kapat",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Bildirimleri devre dışı bırak",
-  "tabs.item.disableService": "Servisi devre dışı bırak",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Sesi etkinleÅŸtirin",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Bildirimleri etkinleÅŸtir",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Yenile",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} geçerli değil",
-  "validation.minLength": "{field} en az {length} karakter uzunluğunda olmalı",
+  "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} gereklidir",
-  "validation.url": "{field} geçerli bir URL değil",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Geri",
   "webControls.forward": "Ä°leri",
   "webControls.goHome": "Ana Sayfa",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index b4f1fb66c..b03bf9072 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Перезавантажити",
-  "app.errorHandler.headline": "Що�ь пішло не так",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Кори�тувацький �ервер",
   "changeserver.headline": "Змінити �ервер",
   "changeserver.label": "Сервер",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "Що трапило�ь?",
   "connectionLostBanner.message": "О ні! Ферді втратив з'єднанн� з {name}.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Опублікувати інформацію дл� налагодженн�",
   "feature.nightlyBuilds.activate": "�ктивувати",
   "feature.nightlyBuilds.info": "�ічні збірки - це ви�окоек�периментальні вер�ії Ferdi, що можуть мі�тити \"неполіровані\" або незавершені функції. �ічні збірки в о�новному викори�товують�� розробниками, щоб перевірити �вої нові функції та те, �к вони будуть працювати в фінальній вер�ії. Якщо ви не знаєте, що ви робите, то радимо не активувати нічні збірки.",
   "feature.nightlyBuilds.title": "�ічні збірки",
@@ -24,30 +23,30 @@
   "feature.quickSwitch.info": "Виберіть �ерві� за допомогою TAB, �трілок ↑ та ↓. �ати�ніть ENTER, щоб відкрити.",
   "feature.quickSwitch.search": "Пошук...",
   "feature.quickSwitch.title": "Швидке перемиканн�",
-  "global.api.unhealthy": "�е можливо підключити�ь до онлайн �ерві�ів Ferdi",
-  "global.cancel": "Відмінити",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "Редагувати",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Ви не підключені до Інтернету.",
   "global.ok": "Ok",
-  "global.quit": "Вийти",
+  "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "�алаштуванн�",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Викори�товувати �и�темні параметри за змовчуванн�м ({default})",
   "global.spellchecking.autodetect": "�втоматично визначати мову",
   "global.spellchecking.autodetect.short": "�втоматично",
   "global.spellchecking.language": "Мова перевірки правопи�у",
-  "global.submit": "Подати",
+  "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": "Ідентифікатор браузера",
   "global.yes": "Yes",
   "import.headline": "Імпортувати ваші �ерві�и з Ferdi 4",
   "import.notSupportedHeadline": "�аразі �ерві�и не підтримують�� у Ferdi 5",
   "import.skip.label": "Я бажаю додати �ерві� вручну",
-  "import.submit.label": "Імпортувати �ерві�и",
+  "import.submit.label": "Import {count} 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": "Що нового?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Перезавантажити і в�тановити оновленн�",
   "infobar.buttonReloadServices": "Перезавантажити �ерві�и",
   "infobar.hide": "Приховати",
@@ -75,7 +74,7 @@
   "login.email.label": "Email адре�а",
   "login.headline": "Увійти",
   "login.invalidCredentials": "Email або пароль некоректні",
-  "login.link.password": "Скинути пароль",
+  "login.link.password": "Reset password",
   "login.link.signup": "Створити безплатний акаунт",
   "login.password.label": "Пароль",
   "login.serverLogout": "Ваша �е�і� закінчила�ь, будь ла�ка, увійдіть знову.",
@@ -117,10 +116,10 @@
   "menu.help.support": "Підтримка",
   "menu.help.tos": "Умови викори�танн�",
   "menu.services": "Служби",
-  "menu.services.activatePreviousService": "�ктивувати попередню �лужбу",
-  "menu.services.addNewService": "Додати новий �ерві�",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Головна",
-  "menu.services.setNextServiceActive": "�ктивувати на�тупний �ерві�",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Завданн�",
   "menu.todos.enableTodos": "Увімкнути Завданн�",
   "menu.view": "Вигл�д",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "У�і �ерві�и",
   "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
   "password.email.label": "Email адре�а",
-  "password.headline": "Скинути пароль",
+  "password.headline": "Reset password",
   "password.link.login": "Увійти до вашого акаунту",
   "password.link.signup": "Створити безплатний акаунт",
-  "password.noUser": "�е знайдено жодного кори�тувача з цією email адре�ою",
-  "password.successInfo": "Будь ла�ка, перевірте ваш 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",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Перезавантажити {name}",
   "service.crashHandler.autoReload": "Спробую автоматично відновити {name} через {seconds} �",
   "service.crashHandler.headline": "О, ні!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Ла�каво про�имо в Ferdi",
-  "settings.account.account.editButton": "Редагувати акаунт",
+  "settings.account.account.editButton": "Edit account",
   "settings.account.accountUnavailable": "Обліковий запи� недо�тупний",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Оновити профіль",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Ви отримали електронного ли�та з по�иланн�м, щоб підтвердити видаленн� облікового запи�у. Ваш обліковий запи� і дані не можна буде відновити!",
   "settings.account.deleteInfo": "Якщо Вам більше не потрібний обліковий запи� Ferdi, Ви можете його видалити і в�і �уміжні дані.",
   "settings.account.headline": "�каунт",
-  "settings.account.headlineAccount": "Інформаці� про акаунт",
-  "settings.account.headlineDangerZone": "�а �вій �трах і ризик",
-  "settings.account.headlineInvoices": "Інвой�и",
-  "settings.account.headlinePassword": "Змінити пароль",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Оновити профіль",
   "settings.account.successInfo": "Ваші зміни були збережені",
   "settings.account.tryReloadServices": "Спробуйте ще раз",
   "settings.account.tryReloadUserInfoRequest": "Спробуйте ще раз",
   "settings.account.userInfoRequestFailed": "�е вдало�� завантажити інформацію кори�тувача",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Очи�тити кеш",
   "settings.app.buttonInstallUpdate": "Перезавантажити і в�тановити оновленн�",
@@ -220,12 +208,12 @@
   "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.darkMode": "Переходь на Темну Сторону",
   "settings.app.form.enableGPUAcceleration": "Ввімкнути при�коренн� GPU",
   "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Увімкнути перевірку орфографії",
-  "settings.app.form.enableSystemTray": "Показувати Ferdi у �и�темному лотку",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,9 +239,10 @@
   "settings.app.form.showDisabledServices": "Показати вкладку вимкнених �ерві�ів",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Показувати значок непрочитаних повідомлень коли �повіщенн� вимкнені",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Запу�кати згорнутим",
   "settings.app.form.universalDarkMode": "Увімкнути універ�альний темний режим",
-  "settings.app.form.useTouchIdToUnlock": "Дозволити викори�танн� TouchID дл� розблокуванн� Ferdi",
+  "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": "Додаткові налаштуванн�",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Видалити �ерві�",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Редагувати {name}",
   "settings.service.form.enableAudio": "Увімкнути звук",
   "settings.service.form.enableBadge": "Показувати непрочитані повідомленн�",
@@ -332,17 +321,18 @@
   "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.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Відкрити user.css",
   "settings.service.form.openUserJs": "Відкрити user.js",
   "settings.service.form.proxy.headline": "�алаштуванн� HTTP/HTTPS прок�і ",
   "settings.service.form.proxy.host": "Прок�і Host/IP",
-  "settings.service.form.proxy.info": "�алаштуванн� прок�і не будуть �инхронізовані із �ерверами Ferdi",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Викори�товувати прок�і",
-  "settings.service.form.proxy.password": "Пароль (опційно)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Порт",
   "settings.service.form.proxy.restartInfo": "Будь ла�ка, перезапу�тіть Ferdi пі�л� зміни налуштувань прок�і",
-  "settings.service.form.proxy.user": "Кори�тувач (опційно)",
+  "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": "Зберегти �ерві�",
   "settings.service.form.tabHosted": "Розміщений",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Відкрийте дл� �ебе �ерві�и",
   "settings.services.headline": "Ваші �ерві�и",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "Серві� відключений",
   "settings.services.tooltip.isMuted": "В�і звуки вимкнено",
@@ -387,8 +378,8 @@
   "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.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "�овий пароль",
   "settings.workspace.add.form.name": "Ім'�",
   "settings.workspace.add.form.submitButton": "Create workspace",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "Увімкнути �повіщенн� та звуки",
   "signup.email.label": "Email адре�а",
   "signup.emailDuplicate": "Кори�тувач із цією email адре�ою вже і�нує",
-  "signup.firstname.label": "Ім`�",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Увійти",
-  "signup.lastname.label": "Прізвище",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Створенн�м акаунту Ferdi ви приймаєте",
   "signup.legal.privacy": "За�ва про конфіденційні�ть",
   "signup.legal.terms": "Умови викори�танн�",
@@ -430,11 +421,11 @@
   "signup.password.label": "Пароль",
   "signup.submit.label": "Створити акаунт",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Видалити �ерві�",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "відключити звук",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Вимкнути �повіщенн�",
-  "tabs.item.disableService": "Вимкнути �ерві�",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Увімкнути звук",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Увімкнути �повіщенн�",
@@ -442,11 +433,11 @@
   "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Перезавантажити",
   "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} не валідне",
-  "validation.minLength": "Кількі�ть �имволів в {field} повина бути не меньше {length} ",
+  "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} обов'�звоке",
-  "validation.url": "{field} не валідний URL",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "�азад",
   "webControls.forward": "Вперед",
   "webControls.goHome": "Головна",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index 0bf52bf1d..668b75127 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Tải lại",
-  "app.errorHandler.headline": "�ã xảy ra lỗi",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Máy chủ tùy chỉnh",
   "changeserver.headline": "Thay đổi máy chủ",
   "changeserver.label": "Máy chủ",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "�i�u gì đã xảy ra?",
   "connectionLostBanner.message": "Mất kết nối tới {name}.",
   "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.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",
@@ -24,30 +23,30 @@
   "feature.quickSwitch.info": "Ch�n một dịch vụ với TAB, ↑ và ↓. Mở một dịch vụ bằng ENTER.",
   "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.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "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.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "Các thiết lập",
+  "global.settings": "Settings",
   "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.submit": "Submit",
   "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",
-  "import.submit.label": "Nhập Dịch vụ",
+  "import.submit.label": "Import {count} services",
   "infobar.authRequestFailed": "�ã xảy ra lỗi khi cố gắng thực hiện một yêu cầu đã xác thực. Vui lòng thử đăng xuất và đăng nhập lại nếu lỗi này vẫn tiếp diễn.",
-  "infobar.buttonChangelog": "Có gì mới?",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Khởi động lại và cài đặt bản cập nhật",
   "infobar.buttonReloadServices": "Tải lại dịch vụ",
   "infobar.hide": "Ẩn",
@@ -75,7 +74,7 @@
   "login.email.label": "�ịa chỉ E-mail",
   "login.headline": "�ăng nhập",
   "login.invalidCredentials": "Email hoặc mật khẩu chưa chính xác",
-  "login.link.password": "�ặt lại mật khẩu",
+  "login.link.password": "Reset password",
   "login.link.signup": "Tạo tài khoản miễn phí",
   "login.password.label": "Mật khẩu",
   "login.serverLogout": "Phiên làm việc của bạn bị quá hạn, hãy đăng nhập lại.",
@@ -117,10 +116,10 @@
   "menu.help.support": "Hỗ trợ",
   "menu.help.tos": "�i�u khoản Dịch vụ",
   "menu.services": "Dịch vụ",
-  "menu.services.activatePreviousService": "Kích hoạt dịch vụ trước đó",
-  "menu.services.addNewService": "Thêm Dịch vụ mới",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Trang chủ",
-  "menu.services.setNextServiceActive": "Kích hoạt dịch vụ tiếp theo",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Danh sách cần làm",
   "menu.todos.enableTodos": "Mở danh sách cần làm",
   "menu.view": "Hiển thị",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "Tất cả Dịch vụ",
   "menu.workspaces.openWorkspaceDrawer": "Mở không gian làm việc",
   "password.email.label": "�ịa chỉ E-mail",
-  "password.headline": "�ặt lại mật khẩu",
+  "password.headline": "Reset password",
   "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.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",
-  "pricing.features.desktopNotifications": "Thông báo",
-  "pricing.features.onPremise": "Tại chỗ & các dịch vụ được lưu trữ khác",
-  "pricing.features.recipes": "Ch�n từ hơn 70 Dịch vụ",
-  "pricing.features.serviceProxies": "Các Proxy Dịch vụ",
-  "pricing.features.spellchecker": "Hỗ trợ Công cụ kiểm tra chính tả",
-  "pricing.features.teamManagement": "Quản lý nhóm",
-  "pricing.features.thirdPartyServices": "Cài đặt dịch vụ của bên thứ 3",
-  "pricing.features.unlimitedServices": "Thêm dịch vụ không giới hạn",
-  "pricing.features.workspaces": "Không gian làm việc",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Tải lại {name}",
   "service.crashHandler.autoReload": "�ang cố gắng tự động khôi phục {name} sau {seconds} giây",
   "service.crashHandler.headline": "Ồ không!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Theo tùy ch�n, bạn có thể thay đổi máy chủ Ferdi của mình bằng cách nhấp vào bánh răng ở góc dưới cùng bên trái. Nếu bạn đang chuyển qua (từ một trong các máy chủ được lưu trữ) sang sử dụng Ferdi mà không có tài khoản, vui lòng thông báo rằng bạn có thể xuất dữ liệu của mình từ máy chủ đó và sau đó nhập dữ liệu đó bằng menu Trợ giúp để phục hồi tất cả không gian làm việc và dịch vụ đã định cấu hình của bạn!",
   "services.serverless": "Sử dụng Ferdi không cần �ăng nhập Tài khoản",
   "services.welcome": "Chào mừng bạn đến với Ferdi",
-  "settings.account.account.editButton": "Chỉnh sửa Tài khoản",
+  "settings.account.account.editButton": "Edit account",
   "settings.account.accountUnavailable": "Tài khoản không hợp lệ",
   "settings.account.accountUnavailableInfo": "Bạn đang sử dụng Ferdi mà không có tài khoản. Nếu bạn muốn sử dụng Ferdi với một tài khoản và giữ cho các dịch vụ của mình được đồng bộ hóa giữa các bản cài đặt, vui lòng ch�n một máy chủ trong tab Cài đặt rồi đăng nhập.",
   "settings.account.buttonSave": "Cập nhật Hồ sơ",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "Bạn đã nhận được một email có liên kết để xác nhận việc xóa tài khoản của bạn. Tài khoản và dữ liệu của bạn không thể được khôi phục!",
   "settings.account.deleteInfo": "Nếu bạn không cần tài khoản Ferdi nữa, bạn có thể xóa tài khoản của mình và tất cả dữ liệu liên quan tại đây.",
   "settings.account.headline": "Tài khoản",
-  "settings.account.headlineAccount": "Thông tin Tài khoản",
-  "settings.account.headlineDangerZone": "Vùng Nguy hiểm",
-  "settings.account.headlineInvoices": "Thanh toán",
-  "settings.account.headlinePassword": "Thay đổi Mật khẩu",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Cập nhật Hồ sơ",
   "settings.account.successInfo": "M�i thay đổi đã được lưu lại",
   "settings.account.tryReloadServices": "Thử lại",
   "settings.account.tryReloadUserInfoRequest": "Thử lại",
   "settings.account.userInfoRequestFailed": "Không thể tải được thông tin ngư�i dùng",
-  "settings.account.yourLicense": "Giấy phép Ferdi của bạn",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Viết màu nhấn của bạn ở định dạng tương thích với CSS. (Mặc định: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Xóa bộ nhớ cache",
   "settings.app.buttonInstallUpdate": "Khởi động lại và cài đặt bản cập nhật",
@@ -219,13 +207,13 @@
   "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.customTodoServer": "Custom Todo Server",
+  "settings.app.form.darkMode": "Cho phép chế độ n�n tối",
   "settings.app.form.enableGPUAcceleration": "Bật Tăng tốc GPU",
   "settings.app.form.enableLock": "Cho phép khóa bằng mật khẩu",
   "settings.app.form.enableMenuBar": "Luôn hiển thị Ferdi trong Menu Bar",
   "settings.app.form.enableSpellchecking": "Kích hoạt tính năng kiểm tra chính tả",
-  "settings.app.form.enableSystemTray": "Hiển thị Ferdi trong khay hệ thống",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Cho phép Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Giữ các dịch vụ ở chế độ ngủ đông khi khởi động",
   "settings.app.form.hibernationStrategy": "Chiến lược ngủ đông",
@@ -251,9 +239,10 @@
   "settings.app.form.showDisabledServices": "Hiển thị các tab dịch vụ bị vô hiệu hóa",
   "settings.app.form.showDragArea": "Hiển thị khu vực có thể kéo trên cửa sổ",
   "settings.app.form.showMessagesBadgesWhenMuted": "Hiển thị huy hiệu tin nhắn chưa đ�c khi tắt thông báo",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Bắt đầu thu nh�",
   "settings.app.form.universalDarkMode": "Bật Chế độ tối chung",
-  "settings.app.form.useTouchIdToUnlock": "Cho phép sử dụng TouchID để mở khóa Ferdi",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Sử dụng kiểu ngang",
   "settings.app.form.wakeUpStrategy": "Chiến lược đánh thức",
   "settings.app.headlineAdvanced": "Nâng cao",
@@ -265,9 +254,9 @@
   "settings.app.hibernateInfo": "Theo mặc định, Ferdi sẽ giữ cho tất cả các dịch vụ của bạn luôn mở và được tải ở chế độ n�n để chúng luôn sẵn sàng khi bạn muốn sử dụng. Service Hibernation sẽ dỡ b� các dịch vụ của bạn sau một khoảng th�i gian cụ thể. �i�u này rất hữu ích để tiết kiệm RAM hoặc giữ cho các dịch vụ không làm chậm máy tính của bạn.",
   "settings.app.inactivityLockInfo": "Vài phút không hoạt động, sau đó Ferdi sẽ tự động khóa. Sử dụng 0 để tắt",
   "settings.app.languageDisclaimer": "Bản dịch chính thức là tiếng Anh và tiếng �ức. Tất cả các ngôn ngữ khác là bản dịch dựa trên cộng đồng.",
-  "settings.app.lockInfo": "Khóa mật khẩu cho phép bạn bảo vệ tin nhắn của mình.\nSử dụng Khóa mật khẩu, bạn sẽ được nhắc nhập mật khẩu của mình mỗi khi khởi động Ferdi hoặc tự khóa Ferdi bằng biểu tượng ổ khóa ở góc dưới cùng bên trái hoặc phím tắt {lockShortcut}.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Mật khẩu",
-  "settings.app.lockedPasswordInfo": "Hãy chắc chắn rằng bạn đã đặt mật khẩu mà bạn sẽ nhớ.\nNếu bạn mất mật khẩu này, bạn sẽ phải cài đặt lại Ferdi.",
+  "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": "Các thay đổi yêu cầu khởi động lại",
   "settings.app.scheduledDNDInfo": "Theo lịch trình Không làm phi�n cho phép bạn xác định khoảng th�i gian mà bạn không muốn nhận Thông báo từ Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Th�i gian ở định dạng 24 gi�. Th�i gian kết thúc có thể trước th�i gian bắt đầu (ví dụ: bắt đầu từ 17:00, kết thúc lúc 09:00) để bật chế độ Không làm phi�n qua đêm.",
@@ -275,7 +264,7 @@
   "settings.app.spellCheckerLanguageInfo": "Ferdi sử dụng trình kiểm tra chính tả tích hợp trên máy Mac của bạn để kiểm tra lỗi chính tả. Nếu bạn muốn thay đổi ngôn ngữ mà trình kiểm tra chính tả kiểm tra, bạn có thể làm như vậy trong Tùy ch�n hệ thống của máy Mac.",
   "settings.app.subheadlineCache": "Bộ nhớ đệm",
   "settings.app.subheadlineFerdiProfile": "Hồ sơ Ferdi",
-  "settings.app.todoServerInfo": "Máy chủ này sẽ được sử dụng cho tính năng \"Ferdi Todo\".",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Giúp chúng tôi dịch Ferdi sang ngôn ngữ của bạn.",
   "settings.app.universalDarkModeInfo": "Chế độ tối chung cố gắng tạo động các kiểu chế độ tối cho các dịch vụ hiện không được hỗ trợ.",
   "settings.app.updateStatusAvailable": "Bản cập nhật phù hợp, đang tải...",
@@ -294,12 +283,12 @@
   "settings.recipes.customService.headline.communityRecipes": "Công thức của cộng đồng bên thứ 3",
   "settings.recipes.customService.headline.customRecipes": "Công thức của tùy chỉnh bên thứ 3",
   "settings.recipes.customService.headline.devRecipes": "Công thức dịch vụ phát triển của bạn",
-  "settings.recipes.customService.intro": "�ể thêm một dịch vụ tùy chỉnh, hãy sao chép công thức dịch vụ vào:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
   "settings.recipes.customService.openDevDocs": "Tài liệu dành cho nhà phát triển",
-  "settings.recipes.customService.openFolder": "Mở thư mục",
+  "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Các dịch vụ có sẵn",
   "settings.recipes.missingService": "Thiếu một dịch vụ?",
-  "settings.recipes.nothingFound": "Xin lỗi, không có dịch vụ nào phù hợp với cụm từ tìm kiếm của bạn - nhưng bạn vẫn có thể thêm nó bằng cách sử dụng tùy ch�n \"Trang web tùy chỉnh\". Xin lưu ý rằng trang web có thể hiển thị nhi�u dịch vụ hơn đã được thêm vào Ferdi kể từ phiên bản bạn đang sử dụng. �ể nhận các dịch vụ mới đó, vui lòng xem xét nâng cấp lên phiên bản Ferdi mới hơn.",
+  "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": "�ã thêm dịch vụ thành công",
   "settings.searchService": "Tìm kiếm dịch vụ",
   "settings.service.error.goBack": "Quay lại dịch vụ",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "�ộ sáng trình đ�c tối",
   "settings.service.form.darkReaderContrast": "�ộ tương phản trình đ�c tối",
   "settings.service.form.darkReaderSepia": "Màu nâu đ� của trình đ�c tối",
-  "settings.service.form.deleteButton": "Xóa dịch vụ",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Chỉnh sửa {name}",
   "settings.service.form.enableAudio": "Cho phép âm thanh",
   "settings.service.form.enableBadge": "Hiển thị huy hiệu tin nhắn chưa đ�c",
@@ -332,17 +321,18 @@
   "settings.service.form.isHibernatedEnabledInfo": "Khi được kích hoạt, một dịch vụ sẽ bị tắt sau một khoảng th�i gian để tiết kiệm tài nguyên hệ thống.",
   "settings.service.form.isMutedInfo": "Khi bị vô hiệu hóa, tất cả âm thanh thông báo và phát lại âm thanh sẽ bị tắt tiếng",
   "settings.service.form.name": "Tên",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Mở darkmode.css",
   "settings.service.form.openUserCss": "Mở user.css",
   "settings.service.form.openUserJs": "Mở user.js",
   "settings.service.form.proxy.headline": "Cài đặt Proxy HTTP / HTTPS",
   "settings.service.form.proxy.host": "Máy chủ Proxy/IP",
-  "settings.service.form.proxy.info": "Cài đặt proxy sẽ không được đồng bộ hóa với máy chủ Ferdi.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Sử dụng Proxy",
-  "settings.service.form.proxy.password": "Mật khẩu (tùy ch�n)",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Cổng",
   "settings.service.form.proxy.restartInfo": "Vui lòng khởi động lại Ferdi sau khi thay đổi Cài đặt proxy.",
-  "settings.service.form.proxy.user": "Ngư�i dùng (tùy ch�n)",
+  "settings.service.form.proxy.user": "User (optional)",
   "settings.service.form.recipeFileInfo": "Các tệp ngư�i dùng của bạn sẽ được chèn vào trang web để bạn có thể tùy chỉnh các dịch vụ theo bất kỳ cách nào bạn muốn. Các tệp ngư�i dùng chỉ được lưu trữ cục bộ và không được chuyển sang các máy tính khác sử dụng cùng một tài khoản.",
   "settings.service.form.saveButton": "Lưu dịch vụ",
   "settings.service.form.tabHosted": "Trở thành host",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Khám phá các dịch vụ",
   "settings.services.headline": "Dịch vụ của bạn",
   "settings.services.noServicesAdded": "Bắt đầu bằng cách thêm một dịch vụ.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Không thể tải các dịch vụ của bạn",
   "settings.services.tooltip.isDisabled": "Dịch vụ bị vô hiệu hóa",
   "settings.services.tooltip.isMuted": "Tất cả âm thanh đ�u bị tắt tiếng",
@@ -362,12 +353,12 @@
   "settings.supportFerdi.aboutIntro": "<p>Ferdi là một ứng dụng mã nguồn mở và dẫn dắt cộng đồng.</p><p>Cảm ơn những ngư�i tạo nên sự khả thi này:</p>",
   "settings.supportFerdi.bannerText": "Bạn có muốn giúp chúng tôi cải thiện Ferdi không?",
   "settings.supportFerdi.headline": "Giới thiệu v� phần m�m Ferdi",
-  "settings.supportFerdi.openSurvey": "Mở khảo sát",
+  "settings.supportFerdi.openSurvey": "Open survey",
   "settings.supportFerdi.textDonation": "Nếu bạn cảm thấy muốn hỗ trợ sự phát triển của Ferdi bằng một khoản đóng góp, bạn có thể làm như vậy trên cả hai,",
   "settings.supportFerdi.textDonationAnd": "và",
   "settings.supportFerdi.textExpenses": "Trong khi các tình nguyện viên thực hiện hầu hết công việc, chúng tôi vẫn cần trả ti�n cho các máy chủ và chứng chỉ. Là một cộng đồng, chúng tôi hoàn toàn minh bạch v� các khoản ti�n mà chúng tôi thu thập và chi tiêu - hãy xem",
   "settings.supportFerdi.textGitHubSponsors": "Tài trợ bởi GitHub",
-  "settings.supportFerdi.textListContributors": "Toàn danh sách ngư�i đóng góp",
+  "settings.supportFerdi.textListContributors": "Full list of contributors",
   "settings.supportFerdi.textListContributorsHere": "tại đây",
   "settings.supportFerdi.textOpenCollective": "Mở Cộng đồng",
   "settings.supportFerdi.textSupportWelcome": "Hỗ trợ luôn được chào đón. Bạn có thể tìm thấy danh sách trợ giúp mà chúng tôi cần",
@@ -377,7 +368,7 @@
   "settings.team.contentHeadline": "Quản lý nhóm Franz",
   "settings.team.copy": "Quản lý nhóm của Franz cho phép bạn quản lý �ăng ký Franz cho nhi�u ngư�i dùng. Xin lưu ý rằng việc đăng ký Franz Premium sẽ không mang lại lợi ích gì cho bạn khi sử dụng Ferdi: Lý do duy nhất bạn vẫn có quy�n truy cập vào Quản lý nhóm là để bạn có thể quản lý Nhóm Franz cũ của mình và để bạn không mất bất kỳ chức năng nào trong việc quản lý tài khoản của bạn.",
   "settings.team.headline": "Nhóm",
-  "settings.team.intro": "Bạn hiện đang sử dụng Máy chủ Franz, đó là lý do bạn có quy�n truy cập vào Quản lý nhóm.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Quản lý Nhóm của bạn trên meetfranz.com",
   "settings.team.teamsUnavailable": "Các đội không có sẵn",
   "settings.team.teamsUnavailableInfo": "Nhóm hiện chỉ khả dụng khi sử dụng Máy chủ Franz và sau khi thanh toán cho Franz Professional. Vui lòng thay đổi máy chủ của bạn thành https://api.franzinfra.com để sử dụng nhóm.",
@@ -387,8 +378,8 @@
   "settings.user.form.accountType.non-profit": "Phi lợi nhuận",
   "settings.user.form.currentPassword": "Mật khẩu hiện tại",
   "settings.user.form.email": "E-mail",
-  "settings.user.form.firstname": "Tên",
-  "settings.user.form.lastname": "H�, tên đệm",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "Mật khẩu mới",
   "settings.workspace.add.form.name": "Tên",
   "settings.workspace.add.form.submitButton": "Tạo không gian làm việc",
@@ -405,7 +396,7 @@
   "settings.workspaces.tryReloadWorkspaces": "Thử lại",
   "settings.workspaces.updatedInfo": "M�i thay đổi đã được lưu lại",
   "settings.workspaces.workspaceFeatureHeadline": "�t hơn là Nhi�u hơn: Giới thiệu Không gian làm việc Ferdi",
-  "settings.workspaces.workspaceFeatureInfo": "Không gian làm việc Ferdi cho phép bạn tập trung vào những gì quan tr�ng ngay bây gi�. Thiết lập các nhóm dịch vụ khác nhau và dễ dàng chuyển đổi giữa chúng bất kỳ lúc nào. Bạn quyết định dịch vụ nào bạn cần khi nào và ở đâu, vì vậy chúng tôi có thể giúp bạn luôn cập nhật trò chơi của mình - hoặc dễ dàng tắt công việc bất cứ khi nào bạn muốn.",
+  "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": "Không thể tải không gian làm việc của bạn",
   "setupAssistant.headline": "Bắt đầu nào",
   "setupAssistant.subheadline": "Ch�n từ các dịch vụ được sử dụng nhi�u nhất của chúng tôi và nhận lại tin nhắn của bạn ngay bây gi�.",
@@ -420,9 +411,9 @@
   "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",
-  "signup.firstname.label": "Tên",
+  "signup.firstname.label": "First Name",
   "signup.headline": "�ăng ký",
-  "signup.lastname.label": "H�, tên đệm",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "Bằng cách tạo tài khoản Ferdi, bạn chấp nhận",
   "signup.legal.privacy": "Cam kết Bảo mật",
   "signup.legal.terms": "�i�u khoản dịch vụ",
@@ -430,23 +421,23 @@
   "signup.password.label": "Mật khẩu",
   "signup.submit.label": "Tạo Tài khoản",
   "tabs.item.confirmDeleteService": "Bạn có thực sự muốn xóa dịch vụ {serviceName} không?",
-  "tabs.item.deleteService": "Xóa dịch vụ",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Vô hiệu hóa âm thanh",
   "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.disableService": "Disable service",
   "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",
   "tabs.item.enableService": "Kích hoạt dịch vụ",
-  "tabs.item.hibernateService": "�ưa dịch vụ vào trạng thái ngủ đông",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Tải lại",
-  "tabs.item.wakeUpService": "�ánh thức dịch vụ",
-  "validation.email": "{field} không hợp lệ",
-  "validation.minLength": "{field} phải dài ít nhất {length} ký tự",
+  "tabs.item.wakeUpService": "Wake up service",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "�t nhất một cái được yêu cầu",
-  "validation.required": "{field} là bắt buộc",
-  "validation.url": "{field} không phải là URL hợp lệ",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Quay lại",
   "webControls.forward": "Tá»›i trÆ°á»›c",
   "webControls.goHome": "Trang chủ",
@@ -454,12 +445,12 @@
   "webControls.reload": "Tải lại",
   "welcome.loginButton": "�ăng nhập vào tài khoản của bạn",
   "welcome.signupButton": "Tạo tài khoản miễn phí",
-  "workspaceDrawer.addNewWorkspaceLabel": "Thêm Không gian làm việc mới",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "Tất cả Dịch vụ",
   "workspaceDrawer.headline": "Không gian làm việc",
   "workspaceDrawer.item.contextMenuEdit": "chỉnh sửa",
   "workspaceDrawer.item.noServicesAddedYet": "Không có dịch vụ bổ sung",
-  "workspaceDrawer.workspaceFeatureInfo": "<p> Ferdi Workspaces cho phép bạn tập trung vào những gì quan tr�ng ngay bây gi�. Thiết lập các nhóm dịch vụ khác nhau và dễ dàng chuyển đổi giữa chúng bất kỳ lúc nào. </p> <p> Bạn quyết định dịch vụ nào bạn cần khi nào và ở đâu, vì vậy chúng tôi có thể giúp bạn luôn cập nhật trò chơi của mình - hoặc dễ dàng tắt kh�i công việc bất cứ khi nào bạn muốn. </p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Chỉnh sửa cài đặt không gian làm việc",
+  "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": "Chuyển sang"
 }
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
deleted file mode 100644
index 632127f4d..000000000
--- a/src/i18n/locales/zh-CN.json
+++ /dev/null
@@ -1,413 +0,0 @@
-{
-  "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "Something went wrong",
-  "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
-  "feature.debugger.title": "Publish debugging information",
-  "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",
-  "feature.shareFranz.action.email": "Send as email",
-  "feature.shareFranz.action.facebook": "Share on Facebook",
-  "feature.shareFranz.action.twitter": "Share on Twitter",
-  "feature.shareFranz.headline": "Ferdi is better together!",
-  "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
-  "feature.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",
-  "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.requiredRequestsFailed": "Could not load services and user information",
-  "infobar.servicesUpdated": "Your services have been updated.",
-  "infobar.updateAvailable": "A new update for Ferdi is available.",
-  "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",
-  "login.changeServer": "Change server",
-  "login.customServerQuestion": "Using a custom Ferdi server?",
-  "login.customServerSuggestion": "Try importing your Franz account",
-  "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.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.unhide": "Unhide",
-  "menu.edit": "Edit",
-  "menu.edit.copy": "Copy",
-  "menu.edit.cut": "Cut",
-  "menu.edit.delete": "Delete",
-  "menu.edit.emojiSymbols": "Emoji & Symbols",
-  "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": "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.resetZoom": "Actual Size",
-  "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",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "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.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 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.accountType.basic": "Basic Account",
-  "settings.account.accountType.premium": "Premium Supporter 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.buttonSearchForUpdate": "Check for updates",
-  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
-  "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.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",
-  "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.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.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",
-  "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
-  "settings.app.form.scheduledDNDEnd": "To",
-  "settings.app.form.scheduledDNDStart": "From",
-  "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
-  "settings.app.form.serviceRibbonWidth": "Sidebar width",
-  "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
-  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
-  "settings.app.headlineAdvanced": "Advanced",
-  "settings.app.headlineAppearance": "Appearance",
-  "settings.app.headlineGeneral": "General",
-  "settings.app.headlineLanguage": "Language",
-  "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.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
-  "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
-  "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": "Support 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. 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.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
-  "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
-  "settings.service.form.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.enableNotification": "Enable notifications",
-  "settings.service.form.enableService": "Enable service",
-  "settings.service.form.headlineBadges": "Unread message badges",
-  "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.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.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.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": "You haven't added any services yet.",
-  "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.github": "Star on GitHub",
-  "settings.supportFerdi.headline": "Support Ferdi",
-  "settings.supportFerdi.openCollective": "Support our Open Collective",
-  "settings.supportFerdi.share": "Tell your Friends",
-  "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
-  "settings.team.headline": "Team",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.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.team.upgradeAction": "Upgrade your Account",
-  "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 added 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",
-  "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.deleteService": "Delete service",
-  "tabs.item.disableAudio": "Disable audio",
-  "tabs.item.disableNotifications": "Disable notifications",
-  "tabs.item.disableService": "Disable service",
-  "tabs.item.enableAudio": "Enable audio",
-  "tabs.item.enableNotification": "Enable notifications",
-  "tabs.item.enableService": "Enable service",
-  "tabs.item.reload": "Reload",
-  "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.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
-  "workspaces.switchingIndicator.switchingTo": "Switching to"
-}
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index 22a0b6771..ec6d9085b 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "�新加載",
-  "app.errorHandler.headline": "出�錯誤",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "切��務器",
   "changeserver.label": "伺�器",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "發布除錯訊�",
   "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",
@@ -24,8 +23,8 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "�尋...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "無法連接到Ferdi網路�務",
-  "global.cancel": "�消",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "編輯",
   "global.no": "No",
   "global.notConnectedToTheInternet": "您未連上網際網路",
@@ -33,21 +32,21 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "設置",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "使用系統�設值({default})",
   "global.spellchecking.autodetect": "自動檢測語言",
   "global.spellchecking.autodetect.short": "自動",
   "global.spellchecking.language": "拼字檢查語言",
-  "global.submit": "�出",
+  "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": "匯入您的 Ferdi 4 �務",
   "import.notSupportedHeadline": "此�務�被 Ferdi 5 支�",
   "import.skip.label": "我想手動匯入",
-  "import.submit.label": "匯入�務",
+  "import.submit.label": "Import {count} 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": "最新消�!",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "�新啟動並且更新",
   "infobar.buttonReloadServices": "�新載入",
   "infobar.hide": "隱�",
@@ -75,7 +74,7 @@
   "login.email.label": "電�郵件信箱",
   "login.headline": "登入",
   "login.invalidCredentials": "電�郵件帳戶或密碼有誤",
-  "login.link.password": "密碼�設",
+  "login.link.password": "Reset password",
   "login.link.signup": "建立一個�費帳戶",
   "login.password.label": "密碼",
   "login.serverLogout": "登入狀態�期，請�新登入",
@@ -118,7 +117,7 @@
   "menu.help.tos": "�務�款",
   "menu.services": "�務",
   "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "主�",
   "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
@@ -148,22 +147,11 @@
   "menu.workspaces.defaultWorkspace": "所有�務",
   "menu.workspaces.openWorkspaceDrawer": "打開工作�",
   "password.email.label": "電�郵件信箱",
-  "password.headline": "密碼�設",
+  "password.headline": "Reset password",
   "password.link.login": "登入您的帳戶",
   "password.link.signup": "建立一個�費帳戶",
-  "password.noUser": "此電�郵件帳戶�存在",
-  "password.successInfo": "請�新確�您的電�郵件信箱",
-  "pricing.features.accountSync": "帳號�步",
-  "pricing.features.customWebsites": "添加自訂網站",
-  "pricing.features.desktopNotifications": "桌�通知",
-  "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": "工作�",
+  "password.noUser": "No user with that email address was found",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "唉呀 糟糕!",
@@ -181,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "歡迎使用 Ferdi",
-  "settings.account.account.editButton": "更改帳戶資訊",
+  "settings.account.account.editButton": "Edit account",
   "settings.account.accountUnavailable": "帳號無法使用",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "更新帳戶資訊",
@@ -189,16 +177,16 @@
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
   "settings.account.deleteInfo": "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
   "settings.account.headline": "帳戶",
-  "settings.account.headlineAccount": "帳戶資訊",
-  "settings.account.headlineDangerZone": "�險�作�",
-  "settings.account.headlineInvoices": "�票",
-  "settings.account.headlinePassword": "更改密碼",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "更新帳戶資訊",
   "settings.account.successInfo": "您的更改已經儲存",
   "settings.account.tryReloadServices": "�試一次",
   "settings.account.tryReloadUserInfoRequest": "�試一次",
   "settings.account.userInfoRequestFailed": "無法載入帳戶資訊",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "清除緩存",
   "settings.app.buttonInstallUpdate": "�新啟動並且更新",
@@ -225,7 +213,7 @@
   "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": "在系統匣上顯示",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -296,7 +285,7 @@
   "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": "開啟資料夾",
+  "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "�用�務",
   "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.",
@@ -312,7 +301,7 @@
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "刪除",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "編輯 {name}",
   "settings.service.form.enableAudio": "啟用音效",
   "settings.service.form.enableBadge": "Show unread message badges",
@@ -332,17 +321,18 @@
   "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
   "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
   "settings.service.form.name": "��",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "使用代�",
-  "settings.service.form.proxy.password": "密碼（��擇）",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "連接埠",
   "settings.service.form.proxy.restartInfo": "Please restart Ferdi after changing proxy Settings.",
-  "settings.service.form.proxy.user": "用戶（��擇）",
+  "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": "儲存",
   "settings.service.form.tabHosted": "Hosted",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "�務列表",
   "settings.services.headline": "您的�務",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "已�用�務",
   "settings.services.tooltip.isMuted": "All sounds are muted",
@@ -387,8 +378,8 @@
   "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.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "新密碼",
   "settings.workspace.add.form.name": "��",
   "settings.workspace.add.form.submitButton": "建立工作�",
@@ -420,9 +411,9 @@
   "sidebar.unmuteApp": "啟用通知",
   "signup.email.label": "電�郵件信箱",
   "signup.emailDuplicate": "此電�郵件信箱已被註冊",
-  "signup.firstname.label": "��",
+  "signup.firstname.label": "First Name",
   "signup.headline": "註冊",
-  "signup.lastname.label": "姓�",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "在建立帳戶�時，您��：",
   "signup.legal.privacy": "隱��明",
   "signup.legal.terms": "�務�款",
@@ -430,11 +421,11 @@
   "signup.password.label": "密碼",
   "signup.submit.label": "建立帳戶",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "刪除",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "�用音效",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "�用通知",
-  "tabs.item.disableService": "�用�務",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "啟用音效",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "啟用通知",
@@ -454,7 +445,7 @@
   "webControls.reload": "�新加載",
   "welcome.loginButton": "登入",
   "welcome.signupButton": "建立一個�費帳戶",
-  "workspaceDrawer.addNewWorkspaceLabel": "新增工作�",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "所有�務",
   "workspaceDrawer.headline": "工作�",
   "workspaceDrawer.item.contextMenuEdit": "編輯",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index fa30d636a..648d75a6d 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "�新加载",
-  "app.errorHandler.headline": "出了些问题",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "�务器：",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "�生了什么？",
   "connectionLostBanner.message": "哦��Ferdi失去了与 {name} 的连接。",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "�布调试信�",
   "feature.nightlyBuilds.activate": "激活",
   "feature.nightlyBuilds.info": "�夜版(Nightly builds) 是Ferdi的实验性版本，�能包�未完善或未完�的功能。这些�夜版主�由开�人员�测试他们新开�的功能�它们在最终版本的的表现。如果您�知�自己在�什么，我们建议您��激活�夜版。",
   "feature.nightlyBuilds.title": "�夜版",
@@ -24,8 +23,8 @@
   "feature.quickSwitch.info": "使用 TAB ，↑ 和 ↓ 选择�务。使用回车键（ENTER）打开�务",
   "feature.quickSwitch.search": "�索...",
   "feature.quickSwitch.title": "快速切�",
-  "global.api.unhealthy": "无法链接到 Ferdi 在线�务",
-  "global.cancel": "�消",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.edit": "编辑",
   "global.no": "No",
   "global.notConnectedToTheInternet": "您没有连接到互�网。",
@@ -33,7 +32,7 @@
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
-  "global.settings": "设置",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "使用系统默认值 ({default})",
   "global.spellchecking.autodetect": "自动检测语言",
   "global.spellchecking.autodetect.short": "自动",
@@ -45,9 +44,9 @@
   "import.headline": "导入你的 Ferdi 4 �务",
   "import.notSupportedHeadline": "Ferdi 5尚未支�的�务",
   "import.skip.label": "我想手动添加�务",
-  "import.submit.label": "导入�务",
+  "import.submit.label": "Import {count} services",
   "infobar.authRequestFailed": "�试进行身份验�时出错。如果此错误�存在，请�试注销并�新登录。",
-  "infobar.buttonChangelog": "有什么新鲜事？",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "��并安装更新",
   "infobar.buttonReloadServices": "�载�务",
   "infobar.hide": "��",
@@ -117,10 +116,10 @@
   "menu.help.support": "支�",
   "menu.help.tos": "�务�款",
   "menu.services": "�务",
-  "menu.services.activatePreviousService": "激活以�的�务",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "主页",
-  "menu.services.setNextServiceActive": "激活下一个�务",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "待办事项",
   "menu.todos.enableTodos": "�用待办事项",
   "menu.view": "查看",
@@ -152,18 +151,7 @@
   "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",
+  "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
   "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.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": "��并安装更新",
@@ -220,12 +208,12 @@
   "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.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.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
   "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
   "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
   "settings.service.form.name": "�称",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
   "settings.services.discoverServices": "Discover services",
   "settings.services.headline": "Your services",
   "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.services.servicesRequestFailed": "Could not load your services",
   "settings.services.tooltip.isDisabled": "Service is disabled",
   "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/manage-translations.js b/src/i18n/manage-translations.js
deleted file mode 100644
index ee64c9c09..000000000
--- a/src/i18n/manage-translations.js
+++ /dev/null
@@ -1,9 +0,0 @@
-require('@babel/register');
-const manageTranslations = require('react-intl-translations-manager').default;
-
-manageTranslations({
-  messagesDirectory: 'src/i18n/messages',
-  translationsDirectory: 'src/i18n/locales',
-  singleMessagesFile: true,
-  languages: ['en-US'],
-});
diff --git a/src/i18n/messages/src/components/AppUpdateInfoBar.json b/src/i18n/messages/src/components/AppUpdateInfoBar.json
deleted file mode 100644
index b99eaff67..000000000
--- a/src/i18n/messages/src/components/AppUpdateInfoBar.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "infobar.updateAvailable",
-    "defaultMessage": "!!!A new update for Ferdi is available.",
-    "file": "src/components/AppUpdateInfoBar.js",
-    "start": {
-      "line": 10,
-      "column": 19
-    },
-    "end": {
-      "line": 13,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.buttonChangelog",
-    "defaultMessage": "!!!Changelog",
-    "file": "src/components/AppUpdateInfoBar.js",
-    "start": {
-      "line": 14,
-      "column": 13
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.buttonInstallUpdate",
-    "defaultMessage": "!!!Restart & install update",
-    "file": "src/components/AppUpdateInfoBar.js",
-    "start": {
-      "line": 18,
-      "column": 23
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/ChangeServer.json b/src/i18n/messages/src/components/auth/ChangeServer.json
deleted file mode 100644
index 87e0b5857..000000000
--- a/src/i18n/messages/src/components/auth/ChangeServer.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "changeserver.headline",
-    "defaultMessage": "!!!Change server",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "changeserver.label",
-    "defaultMessage": "!!!Server",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
-      "line": 19,
-      "column": 9
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "changeserver.warning",
-    "defaultMessage": "!!!Extra settings offered by Ferdi will not be saved",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
-      "line": 23,
-      "column": 11
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "changeserver.customServerLabel",
-    "defaultMessage": "!!!Custom server",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
-      "line": 27,
-      "column": 21
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "changeserver.urlError",
-    "defaultMessage": "!!!Enter a valid URL",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
-      "line": 31,
-      "column": 12
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Import.json b/src/i18n/messages/src/components/auth/Import.json
deleted file mode 100644
index 98ae2e61f..000000000
--- a/src/i18n/messages/src/components/auth/Import.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "import.headline",
-    "defaultMessage": "!!!Import your Ferdi 4 services",
-    "file": "src/components/auth/Import.js",
-    "start": {
-      "line": 13,
-      "column": 12
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "import.notSupportedHeadline",
-    "defaultMessage": "!!!Services not yet supported in Ferdi 5",
-    "file": "src/components/auth/Import.js",
-    "start": {
-      "line": 17,
-      "column": 24
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "import.submit.label",
-    "defaultMessage": "!!!Import {count} services",
-    "file": "src/components/auth/Import.js",
-    "start": {
-      "line": 21,
-      "column": 21
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "import.skip.label",
-    "defaultMessage": "!!!I want to add services manually",
-    "file": "src/components/auth/Import.js",
-    "start": {
-      "line": 25,
-      "column": 19
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Invite.json b/src/i18n/messages/src/components/auth/Invite.json
deleted file mode 100644
index 57c9bddcf..000000000
--- a/src/i18n/messages/src/components/auth/Invite.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "settings.invite.headline",
-    "defaultMessage": "!!!Invite Friends",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 16,
-      "column": 20
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.headline.friends",
-    "defaultMessage": "!!!Invite 3 of your friends or colleagues",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.name.label",
-    "defaultMessage": "!!!Name",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 24,
-      "column": 13
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.email.label",
-    "defaultMessage": "!!!Email address",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 28,
-      "column": 14
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.submit.label",
-    "defaultMessage": "!!!Send invites",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 32,
-      "column": 21
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.skip.label",
-    "defaultMessage": "!!!I want to do this later",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 36,
-      "column": 19
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.successInfo",
-    "defaultMessage": "!!!Invitations sent successfully",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 40,
-      "column": 21
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Locked.json b/src/i18n/messages/src/components/auth/Locked.json
deleted file mode 100644
index a871d6fc8..000000000
--- a/src/i18n/messages/src/components/auth/Locked.json
+++ /dev/null
@@ -1,106 +0,0 @@
-[
-  {
-    "id": "locked.headline",
-    "defaultMessage": "!!!Locked",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 16,
-      "column": 12
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.info",
-    "defaultMessage": "!!!Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 20,
-      "column": 8
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.touchId",
-    "defaultMessage": "!!!Unlock with Touch ID",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 24,
-      "column": 11
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.touchIdPrompt",
-    "defaultMessage": "!!!unlock via Touch ID",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 28,
-      "column": 17
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.password.label",
-    "defaultMessage": "!!!Password",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 32,
-      "column": 17
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.submit.label",
-    "defaultMessage": "!!!Unlock",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 36,
-      "column": 21
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.unlockWithPassword",
-    "defaultMessage": "!!!Unlock with Password",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 40,
-      "column": 22
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.invalidCredentials",
-    "defaultMessage": "!!!Password invalid",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 44,
-      "column": 22
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Login.json b/src/i18n/messages/src/components/auth/Login.json
deleted file mode 100644
index 275b04478..000000000
--- a/src/i18n/messages/src/components/auth/Login.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-  {
-    "id": "login.headline",
-    "defaultMessage": "!!!Sign in",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.email.label",
-    "defaultMessage": "!!!Email address",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 24,
-      "column": 14
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.password.label",
-    "defaultMessage": "!!!Password",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 28,
-      "column": 17
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.submit.label",
-    "defaultMessage": "!!!Sign in",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 32,
-      "column": 21
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.invalidCredentials",
-    "defaultMessage": "!!!Email or password not valid",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 36,
-      "column": 22
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.customServerQuestion",
-    "defaultMessage": "!!!Using a Franz account to log in?",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 40,
-      "column": 24
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.customServerSuggestion",
-    "defaultMessage": "!!!Try importing your Franz account into Ferdi",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 44,
-      "column": 26
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.tokenExpired",
-    "defaultMessage": "!!!Your session expired, please login again.",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 48,
-      "column": 16
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.serverLogout",
-    "defaultMessage": "!!!Your session expired, please login again.",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 52,
-      "column": 16
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.link.signup",
-    "defaultMessage": "!!!Create a free account",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 56,
-      "column": 14
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.changeServer",
-    "defaultMessage": "!!!Change server",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 60,
-      "column": 16
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.serverless",
-    "defaultMessage": "!!!Use Ferdi without an Account",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 64,
-      "column": 14
-    },
-    "end": {
-      "line": 67,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.link.password",
-    "defaultMessage": "!!!Forgot password",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 68,
-      "column": 16
-    },
-    "end": {
-      "line": 71,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Password.json b/src/i18n/messages/src/components/auth/Password.json
deleted file mode 100644
index 336ba42ef..000000000
--- a/src/i18n/messages/src/components/auth/Password.json
+++ /dev/null
@@ -1,80 +0,0 @@
-[
-  {
-    "id": "password.headline",
-    "defaultMessage": "!!!Forgot password",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.email.label",
-    "defaultMessage": "!!!Email address",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 19,
-      "column": 14
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.successInfo",
-    "defaultMessage": "!!!Your new password was sent to your email address",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 23,
-      "column": 15
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.noUser",
-    "defaultMessage": "!!!No user affiliated with that email address",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 27,
-      "column": 10
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.link.signup",
-    "defaultMessage": "!!!Create a free account",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 31,
-      "column": 14
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.link.login",
-    "defaultMessage": "!!!Sign in to your account",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 35,
-      "column": 13
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/ServiceAssistant.json b/src/i18n/messages/src/components/auth/ServiceAssistant.json
deleted file mode 100644
index 9170fc183..000000000
--- a/src/i18n/messages/src/components/auth/ServiceAssistant.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "settings.invite.headline",
-    "defaultMessage": "!!!Invite Friends",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 16,
-      "column": 20
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.headline.friends",
-    "defaultMessage": "!!!Invite 3 of your friends or colleagues",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.name.label",
-    "defaultMessage": "!!!Name",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 24,
-      "column": 13
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.email.label",
-    "defaultMessage": "!!!Email address",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 28,
-      "column": 14
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.submit.label",
-    "defaultMessage": "!!!Send invites",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 32,
-      "column": 21
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.skip.label",
-    "defaultMessage": "!!!I want to do this later",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 36,
-      "column": 19
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.successInfo",
-    "defaultMessage": "!!!Invitations sent successfully",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 40,
-      "column": 21
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/SetupAssistant.json b/src/i18n/messages/src/components/auth/SetupAssistant.json
deleted file mode 100644
index 108adab26..000000000
--- a/src/i18n/messages/src/components/auth/SetupAssistant.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "setupAssistant.headline",
-    "defaultMessage": "!!!Let's get started",
-    "file": "src/components/auth/SetupAssistant.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "setupAssistant.subheadline",
-    "defaultMessage": "!!!Choose from our most used services and get back on top of your messaging now.",
-    "file": "src/components/auth/SetupAssistant.js",
-    "start": {
-      "line": 24,
-      "column": 15
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "setupAssistant.submit.label",
-    "defaultMessage": "!!!Let's go",
-    "file": "src/components/auth/SetupAssistant.js",
-    "start": {
-      "line": 29,
-      "column": 21
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.successInfo",
-    "defaultMessage": "!!!Invitations sent successfully",
-    "file": "src/components/auth/SetupAssistant.js",
-    "start": {
-      "line": 33,
-      "column": 21
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Signup.json b/src/i18n/messages/src/components/auth/Signup.json
deleted file mode 100644
index 4a32628ef..000000000
--- a/src/i18n/messages/src/components/auth/Signup.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-  {
-    "id": "signup.headline",
-    "defaultMessage": "!!!Sign up",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.firstname.label",
-    "defaultMessage": "!!!Firstname",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 24,
-      "column": 18
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.lastname.label",
-    "defaultMessage": "!!!Lastname",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 28,
-      "column": 17
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.email.label",
-    "defaultMessage": "!!!Email address",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 32,
-      "column": 14
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.password.label",
-    "defaultMessage": "!!!Password",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 40,
-      "column": 17
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.legal.info",
-    "defaultMessage": "!!!By creating a Ferdi account you accept the",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 44,
-      "column": 13
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.legal.terms",
-    "defaultMessage": "!!!Terms of service",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 48,
-      "column": 9
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.legal.privacy",
-    "defaultMessage": "!!!Privacy Statement",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 52,
-      "column": 11
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.submit.label",
-    "defaultMessage": "!!!Create account",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 56,
-      "column": 21
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.link.login",
-    "defaultMessage": "!!!Already have an account, sign in?",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 60,
-      "column": 13
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.changeServer",
-    "defaultMessage": "!!!Change server",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 64,
-      "column": 16
-    },
-    "end": {
-      "line": 67,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.serverless",
-    "defaultMessage": "!!!Use Ferdi without an Account",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 68,
-      "column": 14
-    },
-    "end": {
-      "line": 71,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.emailDuplicate",
-    "defaultMessage": "!!!A user with that email address already exists",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 72,
-      "column": 18
-    },
-    "end": {
-      "line": 75,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Welcome.json b/src/i18n/messages/src/components/auth/Welcome.json
deleted file mode 100644
index 3f0c1e5c2..000000000
--- a/src/i18n/messages/src/components/auth/Welcome.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "welcome.signupButton",
-    "defaultMessage": "!!!Create a free account",
-    "file": "src/components/auth/Welcome.js",
-    "start": {
-      "line": 11,
-      "column": 16
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "welcome.loginButton",
-    "defaultMessage": "!!!Login to your account",
-    "file": "src/components/auth/Welcome.js",
-    "start": {
-      "line": 15,
-      "column": 15
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.serverless",
-    "defaultMessage": "!!!Use Ferdi without an Account",
-    "file": "src/components/auth/Welcome.js",
-    "start": {
-      "line": 19,
-      "column": 14
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/layout/AppLayout.json b/src/i18n/messages/src/components/layout/AppLayout.json
deleted file mode 100644
index 807490a4f..000000000
--- a/src/i18n/messages/src/components/layout/AppLayout.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "infobar.servicesUpdated",
-    "defaultMessage": "!!!Your services have been updated.",
-    "file": "src/components/layout/AppLayout.js",
-    "start": {
-      "line": 28,
-      "column": 19
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.buttonReloadServices",
-    "defaultMessage": "!!!Reload services",
-    "file": "src/components/layout/AppLayout.js",
-    "start": {
-      "line": 32,
-      "column": 24
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.requiredRequestsFailed",
-    "defaultMessage": "!!!Could not load services and user information",
-    "file": "src/components/layout/AppLayout.js",
-    "start": {
-      "line": 36,
-      "column": 26
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.authRequestFailed",
-    "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-    "file": "src/components/layout/AppLayout.js",
-    "start": {
-      "line": 40,
-      "column": 21
-    },
-    "end": {
-      "line": 44,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json
deleted file mode 100644
index 9bc435f12..000000000
--- a/src/i18n/messages/src/components/layout/Sidebar.json
+++ /dev/null
@@ -1,106 +0,0 @@
-[
-  {
-    "id": "sidebar.addNewService",
-    "defaultMessage": "!!!Add new service",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 18,
-      "column": 17
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.muteApp",
-    "defaultMessage": "!!!Disable notifications & audio",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 22,
-      "column": 8
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.unmuteApp",
-    "defaultMessage": "!!!Enable notifications & audio",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 26,
-      "column": 10
-    },
-    "end": {
-      "line": 29,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.openWorkspaceDrawer",
-    "defaultMessage": "!!!Open workspace drawer",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 30,
-      "column": 23
-    },
-    "end": {
-      "line": 33,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.closeWorkspaceDrawer",
-    "defaultMessage": "!!!Close workspace drawer",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 34,
-      "column": 24
-    },
-    "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.openTodosDrawer",
-    "defaultMessage": "!!!Open Ferdi Todos",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 38,
-      "column": 19
-    },
-    "end": {
-      "line": 41,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.closeTodosDrawer",
-    "defaultMessage": "!!!Close Ferdi Todos",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 42,
-      "column": 20
-    },
-    "end": {
-      "line": 45,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.lockFerdi",
-    "defaultMessage": "!!!Lock Ferdi",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 46,
-      "column": 13
-    },
-    "end": {
-      "line": 49,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ConnectionBanner.json b/src/i18n/messages/src/components/services/content/ConnectionBanner.json
deleted file mode 100644
index 1047c28b5..000000000
--- a/src/i18n/messages/src/components/services/content/ConnectionBanner.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "webControls.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/components/services/content/ConnectionBanner.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.openInBrowser",
-    "defaultMessage": "!!!Open in Browser",
-    "file": "src/components/services/content/ConnectionBanner.js",
-    "start": {
-      "line": 17,
-      "column": 17
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/components/services/content/ConnectionBanner.js",
-    "start": {
-      "line": 21,
-      "column": 8
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/components/services/content/ConnectionBanner.js",
-    "start": {
-      "line": 25,
-      "column": 11
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/components/services/content/ConnectionBanner.js",
-    "start": {
-      "line": 29,
-      "column": 10
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ConnectionLost.json b/src/i18n/messages/src/components/services/content/ConnectionLost.json
deleted file mode 100644
index ee3f7a4ba..000000000
--- a/src/i18n/messages/src/components/services/content/ConnectionLost.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "webControls.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/components/services/content/ConnectionLost.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.openInBrowser",
-    "defaultMessage": "!!!Open in Browser",
-    "file": "src/components/services/content/ConnectionLost.js",
-    "start": {
-      "line": 17,
-      "column": 17
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/components/services/content/ConnectionLost.js",
-    "start": {
-      "line": 21,
-      "column": 8
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/components/services/content/ConnectionLost.js",
-    "start": {
-      "line": 25,
-      "column": 11
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/components/services/content/ConnectionLost.js",
-    "start": {
-      "line": 29,
-      "column": 10
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json b/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json
deleted file mode 100644
index 6805b4d67..000000000
--- a/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "connectionLostBanner.message",
-    "defaultMessage": "!!!Oh no! Ferdi lost the connection to {name}.",
-    "file": "src/components/services/content/ConnectionLostBanner.js",
-    "start": {
-      "line": 13,
-      "column": 8
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "connectionLostBanner.informationLink",
-    "defaultMessage": "!!!What happened?",
-    "file": "src/components/services/content/ConnectionLostBanner.js",
-    "start": {
-      "line": 17,
-      "column": 19
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "connectionLostBanner.cta",
-    "defaultMessage": "!!!Reload Service",
-    "file": "src/components/services/content/ConnectionLostBanner.js",
-    "start": {
-      "line": 21,
-      "column": 7
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json b/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json
deleted file mode 100644
index c8fe802df..000000000
--- a/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "service.errorHandler.headline",
-    "defaultMessage": "!!!Oh no!",
-    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-    "start": {
-      "line": 12,
-      "column": 12
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.errorHandler.text",
-    "defaultMessage": "!!!{name} has failed to load.",
-    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-    "start": {
-      "line": 16,
-      "column": 8
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.errorHandler.action",
-    "defaultMessage": "!!!Reload {name}",
-    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-    "start": {
-      "line": 20,
-      "column": 10
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.errorHandler.editAction",
-    "defaultMessage": "!!!Edit {name}",
-    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-    "start": {
-      "line": 24,
-      "column": 14
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.errorHandler.message",
-    "defaultMessage": "!!!Error:",
-    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-    "start": {
-      "line": 28,
-      "column": 16
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ServiceDisabled.json b/src/i18n/messages/src/components/services/content/ServiceDisabled.json
deleted file mode 100644
index 8bfad28c7..000000000
--- a/src/i18n/messages/src/components/services/content/ServiceDisabled.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "service.disabledHandler.headline",
-    "defaultMessage": "!!!{name} is disabled",
-    "file": "src/components/services/content/ServiceDisabled.js",
-    "start": {
-      "line": 9,
-      "column": 12
-    },
-    "end": {
-      "line": 12,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.disabledHandler.action",
-    "defaultMessage": "!!!Enable {name}",
-    "file": "src/components/services/content/ServiceDisabled.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/Services.json b/src/i18n/messages/src/components/services/content/Services.json
deleted file mode 100644
index 304c93f3c..000000000
--- a/src/i18n/messages/src/components/services/content/Services.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "services.welcome",
-    "defaultMessage": "!!!Welcome to Ferdi",
-    "file": "src/components/services/content/Services.js",
-    "start": {
-      "line": 15,
-      "column": 11
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.getStarted",
-    "defaultMessage": "!!!Get started",
-    "file": "src/components/services/content/Services.js",
-    "start": {
-      "line": 19,
-      "column": 14
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.login",
-    "defaultMessage": "!!!Please login to use Ferdi.",
-    "file": "src/components/services/content/Services.js",
-    "start": {
-      "line": 23,
-      "column": 9
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.serverless",
-    "defaultMessage": "!!!Use Ferdi without an Account",
-    "file": "src/components/services/content/Services.js",
-    "start": {
-      "line": 27,
-      "column": 14
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.serverInfo",
-    "defaultMessage": "!!!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!",
-    "file": "src/components/services/content/Services.js",
-    "start": {
-      "line": 31,
-      "column": 14
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/WebControls.json b/src/i18n/messages/src/components/services/content/WebControls.json
deleted file mode 100644
index 5af5143d0..000000000
--- a/src/i18n/messages/src/components/services/content/WebControls.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "webControls.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/components/services/content/WebControls.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.openInBrowser",
-    "defaultMessage": "!!!Open in Browser",
-    "file": "src/components/services/content/WebControls.js",
-    "start": {
-      "line": 17,
-      "column": 17
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/components/services/content/WebControls.js",
-    "start": {
-      "line": 21,
-      "column": 8
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/components/services/content/WebControls.js",
-    "start": {
-      "line": 25,
-      "column": 11
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/components/services/content/WebControls.js",
-    "start": {
-      "line": 29,
-      "column": 10
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json b/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json
deleted file mode 100644
index c3d6c41a5..000000000
--- a/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "service.crashHandler.headline",
-    "defaultMessage": "!!!Oh no!",
-    "file": "src/components/services/content/WebviewCrashHandler.js",
-    "start": {
-      "line": 10,
-      "column": 12
-    },
-    "end": {
-      "line": 13,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.crashHandler.text",
-    "defaultMessage": "!!!{name} has caused an error.",
-    "file": "src/components/services/content/WebviewCrashHandler.js",
-    "start": {
-      "line": 14,
-      "column": 8
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.crashHandler.action",
-    "defaultMessage": "!!!Reload {name}",
-    "file": "src/components/services/content/WebviewCrashHandler.js",
-    "start": {
-      "line": 18,
-      "column": 10
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.crashHandler.autoReload",
-    "defaultMessage": "!!!Trying to automatically restore {name} in {seconds} seconds",
-    "file": "src/components/services/content/WebviewCrashHandler.js",
-    "start": {
-      "line": 22,
-      "column": 14
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/tabs/TabItem.json b/src/i18n/messages/src/components/services/tabs/TabItem.json
deleted file mode 100644
index de854f1e1..000000000
--- a/src/i18n/messages/src/components/services/tabs/TabItem.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-  {
-    "id": "tabs.item.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 21,
-      "column": 10
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.disableNotifications",
-    "defaultMessage": "!!!Disable notifications",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 25,
-      "column": 24
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.enableNotification",
-    "defaultMessage": "!!!Enable notifications",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 29,
-      "column": 23
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.disableAudio",
-    "defaultMessage": "!!!Disable audio",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 33,
-      "column": 16
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.enableAudio",
-    "defaultMessage": "!!!Enable audio",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 37,
-      "column": 15
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.enableDarkMode",
-    "defaultMessage": "!!!Enable Dark mode",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 41,
-      "column": 18
-    },
-    "end": {
-      "line": 44,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.disableDarkMode",
-    "defaultMessage": "!!!Disable Dark mode",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 45,
-      "column": 19
-    },
-    "end": {
-      "line": 48,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.disableService",
-    "defaultMessage": "!!!Disable Service",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 49,
-      "column": 18
-    },
-    "end": {
-      "line": 52,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.enableService",
-    "defaultMessage": "!!!Enable Service",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 53,
-      "column": 17
-    },
-    "end": {
-      "line": 56,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.hibernateService",
-    "defaultMessage": "!!!Hibernate Service",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 57,
-      "column": 20
-    },
-    "end": {
-      "line": 60,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.wakeUpService",
-    "defaultMessage": "!!!Wake Up Service",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 61,
-      "column": 17
-    },
-    "end": {
-      "line": 64,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.deleteService",
-    "defaultMessage": "!!!Delete Service",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 65,
-      "column": 17
-    },
-    "end": {
-      "line": 68,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.confirmDeleteService",
-    "defaultMessage": "!!!Do you really want to delete the {serviceName} service?",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 69,
-      "column": 24
-    },
-    "end": {
-      "line": 73,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/SettingsLayout.json b/src/i18n/messages/src/components/settings/SettingsLayout.json
deleted file mode 100644
index 99337a315..000000000
--- a/src/i18n/messages/src/components/settings/SettingsLayout.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "settings.app.closeSettings",
-    "defaultMessage": "!!!Close settings",
-    "file": "src/components/settings/SettingsLayout.js",
-    "start": {
-      "line": 11,
-      "column": 17
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/account/AccountDashboard.json b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
deleted file mode 100644
index b0cc2dcc7..000000000
--- a/src/i18n/messages/src/components/settings/account/AccountDashboard.json
+++ /dev/null
@@ -1,158 +0,0 @@
-[
-  {
-    "id": "settings.account.headline",
-    "defaultMessage": "!!!Account",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 14,
-      "column": 12
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineDangerZone",
-    "defaultMessage": "!!Danger Zone",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 18,
-      "column": 22
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.account.editButton",
-    "defaultMessage": "!!!Edit Account",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 22,
-      "column": 21
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineInvoices",
-    "defaultMessage": "!!Invoices",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 26,
-      "column": 18
-    },
-    "end": {
-      "line": 29,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.userInfoRequestFailed",
-    "defaultMessage": "!!!Could not load user information",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 30,
-      "column": 25
-    },
-    "end": {
-      "line": 33,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.tryReloadUserInfoRequest",
-    "defaultMessage": "!!!Try again",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 34,
-      "column": 28
-    },
-    "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.deleteAccount",
-    "defaultMessage": "!!!Delete account",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 38,
-      "column": 17
-    },
-    "end": {
-      "line": 41,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.deleteInfo",
-    "defaultMessage": "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 42,
-      "column": 14
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.deleteEmailSent",
-    "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 47,
-      "column": 19
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.yourLicense",
-    "defaultMessage": "!!!Your Franz License:",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 52,
-      "column": 15
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.accountUnavailable",
-    "defaultMessage": "Account is unavailable",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 56,
-      "column": 22
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.accountUnavailableInfo",
-    "defaultMessage": "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.",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 60,
-      "column": 26
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
deleted file mode 100644
index 2029ad7af..000000000
--- a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "settings.navigation.availableServices",
-    "defaultMessage": "!!!Available services",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 16,
-      "column": 21
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.yourServices",
-    "defaultMessage": "!!!Your services",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 20,
-      "column": 16
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.yourWorkspaces",
-    "defaultMessage": "!!!Your workspaces",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 24,
-      "column": 18
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.account",
-    "defaultMessage": "!!!Account",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 28,
-      "column": 11
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.team",
-    "defaultMessage": "!!!Manage Team",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 32,
-      "column": 8
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.supportFerdi",
-    "defaultMessage": "!!!About Ferdi",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 36,
-      "column": 16
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.logout",
-    "defaultMessage": "!!!Logout",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 40,
-      "column": 10
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json b/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
deleted file mode 100644
index 7ab2916f5..000000000
--- a/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-  {
-    "id": "settings.recipes.headline",
-    "defaultMessage": "!!!Available Services",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 19,
-      "column": 12
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.searchService",
-    "defaultMessage": "!!!Search service",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 23,
-      "column": 17
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.all",
-    "defaultMessage": "!!!All services",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 27,
-      "column": 14
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.custom",
-    "defaultMessage": "!!!Custom Services",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 31,
-      "column": 17
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.nothingFound",
-    "defaultMessage": "!!!Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 35,
-      "column": 16
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.servicesSuccessfulAddedInfo",
-    "defaultMessage": "!!!Service successfully added",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 39,
-      "column": 31
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.missingService",
-    "defaultMessage": "!!!Missing a service?",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 43,
-      "column": 18
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.intro",
-    "defaultMessage": "!!!To add a custom service, copy the recipe folder into:",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 47,
-      "column": 21
-    },
-    "end": {
-      "line": 50,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.openFolder",
-    "defaultMessage": "!!!Open directory",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 51,
-      "column": 14
-    },
-    "end": {
-      "line": 54,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.openDevDocs",
-    "defaultMessage": "!!!Developer Documentation",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 55,
-      "column": 15
-    },
-    "end": {
-      "line": 58,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.headline.customRecipes",
-    "defaultMessage": "!!!Custom 3rd Party Recipes",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 59,
-      "column": 25
-    },
-    "end": {
-      "line": 62,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.headline.communityRecipes",
-    "defaultMessage": "!!!Community 3rd Party Recipes",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 63,
-      "column": 28
-    },
-    "end": {
-      "line": 66,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.headline.devRecipes",
-    "defaultMessage": "!!!Your Development Service Recipes",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 67,
-      "column": 22
-    },
-    "end": {
-      "line": 70,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/EditServiceForm.json b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
deleted file mode 100644
index d7830f198..000000000
--- a/src/i18n/messages/src/components/settings/services/EditServiceForm.json
+++ /dev/null
@@ -1,340 +0,0 @@
-[
-  {
-    "id": "settings.service.form.saveButton",
-    "defaultMessage": "!!!Save service",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 23,
-      "column": 15
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.deleteButton",
-    "defaultMessage": "!!!Delete Service",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 27,
-      "column": 17
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.openDarkmodeCss",
-    "defaultMessage": "!!!Open darkmode.css",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 31,
-      "column": 19
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.openUserCss",
-    "defaultMessage": "!!!Open user.css",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 35,
-      "column": 15
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.openUserJs",
-    "defaultMessage": "!!!Open user.js",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 39,
-      "column": 14
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.recipeFileInfo",
-    "defaultMessage": "!!!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.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 43,
-      "column": 18
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.availableServices",
-    "defaultMessage": "!!!Available services",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 47,
-      "column": 21
-    },
-    "end": {
-      "line": 50,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.yourServices",
-    "defaultMessage": "!!!Your services",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 51,
-      "column": 16
-    },
-    "end": {
-      "line": 54,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.addServiceHeadline",
-    "defaultMessage": "!!!Add {name}",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 55,
-      "column": 22
-    },
-    "end": {
-      "line": 58,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.editServiceHeadline",
-    "defaultMessage": "!!!Edit {name}",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 59,
-      "column": 23
-    },
-    "end": {
-      "line": 62,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.tabHosted",
-    "defaultMessage": "!!!Hosted",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 63,
-      "column": 13
-    },
-    "end": {
-      "line": 66,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.tabOnPremise",
-    "defaultMessage": "!!!Self hosted ��",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 67,
-      "column": 16
-    },
-    "end": {
-      "line": 70,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.useHostedService",
-    "defaultMessage": "!!!Use the hosted {name} service.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 71,
-      "column": 20
-    },
-    "end": {
-      "line": 74,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.customUrlValidationError",
-    "defaultMessage": "!!!Could not validate custom {name} server.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 75,
-      "column": 28
-    },
-    "end": {
-      "line": 78,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.indirectMessageInfo",
-    "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 79,
-      "column": 23
-    },
-    "end": {
-      "line": 82,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.isMutedInfo",
-    "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 83,
-      "column": 15
-    },
-    "end": {
-      "line": 86,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.isHibernatedEnabledInfo",
-    "defaultMessage": "!!!When enabled, a service will be shut down after a period of time to save system resources.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 87,
-      "column": 28
-    },
-    "end": {
-      "line": 90,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.headlineNotifications",
-    "defaultMessage": "!!!Notifications",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 91,
-      "column": 25
-    },
-    "end": {
-      "line": 94,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.headlineBadges",
-    "defaultMessage": "!!!Unread message badges",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 95,
-      "column": 18
-    },
-    "end": {
-      "line": 98,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.headlineGeneral",
-    "defaultMessage": "!!!General",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 99,
-      "column": 19
-    },
-    "end": {
-      "line": 102,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.headlineDarkReaderSettings",
-    "defaultMessage": "!!!Dark Reader Settings",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 103,
-      "column": 30
-    },
-    "end": {
-      "line": 106,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.iconDelete",
-    "defaultMessage": "!!!Delete",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 107,
-      "column": 14
-    },
-    "end": {
-      "line": 110,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.iconUpload",
-    "defaultMessage": "!!!Drop your image, or click here",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 111,
-      "column": 14
-    },
-    "end": {
-      "line": 114,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.headline",
-    "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 115,
-      "column": 17
-    },
-    "end": {
-      "line": 118,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.restartInfo",
-    "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 119,
-      "column": 20
-    },
-    "end": {
-      "line": 122,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.info",
-    "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 123,
-      "column": 13
-    },
-    "end": {
-      "line": 126,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/ServiceError.json b/src/i18n/messages/src/components/settings/services/ServiceError.json
deleted file mode 100644
index 648fc5b3e..000000000
--- a/src/i18n/messages/src/components/settings/services/ServiceError.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "settings.service.error.headline",
-    "defaultMessage": "!!!Error",
-    "file": "src/components/settings/services/ServiceError.js",
-    "start": {
-      "line": 10,
-      "column": 12
-    },
-    "end": {
-      "line": 13,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.error.goBack",
-    "defaultMessage": "!!!Back to services",
-    "file": "src/components/settings/services/ServiceError.js",
-    "start": {
-      "line": 14,
-      "column": 10
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.availableServices",
-    "defaultMessage": "!!!Available services",
-    "file": "src/components/settings/services/ServiceError.js",
-    "start": {
-      "line": 18,
-      "column": 21
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.error.message",
-    "defaultMessage": "!!!Could not load service recipe.",
-    "file": "src/components/settings/services/ServiceError.js",
-    "start": {
-      "line": 22,
-      "column": 16
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/ServiceItem.json b/src/i18n/messages/src/components/settings/services/ServiceItem.json
deleted file mode 100644
index ffea8b9e1..000000000
--- a/src/i18n/messages/src/components/settings/services/ServiceItem.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "settings.services.tooltip.isDisabled",
-    "defaultMessage": "!!!Service is disabled",
-    "file": "src/components/settings/services/ServiceItem.js",
-    "start": {
-      "line": 11,
-      "column": 21
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.tooltip.notificationsDisabled",
-    "defaultMessage": "!!!Notifications are disabled",
-    "file": "src/components/settings/services/ServiceItem.js",
-    "start": {
-      "line": 15,
-      "column": 32
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.tooltip.isMuted",
-    "defaultMessage": "!!!All sounds are muted",
-    "file": "src/components/settings/services/ServiceItem.js",
-    "start": {
-      "line": 19,
-      "column": 18
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json b/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
deleted file mode 100644
index 7e7c5d67e..000000000
--- a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
+++ /dev/null
@@ -1,119 +0,0 @@
-[
-  {
-    "id": "settings.services.headline",
-    "defaultMessage": "!!!Your services",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.searchService",
-    "defaultMessage": "!!!Search service",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 19,
-      "column": 17
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.noServicesAdded",
-    "defaultMessage": "!!!Start by adding a service.",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 23,
-      "column": 19
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.nothingFound",
-    "defaultMessage": "!!!Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 27,
-      "column": 18
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.discoverServices",
-    "defaultMessage": "!!!Discover services",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 31,
-      "column": 20
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.servicesRequestFailed",
-    "defaultMessage": "!!!Could not load your services",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 35,
-      "column": 25
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.tryReloadServices",
-    "defaultMessage": "!!!Try again",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 39,
-      "column": 21
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.updatedInfo",
-    "defaultMessage": "!!!Your changes have been saved",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 43,
-      "column": 15
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.deletedInfo",
-    "defaultMessage": "!!!Service has been deleted",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 47,
-      "column": 15
-    },
-    "end": {
-      "line": 50,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
deleted file mode 100644
index c281ebff3..000000000
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ /dev/null
@@ -1,444 +0,0 @@
-[
-  {
-    "id": "settings.app.headlineGeneral",
-    "defaultMessage": "!!!General",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 21,
-      "column": 19
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.sentryInfo",
-    "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": 25,
-      "column": 14
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.hibernateInfo",
-    "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": 29,
-      "column": 17
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.inactivityLockInfo",
-    "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 33,
-      "column": 22
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.todoServerInfo",
-    "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": 37,
-      "column": 18
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.lockedPassword",
-    "defaultMessage": "!!!Password",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 41,
-      "column": 18
-    },
-    "end": {
-      "line": 44,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.lockedPasswordInfo",
-    "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": 45,
-      "column": 22
-    },
-    "end": {
-      "line": 48,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.lockInfo",
-    "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": 49,
-      "column": 12
-    },
-    "end": {
-      "line": 52,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.scheduledDNDTimeInfo",
-    "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": 53,
-      "column": 24
-    },
-    "end": {
-      "line": 56,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.scheduledDNDInfo",
-    "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": 57,
-      "column": 20
-    },
-    "end": {
-      "line": 60,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.headlineLanguage",
-    "defaultMessage": "!!!Language",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 61,
-      "column": 20
-    },
-    "end": {
-      "line": 64,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.headlineUpdates",
-    "defaultMessage": "!!!Updates",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 65,
-      "column": 19
-    },
-    "end": {
-      "line": 68,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.headlineAppearance",
-    "defaultMessage": "!!!Appearance",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 69,
-      "column": 22
-    },
-    "end": {
-      "line": 72,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.universalDarkModeInfo",
-    "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": 73,
-      "column": 25
-    },
-    "end": {
-      "line": 76,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.accentColorInfo",
-    "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 77,
-      "column": 19
-    },
-    "end": {
-      "line": 80,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.headlinePrivacy",
-    "defaultMessage": "!!!Privacy",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 81,
-      "column": 19
-    },
-    "end": {
-      "line": 84,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.headlineAdvanced",
-    "defaultMessage": "!!!Advanced",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 85,
-      "column": 20
-    },
-    "end": {
-      "line": 88,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.translationHelp",
-    "defaultMessage": "!!!Help us to translate Ferdi into your language.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 89,
-      "column": 19
-    },
-    "end": {
-      "line": 92,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.spellCheckerLanguageInfo",
-    "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": 93,
-      "column": 28
-    },
-    "end": {
-      "line": 96,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.subheadlineCache",
-    "defaultMessage": "!!!Cache",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 97,
-      "column": 20
-    },
-    "end": {
-      "line": 100,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.cacheInfo",
-    "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 101,
-      "column": 13
-    },
-    "end": {
-      "line": 104,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.cacheNotCleared",
-    "defaultMessage": "!!!Couldn't clear all cache",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 105,
-      "column": 19
-    },
-    "end": {
-      "line": 108,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.buttonClearAllCache",
-    "defaultMessage": "!!!Clear cache",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 109,
-      "column": 23
-    },
-    "end": {
-      "line": 112,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.subheadlineFerdiProfile",
-    "defaultMessage": "!!!Ferdi Profile",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 113,
-      "column": 27
-    },
-    "end": {
-      "line": 116,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.buttonOpenFerdiProfileFolder",
-    "defaultMessage": "!!!Open Profile folder",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 117,
-      "column": 32
-    },
-    "end": {
-      "line": 120,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.buttonOpenFerdiServiceRecipesFolder",
-    "defaultMessage": "!!!Open Service Recipes folder",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 121,
-      "column": 39
-    },
-    "end": {
-      "line": 124,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.buttonSearchForUpdate",
-    "defaultMessage": "!!!Check for updates",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 125,
-      "column": 25
-    },
-    "end": {
-      "line": 128,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.buttonInstallUpdate",
-    "defaultMessage": "!!!Restart & install update",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 129,
-      "column": 23
-    },
-    "end": {
-      "line": 132,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.updateStatusSearching",
-    "defaultMessage": "!!!Is searching for update",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 133,
-      "column": 25
-    },
-    "end": {
-      "line": 136,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.updateStatusAvailable",
-    "defaultMessage": "!!!Update available, downloading...",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 137,
-      "column": 25
-    },
-    "end": {
-      "line": 140,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.updateStatusUpToDate",
-    "defaultMessage": "!!!You are using the latest version of Ferdi",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 141,
-      "column": 24
-    },
-    "end": {
-      "line": 144,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.currentVersion",
-    "defaultMessage": "!!!Current version:",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 145,
-      "column": 18
-    },
-    "end": {
-      "line": 148,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.restartRequired",
-    "defaultMessage": "!!!Changes require restart",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 149,
-      "column": 22
-    },
-    "end": {
-      "line": 152,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.languageDisclaimer",
-    "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 153,
-      "column": 22
-    },
-    "end": {
-      "line": 156,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/supportFerdi/SupportFerdiDashboard.json b/src/i18n/messages/src/components/settings/supportFerdi/SupportFerdiDashboard.json
deleted file mode 100644
index e63c2801f..000000000
--- a/src/i18n/messages/src/components/settings/supportFerdi/SupportFerdiDashboard.json
+++ /dev/null
@@ -1,197 +0,0 @@
-[
-  {
-    "id": "settings.supportFerdi.headline",
-    "defaultMessage": "!!!About Ferdi",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 7,
-      "column": 12
-    },
-    "end": {
-      "line": 10,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.title",
-    "defaultMessage": "!!!Do you like Ferdi?",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 11,
-      "column": 9
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.aboutIntro",
-    "defaultMessage": "!!!<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 15,
-      "column": 14
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textListContributors",
-    "defaultMessage": "!!!Full list of contributor",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 19,
-      "column": 24
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textListContributorsHere",
-    "defaultMessage": "!!!here",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 23,
-      "column": 28
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textVolunteers",
-    "defaultMessage": "!!!The development of Ferdi is done by volunteers. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 27,
-      "column": 18
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textSupportWelcome",
-    "defaultMessage": "!!!Support is always welcome. You can find a list of the help we need",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 31,
-      "column": 22
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textSupportWelcomeHere",
-    "defaultMessage": "!!!here",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 35,
-      "column": 26
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textExpenses",
-    "defaultMessage": "!!!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",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 39,
-      "column": 16
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textOpenCollective",
-    "defaultMessage": "!!!Open Collective",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 43,
-      "column": 22
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textDonation",
-    "defaultMessage": "!!!If you feel like supporting Ferdi development with a donation, you can do so on both,",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 47,
-      "column": 16
-    },
-    "end": {
-      "line": 50,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textDonationAnd",
-    "defaultMessage": "!!!and",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 51,
-      "column": 19
-    },
-    "end": {
-      "line": 54,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textGitHubSponsors",
-    "defaultMessage": "!!!GitHub Sponsors",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 55,
-      "column": 22
-    },
-    "end": {
-      "line": 58,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.openSurvey",
-    "defaultMessage": "!!!Open Survey",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 59,
-      "column": 14
-    },
-    "end": {
-      "line": 62,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.bannerText",
-    "defaultMessage": "!!!Do you want to help us improve Ferdi?",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 63,
-      "column": 14
-    },
-    "end": {
-      "line": 66,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/team/TeamDashboard.json b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
deleted file mode 100644
index ac42ad98a..000000000
--- a/src/i18n/messages/src/components/settings/team/TeamDashboard.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "settings.team.headline",
-    "defaultMessage": "!!!Team",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.contentHeadline",
-    "defaultMessage": "!!!Franz Team Management",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 19,
-      "column": 19
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.intro",
-    "defaultMessage": "!!!Your are currently using Franz Servers, which is why you have access to Team Management.",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 23,
-      "column": 9
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.copy",
-    "defaultMessage": "!!!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.",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 27,
-      "column": 8
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.manageAction",
-    "defaultMessage": "!!!Manage your Team on meetfranz.com",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 31,
-      "column": 16
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.teamsUnavailable",
-    "defaultMessage": "!!!Teams are unavailable",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 35,
-      "column": 20
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.teamsUnavailableInfo",
-    "defaultMessage": "!!!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.",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 39,
-      "column": 24
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/user/EditUserForm.json b/src/i18n/messages/src/components/settings/user/EditUserForm.json
deleted file mode 100644
index 3a59f8681..000000000
--- a/src/i18n/messages/src/components/settings/user/EditUserForm.json
+++ /dev/null
@@ -1,80 +0,0 @@
-[
-  {
-    "id": "settings.account.headline",
-    "defaultMessage": "!!!Account",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineProfile",
-    "defaultMessage": "!!!Update Profile",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 19,
-      "column": 19
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineAccount",
-    "defaultMessage": "!!!Account Information",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 23,
-      "column": 19
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlinePassword",
-    "defaultMessage": "!!!Change Password",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 27,
-      "column": 20
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.successInfo",
-    "defaultMessage": "!!!Your changes have been saved",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 31,
-      "column": 15
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.buttonSave",
-    "defaultMessage": "!!!Update profile",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 35,
-      "column": 14
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/FeatureList.json b/src/i18n/messages/src/components/ui/FeatureList.json
deleted file mode 100644
index eb4bc483b..000000000
--- a/src/i18n/messages/src/components/ui/FeatureList.json
+++ /dev/null
@@ -1,145 +0,0 @@
-[
-  {
-    "id": "pricing.features.recipes",
-    "defaultMessage": "!!!Choose from more than 70 Services",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 8,
-      "column": 20
-    },
-    "end": {
-      "line": 11,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.accountSync",
-    "defaultMessage": "!!!Account Synchronisation",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 12,
-      "column": 15
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.desktopNotifications",
-    "defaultMessage": "!!!Desktop Notifications",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 16,
-      "column": 24
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.unlimitedServices",
-    "defaultMessage": "!!!Add unlimited services",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 20,
-      "column": 21
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.spellchecker",
-    "defaultMessage": "!!!Spellchecker support",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 24,
-      "column": 16
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.workspaces",
-    "defaultMessage": "!!!Workspaces",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 28,
-      "column": 14
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.customWebsites",
-    "defaultMessage": "!!!Add Custom Websites",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 32,
-      "column": 18
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.onPremise",
-    "defaultMessage": "!!!On-premise & other Hosted Services",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 36,
-      "column": 13
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.thirdPartyServices",
-    "defaultMessage": "!!!Install 3rd party services",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 40,
-      "column": 22
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.serviceProxies",
-    "defaultMessage": "!!!Service Proxies",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 44,
-      "column": 18
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.teamManagement",
-    "defaultMessage": "!!!Team Management",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 48,
-      "column": 18
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/InfoBar.json b/src/i18n/messages/src/components/ui/InfoBar.json
deleted file mode 100644
index a6a629c71..000000000
--- a/src/i18n/messages/src/components/ui/InfoBar.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "infobar.hide",
-    "defaultMessage": "!!!Hide",
-    "file": "src/components/ui/InfoBar.js",
-    "start": {
-      "line": 12,
-      "column": 8
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/Infobox.json b/src/i18n/messages/src/components/ui/Infobox.json
deleted file mode 100644
index 296c2ad3e..000000000
--- a/src/i18n/messages/src/components/ui/Infobox.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "infobox.dismiss",
-    "defaultMessage": "!!!Dismiss",
-    "file": "src/components/ui/Infobox.js",
-    "start": {
-      "line": 9,
-      "column": 11
-    },
-    "end": {
-      "line": 12,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/Input.json b/src/i18n/messages/src/components/ui/Input.json
deleted file mode 100644
index 6240badfb..000000000
--- a/src/i18n/messages/src/components/ui/Input.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "settings.app.form.passwordToggle",
-    "defaultMessage": "!!!Password toggle",
-    "file": "src/components/ui/Input.js",
-    "start": {
-      "line": 11,
-      "column": 18
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/WebviewLoader/index.json b/src/i18n/messages/src/components/ui/WebviewLoader/index.json
deleted file mode 100644
index 9caabef25..000000000
--- a/src/i18n/messages/src/components/ui/WebviewLoader/index.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "service.webviewLoader.loading",
-    "defaultMessage": "!!!Loading {service}",
-    "file": "src/components/ui/WebviewLoader/index.js",
-    "start": {
-      "line": 11,
-      "column": 11
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/util/ErrorBoundary/index.json b/src/i18n/messages/src/components/util/ErrorBoundary/index.json
deleted file mode 100644
index 43c323031..000000000
--- a/src/i18n/messages/src/components/util/ErrorBoundary/index.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "app.errorHandler.headline",
-    "defaultMessage": "!!!Something went wrong.",
-    "file": "src/components/util/ErrorBoundary/index.js",
-    "start": {
-      "line": 11,
-      "column": 12
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "app.errorHandler.action",
-    "defaultMessage": "!!!Reload",
-    "file": "src/components/util/ErrorBoundary/index.js",
-    "start": {
-      "line": 15,
-      "column": 10
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditServiceScreen.json b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
deleted file mode 100644
index 6744a9ff3..000000000
--- a/src/i18n/messages/src/containers/settings/EditServiceScreen.json
+++ /dev/null
@@ -1,249 +0,0 @@
-[
-  {
-    "id": "settings.service.form.name",
-    "defaultMessage": "!!!Name",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 28,
-      "column": 8
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableService",
-    "defaultMessage": "!!!Enable service",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 32,
-      "column": 17
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableHibernation",
-    "defaultMessage": "!!!Enable hibernation",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 36,
-      "column": 21
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableNotification",
-    "defaultMessage": "!!!Enable Notifications",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 40,
-      "column": 22
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableBadge",
-    "defaultMessage": "!!!Show unread message badges",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 44,
-      "column": 15
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableAudio",
-    "defaultMessage": "!!!Enable audio",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 48,
-      "column": 15
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.team",
-    "defaultMessage": "!!!Team",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 52,
-      "column": 8
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.customUrl",
-    "defaultMessage": "!!!Service URL",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 56,
-      "column": 13
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.indirectMessages",
-    "defaultMessage": "!!!Show message badge for all new messages",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 60,
-      "column": 20
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.icon",
-    "defaultMessage": "!!!Custom icon",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 64,
-      "column": 8
-    },
-    "end": {
-      "line": 67,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableDarkMode",
-    "defaultMessage": "!!!Enable Dark Mode",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 68,
-      "column": 18
-    },
-    "end": {
-      "line": 71,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.darkReaderBrightness",
-    "defaultMessage": "!!!Dark Reader Brightness",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 72,
-      "column": 24
-    },
-    "end": {
-      "line": 75,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.darkReaderContrast",
-    "defaultMessage": "!!!Dark Reader Contrast",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 76,
-      "column": 22
-    },
-    "end": {
-      "line": 79,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.darkReaderSepia",
-    "defaultMessage": "!!!Dark Reader Sepia",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 80,
-      "column": 19
-    },
-    "end": {
-      "line": 83,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.isEnabled",
-    "defaultMessage": "!!!Use Proxy",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 84,
-      "column": 15
-    },
-    "end": {
-      "line": 87,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.host",
-    "defaultMessage": "!!!Proxy Host/IP",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 88,
-      "column": 13
-    },
-    "end": {
-      "line": 91,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.port",
-    "defaultMessage": "!!!Port",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 92,
-      "column": 13
-    },
-    "end": {
-      "line": 95,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.user",
-    "defaultMessage": "!!!User",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 96,
-      "column": 13
-    },
-    "end": {
-      "line": 99,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.password",
-    "defaultMessage": "!!!Password",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 100,
-      "column": 17
-    },
-    "end": {
-      "line": 103,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
deleted file mode 100644
index b0087e5dd..000000000
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ /dev/null
@@ -1,600 +0,0 @@
-[
-  {
-    "id": "settings.app.form.autoLaunchOnStart",
-    "defaultMessage": "!!!Launch Ferdi on start",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 32,
-      "column": 21
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.autoLaunchInBackground",
-    "defaultMessage": "!!!Open in background",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 36,
-      "column": 26
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.runInBackground",
-    "defaultMessage": "!!!Keep Ferdi in background when closing the window",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 40,
-      "column": 19
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.startMinimized",
-    "defaultMessage": "!!!Start minimized",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 44,
-      "column": 18
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "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": 52,
-      "column": 20
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableMenuBar",
-    "defaultMessage": "!!!Always show Ferdi in Menu Bar",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 56,
-      "column": 17
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.reloadAfterResume",
-    "defaultMessage": "!!!Reload Ferdi after system resume",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 60,
-      "column": 21
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.minimizeToSystemTray",
-    "defaultMessage": "!!!Minimize Ferdi to system tray",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 64,
-      "column": 24
-    },
-    "end": {
-      "line": 67,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.closeToSystemTray",
-    "defaultMessage": "!!!Close Ferdi to system tray",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 68,
-      "column": 21
-    },
-    "end": {
-      "line": 71,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.privateNotifications",
-    "defaultMessage": "!!!Don't show message content in notifications",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 72,
-      "column": 24
-    },
-    "end": {
-      "line": 75,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.clipboardNotifications",
-    "defaultMessage": "!!!Don't show notifications for clipboard events",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 76,
-      "column": 26
-    },
-    "end": {
-      "line": 79,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.notifyTaskBarOnMessage",
-    "defaultMessage": "!!!Notify TaskBar/Dock on new message",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 80,
-      "column": 26
-    },
-    "end": {
-      "line": 83,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.navigationBarBehaviour",
-    "defaultMessage": "!!!Navigation bar behaviour",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 84,
-      "column": 26
-    },
-    "end": {
-      "line": 87,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.searchEngine",
-    "defaultMessage": "!!!Search engine",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 88,
-      "column": 16
-    },
-    "end": {
-      "line": 91,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.sentry",
-    "defaultMessage": "!!!Send telemetry data",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 92,
-      "column": 10
-    },
-    "end": {
-      "line": 95,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.hibernateOnStartup",
-    "defaultMessage": "!!!Keep services in hibernation on startup",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 96,
-      "column": 22
-    },
-    "end": {
-      "line": 99,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.hibernationStrategy",
-    "defaultMessage": "!!!Hibernation strategy",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 100,
-      "column": 23
-    },
-    "end": {
-      "line": 103,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.wakeUpStrategy",
-    "defaultMessage": "!!!Wake up strategy",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 104,
-      "column": 18
-    },
-    "end": {
-      "line": 107,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.predefinedTodoServer",
-    "defaultMessage": "!!!Todo Server",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 108,
-      "column": 24
-    },
-    "end": {
-      "line": 111,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.customTodoServer",
-    "defaultMessage": "!!!Custom TodoServer",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 112,
-      "column": 20
-    },
-    "end": {
-      "line": 115,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableLock",
-    "defaultMessage": "!!!Enable Password Lock",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 116,
-      "column": 14
-    },
-    "end": {
-      "line": 119,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.lockPassword",
-    "defaultMessage": "!!!Password",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 120,
-      "column": 16
-    },
-    "end": {
-      "line": 123,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.useTouchIdToUnlock",
-    "defaultMessage": "!!!Allow using Touch ID to unlock",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 124,
-      "column": 22
-    },
-    "end": {
-      "line": 127,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.inactivityLock",
-    "defaultMessage": "!!!Lock after inactivity",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 128,
-      "column": 18
-    },
-    "end": {
-      "line": 131,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.scheduledDNDEnabled",
-    "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 132,
-      "column": 23
-    },
-    "end": {
-      "line": 135,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.scheduledDNDStart",
-    "defaultMessage": "!!!From",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 136,
-      "column": 21
-    },
-    "end": {
-      "line": 139,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.scheduledDNDEnd",
-    "defaultMessage": "!!!To",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 140,
-      "column": 19
-    },
-    "end": {
-      "line": 143,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.language",
-    "defaultMessage": "!!!Language",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 144,
-      "column": 12
-    },
-    "end": {
-      "line": 147,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.darkMode",
-    "defaultMessage": "!!!Dark Mode",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 148,
-      "column": 12
-    },
-    "end": {
-      "line": 151,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.adaptableDarkMode",
-    "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 152,
-      "column": 21
-    },
-    "end": {
-      "line": 155,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.universalDarkMode",
-    "defaultMessage": "!!!Enable universal Dark Mode",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 156,
-      "column": 21
-    },
-    "end": {
-      "line": 159,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.serviceRibbonWidth",
-    "defaultMessage": "!!!Sidebar width",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 160,
-      "column": 22
-    },
-    "end": {
-      "line": 163,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.iconSize",
-    "defaultMessage": "!!!Service icon size",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 164,
-      "column": 12
-    },
-    "end": {
-      "line": 167,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.useVerticalStyle",
-    "defaultMessage": "!!!Use horizontal style",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 168,
-      "column": 20
-    },
-    "end": {
-      "line": 171,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.alwaysShowWorkspaces",
-    "defaultMessage": "!!!Always show workspace drawer",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 172,
-      "column": 24
-    },
-    "end": {
-      "line": 175,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.accentColor",
-    "defaultMessage": "!!!Accent color",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 176,
-      "column": 15
-    },
-    "end": {
-      "line": 179,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.showDisabledServices",
-    "defaultMessage": "!!!Display disabled services tabs",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 180,
-      "column": 24
-    },
-    "end": {
-      "line": 183,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.showMessagesBadgesWhenMuted",
-    "defaultMessage": "!!!Show unread message badge when notifications are disabled",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 184,
-      "column": 29
-    },
-    "end": {
-      "line": 187,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.showDragArea",
-    "defaultMessage": "!!!Show draggable area on window",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 188,
-      "column": 16
-    },
-    "end": {
-      "line": 191,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableSpellchecking",
-    "defaultMessage": "!!!Enable spell checking",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 192,
-      "column": 23
-    },
-    "end": {
-      "line": 195,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableGPUAcceleration",
-    "defaultMessage": "!!!Enable GPU Acceleration",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 196,
-      "column": 25
-    },
-    "end": {
-      "line": 199,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.beta",
-    "defaultMessage": "!!!Include beta versions",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 200,
-      "column": 8
-    },
-    "end": {
-      "line": 203,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.automaticUpdates",
-    "defaultMessage": "!!!Enable updates",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 204,
-      "column": 20
-    },
-    "end": {
-      "line": 207,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableTodos",
-    "defaultMessage": "!!!Enable Franz Todos",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 208,
-      "column": 15
-    },
-    "end": {
-      "line": 211,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.keepAllWorkspacesLoaded",
-    "defaultMessage": "!!!Keep all workspaces loaded",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 212,
-      "column": 27
-    },
-    "end": {
-      "line": 215,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditUserScreen.json b/src/i18n/messages/src/containers/settings/EditUserScreen.json
deleted file mode 100644
index 70ff29945..000000000
--- a/src/i18n/messages/src/containers/settings/EditUserScreen.json
+++ /dev/null
@@ -1,119 +0,0 @@
-[
-  {
-    "id": "settings.user.form.firstname",
-    "defaultMessage": "!!!Firstname",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 14,
-      "column": 13
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.lastname",
-    "defaultMessage": "!!!Lastname",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 18,
-      "column": 12
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.email",
-    "defaultMessage": "!!!Email",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 22,
-      "column": 9
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.accountType.label",
-    "defaultMessage": "!!!Account type",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 26,
-      "column": 20
-    },
-    "end": {
-      "line": 29,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.accountType.individual",
-    "defaultMessage": "!!!Individual",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 30,
-      "column": 25
-    },
-    "end": {
-      "line": 33,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.accountType.non-profit",
-    "defaultMessage": "!!!Non-Profit",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 34,
-      "column": 24
-    },
-    "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.accountType.company",
-    "defaultMessage": "!!!Company",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 38,
-      "column": 22
-    },
-    "end": {
-      "line": 41,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.currentPassword",
-    "defaultMessage": "!!!Current password",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 42,
-      "column": 19
-    },
-    "end": {
-      "line": 45,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.newPassword",
-    "defaultMessage": "!!!New password",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 46,
-      "column": 15
-    },
-    "end": {
-      "line": 49,
-      "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
deleted file mode 100644
index fea1b0838..000000000
--- a/src/i18n/messages/src/features/basicAuth/Component.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "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/debugger/Component.json b/src/i18n/messages/src/features/debugger/Component.json
deleted file mode 100644
index 86a5a05f4..000000000
--- a/src/i18n/messages/src/features/debugger/Component.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "feature.debugger.title",
-    "defaultMessage": "!!!Publish debugging information",
-    "file": "src/features/debugger/Component.js",
-    "start": {
-      "line": 16,
-      "column": 9
-    },
-    "end": {
-      "line": 19,
-      "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
deleted file mode 100644
index 0b2eab354..000000000
--- a/src/i18n/messages/src/features/nightlyBuilds/Component.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "feature.nightlyBuilds.title",
-    "defaultMessage": "!!!Nightly Builds",
-    "file": "src/features/nightlyBuilds/Component.js",
-    "start": {
-      "line": 17,
-      "column": 9
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.nightlyBuilds.info",
-    "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": 21,
-      "column": 8
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.nightlyBuilds.activate",
-    "defaultMessage": "!!!Activate",
-    "file": "src/features/nightlyBuilds/Component.js",
-    "start": {
-      "line": 25,
-      "column": 12
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/publishDebugInfo/Component.json b/src/i18n/messages/src/features/publishDebugInfo/Component.json
deleted file mode 100644
index 4d07a4794..000000000
--- a/src/i18n/messages/src/features/publishDebugInfo/Component.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "feature.publishDebugInfo.title",
-    "defaultMessage": "!!!Publish debug information",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 19,
-      "column": 9
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.info",
-    "defaultMessage": "!!!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",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 23,
-      "column": 8
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.error",
-    "defaultMessage": "!!!There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 27,
-      "column": 9
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.privacy",
-    "defaultMessage": "!!!Privacy policy",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 31,
-      "column": 11
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.terms",
-    "defaultMessage": "!!!Terms of service",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 35,
-      "column": 9
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.publish",
-    "defaultMessage": "!!!Accept and publish",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 39,
-      "column": 11
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.published",
-    "defaultMessage": "!!!Your debug log was published and is now availible at",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 43,
-      "column": 13
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/quickSwitch/Component.json b/src/i18n/messages/src/features/quickSwitch/Component.json
deleted file mode 100644
index e112bedc1..000000000
--- a/src/i18n/messages/src/features/quickSwitch/Component.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "feature.quickSwitch.title",
-    "defaultMessage": "!!!QuickSwitch",
-    "file": "src/features/quickSwitch/Component.js",
-    "start": {
-      "line": 17,
-      "column": 9
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.quickSwitch.search",
-    "defaultMessage": "!!!Search...",
-    "file": "src/features/quickSwitch/Component.js",
-    "start": {
-      "line": 21,
-      "column": 10
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.quickSwitch.info",
-    "defaultMessage": "!!!Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
-    "file": "src/features/quickSwitch/Component.js",
-    "start": {
-      "line": 25,
-      "column": 8
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/recipeConnectionLost/components/WebControls.json b/src/i18n/messages/src/features/recipeConnectionLost/components/WebControls.json
deleted file mode 100644
index f3bcaf345..000000000
--- a/src/i18n/messages/src/features/recipeConnectionLost/components/WebControls.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "webControls.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/features/recipeConnectionLost/components/WebControls.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.openInBrowser",
-    "defaultMessage": "!!!Open in Browser",
-    "file": "src/features/recipeConnectionLost/components/WebControls.js",
-    "start": {
-      "line": 17,
-      "column": 17
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/features/recipeConnectionLost/components/WebControls.js",
-    "start": {
-      "line": 21,
-      "column": 8
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/features/recipeConnectionLost/components/WebControls.js",
-    "start": {
-      "line": 25,
-      "column": 11
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/features/recipeConnectionLost/components/WebControls.js",
-    "start": {
-      "line": 29,
-      "column": 10
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/webControls/components/WebControls.json b/src/i18n/messages/src/features/webControls/components/WebControls.json
deleted file mode 100644
index 7676ec0b1..000000000
--- a/src/i18n/messages/src/features/webControls/components/WebControls.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "webControls.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/features/webControls/components/WebControls.js",
-    "start": {
-      "line": 17,
-      "column": 10
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.openInBrowser",
-    "defaultMessage": "!!!Open in Browser",
-    "file": "src/features/webControls/components/WebControls.js",
-    "start": {
-      "line": 21,
-      "column": 17
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/features/webControls/components/WebControls.js",
-    "start": {
-      "line": 25,
-      "column": 8
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/features/webControls/components/WebControls.js",
-    "start": {
-      "line": 29,
-      "column": 11
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/features/webControls/components/WebControls.js",
-    "start": {
-      "line": 33,
-      "column": 10
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
deleted file mode 100644
index 1aabfb520..000000000
--- a/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "settings.workspace.add.form.submitButton",
-    "defaultMessage": "!!!Create workspace",
-    "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
-    "start": {
-      "line": 12,
-      "column": 16
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.add.form.name",
-    "defaultMessage": "!!!Name",
-    "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
-    "start": {
-      "line": 16,
-      "column": 8
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
deleted file mode 100644
index 804e30070..000000000
--- a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
+++ /dev/null
@@ -1,119 +0,0 @@
-[
-  {
-    "id": "settings.workspace.form.buttonDelete",
-    "defaultMessage": "!!!Delete workspace",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 21,
-      "column": 16
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.buttonSave",
-    "defaultMessage": "!!!Save workspace",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 25,
-      "column": 14
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.name",
-    "defaultMessage": "!!!Name",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 29,
-      "column": 8
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.yourWorkspaces",
-    "defaultMessage": "!!!Your workspaces",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 33,
-      "column": 18
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.keepLoaded",
-    "defaultMessage": "!!!Keep this workspace loaded*",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 37,
-      "column": 14
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.keepLoadedInfo",
-    "defaultMessage": "!!!*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 41,
-      "column": 18
-    },
-    "end": {
-      "line": 45,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.servicesInWorkspaceHeadline",
-    "defaultMessage": "!!!Services in this Workspace",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 46,
-      "column": 31
-    },
-    "end": {
-      "line": 49,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.noServicesAdded",
-    "defaultMessage": "!!!Start by adding a service.",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 50,
-      "column": 19
-    },
-    "end": {
-      "line": 53,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.discoverServices",
-    "defaultMessage": "!!!Discover services",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 54,
-      "column": 20
-    },
-    "end": {
-      "line": 57,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
deleted file mode 100644
index 431f12710..000000000
--- a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "workspaceDrawer.headline",
-    "defaultMessage": "!!!Workspaces",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.allServices",
-    "defaultMessage": "!!!All services",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 19,
-      "column": 15
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.workspacesSettingsTooltip",
-    "defaultMessage": "!!!Workspaces settings",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 23,
-      "column": 29
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.workspaceFeatureInfo",
-    "defaultMessage": "!!!Info about workspace feature",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 27,
-      "column": 24
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.addNewWorkspaceLabel",
-    "defaultMessage": "!!!add new workspace",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 31,
-      "column": 24
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json
deleted file mode 100644
index 737dee59b..000000000
--- a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "workspaceDrawer.item.noServicesAddedYet",
-    "defaultMessage": "!!!No services added yet",
-    "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
-    "start": {
-      "line": 11,
-      "column": 22
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.item.contextMenuEdit",
-    "defaultMessage": "!!!edit",
-    "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
-    "start": {
-      "line": 15,
-      "column": 19
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceSwitchingIndicator.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceSwitchingIndicator.json
deleted file mode 100644
index 4f3e6d55c..000000000
--- a/src/i18n/messages/src/features/workspaces/components/WorkspaceSwitchingIndicator.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "workspaces.switchingIndicator.switchingTo",
-    "defaultMessage": "!!!Switching to",
-    "file": "src/features/workspaces/components/WorkspaceSwitchingIndicator.js",
-    "start": {
-      "line": 12,
-      "column": 15
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
deleted file mode 100644
index 39c9c30fb..000000000
--- a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
+++ /dev/null
@@ -1,106 +0,0 @@
-[
-  {
-    "id": "settings.workspaces.headline",
-    "defaultMessage": "!!!Your workspaces",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 17,
-      "column": 12
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.noWorkspacesAdded",
-    "defaultMessage": "!!!You haven't created any workspaces yet.",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 21,
-      "column": 19
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.workspacesRequestFailed",
-    "defaultMessage": "!!!Could not load your workspaces",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 25,
-      "column": 27
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.tryReloadWorkspaces",
-    "defaultMessage": "!!!Try again",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 29,
-      "column": 23
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.updatedInfo",
-    "defaultMessage": "!!!Your changes have been saved",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 33,
-      "column": 15
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.deletedInfo",
-    "defaultMessage": "!!!Workspace has been deleted",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 37,
-      "column": 15
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.workspaceFeatureInfo",
-    "defaultMessage": "!!!Info about workspace feature",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 41,
-      "column": 24
-    },
-    "end": {
-      "line": 44,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.workspaceFeatureHeadline",
-    "defaultMessage": "!!!Less is More: Introducing Ferdi Workspaces",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 45,
-      "column": 28
-    },
-    "end": {
-      "line": 48,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/helpers/validation-helpers.json b/src/i18n/messages/src/helpers/validation-helpers.json
deleted file mode 100644
index 6be1d33e9..000000000
--- a/src/i18n/messages/src/helpers/validation-helpers.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "validation.required",
-    "defaultMessage": "!!!Field is required",
-    "file": "src/helpers/validation-helpers.js",
-    "start": {
-      "line": 5,
-      "column": 12
-    },
-    "end": {
-      "line": 8,
-      "column": 3
-    }
-  },
-  {
-    "id": "validation.email",
-    "defaultMessage": "!!!Email not valid",
-    "file": "src/helpers/validation-helpers.js",
-    "start": {
-      "line": 9,
-      "column": 9
-    },
-    "end": {
-      "line": 12,
-      "column": 3
-    }
-  },
-  {
-    "id": "validation.url",
-    "defaultMessage": "!!!Not a valid URL",
-    "file": "src/helpers/validation-helpers.js",
-    "start": {
-      "line": 13,
-      "column": 7
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "validation.minLength",
-    "defaultMessage": "!!!Too few characters",
-    "file": "src/helpers/validation-helpers.js",
-    "start": {
-      "line": 17,
-      "column": 13
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "validation.oneRequired",
-    "defaultMessage": "!!!At least one is required",
-    "file": "src/helpers/validation-helpers.js",
-    "start": {
-      "line": 21,
-      "column": 15
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/i18n/globalMessages.json b/src/i18n/messages/src/i18n/globalMessages.json
deleted file mode 100644
index bc1ec7397..000000000
--- a/src/i18n/messages/src/i18n/globalMessages.json
+++ /dev/null
@@ -1,236 +0,0 @@
-[
-  {
-    "id": "global.api.unhealthy",
-    "defaultMessage": "!!!Can't connect to Ferdi Online Services",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 4,
-      "column": 16
-    },
-    "end": {
-      "line": 7,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.notConnectedToTheInternet",
-    "defaultMessage": "!!!You are not connected to the internet.",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 8,
-      "column": 29
-    },
-    "end": {
-      "line": 11,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.spellchecking.language",
-    "defaultMessage": "!!!Spell checking language",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 12,
-      "column": 24
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.spellchecker.useDefault",
-    "defaultMessage": "!!!Use System Default ({default})",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 16,
-      "column": 29
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.spellchecking.autodetect",
-    "defaultMessage": "!!!Detect language automatically",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 20,
-      "column": 34
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.spellchecking.autodetect.short",
-    "defaultMessage": "!!!Automatic",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 24,
-      "column": 39
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.userAgentPref",
-    "defaultMessage": "!!!User Agent",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 28,
-      "column": 17
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "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.",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 32,
-      "column": 17
-    },
-    "end": {
-      "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
deleted file mode 100644
index 35f2e3b7b..000000000
--- a/src/i18n/messages/src/lib/Menu.json
+++ /dev/null
@@ -1,912 +0,0 @@
-[
-  {
-    "id": "menu.edit",
-    "defaultMessage": "!!!Edit",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 32,
-      "column": 8
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.undo",
-    "defaultMessage": "!!!Undo",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 36,
-      "column": 8
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.redo",
-    "defaultMessage": "!!!Redo",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 40,
-      "column": 8
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.cut",
-    "defaultMessage": "!!!Cut",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 44,
-      "column": 7
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.copy",
-    "defaultMessage": "!!!Copy",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 48,
-      "column": 8
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.paste",
-    "defaultMessage": "!!!Paste",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 52,
-      "column": 9
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.pasteAndMatchStyle",
-    "defaultMessage": "!!!Paste And Match Style",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 56,
-      "column": 22
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.delete",
-    "defaultMessage": "!!!Delete",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 60,
-      "column": 10
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.selectAll",
-    "defaultMessage": "!!!Select All",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 64,
-      "column": 13
-    },
-    "end": {
-      "line": 67,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.findInPage",
-    "defaultMessage": "!!!Find in Page",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 68,
-      "column": 14
-    },
-    "end": {
-      "line": 71,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.speech",
-    "defaultMessage": "!!!Speech",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 72,
-      "column": 10
-    },
-    "end": {
-      "line": 75,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.startSpeaking",
-    "defaultMessage": "!!!Start Speaking",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 76,
-      "column": 17
-    },
-    "end": {
-      "line": 79,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.stopSpeaking",
-    "defaultMessage": "!!!Stop Speaking",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 80,
-      "column": 16
-    },
-    "end": {
-      "line": 83,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.startDictation",
-    "defaultMessage": "!!!Start Dictation",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 84,
-      "column": 18
-    },
-    "end": {
-      "line": 87,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.emojiSymbols",
-    "defaultMessage": "!!!Emoji & Symbols",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 88,
-      "column": 16
-    },
-    "end": {
-      "line": 91,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.openQuickSwitch",
-    "defaultMessage": "!!!Open Quick Switch",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 92,
-      "column": 19
-    },
-    "end": {
-      "line": 95,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 96,
-      "column": 8
-    },
-    "end": {
-      "line": 99,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 100,
-      "column": 11
-    },
-    "end": {
-      "line": 103,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.resetZoom",
-    "defaultMessage": "!!!Actual Size",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 104,
-      "column": 13
-    },
-    "end": {
-      "line": 107,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.zoomIn",
-    "defaultMessage": "!!!Zoom In",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 108,
-      "column": 10
-    },
-    "end": {
-      "line": 111,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.zoomOut",
-    "defaultMessage": "!!!Zoom Out",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 112,
-      "column": 11
-    },
-    "end": {
-      "line": 115,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.toggleFullScreen",
-    "defaultMessage": "!!!Toggle Full Screen",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 116,
-      "column": 20
-    },
-    "end": {
-      "line": 119,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.toggleDarkMode",
-    "defaultMessage": "!!!Toggle Dark Mode",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 120,
-      "column": 18
-    },
-    "end": {
-      "line": 123,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.toggleDevTools",
-    "defaultMessage": "!!!Toggle Developer Tools",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 124,
-      "column": 18
-    },
-    "end": {
-      "line": 127,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.toggleTodosDevTools",
-    "defaultMessage": "!!!Toggle Todos Developer Tools",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 128,
-      "column": 23
-    },
-    "end": {
-      "line": 131,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.toggleServiceDevTools",
-    "defaultMessage": "!!!Toggle Service Developer Tools",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 132,
-      "column": 25
-    },
-    "end": {
-      "line": 135,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.reloadService",
-    "defaultMessage": "!!!Reload Service",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 136,
-      "column": 17
-    },
-    "end": {
-      "line": 139,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.reloadFerdi",
-    "defaultMessage": "!!!Reload Ferdi",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 140,
-      "column": 15
-    },
-    "end": {
-      "line": 143,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.lockFerdi",
-    "defaultMessage": "!!!Lock Ferdi",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 144,
-      "column": 13
-    },
-    "end": {
-      "line": 147,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.reloadTodos",
-    "defaultMessage": "!!!Reload ToDos",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 148,
-      "column": 15
-    },
-    "end": {
-      "line": 151,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.window.minimize",
-    "defaultMessage": "!!!Minimize",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 152,
-      "column": 12
-    },
-    "end": {
-      "line": 155,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.window.close",
-    "defaultMessage": "!!!Close",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 156,
-      "column": 9
-    },
-    "end": {
-      "line": 159,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.learnMore",
-    "defaultMessage": "!!!Learn More",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 160,
-      "column": 13
-    },
-    "end": {
-      "line": 163,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.changelog",
-    "defaultMessage": "!!!Changelog",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 164,
-      "column": 13
-    },
-    "end": {
-      "line": 167,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.importExportData",
-    "defaultMessage": "!!!Import/Export Configuration Data",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 168,
-      "column": 20
-    },
-    "end": {
-      "line": 171,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.support",
-    "defaultMessage": "!!!Support",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 172,
-      "column": 11
-    },
-    "end": {
-      "line": 175,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.debugInfo",
-    "defaultMessage": "!!!Copy Debug Information",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 176,
-      "column": 13
-    },
-    "end": {
-      "line": 179,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.publishDebugInfo",
-    "defaultMessage": "!!!Publish Debug Information",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 180,
-      "column": 20
-    },
-    "end": {
-      "line": 183,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.debugInfoCopiedHeadline",
-    "defaultMessage": "!!!Ferdi Debug Information",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 184,
-      "column": 27
-    },
-    "end": {
-      "line": 187,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.debugInfoCopiedBody",
-    "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 188,
-      "column": 23
-    },
-    "end": {
-      "line": 192,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.touchId",
-    "defaultMessage": "!!!Unlock with Touch ID",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 193,
-      "column": 11
-    },
-    "end": {
-      "line": 196,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.touchIdPrompt",
-    "defaultMessage": "!!!unlock via Touch ID",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 197,
-      "column": 17
-    },
-    "end": {
-      "line": 200,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.tos",
-    "defaultMessage": "!!!Terms of Service",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 201,
-      "column": 7
-    },
-    "end": {
-      "line": 204,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.privacy",
-    "defaultMessage": "!!!Privacy Statement",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 205,
-      "column": 11
-    },
-    "end": {
-      "line": 208,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.file",
-    "defaultMessage": "!!!File",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 209,
-      "column": 8
-    },
-    "end": {
-      "line": 212,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view",
-    "defaultMessage": "!!!View",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 213,
-      "column": 8
-    },
-    "end": {
-      "line": 216,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.services",
-    "defaultMessage": "!!!Services",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 217,
-      "column": 12
-    },
-    "end": {
-      "line": 220,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.window",
-    "defaultMessage": "!!!Window",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 221,
-      "column": 10
-    },
-    "end": {
-      "line": 224,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help",
-    "defaultMessage": "!!!Help",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 225,
-      "column": 8
-    },
-    "end": {
-      "line": 228,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.about",
-    "defaultMessage": "!!!About Ferdi",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 229,
-      "column": 9
-    },
-    "end": {
-      "line": 232,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.checkForUpdates",
-    "defaultMessage": "!!!Check for updates",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 233,
-      "column": 19
-    },
-    "end": {
-      "line": 236,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.hide",
-    "defaultMessage": "!!!Hide",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 237,
-      "column": 8
-    },
-    "end": {
-      "line": 240,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.hideOthers",
-    "defaultMessage": "!!!Hide Others",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 241,
-      "column": 14
-    },
-    "end": {
-      "line": 244,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.unhide",
-    "defaultMessage": "!!!Unhide",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 245,
-      "column": 10
-    },
-    "end": {
-      "line": 248,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.autohideMenuBar",
-    "defaultMessage": "!!!Auto-hide menu bar",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 249,
-      "column": 19
-    },
-    "end": {
-      "line": 252,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.services.addNewService",
-    "defaultMessage": "!!!Add New Service...",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 253,
-      "column": 17
-    },
-    "end": {
-      "line": 256,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.workspaces.addNewWorkspace",
-    "defaultMessage": "!!!Add New Workspace...",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 257,
-      "column": 19
-    },
-    "end": {
-      "line": 260,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.workspaces.openWorkspaceDrawer",
-    "defaultMessage": "!!!Open workspace drawer",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 261,
-      "column": 23
-    },
-    "end": {
-      "line": 264,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.workspaces.closeWorkspaceDrawer",
-    "defaultMessage": "!!!Close workspace drawer",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 265,
-      "column": 24
-    },
-    "end": {
-      "line": 268,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.services.setNextServiceActive",
-    "defaultMessage": "!!!Activate next service...",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 269,
-      "column": 23
-    },
-    "end": {
-      "line": 272,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.services.activatePreviousService",
-    "defaultMessage": "!!!Activate previous service...",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 273,
-      "column": 27
-    },
-    "end": {
-      "line": 276,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.muteApp",
-    "defaultMessage": "!!!Disable notifications & audio",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 277,
-      "column": 11
-    },
-    "end": {
-      "line": 280,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.unmuteApp",
-    "defaultMessage": "!!!Enable notifications & audio",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 281,
-      "column": 13
-    },
-    "end": {
-      "line": 284,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.workspaces",
-    "defaultMessage": "!!!Workspaces",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 285,
-      "column": 14
-    },
-    "end": {
-      "line": 288,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.workspaces.defaultWorkspace",
-    "defaultMessage": "!!!Default",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 289,
-      "column": 20
-    },
-    "end": {
-      "line": 292,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.todos",
-    "defaultMessage": "!!!Todos",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 293,
-      "column": 9
-    },
-    "end": {
-      "line": 296,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.Todoss.openTodosDrawer",
-    "defaultMessage": "!!!Open Todos drawer",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 297,
-      "column": 19
-    },
-    "end": {
-      "line": 300,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.Todoss.closeTodosDrawer",
-    "defaultMessage": "!!!Close Todos drawer",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 301,
-      "column": 20
-    },
-    "end": {
-      "line": 304,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.todos.enableTodos",
-    "defaultMessage": "!!!Enable Todos",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 305,
-      "column": 15
-    },
-    "end": {
-      "line": 308,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.services.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 309,
-      "column": 17
-    },
-    "end": {
-      "line": 312,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/translations.js b/src/i18n/translations.js
deleted file mode 100644
index 161a172ba..000000000
--- a/src/i18n/translations.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { APP_LOCALES } from './languages';
-
-const translations = [];
-Object.keys(APP_LOCALES).forEach((key) => {
-  try {
-    const translation = require(`./locales/${key}.json`); // eslint-disable-line
-    translations[key] = translation;
-  } catch (err) {
-    console.warn(`Can't find translations for ${key}`);
-  }
-});
-
-module.exports = translations;
diff --git a/src/i18n/translations.ts b/src/i18n/translations.ts
new file mode 100644
index 000000000..9a7dc7453
--- /dev/null
+++ b/src/i18n/translations.ts
@@ -0,0 +1,15 @@
+/* eslint-disable global-require */
+import { APP_LOCALES } from './languages';
+
+const translations = [];
+for (const key of Object.keys(APP_LOCALES)) {
+  try {
+    // eslint-disable-next-line import/no-dynamic-require
+    const translation = require(`./locales/${key}.json`);
+    translations[key] = translation;
+  } catch {
+    console.warn(`Can't find translations for ${key}`);
+  }
+}
+
+module.exports = translations;
diff --git a/src/index.html b/src/index.html
index 929aec3ad..fea2ec387 100644
--- a/src/index.html
+++ b/src/index.html
@@ -26,7 +26,7 @@
         );
 
       require('./sentry');
-      const { isDevMode } = require('./environment');
+      const { isDevMode } = require('./environment-remote');
       if (isDevMode) {
         const debugging = require('debug');
         debugging.enable(process.env.DEBUG);
diff --git a/src/index.js b/src/index.js
index 1f3510361..9f384f5fa 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,31 +1,30 @@
 /* eslint-disable import/first */
 
-import { app, BrowserWindow, ipcMain, session, dialog } from 'electron';
+import { app, BrowserWindow, globalShortcut, ipcMain, session, dialog } from 'electron';
 
 import { emptyDirSync, ensureFileSync } from 'fs-extra';
 import { join } from 'path';
 import windowStateKeeper from 'electron-window-state';
-import { enforceMacOSAppLocation } from 'electron-util';
 import ms from 'ms';
+import { initializeRemote } from './electron-util';
+import { enforceMacOSAppLocation } from './enforce-macos-app-location';
 
-require('@electron/remote/main').initialize();
+initializeRemote();
 
-import osName from 'os-name';
-import { DEFAULT_WINDOW_OPTIONS } from './config';
+import { DEFAULT_APP_SETTINGS, DEFAULT_WINDOW_OPTIONS } from './config';
 
 import {
-  DEFAULT_APP_SETTINGS,
-  isDevMode,
   isMac,
   isWindows,
   isLinux,
+  altKey,
+} from './environment';
+import {
+  isDevMode,
+  aboutAppDetails,
   userDataRecipesPath,
   userDataPath,
-  ferdiVersion,
-  electronVersion,
-  chromeVersion,
-  nodeVersion,
-} from './environment';
+} from './environment-remote';
 import { ifUndefinedBoolean } from './jsUtils';
 
 import { mainIpcHandler as basicAuthHandler } from './features/basicAuth';
@@ -41,15 +40,9 @@ import './electron/exception';
 import { asarPath } from './helpers/asar-helpers';
 import { openExternalUrl } from './helpers/url-helpers';
 import userAgent from './helpers/userAgent-helpers';
-import * as buildInfo from './buildInfo.json'; // eslint-disable-line import/no-unresolved
 
 const debug = require('debug')('Ferdi:App');
 
-// From Electron 9 onwards, app.allowRendererProcessReuse = true by default. This causes the app to crash on Windows due to the
-// Electron Windows Notification API crashing. Setting this to false fixes the issue until the electron team fixes the notification bug
-// More Info - https://github.com/electron/electron/issues/18397
-app.allowRendererProcessReuse = false;
-
 // Globally set useragent to fix user agent override in service workers
 debug('Set userAgent to ', userAgent());
 app.userAgentFallback = userAgent();
@@ -83,14 +76,18 @@ if (isWindows) {
 const settings = new Settings('app', DEFAULT_APP_SETTINGS);
 const proxySettings = new Settings('proxy');
 
-const retrieveSettingValue = (key, defaultValue = true) => ifUndefinedBoolean(settings.get(key), defaultValue);
+const retrieveSettingValue = (key, defaultValue = true) =>
+  ifUndefinedBoolean(settings.get(key), defaultValue);
 
 if (retrieveSettingValue('sentry')) {
   // eslint-disable-next-line global-require
   require('./sentry');
 }
 
-const liftSingleInstanceLock = retrieveSettingValue('liftSingleInstanceLock', false);
+const liftSingleInstanceLock = retrieveSettingValue(
+  'liftSingleInstanceLock',
+  false,
+);
 
 // Force single window
 const gotTheLock = liftSingleInstanceLock
@@ -148,7 +145,7 @@ if (!gotTheLock) {
 // https://github.com/electron/electron/issues/9046
 if (
   isLinux &&
-  ['Pantheon', 'Unity:Unity7'].indexOf(process.env.XDG_CURRENT_DESKTOP) !== -1
+  ['Pantheon', 'Unity:Unity7'].includes(process.env.XDG_CURRENT_DESKTOP)
 ) {
   process.env.XDG_CURRENT_DESKTOP = 'Unity';
 }
@@ -160,17 +157,7 @@ if (!retrieveSettingValue('enableGPUAcceleration', false)) {
 }
 
 app.setAboutPanelOptions({
-  applicationVersion: [
-    `Version: ${ferdiVersion}`,
-    `Electron: ${electronVersion}`,
-    `Chrome: ${chromeVersion}`,
-    `Node.js: ${nodeVersion}`,
-    `Platform: ${osName()}`,
-    `Arch: ${process.arch}`,
-    `Build date: ${new Date(Number(buildInfo.timestamp))}`,
-    `Git SHA: ${buildInfo.gitHashShort}`,
-    `Git branch: ${buildInfo.gitBranch}`,
-  ].join('\n'),
+  applicationVersion: aboutAppDetails(),
   version: '',
 });
 
@@ -205,11 +192,11 @@ const createWindow = () => {
     minWidth: 600,
     minHeight: 500,
     show: false,
-    titleBarStyle: isMac ? 'hidden' : '',
+    titleBarStyle: isMac ? 'hidden' : 'default',
     frame: isLinux,
-    spellcheck: retrieveSettingValue('enableSpellchecking'),
     backgroundColor,
     webPreferences: {
+      spellcheck: retrieveSettingValue('enableSpellchecking'),
       nodeIntegration: true,
       contextIsolation: false,
       webviewTag: true,
@@ -283,10 +270,7 @@ const createWindow = () => {
     // Dereference the window object, usually you would store windows
     // in an array if your app supports multi windows, this is the time
     // when you should delete the corresponding element.
-    if (
-      !willQuitApp &&
-      retrieveSettingValue('runInBackground')
-    ) {
+    if (!willQuitApp && retrieveSettingValue('runInBackground')) {
       e.preventDefault();
       if (isWindows) {
         debug('Window: minimize');
@@ -372,6 +356,13 @@ const createWindow = () => {
   } else {
     mainWindow.show();
   }
+
+  app.whenReady().then(() => {
+    // Toggle the window on 'Alt+X'
+    globalShortcut.register(`${altKey()}+X`, () => {
+      trayIcon.trayMenuTemplate[0].click();
+    });
+  });
 };
 
 // Allow passing command line parameters/switches to electron
@@ -415,31 +406,36 @@ app.on('ready', () => {
   }
 
   if (isWindows) {
-    app.setUserTasks([
-      {
-        program: process.execPath,
-        arguments: `${isDevMode ? `${__dirname} ` : ''}--reset-window`,
-        iconPath: asarPath(
+    const extraArgs = isDevMode ? `${__dirname} ` : '';
+    const iconPath = asarPath(
           join(
             isDevMode ? `${__dirname}../src/` : __dirname,
             'assets/images/taskbar/win32/display.ico',
           ),
-        ),
+        );
+    app.setUserTasks([
+      {
+        program: process.execPath,
+        arguments: `${extraArgs}--reset-window`,
+        iconPath,
         iconIndex: 0,
         title: 'Move Ferdi to Current Display',
         description: 'Restore the position and size of Ferdi',
       },
       {
         program: process.execPath,
-        arguments: `${isDevMode ? `${__dirname} ` : ''}--quit`,
+        arguments: `${extraArgs}--quit`,
+        iconPath,
         iconIndex: 0,
-        iconPath: null,
         title: 'Quit Ferdi',
         description: null,
       },
     ]);
   }
 
+  // eslint-disable-next-line global-require
+  require('electron-react-titlebar/main').initialize();
+
   createWindow();
 });
 
@@ -486,8 +482,10 @@ ipcMain.on('open-browser-window', (e, { url, serviceId }) => {
 ipcMain.on(
   'modifyRequestHeaders',
   (e, { modifiedRequestHeaders, serviceId }) => {
-    debug(`Received modifyRequestHeaders ${modifiedRequestHeaders} for serviceId ${serviceId}`);
-    modifiedRequestHeaders.forEach(headerFilterSet => {
+    debug(
+      `Received modifyRequestHeaders ${modifiedRequestHeaders} for serviceId ${serviceId}`,
+    );
+    for (const headerFilterSet of modifiedRequestHeaders) {
       const { headers, requestFilters } = headerFilterSet;
       session
         .fromPartition(`persist:service-${serviceId}`)
@@ -500,27 +498,26 @@ ipcMain.on(
           }
           callback({ requestHeaders: details.requestHeaders });
         });
-    });
+    }
   },
 );
 
-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('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');
@@ -563,6 +560,20 @@ ipcMain.on('stop-find-in-page', (e, action) => {
   e.returnValue = null;
 });
 
+ipcMain.on('set-spellchecker-locales', (e, { locale, serviceId }) => {
+  if (serviceId === undefined) {
+    return;
+  }
+
+  const serviceSession = session.fromPartition(`persist:service-${serviceId}`);
+  const [defaultLocale] = serviceSession.getSpellCheckerLanguages();
+  debug(`Spellchecker default locale is: ${defaultLocale}`);
+
+  const locales = [locale, defaultLocale, DEFAULT_APP_SETTINGS.fallbackLocale];
+  debug(`Setting spellchecker locales to: ${locales}`);
+  serviceSession.setSpellCheckerLanguages(locales);
+});
+
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
   // On OS X it is common for applications and their menu bar
@@ -575,7 +586,7 @@ app.on('window-all-closed', () => {
   }
 });
 
-app.on('before-quit', (event) => {
+app.on('before-quit', event => {
   const yesButtonIndex = 0;
   let selection = yesButtonIndex;
   if (retrieveSettingValue('confirmOnQuit')) {
@@ -583,10 +594,7 @@ app.on('before-quit', (event) => {
       type: 'question',
       message: 'Quit',
       detail: 'Do you really want to quit Ferdi?',
-      buttons: [
-        'Yes',
-        'No',
-      ],
+      buttons: ['Yes', 'No'],
     });
   }
   if (selection === yesButtonIndex) {
diff --git a/src/internal-server/app/Controllers/Http/RecipeController.js b/src/internal-server/app/Controllers/Http/RecipeController.js
index 1a7595a9d..d44839db1 100644
--- a/src/internal-server/app/Controllers/Http/RecipeController.js
+++ b/src/internal-server/app/Controllers/Http/RecipeController.js
@@ -1,22 +1,18 @@
 const Recipe = use('App/Models/Recipe');
 const Drive = use('Drive');
-const {
-  validateAll,
-} = use('Validator');
+const { validateAll } = use('Validator');
 const Env = use('Env');
 
 const fetch = require('node-fetch');
 const debug = require('debug')('Ferdi:internalServer:RecipeController');
 const { LIVE_FERDI_API } = require('../../../../config');
-const { API_VERSION } = require('../../../../environment');
+const { API_VERSION } = require('../../../../environment-remote');
 
 const RECIPES_URL = `${LIVE_FERDI_API}/${API_VERSION}/recipes`;
 
 class RecipeController {
   // List official and custom recipes
-  async list({
-    response,
-  }) {
+  async list({ response }) {
     const officialRecipes = JSON.parse(await (await fetch(RECIPES_URL)).text());
     const customRecipesArray = (await Recipe.all()).rows;
     const customRecipes = customRecipesArray.map(recipe => ({
@@ -25,19 +21,13 @@ class RecipeController {
       ...JSON.parse(recipe.data),
     }));
 
-    const recipes = [
-      ...officialRecipes,
-      ...customRecipes,
-    ];
+    const recipes = [...officialRecipes, ...customRecipes];
 
     return response.send(recipes);
   }
 
   // Search official and custom recipes
-  async search({
-    request,
-    response,
-  }) {
+  async search({ request, response }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       needle: 'required',
@@ -64,13 +54,23 @@ class RecipeController {
       }));
     } else {
       let remoteResults = [];
-      if (Env.get('CONNECT_WITH_FRANZ') == 'true') { // eslint-disable-line eqeqeq
-        remoteResults = JSON.parse(await (await fetch(`${RECIPES_URL}/search?needle=${encodeURIComponent(needle)}`)).text());
+      // eslint-disable-next-line eqeqeq
+      if (Env.get('CONNECT_WITH_FRANZ') == 'true') {
+        // eslint-disable-line eqeqeq
+        remoteResults = JSON.parse(
+          await (
+            await fetch(
+              `${RECIPES_URL}/search?needle=${encodeURIComponent(needle)}`,
+            )
+          ).text(),
+        );
       }
 
       debug('remoteResults:', remoteResults);
 
-      const localResultsArray = (await Recipe.query().where('name', 'LIKE', `%${needle}%`).fetch()).toJSON();
+      const localResultsArray = (
+        await Recipe.query().where('name', 'LIKE', `%${needle}%`).fetch()
+      ).toJSON();
       const localResults = localResultsArray.map(recipe => ({
         id: recipe.recipeId,
         name: recipe.name,
@@ -79,20 +79,14 @@ class RecipeController {
 
       debug('localResults:', localResults);
 
-      results = [
-        ...localResults,
-        ...remoteResults || [],
-      ];
+      results = [...localResults, ...(remoteResults || [])];
     }
 
     return response.send(results);
   }
 
   // Download a recipe
-  async download({
-    response,
-    params,
-  }) {
+  async download({ response, params }) {
     // Validate user input
     const validation = await validateAll(params, {
       recipe: 'required|accepted',
@@ -108,14 +102,17 @@ class RecipeController {
     const service = params.recipe;
 
     // Check for invalid characters
-    if (/\.{1,}/.test(service) || /\/{1,}/.test(service)) {
+    if (/\.+/.test(service) || /\/+/.test(service)) {
       return response.send('Invalid recipe name');
     }
 
     // Check if recipe exists in recipes folder
     if (await Drive.exists(`${service}.tar.gz`)) {
       return response.send(await Drive.get(`${service}.tar.gz`));
-    } if (Env.get('CONNECT_WITH_FRANZ') == 'true') { // eslint-disable-line eqeqeq
+    }
+    // eslint-disable-next-line eqeqeq
+    if (Env.get('CONNECT_WITH_FRANZ') == 'true') {
+      // eslint-disable-line eqeqeq
       return response.redirect(`${RECIPES_URL}/download/${service}`);
     }
     return response.status(400).send({
diff --git a/src/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js
index f2af9d411..133473b68 100644
--- a/src/internal-server/app/Controllers/Http/ServiceController.js
+++ b/src/internal-server/app/Controllers/Http/ServiceController.js
@@ -2,7 +2,7 @@ const Service = use('App/Models/Service');
 const { validateAll } = use('Validator');
 const Env = use('Env');
 
-const uuid = require('uuid/v4');
+const { v4: uuid } = require('uuid');
 const path = require('path');
 const fs = require('fs-extra');
 const { LOCAL_HOSTNAME, DEFAULT_SERVICE_ORDER } = require('../../../../config');
@@ -135,13 +135,11 @@ class ServiceController {
 
       const newSettings = {
         ...settings,
-        ...{
-          iconId,
-          customIconVersion:
-            settings && settings.customIconVersion
-              ? settings.customIconVersion + 1
-              : 1,
-        },
+        iconId,
+        customIconVersion:
+          settings && settings.customIconVersion
+            ? settings.customIconVersion + 1
+            : 1,
       };
 
       // Update data in database
@@ -157,9 +155,7 @@ class ServiceController {
           id,
           name: service.name,
           ...newSettings,
-          iconUrl: `http://${hostname}:${port}/${API_VERSION}/icon/${
-            newSettings.iconId
-          }`,
+          iconUrl: `http://${hostname}:${port}/${API_VERSION}/icon/${newSettings.iconId}`,
           userId: 1,
         },
         status: ['updated'],
diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js
index 994dcc0dc..25b5277bd 100644
--- a/src/internal-server/app/Controllers/Http/UserController.js
+++ b/src/internal-server/app/Controllers/Http/UserController.js
@@ -1,34 +1,35 @@
 const User = use('App/Models/User');
 const Service = use('App/Models/Service');
 const Workspace = use('App/Models/Workspace');
-const {
-  validateAll,
-} = use('Validator');
+const { validateAll } = use('Validator');
 
 const btoa = require('btoa');
 const fetch = require('node-fetch');
-const uuid = require('uuid/v4');
+const { v4: uuid } = require('uuid');
 const crypto = require('crypto');
-const { DEFAULT_APP_SETTINGS, API_VERSION } = require('../../../../environment');
+const { DEFAULT_APP_SETTINGS } = require('../../../../config');
+const { API_VERSION } = require('../../../../environment-remote');
 const { default: userAgent } = require('../../../../helpers/userAgent-helpers');
 
-const apiRequest = (url, route, method, auth) => new Promise((resolve, reject) => {
-  try {
-    fetch(`${url}/${API_VERSION}/${route}`, {
-      method,
-      headers: {
-        Authorization: `Bearer ${auth}`,
-        'User-Agent': userAgent(),
-      },
-    })
-      .then(data => data.json())
-      .then(json => resolve(json));
-  } catch (e) {
-    reject();
-  }
-});
+const apiRequest = (url, route, method, auth) =>
+  new Promise((resolve, reject) => {
+    try {
+      fetch(`${url}/${API_VERSION}/${route}`, {
+        method,
+        headers: {
+          Authorization: `Bearer ${auth}`,
+          'User-Agent': userAgent(),
+        },
+      })
+        .then(data => data.json())
+        .then(json => resolve(json));
+    } catch {
+      reject();
+    }
+  });
 
-const LOGIN_SUCCESS_TOKEN = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJGZXJkaSBJbnRlcm5hbCBTZXJ2ZXIiLCJpYXQiOjE1NzEwNDAyMTUsImV4cCI6MjUzMzk1NDE3ODQ0LCJhdWQiOiJnZXRmZXJkaS5jb20iLCJzdWIiOiJmZXJkaUBsb2NhbGhvc3QiLCJ1c2VySWQiOiIxIn0.9_TWFGp6HROv8Yg82Rt6i1-95jqWym40a-HmgrdMC6M';
+const LOGIN_SUCCESS_TOKEN =
+  'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJGZXJkaSBJbnRlcm5hbCBTZXJ2ZXIiLCJpYXQiOjE1NzEwNDAyMTUsImV4cCI6MjUzMzk1NDE3ODQ0LCJhdWQiOiJnZXRmZXJkaS5jb20iLCJzdWIiOiJmZXJkaUBsb2NhbGhvc3QiLCJ1c2VySWQiOiIxIn0.9_TWFGp6HROv8Yg82Rt6i1-95jqWym40a-HmgrdMC6M';
 
 const DEFAULT_USER_DATA = {
   accountType: 'individual',
@@ -45,10 +46,7 @@ const DEFAULT_USER_DATA = {
 
 class UserController {
   // Register a new user
-  async signup({
-    request,
-    response,
-  }) {
+  async signup({ request, response }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       firstname: 'required',
@@ -70,10 +68,7 @@ class UserController {
   }
 
   // Login using an existing user
-  async login({
-    request,
-    response,
-  }) {
+  async login({ request, response }) {
     if (!request.header('Authorization')) {
       return response.status(401).send({
         message: 'Please provide authorization',
@@ -88,23 +83,21 @@ class UserController {
   }
 
   // Return information about the current user
-  async me({
-    response,
-  }) {
+  async me({ response }) {
     const user = await User.find(1);
 
-    const settings = typeof user.settings === 'string' ? JSON.parse(user.settings) : user.settings;
+    const settings =
+      typeof user.settings === 'string'
+        ? JSON.parse(user.settings)
+        : user.settings;
 
     return response.send({
       ...DEFAULT_USER_DATA,
-      ...settings || {},
+      ...settings,
     });
   }
 
-  async updateMe({
-    request,
-    response,
-  }) {
+  async updateMe({ request, response }) {
     const user = await User.find(1);
 
     let settings = user.settings || {};
@@ -125,16 +118,11 @@ class UserController {
         ...DEFAULT_USER_DATA,
         ...newSettings,
       },
-      status: [
-        'data-updated',
-      ],
+      status: ['data-updated'],
     });
   }
 
-  async import({
-    request,
-    response,
-  }) {
+  async import({ request, response }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       email: 'required|email',
@@ -142,7 +130,8 @@ class UserController {
       server: 'required',
     });
     if (validation.fails()) {
-      let errorMessage = 'There was an error while trying to import your account:\n';
+      let errorMessage =
+        'There was an error while trying to import your account:\n';
       for (const message of validation.messages()) {
         if (message.validation === 'required') {
           errorMessage += `- Please make sure to supply your ${message.field}\n`;
@@ -155,13 +144,12 @@ class UserController {
       return response.status(401).send(errorMessage);
     }
 
-    const {
-      email,
-      password,
-      server,
-    } = request.all();
+    const { email, password, server } = request.all();
 
-    const hashedPassword = crypto.createHash('sha256').update(password).digest('base64');
+    const hashedPassword = crypto
+      .createHash('sha256')
+      .update(password)
+      .digest('base64');
 
     // Try to get an authentication token
     let token;
@@ -178,16 +166,17 @@ class UserController {
       const content = await rawResponse.json();
 
       if (!content.message || content.message !== 'Successfully logged in') {
-        const errorMessage = 'Could not login into Franz with your supplied credentials. Please check and try again';
+        const errorMessage =
+          'Could not login into Franz with your supplied credentials. Please check and try again';
         return response.status(401).send(errorMessage);
       }
 
       // eslint-disable-next-line prefer-destructuring
       token = content.token;
-    } catch (e) {
+    } catch (error) {
       return response.status(401).send({
         message: 'Cannot login to Franz',
-        error: e,
+        error,
       });
     }
 
@@ -195,12 +184,13 @@ class UserController {
     let userInf = false;
     try {
       userInf = await apiRequest(server, 'me', 'GET', token);
-    } catch (e) {
-      const errorMessage = `Could not get your user info from Franz. Please check your credentials or try again later.\nError: ${e}`;
+    } catch (error) {
+      const errorMessage = `Could not get your user info from Franz. Please check your credentials or try again later.\nError: ${error}`;
       return response.status(401).send(errorMessage);
     }
     if (!userInf) {
-      const errorMessage = 'Could not get your user info from Franz. Please check your credentials or try again later';
+      const errorMessage =
+        'Could not get your user info from Franz. Please check your credentials or try again later';
       return response.status(401).send(errorMessage);
     }
 
@@ -213,8 +203,8 @@ class UserController {
       for (const service of services) {
         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}`;
+    } catch (error) {
+      const errorMessage = `Could not import your services into our system.\nError: ${error}`;
       return response.status(401).send(errorMessage);
     }
 
@@ -225,12 +215,14 @@ class UserController {
       for (const workspace of workspaces) {
         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}`;
+    } catch (error) {
+      const errorMessage = `Could not import your workspaces into our system.\nError: ${error}`;
       return response.status(401).send(errorMessage);
     }
 
-    return response.send('Your account has been imported. You can now use your Franz account in Ferdi.');
+    return response.send(
+      'Your account has been imported. You can now use your Franz account in Ferdi.',
+    );
   }
 
   // Account import/export
@@ -255,10 +247,7 @@ class UserController {
       .send(exportData);
   }
 
-  async importFerdi({
-    request,
-    response,
-  }) {
+  async importFerdi({ request, response }) {
     const validation = await validateAll(request.all(), {
       file: 'required',
     });
@@ -269,8 +258,10 @@ class UserController {
     let file;
     try {
       file = JSON.parse(request.input('file'));
-    } catch (e) {
-      return response.send('Could not import: Invalid file, could not read file');
+    } catch {
+      return response.send(
+        'Could not import: Invalid file, could not read file',
+      );
     }
 
     if (!file || !file.services || !file.workspaces) {
@@ -284,8 +275,8 @@ class UserController {
       for (const service of file.services) {
         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}`;
+    } catch (error) {
+      const errorMessage = `Could not import your services into our system.\nError: ${error}`;
       return response.send(errorMessage);
     }
 
@@ -294,8 +285,8 @@ class UserController {
       for (const workspace of file.workspaces) {
         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}`;
+    } catch (error) {
+      const errorMessage = `Could not import your workspaces into our system.\nError: ${error}`;
       return response.status(401).send(errorMessage);
     }
 
@@ -306,15 +297,29 @@ class UserController {
     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) {
+    } 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) {
+    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);
     }
 
@@ -332,12 +337,19 @@ class UserController {
     let newServiceId;
     do {
       newServiceId = uuid();
-    } while ((await Service.query().where('serviceId', newServiceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
+    } 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) {
+    if (
+      service.settings &&
+      typeof service.settings === 'string' &&
+      service.settings.length > 0
+    ) {
       service.settings = JSON.parse(service.settings);
     }
 
diff --git a/src/internal-server/app/Controllers/Http/WorkspaceController.js b/src/internal-server/app/Controllers/Http/WorkspaceController.js
index 773312a0b..9d461135e 100644
--- a/src/internal-server/app/Controllers/Http/WorkspaceController.js
+++ b/src/internal-server/app/Controllers/Http/WorkspaceController.js
@@ -1,16 +1,11 @@
 const Workspace = use('App/Models/Workspace');
-const {
-  validateAll,
-} = use('Validator');
+const { validateAll } = use('Validator');
 
-const uuid = require('uuid/v4');
+const { v4: uuid } = require('uuid');
 
 class WorkspaceController {
   // Create a new workspace for user
-  async create({
-    request,
-    response,
-  }) {
+  async create({ request, response }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       name: 'required',
@@ -29,10 +24,13 @@ class WorkspaceController {
     let workspaceId;
     do {
       workspaceId = uuid();
-    } while ((await Workspace.query().where('workspaceId', workspaceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
+    } 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;
+    const { name } = data;
     delete data.name;
 
     await Workspace.create({
@@ -52,11 +50,7 @@ class WorkspaceController {
     });
   }
 
-  async edit({
-    request,
-    response,
-    params,
-  }) {
+  async edit({ request, response, params }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       name: 'required',
@@ -71,20 +65,19 @@ class WorkspaceController {
     }
 
     const data = request.all();
-    const {
-      id,
-    } = params;
+    const { id } = params;
 
     // Update data in database
-    await (Workspace.query()
-      .where('workspaceId', id)).update({
-      name: data.name,
-      services: JSON.stringify(data.services),
-    });
+    await Workspace.query()
+      .where('workspaceId', id)
+      .update({
+        name: data.name,
+        services: JSON.stringify(data.services),
+      });
 
     // Get updated row
-    const workspace = (await Workspace.query()
-      .where('workspaceId', id).fetch()).rows[0];
+    const workspace = (await Workspace.query().where('workspaceId', id).fetch())
+      .rows[0];
 
     return response.send({
       id: workspace.workspaceId,
@@ -113,13 +106,10 @@ class WorkspaceController {
       });
     }
 
-    const {
-      id,
-    } = params;
+    const { id } = params;
 
     // Update data in database
-    await (Workspace.query()
-      .where('workspaceId', id)).delete();
+    await Workspace.query().where('workspaceId', id).delete();
 
     return response.send({
       message: 'Successfully deleted workspace',
@@ -127,9 +117,7 @@ class WorkspaceController {
   }
 
   // List all workspaces a user has created
-  async list({
-    response,
-  }) {
+  async list({ response }) {
     const workspaces = (await Workspace.all()).rows;
     // Convert to array with all data Franz wants
     let workspacesArray = [];
@@ -138,7 +126,10 @@ class WorkspaceController {
         id: workspace.workspaceId,
         name: workspace.name,
         order: workspace.order,
-        services: typeof workspace.services === 'string' ? JSON.parse(workspace.services) : workspace.services,
+        services:
+          typeof workspace.services === 'string'
+            ? JSON.parse(workspace.services)
+            : workspace.services,
         userId: 1,
       }));
     }
diff --git a/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js b/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js
index 87f1f6c25..9591cdc41 100644
--- a/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js
+++ b/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js
@@ -1,6 +1,6 @@
 class ConvertEmptyStringsToNull {
   async handle({ request }, next) {
-    if (Object.keys(request.body).length) {
+    if (Object.keys(request.body).length > 0) {
       request.body = Object.assign(
         ...Object.keys(request.body).map(key => ({
           [key]: request.body[key] !== '' ? request.body[key] : null,
diff --git a/src/internal-server/app/Models/Recipe.js b/src/internal-server/app/Models/Recipe.js
index bd9741114..f9370e206 100644
--- a/src/internal-server/app/Models/Recipe.js
+++ b/src/internal-server/app/Models/Recipe.js
@@ -1,7 +1,6 @@
 /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
 const Model = use('Model');
 
-class Recipe extends Model {
-}
+class Recipe extends Model {}
 
 module.exports = Recipe;
diff --git a/src/internal-server/app/Models/Service.js b/src/internal-server/app/Models/Service.js
index a2e5c981e..95321686c 100644
--- a/src/internal-server/app/Models/Service.js
+++ b/src/internal-server/app/Models/Service.js
@@ -1,7 +1,6 @@
 /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
 const Model = use('Model');
 
-class Service extends Model {
-}
+class Service extends Model {}
 
 module.exports = Service;
diff --git a/src/internal-server/app/Models/Token.js b/src/internal-server/app/Models/Token.js
index 83e989117..1388b94ad 100644
--- a/src/internal-server/app/Models/Token.js
+++ b/src/internal-server/app/Models/Token.js
@@ -1,7 +1,6 @@
 /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
 const Model = use('Model');
 
-class Token extends Model {
-}
+class Token extends Model {}
 
 module.exports = Token;
diff --git a/src/internal-server/app/Models/User.js b/src/internal-server/app/Models/User.js
index 907710d8d..f17f04c3e 100644
--- a/src/internal-server/app/Models/User.js
+++ b/src/internal-server/app/Models/User.js
@@ -2,7 +2,6 @@
 /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
 const Model = use('Model');
 
-class User extends Model {
-}
+class User extends Model {}
 
 module.exports = User;
diff --git a/src/internal-server/app/Models/Workspace.js b/src/internal-server/app/Models/Workspace.js
index dcf39ac75..c47c02e37 100644
--- a/src/internal-server/app/Models/Workspace.js
+++ b/src/internal-server/app/Models/Workspace.js
@@ -1,7 +1,6 @@
 /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
 const Model = use('Model');
 
-class Workspace extends Model {
-}
+class Workspace extends Model {}
 
 module.exports = Workspace;
diff --git a/src/internal-server/config/shield.js b/src/internal-server/config/shield.js
index 76f430e91..4ff22c3f9 100644
--- a/src/internal-server/config/shield.js
+++ b/src/internal-server/config/shield.js
@@ -25,8 +25,7 @@ module.exports = {
     | }
     |
     */
-    directives: {
-    },
+    directives: {},
     /*
     |--------------------------------------------------------------------------
     | Report only
diff --git a/src/internal-server/public/js/transfer.js b/src/internal-server/public/js/transfer.js
index 8382bba02..36fdbd61a 100644
--- a/src/internal-server/public/js/transfer.js
+++ b/src/internal-server/public/js/transfer.js
@@ -1,13 +1,17 @@
-const submitBtn = document.getElementById('submit');
-const fileInput = document.getElementById('file');
-const fileOutput = document.getElementById('fileoutput');
+const submitBtn = document.querySelector('#submit');
+const fileInput = document.querySelector('#file');
+const fileOutput = document.querySelector('#fileoutput');
 
-fileInput.addEventListener('change', () => {
+fileInput?.addEventListener('change', () => {
   const reader = new FileReader();
-  reader.onload = () => {
+  reader.addEventListener('load', () => {
     const text = reader.result;
-    fileOutput.value = text;
-    submitBtn.disabled = false;
-  };
+    if (fileOutput) {
+      fileOutput.value = text;
+    }
+    if (submitBtn) {
+      submitBtn.disabled = false;
+    }
+  });
   reader.readAsText(fileInput.files[0]);
 });
diff --git a/src/internal-server/start.js b/src/internal-server/start.ts
index 5ccc1330e..392f7cf41 100644
--- a/src/internal-server/start.js
+++ b/src/internal-server/start.ts
@@ -15,16 +15,16 @@
 |     Make sure to pass a relative path from the project root.
 */
 
-const fold = require('@adonisjs/fold');
-const { Ignitor } = require('@adonisjs/ignitor');
-const fs = require('fs-extra');
-const path = require('path');
-const { LOCAL_HOSTNAME } = require('../config');
-const { isWindows } = require('../environment');
+import fold from '@adonisjs/fold';
+import { Ignitor } from '@adonisjs/ignitor';
+import fs from 'fs-extra';
+import path from 'path';
+import { LOCAL_HOSTNAME } from '../config';
+import { isWindows } from '../environment';
 
 process.env.ENV_PATH = path.join(__dirname, 'env.ini');
 
-module.exports = async (userPath, port) => {
+export const server = async (userPath: string, port: number) => {
   const dbPath = path.join(userPath, 'server.sqlite');
   const dbTemplatePath = path.join(__dirname, 'database', 'template.sqlite');
 
@@ -45,7 +45,7 @@ module.exports = async (userPath, port) => {
   process.env.DB_PATH = dbPath;
   process.env.USER_PATH = userPath;
   process.env.HOST = LOCAL_HOSTNAME;
-  process.env.PORT = port;
+  process.env.PORT = port.toString();
 
-  new Ignitor(fold).appRoot(__dirname).fireHttpServer().catch(console.error); // eslint-disable-line no-console
+  new Ignitor(fold).appRoot(__dirname).fireHttpServer().catch(console.error);
 };
diff --git a/src/internal-server/start/kernel.js b/src/internal-server/start/kernel.js
index 7b540f829..f72e445f2 100644
--- a/src/internal-server/start/kernel.js
+++ b/src/internal-server/start/kernel.js
@@ -32,8 +32,7 @@ const globalMiddleware = [
 | Route.get().middleware('auth')
 |
 */
-const namedMiddleware = {
-};
+const namedMiddleware = {};
 
 /*
 |--------------------------------------------------------------------------
@@ -45,11 +44,8 @@ const namedMiddleware = {
 | control over request lifecycle.
 |
 */
-const serverMiddleware = [
-  'Adonis/Middleware/Static',
-];
+const serverMiddleware = ['Adonis/Middleware/Static'];
 
-Server
-  .registerGlobal(globalMiddleware)
+Server.registerGlobal(globalMiddleware)
   .registerNamed(namedMiddleware)
   .use(serverMiddleware);
diff --git a/src/internal-server/start/migrate.js b/src/internal-server/start/migrate.js
index c27e07bc5..97cefcc54 100644
--- a/src/internal-server/start/migrate.js
+++ b/src/internal-server/start/migrate.js
@@ -1,4 +1,4 @@
-const { ferdiVersion } = require('../../environment');
+const { ferdiVersion } = require('../../environment-remote');
 
 /**
  * Migrate server database to work with current Ferdi version
@@ -6,29 +6,39 @@ const { ferdiVersion } = require('../../environment');
 const Database = use('Database');
 const User = use('App/Models/User');
 
-const migrateLog = (text) => {
-  console.log('\x1b[36m%s\x1b[0m', 'Ferdi Migration:', '\x1b[0m', text);
+const migrateLog = text => {
+  console.log('\u001B[36m%s\u001B[0m', 'Ferdi Migration:', '\u001B[0m', text);
 };
 
 module.exports = async () => {
   migrateLog('🧙�  Running database migration wizard');
 
   // Make sure user table exists
-  await Database.raw('CREATE TABLE IF NOT EXISTS `users` (`id` integer not null primary key autoincrement, `settings` text, `created_at` datetime, `updated_at` datetime);');
+  await Database.raw(
+    'CREATE TABLE IF NOT EXISTS `users` (`id` integer not null primary key autoincrement, `settings` text, `created_at` datetime, `updated_at` datetime);',
+  );
 
   const user = await User.find(1);
   let settings;
   if (!user) {
-    migrateLog('🎩  Migrating from old Ferdi version as user doesn\'t exist');
+    migrateLog("🎩  Migrating from old Ferdi version as user doesn't exist");
 
     // Create new user
     await Database.raw('INSERT INTO  "users" ("id") VALUES (\'1\');');
   } else {
-    settings = typeof user.settings === 'string' ? JSON.parse(user.settings) : user.settings;
+    settings =
+      typeof user.settings === 'string'
+        ? JSON.parse(user.settings)
+        : user.settings;
   }
 
-  if (!settings || !settings.db_version || settings.db_version !== ferdiVersion) {
-    const srcVersion = settings && settings.db_version ? settings.db_version : '5.4.0-beta.2';
+  if (
+    !settings ||
+    !settings.db_version ||
+    settings.db_version !== ferdiVersion
+  ) {
+    const srcVersion =
+      settings && settings.db_version ? settings.db_version : '5.4.0-beta.2';
     migrateLog(`🔮  Migrating table from ${srcVersion} to ${ferdiVersion}`);
 
     // Migrate database to current Ferdi version
diff --git a/src/internal-server/start/routes.js b/src/internal-server/start/routes.js
index e75380ccd..db74479c9 100644
--- a/src/internal-server/start/routes.js
+++ b/src/internal-server/start/routes.js
@@ -8,7 +8,7 @@
 /** @type {typeof import('@adonisjs/framework/src/Route/Manager')} */
 const Route = use('Route');
 
-const { API_VERSION } = require('../../environment');
+const { API_VERSION } = require('../../environment-remote');
 // Run latest database migration
 const migrate = require('./migrate');
 
diff --git a/src/internal-server/test.js b/src/internal-server/test.js
deleted file mode 100644
index 8d4807d06..000000000
--- a/src/internal-server/test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const path = require('path');
-const fs = require('fs-extra');
-const server = require('./start');
-
-const dummyUserFolder = path.join(__dirname, 'user_data');
-
-fs.ensureDirSync(dummyUserFolder);
-
-server(dummyUserFolder, 45568);
diff --git a/src/internal-server/test.ts b/src/internal-server/test.ts
new file mode 100644
index 000000000..437a2813b
--- /dev/null
+++ b/src/internal-server/test.ts
@@ -0,0 +1,9 @@
+import path from 'path';
+import fs from 'fs-extra';
+import { server } from './start';
+
+const dummyUserFolder = path.join(__dirname, 'user_data');
+
+fs.ensureDirSync(dummyUserFolder);
+
+server(dummyUserFolder, 45_568);
diff --git a/src/lib/DBus.js b/src/lib/DBus.ts
index 9baaea014..b1febc2d1 100644
--- a/src/lib/DBus.js
+++ b/src/lib/DBus.ts
@@ -1,10 +1,12 @@
-import { sessionBus } from 'dbus-next';
+import { MessageBus, sessionBus } from 'dbus-next';
 import { isLinux } from '../environment';
 
 export default class DBus {
-  bus = null;
+  bus: MessageBus | null = null;
 
-  constructor(trayIcon) {
+  trayIcon: any;
+
+  constructor(trayIcon: any) {
     this.trayIcon = trayIcon;
   }
 
@@ -19,15 +21,23 @@ export default class DBus {
     }
 
     // HACK Hook onto the MessageBus to track StatusNotifierWatchers
-    this.bus._addMatch("type='signal',sender='org.freedesktop.DBus',interface='org.freedesktop.DBus',path='/org/freedesktop/DBus',member='NameOwnerChanged'");
+    // @ts-expect-error Property '_addMatch' does not exist on type 'MessageBus'.
+    this.bus._addMatch(
+      "type='signal',sender='org.freedesktop.DBus',interface='org.freedesktop.DBus',path='/org/freedesktop/DBus',member='NameOwnerChanged'",
+    );
     const mangled = JSON.stringify({
       path: '/org/freedesktop/DBus',
       interface: 'org.freedesktop.DBus',
       member: 'NameOwnerChanged',
     });
-    this.bus._signals.on(mangled, (msg) => {
+    // @ts-expect-error Property '_signals' does not exist on type 'MessageBus'.
+    this.bus._signals.on(mangled, (msg: { body: [any, any, any] }) => {
       const [name, oldOwner, newOwner] = msg.body;
-      if (name === 'org.kde.StatusNotifierWatcher' && oldOwner !== newOwner && newOwner !== '') {
+      if (
+        name === 'org.kde.StatusNotifierWatcher' &&
+        oldOwner !== newOwner &&
+        newOwner !== ''
+      ) {
         // Leave ample time for the StatusNotifierWatcher to be initialized
         setTimeout(() => {
           this.trayIcon.recreateIfVisible();
diff --git a/src/lib/Form.js b/src/lib/Form.ts
index 9b8321948..9b8321948 100644
--- a/src/lib/Form.js
+++ b/src/lib/Form.ts
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 5dae56544..cd86f1669 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,5 +1,5 @@
 import { clipboard } from 'electron';
-import { app, Menu, systemPreferences } from '@electron/remote';
+import { app, Menu, dialog, systemPreferences } from '@electron/remote';
 import { autorun, observable } from 'mobx';
 import { defineMessages } from 'react-intl';
 import {
@@ -20,6 +20,7 @@ import {
   addNewServiceShortcutKey,
   muteFerdiShortcutKey,
 } from '../environment';
+import { aboutAppDetails } from '../environment-remote';
 import { todosStore } from '../features/todos';
 import { todoActions } from '../features/todos/actions';
 import { workspaceActions } from '../features/workspaces/actions';
@@ -31,284 +32,283 @@ import globalMessages from '../i18n/globalMessages';
 const menuItems = defineMessages({
   edit: {
     id: 'menu.edit',
-    defaultMessage: '!!!Edit',
+    defaultMessage: 'Edit',
   },
   undo: {
     id: 'menu.edit.undo',
-    defaultMessage: '!!!Undo',
+    defaultMessage: 'Undo',
   },
   redo: {
     id: 'menu.edit.redo',
-    defaultMessage: '!!!Redo',
+    defaultMessage: 'Redo',
   },
   cut: {
     id: 'menu.edit.cut',
-    defaultMessage: '!!!Cut',
+    defaultMessage: 'Cut',
   },
   copy: {
     id: 'menu.edit.copy',
-    defaultMessage: '!!!Copy',
+    defaultMessage: 'Copy',
   },
   paste: {
     id: 'menu.edit.paste',
-    defaultMessage: '!!!Paste',
+    defaultMessage: 'Paste',
   },
   pasteAndMatchStyle: {
     id: 'menu.edit.pasteAndMatchStyle',
-    defaultMessage: '!!!Paste And Match Style',
+    defaultMessage: 'Paste And Match Style',
   },
   delete: {
     id: 'menu.edit.delete',
-    defaultMessage: '!!!Delete',
+    defaultMessage: 'Delete',
   },
   selectAll: {
     id: 'menu.edit.selectAll',
-    defaultMessage: '!!!Select All',
+    defaultMessage: 'Select All',
   },
   findInPage: {
     id: 'menu.edit.findInPage',
-    defaultMessage: '!!!Find in Page',
+    defaultMessage: 'Find in Page',
   },
   speech: {
     id: 'menu.edit.speech',
-    defaultMessage: '!!!Speech',
+    defaultMessage: 'Speech',
   },
   startSpeaking: {
     id: 'menu.edit.startSpeaking',
-    defaultMessage: '!!!Start Speaking',
+    defaultMessage: 'Start Speaking',
   },
   stopSpeaking: {
     id: 'menu.edit.stopSpeaking',
-    defaultMessage: '!!!Stop Speaking',
+    defaultMessage: 'Stop Speaking',
   },
   startDictation: {
     id: 'menu.edit.startDictation',
-    defaultMessage: '!!!Start Dictation',
+    defaultMessage: 'Start Dictation',
   },
   emojiSymbols: {
     id: 'menu.edit.emojiSymbols',
-    defaultMessage: '!!!Emoji & Symbols',
+    defaultMessage: 'Emoji & Symbols',
   },
   openQuickSwitch: {
     id: 'menu.view.openQuickSwitch',
-    defaultMessage: '!!!Open Quick Switch',
+    defaultMessage: 'Open Quick Switch',
   },
   back: {
     id: 'menu.view.back',
-    defaultMessage: '!!!Back',
+    defaultMessage: 'Back',
   },
   forward: {
     id: 'menu.view.forward',
-    defaultMessage: '!!!Forward',
+    defaultMessage: 'Forward',
   },
   resetZoom: {
     id: 'menu.view.resetZoom',
-    defaultMessage: '!!!Actual Size',
+    defaultMessage: 'Actual Size',
   },
   zoomIn: {
     id: 'menu.view.zoomIn',
-    defaultMessage: '!!!Zoom In',
+    defaultMessage: 'Zoom In',
   },
   zoomOut: {
     id: 'menu.view.zoomOut',
-    defaultMessage: '!!!Zoom Out',
+    defaultMessage: 'Zoom Out',
   },
   toggleFullScreen: {
     id: 'menu.view.toggleFullScreen',
-    defaultMessage: '!!!Toggle Full Screen',
+    defaultMessage: 'Toggle Full Screen',
   },
   toggleDarkMode: {
     id: 'menu.view.toggleDarkMode',
-    defaultMessage: '!!!Toggle Dark Mode',
+    defaultMessage: 'Toggle Dark Mode',
   },
   toggleDevTools: {
     id: 'menu.view.toggleDevTools',
-    defaultMessage: '!!!Toggle Developer Tools',
+    defaultMessage: 'Toggle Developer Tools',
   },
   toggleTodosDevTools: {
     id: 'menu.view.toggleTodosDevTools',
-    defaultMessage: '!!!Toggle Todos Developer Tools',
+    defaultMessage: 'Toggle Todos Developer Tools',
   },
   toggleServiceDevTools: {
     id: 'menu.view.toggleServiceDevTools',
-    defaultMessage: '!!!Toggle Service Developer Tools',
+    defaultMessage: 'Toggle Service Developer Tools',
   },
   reloadService: {
     id: 'menu.view.reloadService',
-    defaultMessage: '!!!Reload Service',
+    defaultMessage: 'Reload Service',
   },
   reloadFerdi: {
     id: 'menu.view.reloadFerdi',
-    defaultMessage: '!!!Reload Ferdi',
+    defaultMessage: 'Reload Ferdi',
   },
   lockFerdi: {
     id: 'menu.view.lockFerdi',
-    defaultMessage: '!!!Lock Ferdi',
+    defaultMessage: 'Lock Ferdi',
   },
   reloadTodos: {
     id: 'menu.view.reloadTodos',
-    defaultMessage: '!!!Reload ToDos',
+    defaultMessage: 'Reload ToDos',
   },
   minimize: {
     id: 'menu.window.minimize',
-    defaultMessage: '!!!Minimize',
+    defaultMessage: 'Minimize',
   },
   close: {
     id: 'menu.window.close',
-    defaultMessage: '!!!Close',
+    defaultMessage: 'Close',
   },
   learnMore: {
     id: 'menu.help.learnMore',
-    defaultMessage: '!!!Learn More',
+    defaultMessage: 'Learn More',
   },
   changelog: {
     id: 'menu.help.changelog',
-    defaultMessage: '!!!Changelog',
+    defaultMessage: 'Changelog',
   },
   importExportData: {
     id: 'menu.help.importExportData',
-    defaultMessage: '!!!Import/Export Configuration Data',
+    defaultMessage: 'Import/Export Configuration Data',
   },
   support: {
     id: 'menu.help.support',
-    defaultMessage: '!!!Support',
+    defaultMessage: 'Support',
   },
   debugInfo: {
     id: 'menu.help.debugInfo',
-    defaultMessage: '!!!Copy Debug Information',
+    defaultMessage: 'Copy Debug Information',
   },
   publishDebugInfo: {
     id: 'menu.help.publishDebugInfo',
-    defaultMessage: '!!!Publish Debug Information',
+    defaultMessage: 'Publish Debug Information',
   },
   debugInfoCopiedHeadline: {
     id: 'menu.help.debugInfoCopiedHeadline',
-    defaultMessage: '!!!Ferdi Debug Information',
+    defaultMessage: 'Ferdi Debug Information',
   },
   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',
-    defaultMessage: '!!!Unlock with Touch ID',
+    defaultMessage: 'Unlock with Touch ID',
   },
   touchIdPrompt: {
     id: 'locked.touchIdPrompt',
-    defaultMessage: '!!!unlock via Touch ID',
+    defaultMessage: 'unlock via Touch ID',
   },
   tos: {
     id: 'menu.help.tos',
-    defaultMessage: '!!!Terms of Service',
+    defaultMessage: 'Terms of Service',
   },
   privacy: {
     id: 'menu.help.privacy',
-    defaultMessage: '!!!Privacy Statement',
+    defaultMessage: 'Privacy Statement',
   },
   file: {
     id: 'menu.file',
-    defaultMessage: '!!!File',
+    defaultMessage: 'File',
   },
   view: {
     id: 'menu.view',
-    defaultMessage: '!!!View',
+    defaultMessage: 'View',
   },
   services: {
     id: 'menu.services',
-    defaultMessage: '!!!Services',
+    defaultMessage: 'Services',
   },
   window: {
     id: 'menu.window',
-    defaultMessage: '!!!Window',
+    defaultMessage: 'Window',
   },
   help: {
     id: 'menu.help',
-    defaultMessage: '!!!Help',
+    defaultMessage: 'Help',
   },
   about: {
     id: 'menu.app.about',
-    defaultMessage: '!!!About Ferdi',
+    defaultMessage: 'About Ferdi',
   },
   checkForUpdates: {
     id: 'menu.app.checkForUpdates',
-    defaultMessage: '!!!Check for updates',
+    defaultMessage: 'Check for updates',
   },
   hide: {
     id: 'menu.app.hide',
-    defaultMessage: '!!!Hide',
+    defaultMessage: 'Hide',
   },
   hideOthers: {
     id: 'menu.app.hideOthers',
-    defaultMessage: '!!!Hide Others',
+    defaultMessage: 'Hide Others',
   },
   unhide: {
     id: 'menu.app.unhide',
-    defaultMessage: '!!!Unhide',
+    defaultMessage: 'Unhide',
   },
   autohideMenuBar: {
     id: 'menu.app.autohideMenuBar',
-    defaultMessage: '!!!Auto-hide menu bar',
+    defaultMessage: 'Auto-hide menu bar',
   },
   addNewService: {
     id: 'menu.services.addNewService',
-    defaultMessage: '!!!Add New Service...',
+    defaultMessage: 'Add New Service...',
   },
   addNewWorkspace: {
     id: 'menu.workspaces.addNewWorkspace',
-    defaultMessage: '!!!Add New Workspace...',
+    defaultMessage: 'Add New Workspace...',
   },
   openWorkspaceDrawer: {
     id: 'menu.workspaces.openWorkspaceDrawer',
-    defaultMessage: '!!!Open workspace drawer',
+    defaultMessage: 'Open workspace drawer',
   },
   closeWorkspaceDrawer: {
     id: 'menu.workspaces.closeWorkspaceDrawer',
-    defaultMessage: '!!!Close workspace drawer',
+    defaultMessage: 'Close workspace drawer',
   },
   activateNextService: {
     id: 'menu.services.setNextServiceActive',
-    defaultMessage: '!!!Activate next service...',
+    defaultMessage: 'Activate next service',
   },
   activatePreviousService: {
     id: 'menu.services.activatePreviousService',
-    defaultMessage: '!!!Activate previous service...',
+    defaultMessage: 'Activate previous service',
   },
   muteApp: {
     id: 'sidebar.muteApp',
-    defaultMessage: '!!!Disable notifications & audio',
+    defaultMessage: 'Disable notifications & audio',
   },
   unmuteApp: {
     id: 'sidebar.unmuteApp',
-    defaultMessage: '!!!Enable notifications & audio',
+    defaultMessage: 'Enable notifications & audio',
   },
   workspaces: {
     id: 'menu.workspaces',
-    defaultMessage: '!!!Workspaces',
+    defaultMessage: 'Workspaces',
   },
   defaultWorkspace: {
     id: 'menu.workspaces.defaultWorkspace',
-    defaultMessage: '!!!Default',
+    defaultMessage: 'All services',
   },
   todos: {
     id: 'menu.todos',
-    defaultMessage: '!!!Todos',
+    defaultMessage: 'Todos',
   },
   openTodosDrawer: {
     id: 'menu.Todoss.openTodosDrawer',
-    defaultMessage: '!!!Open Todos drawer',
+    defaultMessage: 'Open Todos drawer',
   },
   closeTodosDrawer: {
     id: 'menu.Todoss.closeTodosDrawer',
-    defaultMessage: '!!!Close Todos drawer',
+    defaultMessage: 'Close Todos drawer',
   },
   enableTodos: {
     id: 'menu.todos.enableTodos',
-    defaultMessage: '!!!Enable Todos',
+    defaultMessage: 'Enable Todos',
   },
   serviceGoHome: {
     id: 'menu.services.goHome',
-    defaultMessage: '!!!Home',
+    defaultMessage: 'Home',
   },
 });
 
@@ -404,14 +404,14 @@ const _titleBarTemplateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.back),
-        accelerator: `${cmdOrCtrlShortcutKey()}+Left`,
+        accelerator: `${!isMac ? altKey() : cmdOrCtrlShortcutKey()}+Left`,
         click() {
           getActiveService().webview.goBack();
         },
       },
       {
         label: intl.formatMessage(menuItems.forward),
-        accelerator: `${cmdOrCtrlShortcutKey()}+Right`,
+        accelerator: `${!isMac ? altKey() : cmdOrCtrlShortcutKey()}+Right`,
         click() {
           getActiveService().webview.goForward();
         },
@@ -433,8 +433,7 @@ const _titleBarTemplateFactory = (intl, locked) => [
           const activeService = getActiveService().webview;
           const level = activeService.getZoomLevel();
 
-          // level 9 =~ +300% and setZoomLevel wouldnt zoom in further
-          if (level < 9) activeService.setZoomLevel(level + 1);
+          activeService.setZoomLevel(level + 0.5);
         },
       },
       {
@@ -444,8 +443,7 @@ const _titleBarTemplateFactory = (intl, locked) => [
           const activeService = getActiveService().webview;
           const level = activeService.getZoomLevel();
 
-          // level -9 =~ -50% and setZoomLevel wouldnt zoom out further
-          if (level > -9) activeService.setZoomLevel(level - 1);
+          activeService.setZoomLevel(level - 0.5);
         },
       },
       {
@@ -557,7 +555,7 @@ const _titleBarTemplateFactory = (intl, locked) => [
   },
 ];
 
-export default class FranzMenu {
+class FranzMenu {
   @observable currentTemplate = [];
 
   constructor(stores, actions) {
@@ -632,7 +630,7 @@ export default class FranzMenu {
         },
       );
 
-      if (this.stores.features.features.isTodosEnabled) {
+      if (this.stores.todos.isFeatureEnabledByUser) {
         tpl[1].submenu.push({
           label: intl.formatMessage(menuItems.toggleTodosDevTools),
           accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+${altKey()}+O`,
@@ -805,7 +803,12 @@ export default class FranzMenu {
     const about = {
       label: intl.formatMessage(menuItems.about),
       click: () => {
-        app.showAboutPanel();
+        dialog.showMessageBox({
+          type: 'info',
+          title: 'Franz Ferdinand',
+          message: 'Ferdi',
+          detail: aboutAppDetails(),
+        });
       },
     };
 
@@ -947,7 +950,7 @@ export default class FranzMenu {
       },
     );
 
-    services.allDisplayed.forEach((service, i) =>
+    for (const [i, service] of services.allDisplayed.entries()) {
       menu.push({
         label: this._getServiceName(service),
         accelerator: i < 9 ? `${cmdOrCtrlShortcutKey()}+${i + 1}` : null,
@@ -960,8 +963,8 @@ export default class FranzMenu {
             app.mainWindow.restore();
           }
         },
-      }),
-    );
+      });
+    }
 
     if (
       services.active &&
@@ -1013,23 +1016,23 @@ export default class FranzMenu {
       });
     }
 
-    menu.push({
-      type: 'separator',
-    });
-
-    // Default workspace
-    menu.push({
-      label: intl.formatMessage(menuItems.defaultWorkspace),
-      accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+0`,
-      type: 'radio',
-      checked: !activeWorkspace,
-      click: () => {
-        workspaceActions.deactivate();
+    menu.push(
+      {
+        type: 'separator',
       },
-    });
+      {
+        label: intl.formatMessage(menuItems.defaultWorkspace),
+        accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+0`,
+        type: 'radio',
+        checked: !activeWorkspace,
+        click: () => {
+          workspaceActions.deactivate();
+        },
+      },
+    );
 
     // Workspace items
-    workspaces.forEach((workspace, i) =>
+    for (const [i, workspace] of workspaces.entries()) {
       menu.push({
         label: workspace.name,
         accelerator:
@@ -1039,8 +1042,8 @@ export default class FranzMenu {
         click: () => {
           workspaceActions.activate({ workspace });
         },
-      }),
-    );
+      });
+    }
 
     return menu;
   }
@@ -1126,3 +1129,5 @@ export default class FranzMenu {
     return name;
   }
 }
+
+export default FranzMenu;
diff --git a/src/lib/TouchBar.js b/src/lib/TouchBar.ts
index 3397afdb2..417e20411 100644
--- a/src/lib/TouchBar.js
+++ b/src/lib/TouchBar.ts
@@ -5,7 +5,13 @@ import { autorun } from 'mobx';
 import { isMac, osRelease } from '../environment';
 
 export default class FranzTouchBar {
-  constructor(stores, actions) {
+  stores: any;
+
+  actions: any;
+
+  build: any;
+
+  constructor(stores: any, actions: any) {
     this.stores = stores;
     this.actions = actions;
 
@@ -15,8 +21,8 @@ export default class FranzTouchBar {
       if (isMac && semver.gt(osRelease, '16.6.0')) {
         this.build = autorun(this._build.bind(this));
       }
-    } catch (err) {
-      console.error(err);
+    } catch (error) {
+      console.error(error);
     }
   }
 
@@ -26,19 +32,26 @@ export default class FranzTouchBar {
     if (this.stores.user.isLoggedIn) {
       const { TouchBarButton, TouchBarSpacer } = TouchBar;
 
-      const buttons = [];
-      this.stores.services.allDisplayed.forEach(((service) => {
-        buttons.push(new TouchBarButton({
-          label: `${service.name}${service.unreadDirectMessageCount > 0
-            ? ' 🔴' : ''} ${service.unreadDirectMessageCount === 0
-              && service.unreadIndirectMessageCount > 0
-            ? ' ⚪�' : ''}`,
-          backgroundColor: service.isActive ? '#3498DB' : null,
-          click: () => {
-            this.actions.service.setActive({ serviceId: service.id });
-          },
-        }), new TouchBarSpacer({ size: 'small' }));
-      }));
+      const buttons: any[] = [];
+      for (const service of this.stores.services.allDisplayed) {
+        buttons.push(
+          new TouchBarButton({
+            label: `${service.name}${
+              service.unreadDirectMessageCount > 0 ? ' 🔴' : ''
+            } ${
+              service.unreadDirectMessageCount === 0 &&
+              service.unreadIndirectMessageCount > 0
+                ? ' ⚪�'
+                : ''
+            }`,
+            backgroundColor: service.isActive && '#3498DB',
+            click: () => {
+              this.actions.service.setActive({ serviceId: service.id });
+            },
+          }),
+          new TouchBarSpacer({ size: 'small' }),
+        );
+      }
 
       const touchBar = new TouchBar({ items: buttons });
       currentWindow.setTouchBar(touchBar);
diff --git a/src/models/News.ts b/src/models/News.ts
index a6ff86dda..4fc21f590 100644
--- a/src/models/News.ts
+++ b/src/models/News.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { ifUndefinedString, ifUndefinedBoolean } from '../jsUtils';
 
 interface INews {
@@ -20,11 +18,11 @@ export default class News {
 
   constructor(data: INews) {
     if (!data) {
-      throw Error('News config not valid');
+      throw new Error('News config not valid');
     }
 
     if (!data.id) {
-      throw Error('News requires Id');
+      throw new Error('News requires Id');
     }
 
     this.id = data.id;
diff --git a/src/models/Recipe.ts b/src/models/Recipe.ts
index 0a93fbc5a..859c75df0 100644
--- a/src/models/Recipe.ts
+++ b/src/models/Recipe.ts
@@ -1,6 +1,10 @@
 import semver from 'semver';
 import { pathExistsSync } from 'fs-extra';
 import { join } from 'path';
+import {
+  ifUndefinedString,
+  ifUndefinedBoolean,
+} from '../jsUtils';
 
 interface IRecipe {
   id: string;
@@ -22,11 +26,25 @@ interface IRecipe {
     autoHibernate?: boolean;
     partition?: string;
     message?: string;
+    allowFavoritesDelineationInUnreadCount?: boolean;
   };
 }
 
+// Note: Do NOT change these default values. If they change, then the corresponding changes in the recipes needs to be done
+// TODO: Need to reconcile other properties
+const DEFAULT_RECIPE_SETTINGS = {
+  hasDirectMessages: true,
+  hasIndirectMessages: false,
+  hasNotificationSound: false,
+  hasTeamId: false,
+  hasCustomUrl: false,
+  hasHostedOption: false,
+  allowFavoritesDelineationInUnreadCount: false,
+  disablewebsecurity: false,
+  autoHibernate: false,
+};
+
 export default class Recipe {
-  // Note: Do NOT change these default values. If they change, then the corresponding changes in the recipes needs to be done
   id: string = '';
 
   name: string = '';
@@ -37,21 +55,19 @@ export default class Recipe {
 
   aliases: string[] = [];
 
-  path: string = '';
-
   serviceURL: string = '';
 
-  hasDirectMessages: boolean = true;
+  hasDirectMessages: boolean = DEFAULT_RECIPE_SETTINGS.hasDirectMessages;
 
-  hasIndirectMessages: boolean = false;
+  hasIndirectMessages: boolean = DEFAULT_RECIPE_SETTINGS.hasIndirectMessages;
 
-  hasNotificationSound: boolean = false;
+  hasNotificationSound: boolean = DEFAULT_RECIPE_SETTINGS.hasNotificationSound;
 
-  hasTeamId: boolean = false;
+  hasTeamId: boolean = DEFAULT_RECIPE_SETTINGS.hasTeamId;
 
-  hasCustomUrl: boolean = false;
+  hasCustomUrl: boolean = DEFAULT_RECIPE_SETTINGS.hasCustomUrl;
 
-  hasHostedOption: boolean = false;
+  hasHostedOption: boolean = DEFAULT_RECIPE_SETTINGS.hasHostedOption;
 
   urlInputPrefix: string = '';
 
@@ -59,52 +75,54 @@ export default class Recipe {
 
   message: string = '';
 
-  disablewebsecurity: boolean = false;
+  allowFavoritesDelineationInUnreadCount: boolean = DEFAULT_RECIPE_SETTINGS.allowFavoritesDelineationInUnreadCount;
+
+  disablewebsecurity: boolean = DEFAULT_RECIPE_SETTINGS.disablewebsecurity;
 
-  autoHibernate: boolean = false;
+  // TODO: Is this even used?
+  autoHibernate: boolean = DEFAULT_RECIPE_SETTINGS.autoHibernate;
+
+  path: string = '';
 
   partition: string = '';
 
   // TODO: Need to reconcile which of these are optional/mandatory
   constructor(data: IRecipe) {
     if (!data) {
-      throw Error('Recipe config not valid');
+      throw new Error('Recipe config not valid');
     }
 
     if (!data.id) {
       // Ferdi 4 recipes do not have an Id
-      throw Error(`Recipe '${data.name}' requires Id`);
+      throw new Error(`Recipe '${data.name}' requires Id`);
     }
 
     if (!semver.valid(data.version)) {
-      throw Error(`Version ${data.version} of recipe '${data.name}' is not a valid semver version`);
+      throw new Error(`Version ${data.version} of recipe '${data.name}' is not a valid semver version`);
     }
 
-    this.id = data.id || this.id;
-    this.name = data.name || this.name;
-    this.version = data.version || this.version;
+    // from the recipe
+    this.id = ifUndefinedString(data.id, this.id);
+    this.name = ifUndefinedString(data.name, this.name);
+    this.version = ifUndefinedString(data.version, this.version);
     this.aliases = data.aliases || this.aliases;
+    this.serviceURL = ifUndefinedString(data.config.serviceURL, this.serviceURL);
+    this.hasDirectMessages = ifUndefinedBoolean(data.config.hasDirectMessages, this.hasDirectMessages);
+    this.hasIndirectMessages = ifUndefinedBoolean(data.config.hasIndirectMessages, this.hasIndirectMessages);
+    this.hasNotificationSound = ifUndefinedBoolean(data.config.hasNotificationSound, this.hasNotificationSound);
+    this.hasTeamId = ifUndefinedBoolean(data.config.hasTeamId, this.hasTeamId);
+    this.hasCustomUrl = ifUndefinedBoolean(data.config.hasCustomUrl, this.hasCustomUrl);
+    this.hasHostedOption = ifUndefinedBoolean(data.config.hasHostedOption, this.hasHostedOption);
+    this.urlInputPrefix = ifUndefinedString(data.config.urlInputPrefix, this.urlInputPrefix);
+    this.urlInputSuffix = ifUndefinedString(data.config.urlInputSuffix, this.urlInputSuffix);
+    this.disablewebsecurity = ifUndefinedBoolean(data.config.disablewebsecurity, this.disablewebsecurity);
+    this.autoHibernate = ifUndefinedBoolean(data.config.autoHibernate, this.autoHibernate);
+    this.message = ifUndefinedString(data.config.message, this.message);
+    this.allowFavoritesDelineationInUnreadCount = ifUndefinedBoolean(data.config.allowFavoritesDelineationInUnreadCount, this.allowFavoritesDelineationInUnreadCount);
+
+    // computed
     this.path = data.path;
-
-    this.serviceURL = data.config.serviceURL || this.serviceURL;
-
-    this.hasDirectMessages = data.config.hasDirectMessages || this.hasDirectMessages;
-    this.hasIndirectMessages = data.config.hasIndirectMessages || this.hasIndirectMessages;
-    this.hasNotificationSound = data.config.hasNotificationSound || this.hasNotificationSound;
-    this.hasTeamId = data.config.hasTeamId || this.hasTeamId;
-    this.hasCustomUrl = data.config.hasCustomUrl || this.hasCustomUrl;
-    this.hasHostedOption = data.config.hasHostedOption || this.hasHostedOption;
-
-    this.urlInputPrefix = data.config.urlInputPrefix || this.urlInputPrefix;
-    this.urlInputSuffix = data.config.urlInputSuffix || this.urlInputSuffix;
-
-    this.disablewebsecurity = data.config.disablewebsecurity || this.disablewebsecurity;
-
-    this.autoHibernate = data.config.autoHibernate || this.autoHibernate;
-
-    this.partition = data.config.partition || this.partition;
-
-    this.message = data.config.message || this.message;
+    this.partition = ifUndefinedString(data.config.partition, this.partition);
   }
 
   // TODO: Need to remove this if its not used anywhere
diff --git a/src/models/RecipePreview.ts b/src/models/RecipePreview.ts
index 4d2cc8450..fb8cb3e3e 100644
--- a/src/models/RecipePreview.ts
+++ b/src/models/RecipePreview.ts
@@ -1,5 +1,3 @@
-// @flow
-
 interface IRecipePreview {
   id: string;
   name: string;
@@ -21,11 +19,11 @@ export default class RecipePreview {
 
   constructor(data: IRecipePreview) {
     if (!data) {
-      throw Error('RecipePreview config not valid');
+      throw new Error('RecipePreview config not valid');
     }
 
     if (!data.id) {
-      throw Error(`RecipePreview '${data.name}' requires Id`);
+      throw new Error(`RecipePreview '${data.name}' requires Id`);
     }
 
     Object.assign(this, data);
diff --git a/src/models/Service.js b/src/models/Service.js
index 4ee054b2b..75dfde027 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -8,7 +8,11 @@ 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';
+import {
+  ifUndefinedString,
+  ifUndefinedBoolean,
+  ifUndefinedNumber,
+} from '../jsUtils';
 
 const debug = require('debug')('Ferdi:Service');
 
@@ -79,6 +83,8 @@ export default class Service {
 
   @observable isHibernationRequested = false;
 
+  @observable onlyShowFavoritesInUnreadCount = false;
+
   @observable lastUsed = Date.now(); // timestamp
 
   @observable lastHibernated = null; // timestamp
@@ -95,11 +101,11 @@ export default class Service {
 
   constructor(data, recipe) {
     if (!data) {
-      throw Error('Service config not valid');
+      throw new Error('Service config not valid');
     }
 
     if (!recipe) {
-      throw Error('Service recipe not valid');
+      throw new Error('Service recipe not valid');
     }
 
     this.recipe = recipe;
@@ -115,22 +121,55 @@ export default class Service {
 
     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.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.isDarkModeEnabled = ifUndefinedBoolean(
+      data.isDarkModeEnabled,
+      this.isDarkModeEnabled,
+    );
+    this.darkReaderSettings = ifUndefinedString(
+      data.darkReaderSettings,
+      this.darkReaderSettings,
+    );
+    this.hasCustomUploadedIcon = ifUndefinedBoolean(
+      data.hasCustomIcon,
+      this.hasCustomUploadedIcon,
+    );
+    this.onlyShowFavoritesInUnreadCount = ifUndefinedBoolean(
+      data.onlyShowFavoritesInUnreadCount,
+      this.onlyShowFavoritesInUnreadCount,
+    );
     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);
+    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;
     // The service store is probably not loaded yet so we need to use localStorage data to get active service
-    const isActive = window.localStorage.service && JSON.parse(window.localStorage.service).activeService === this.id;
+    const isActive =
+      window.localStorage.service &&
+      JSON.parse(window.localStorage.service).activeService === this.id;
     if (hibernateOnStartup && !isActive) {
       this.isHibernationRequested = true;
     }
@@ -158,6 +197,7 @@ export default class Service {
       team: this.team,
       url: this.url,
       hasCustomIcon: this.hasCustomIcon,
+      onlyShowFavoritesInUnreadCount: this.onlyShowFavoritesInUnreadCount,
     };
   }
 
@@ -189,9 +229,14 @@ export default class Service {
     if (this.recipe.hasCustomUrl && this.customUrl) {
       let url;
       try {
-        url = normalizeUrl(this.customUrl, { stripWWW: false, removeTrailingSlash: false });
-      } catch (err) {
-        console.error(`Service (${this.recipe.name}): '${this.customUrl}' is not a valid Url.`);
+        url = normalizeUrl(this.customUrl, {
+          stripWWW: false,
+          removeTrailingSlash: false,
+        });
+      } catch {
+        console.error(
+          `Service (${this.recipe.name}): '${this.customUrl}' is not a valid Url.`,
+        );
       }
 
       if (typeof this.recipe.buildUrl === 'function') {
@@ -241,7 +286,9 @@ export default class Service {
   }
 
   initializeWebViewEvents({ handleIPCMessage, openWindow, stores }) {
-    const webviewWebContents = webContents.fromId(this.webview.getWebContentsId());
+    const webviewWebContents = webContents.fromId(
+      this.webview.getWebContentsId(),
+    );
 
     this.userAgentModel.setWebviewReference(this.webview);
 
@@ -270,9 +317,15 @@ export default class Service {
       debug(this.name, 'knownCertificateHosts is not defined in the recipe');
     }
 
-    this.webview.addEventListener('ipc-message', async (e) => {
+    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} })();`)));
+        await Promise.all(
+          e.args.map(script =>
+            this.webview.executeJavaScript(
+              `"use strict"; (() => { ${script} })();`,
+            ),
+          ),
+        );
       } else {
         handleIPCMessage({
           serviceId: this.id,
@@ -282,27 +335,33 @@ export default class Service {
       }
     });
 
-    this.webview.addEventListener('new-window', (event, url, frameName, options) => {
-      debug('new-window', event, url, frameName, options);
-      if (!isValidExternalURL(event.url)) {
-        return;
-      }
-      if (event.disposition === 'foreground-tab' || event.disposition === 'background-tab') {
-        openWindow({
-          event,
-          url,
-          frameName,
-          options,
-        });
-      } else {
-        ipcRenderer.send('open-browser-window', {
-          url: event.url,
-          serviceId: this.id,
-        });
-      }
-    });
+    this.webview.addEventListener(
+      'new-window',
+      (event, url, frameName, options) => {
+        debug('new-window', event, url, frameName, options);
+        if (!isValidExternalURL(event.url)) {
+          return;
+        }
+        if (
+          event.disposition === 'foreground-tab' ||
+          event.disposition === 'background-tab'
+        ) {
+          openWindow({
+            event,
+            url,
+            frameName,
+            options,
+          });
+        } else {
+          ipcRenderer.send('open-browser-window', {
+            url: event.url,
+            serviceId: this.id,
+          });
+        }
+      },
+    );
 
-    this.webview.addEventListener('did-start-loading', (event) => {
+    this.webview.addEventListener('did-start-loading', event => {
       debug('Did start load', this.name, event);
 
       this.hasCrashed = false;
@@ -321,9 +380,13 @@ export default class Service {
     this.webview.addEventListener('did-frame-finish-load', didLoad.bind(this));
     this.webview.addEventListener('did-navigate', didLoad.bind(this));
 
-    this.webview.addEventListener('did-fail-load', (event) => {
+    this.webview.addEventListener('did-fail-load', event => {
       debug('Service failed to load', this.name, event);
-      if (event.isMainFrame && event.errorCode !== -21 && event.errorCode !== -3) {
+      if (
+        event.isMainFrame &&
+        event.errorCode !== -21 &&
+        event.errorCode !== -3
+      ) {
         this.isError = true;
         this.errorMessage = event.errorDescription;
         this.isLoading = false;
@@ -365,12 +428,12 @@ export default class Service {
 
   initializeWebViewListener() {
     if (this.webview && this.recipe.events) {
-      Object.keys(this.recipe.events).forEach((eventName) => {
+      for (const eventName of Object.keys(this.recipe.events)) {
         const eventHandler = this.recipe[this.recipe.events[eventName]];
         if (typeof eventHandler === 'function') {
           this.webview.addEventListener(eventName, eventHandler);
         }
-      });
+      }
     }
   }
 
diff --git a/src/models/User.ts b/src/models/User.ts
index 54a6838df..a04d46d3c 100644
--- a/src/models/User.ts
+++ b/src/models/User.ts
@@ -43,11 +43,11 @@ export default class User {
 
   constructor(data: IUser) {
     if (!data) {
-      throw Error('User config not valid');
+      throw new Error('User config not valid');
     }
 
     if (!data.id) {
-      throw Error('User requires Id');
+      throw new Error('User requires Id');
     }
 
     this.id = data.id;
diff --git a/src/models/UserAgent.js b/src/models/UserAgent.js
index 930ae19ef..33bf9d072 100644
--- a/src/models/UserAgent.js
+++ b/src/models/UserAgent.js
@@ -1,9 +1,4 @@
-import {
-  action,
-  computed,
-  observe,
-  observable,
-} from 'mobx';
+import { action, computed, observe, observable } from 'mobx';
 
 import defaultUserAgent from '../helpers/userAgent-helpers';
 
@@ -27,7 +22,7 @@ export default class UserAgent {
       this.getUserAgent = overrideUserAgent;
     }
 
-    observe(this, 'webview', (change) => {
+    observe(this, 'webview', change => {
       const { oldValue, newValue } = change;
       if (oldValue !== null) {
         this._removeWebviewEvents(oldValue);
@@ -52,23 +47,24 @@ export default class UserAgent {
     return defaultUserAgent();
   }
 
-  @computed get userAgentWithChromeVersion() {
+  @computed get serviceUserAgentPref() {
     if (typeof this.userAgentPref === 'string') {
       const trimmed = this.userAgentPref.trim();
       if (trimmed !== '') {
         return trimmed;
       }
     }
-    return this.defaultUserAgent;
+    return null;
   }
 
   @computed get userAgentWithoutChromeVersion() {
-    const withChrome = this.userAgentWithChromeVersion;
-    return withChrome.replace(/Chrome\/[0-9.]+/, 'Chrome');
+    const withChrome = this.defaultUserAgent;
+    return withChrome.replace(/Chrome\/[\d.]+/, 'Chrome');
   }
 
   @computed get userAgent() {
-    return this.chromelessUserAgent ? this.userAgentWithoutChromeVersion : this.userAgentWithChromeVersion;
+    return this.serviceUserAgentPref
+      || (this.chromelessUserAgent ? this.userAgentWithoutChromeVersion : this.defaultUserAgent);
   }
 
   @action setWebviewReference(webview) {
@@ -95,10 +91,10 @@ export default class UserAgent {
   _addWebviewEvents(webview) {
     debug('Adding event handlers');
 
-    this._willNavigateListener = (event) => this._handleNavigate(event.url, true);
+    this._willNavigateListener = event => this._handleNavigate(event.url, true);
     webview.addEventListener('will-navigate', this._willNavigateListener);
 
-    this._didNavigateListener = (event) => this._handleNavigate(event.url);
+    this._didNavigateListener = event => this._handleNavigate(event.url);
     webview.addEventListener('did-navigate', this._didNavigateListener);
   }
 
diff --git a/src/prop-types.ts b/src/prop-types.ts
index 459b9a7b9..07607f105 100644
--- a/src/prop-types.ts
+++ b/src/prop-types.ts
@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 
-// eslint-disable-next-line
 export const oneOrManyChildElements = PropTypes.oneOfType([
   PropTypes.arrayOf(PropTypes.element),
   PropTypes.element,
diff --git a/src/routes.js b/src/routes.js
index 4d32a59e0..502ea86f5 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -30,7 +30,6 @@ import { WORKSPACES_ROUTES } from './features/workspaces/constants';
 
 import SettingsStore from './stores/SettingsStore';
 
-export default
 @inject('stores', 'actions')
 @observer
 class Routes extends Component {
@@ -95,3 +94,5 @@ Routes.wrappedComponent.propTypes = {
   }).isRequired,
   history: PropTypes.any.isRequired,
 };
+
+export default Routes;
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 469e7519e..3d9d2b551 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -16,16 +16,17 @@ import { readJsonSync } from 'fs-extra';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
-import { CHECK_INTERVAL } from '../config';
+import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
 import {
-  DEFAULT_APP_SETTINGS,
   isMac,
-  ferdiVersion,
   electronVersion,
   osRelease,
+} from '../environment';
+import {
+  ferdiVersion,
   userDataPath,
   ferdiLocale,
-} from '../environment';
+} from '../environment-remote';
 import locales from '../i18n/translations';
 import { getLocale } from '../helpers/i18n-helpers';
 
@@ -251,16 +252,14 @@ export default class AppStore extends Store {
     // macOS catalina notifications hack
     // notifications got stuck after upgrade but forcing a notification
     // via `new Notification` triggered the permission request
-    if (isMac) {
-      if (!localStorage.getItem(CATALINA_NOTIFICATION_HACK_KEY)) {
-        debug('Triggering macOS Catalina notification permission trigger');
-        // eslint-disable-next-line no-new
-        new window.Notification('Welcome to Ferdi 5', {
-          body: 'Have a wonderful day & happy messaging.',
-        });
+    if (isMac && !localStorage.getItem(CATALINA_NOTIFICATION_HACK_KEY)) {
+      debug('Triggering macOS Catalina notification permission trigger');
+      // eslint-disable-next-line no-new
+      new window.Notification('Welcome to Ferdi 5', {
+        body: 'Have a wonderful day & happy messaging.',
+      });
 
-        localStorage.setItem(CATALINA_NOTIFICATION_HACK_KEY, true);
-      }
+      localStorage.setItem(CATALINA_NOTIFICATION_HACK_KEY, 'true');
     }
   }
 
@@ -325,7 +324,7 @@ export default class AppStore extends Store {
 
     debug('New notification', title, options);
 
-    notification.onclick = () => {
+    notification.addEventListener('click', () => {
       if (serviceId) {
         this.actions.service.sendIPCMessage({
           channel: `notification-onclick:${notificationId}`,
@@ -346,7 +345,7 @@ export default class AppStore extends Store {
 
         debug('Notification click handler');
       }
-    };
+    });
   }
 
   @action _setBadge({ unreadDirectMessageCount, unreadIndirectMessageCount }) {
@@ -360,7 +359,7 @@ export default class AppStore extends Store {
     ) {
       indicator = 0;
     } else {
-      indicator = parseInt(indicator, 10);
+      indicator = Number.parseInt(indicator, 10);
     }
 
     ipcRenderer.send('updateAppIndicator', {
@@ -379,8 +378,8 @@ export default class AppStore extends Store {
         debug('disabling launch on startup');
         autoLauncher.disable();
       }
-    } catch (err) {
-      console.warn(err);
+    } catch (error) {
+      console.warn(error);
     }
   }
 
@@ -438,7 +437,7 @@ export default class AppStore extends Store {
     const allServiceIds = await getServiceIdsFromPartitions();
     const allOrphanedServiceIds = allServiceIds.filter(
       id =>
-        !this.stores.services.all.find(
+        !this.stores.services.all.some(
           s => id.replace('service-', '') === s.id,
         ),
     );
@@ -447,8 +446,8 @@ export default class AppStore extends Store {
       await Promise.all(
         allOrphanedServiceIds.map(id => removeServicePartitionDirectory(id)),
       );
-    } catch (ex) {
-      console.log('Error while deleting service partition directory - ', ex);
+    } catch (error) {
+      console.log('Error while deleting service partition directory -', error);
     }
     await Promise.all(
       this.stores.services.all.map(s =>
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 1d50dd714..8e0134d7f 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -51,7 +51,9 @@ export default class FeaturesStore extends Store {
       let requestResult = {};
       try {
         requestResult = this.featuresRequest.execute().result;
-      } catch (e) {} // eslint-disable-line no-empty
+      } catch (error) {
+        console.error(error);
+      }
       Object.assign(features, requestResult);
     }
     runInAction('FeaturesStore::_updateFeatures', () => {
@@ -69,15 +71,15 @@ export default class FeaturesStore extends Store {
   }
 
   _setupFeatures() {
-    serviceProxy(this.stores, this.actions);
-    basicAuth(this.stores, this.actions);
+    serviceProxy(this.stores);
+    basicAuth();
     workspaces(this.stores, this.actions);
-    quickSwitch(this.stores, this.actions);
-    nightlyBuilds(this.stores, this.actions);
-    publishDebugInfo(this.stores, this.actions);
+    quickSwitch();
+    nightlyBuilds();
+    publishDebugInfo();
     settingsWS(this.stores, this.actions);
     communityRecipes(this.stores, this.actions);
     todos(this.stores, this.actions);
-    appearance(this.stores, this.actions);
+    appearance(this.stores);
   }
 }
diff --git a/src/stores/GlobalErrorStore.js b/src/stores/GlobalErrorStore.js
index aacaa247f..7cbfdc608 100644
--- a/src/stores/GlobalErrorStore.js
+++ b/src/stores/GlobalErrorStore.js
@@ -12,9 +12,9 @@ export default class GlobalErrorStore extends Store {
   constructor(...args) {
     super(...args);
 
-    window.onerror = (...errorArgs) => {
+    window.addEventListener('error', (...errorArgs) => {
       this._handleConsoleError.call(this, ['error', ...errorArgs]);
-    };
+    });
 
     const origConsoleError = console.error;
     window.console.error = (...errorArgs) => {
@@ -38,7 +38,7 @@ export default class GlobalErrorStore extends Store {
   }
 
   _handleConsoleError(type, error, url, line) {
-    if (typeof type === 'object' && type.length && type.length >= 1) {
+    if (typeof type === 'object' && type.length > 0) {
       this.messages.push({
         type: type[0],
         info: type,
@@ -53,14 +53,14 @@ export default class GlobalErrorStore extends Store {
     }
   }
 
-  _handleRequests = action(async (request) => {
+  _handleRequests = action(async request => {
     if (request.isError) {
       this.error = request.error;
 
       if (request.error.json) {
         try {
           this.response = await request.error.json();
-        } catch (error) {
+        } catch {
           this.response = {};
         }
         if (this.error.status === 401) {
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index d2acebb75..95d662e79 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -6,7 +6,7 @@ import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 import { matchRoute } from '../helpers/routing-helpers';
-import { asarRecipesPath } from '../environment';
+import { asarRecipesPath } from '../helpers/asar-helpers';
 
 const debug = require('debug')('Ferdi:RecipeStore');
 
@@ -25,9 +25,7 @@ export default class RecipesStore extends Store {
     this.actions.recipe.update.listen(this._update.bind(this));
 
     // Reactions
-    this.registerReactions([
-      this._checkIfRecipeIsInstalled.bind(this),
-    ]);
+    this.registerReactions([this._checkIfRecipeIsInstalled.bind(this)]);
   }
 
   setup() {
@@ -39,7 +37,10 @@ export default class RecipesStore extends Store {
   }
 
   @computed get active() {
-    const match = matchRoute('/settings/services/add/:id', this.stores.router.location.pathname);
+    const match = matchRoute(
+      '/settings/services/add/:id',
+      this.stores.router.location.pathname,
+    );
     if (match) {
       const activeRecipe = this.one(match.id);
       if (activeRecipe) {
@@ -53,11 +54,11 @@ export default class RecipesStore extends Store {
   }
 
   @computed get recipeIdForServices() {
-    return this.stores.services.all.map((s) => s.recipe.id);
+    return this.stores.services.all.map(s => s.recipe.id);
   }
 
   one(id) {
-    return this.all.find((recipe) => recipe.id === id);
+    return this.all.find(recipe => recipe.id === id);
   }
 
   isInstalled(id) {
@@ -77,41 +78,43 @@ export default class RecipesStore extends Store {
     const recipes = {};
 
     // Hackfix, reference this.all to fetch services
-    debug(`Check Recipe updates for ${this.all.map((recipe) => recipe.id)}`);
+    debug(`Check Recipe updates for ${this.all.map(recipe => recipe.id)}`);
 
-    recipeIds.forEach((r) => {
+    for (const r of recipeIds) {
       const recipe = this.one(r);
       recipes[r] = recipe.version;
-    });
+    }
 
     if (Object.keys(recipes).length === 0) return;
 
-    const remoteUpdates = await this.getRecipeUpdatesRequest.execute(recipes)._promise;
+    const remoteUpdates = await this.getRecipeUpdatesRequest.execute(recipes)
+      ._promise;
 
     // Check for local updates
     const allJsonFile = asarRecipesPath('all.json');
     const allJson = readJSONSync(allJsonFile);
     const localUpdates = [];
 
-    Object.keys(recipes).forEach((recipe) => {
+    for (const recipe of Object.keys(recipes)) {
       const version = recipes[recipe];
 
       // Find recipe in local recipe repository
-      const localRecipe = allJson.find((r) => r.id === recipe);
+      const localRecipe = allJson.find(r => r.id === recipe);
 
       if (localRecipe && semver.lt(version, localRecipe.version)) {
         localUpdates.push(recipe);
       }
-    });
+    }
 
-    const updates = [
-      ...remoteUpdates,
-      ...localUpdates,
-    ];
-    debug('Got update information (local, remote):', localUpdates, remoteUpdates);
+    const updates = [...remoteUpdates, ...localUpdates];
+    debug(
+      'Got update information (local, remote):',
+      localUpdates,
+      remoteUpdates,
+    );
 
     const length = updates.length - 1;
-    const syncUpdate = async (i) => {
+    const syncUpdate = async i => {
       const update = updates[i];
 
       this.actions.recipe.install({ recipeId: update });
@@ -134,7 +137,9 @@ export default class RecipesStore extends Store {
   async _checkIfRecipeIsInstalled() {
     const { router } = this.stores;
 
-    const match = router.location && matchRoute('/settings/services/add/:id', router.location.pathname);
+    const match =
+      router.location &&
+      matchRoute('/settings/services/add/:id', router.location.pathname);
     if (match) {
       const recipeId = match.id;
 
@@ -142,9 +147,11 @@ export default class RecipesStore extends Store {
         router.push('/settings/recipes');
         debug(`Recipe ${recipeId} is not installed, trying to install it`);
 
-        const recipe = await this.installRecipeRequest.execute(recipeId)._promise;
+        const recipe = await this.installRecipeRequest.execute(recipeId)
+          ._promise;
         if (recipe) {
-          await this.allRecipesRequest.invalidate({ immediately: true })._promise;
+          await this.allRecipesRequest.invalidate({ immediately: true })
+            ._promise;
           router.push(`/settings/services/add/${recipeId}`);
         } else {
           router.push('/settings/recipes');
diff --git a/src/stores/RequestStore.js b/src/stores/RequestStore.js
index a92f4c685..6d2f2ef91 100644
--- a/src/stores/RequestStore.js
+++ b/src/stores/RequestStore.js
@@ -13,7 +13,7 @@ export default class RequestStore extends Store {
 
   @observable showRequiredRequestsError = false;
 
-  @observable localServerPort = 45569;
+  @observable localServerPort = 45_569;
 
   retries = 0;
 
@@ -22,11 +22,11 @@ export default class RequestStore extends Store {
   constructor(...args) {
     super(...args);
 
-    this.actions.requests.retryRequiredRequests.listen(this._retryRequiredRequests.bind(this));
+    this.actions.requests.retryRequiredRequests.listen(
+      this._retryRequiredRequests.bind(this),
+    );
 
-    this.registerReactions([
-      this._autoRetry.bind(this),
-    ]);
+    this.registerReactions([this._autoRetry.bind(this)]);
   }
 
   setup() {
@@ -41,13 +41,11 @@ export default class RequestStore extends Store {
   }
 
   @computed get areRequiredRequestsSuccessful() {
-    return !this.userInfoRequest.isError
-      && !this.servicesRequest.isError;
+    return !this.userInfoRequest.isError && !this.servicesRequest.isError;
   }
 
   @computed get areRequiredRequestsLoading() {
-    return this.userInfoRequest.isExecuting
-      || this.servicesRequest.isExecuting;
+    return this.userInfoRequest.isExecuting || this.servicesRequest.isExecuting;
   }
 
   @action _retryRequiredRequests() {
@@ -67,7 +65,7 @@ export default class RequestStore extends Store {
         }
 
         this._autoRetry();
-        debug(`Retry required requests delayed in ${(delay) / 1000}s`);
+        debug(`Retry required requests delayed in ${delay / 1000}s`);
       }, delay);
     }
   }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 75bc71388..ce6675866 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -10,11 +10,14 @@ import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { matchRoute } from '../helpers/routing-helpers';
 import { isInTimeframe } from '../helpers/schedule-helpers';
-import { getRecipeDirectory, getDevRecipeDirectory } from '../helpers/recipe-helpers';
+import {
+  getRecipeDirectory,
+  getDevRecipeDirectory,
+} from '../helpers/recipe-helpers';
 import { workspaceStore } from '../features/workspaces';
 import { KEEP_WS_LOADED_USID } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
-import { ferdiVersion } from '../environment';
+import { ferdiVersion } from '../environment-remote';
 
 const debug = require('debug')('Ferdi:ServiceStore');
 
@@ -125,63 +128,56 @@ export default class ServicesStore extends Store {
   setup() {
     // Single key reactions for the sake of your CPU
     reaction(
-      () => (
-        this.stores.settings.app.enableSpellchecking
-      ),
+      () => this.stores.settings.app.enableSpellchecking,
       () => {
         this._shareSettingsWithServiceProcess();
       },
     );
 
     reaction(
-      () => (
-        this.stores.settings.app.spellcheckerLanguage
-      ),
+      () => this.stores.settings.app.spellcheckerLanguage,
       () => {
         this._shareSettingsWithServiceProcess();
       },
     );
 
     reaction(
-      () => (
-        this.stores.settings.app.darkMode
-      ),
+      () => this.stores.settings.app.darkMode,
       () => {
         this._shareSettingsWithServiceProcess();
       },
     );
 
     reaction(
-      () => (
-        this.stores.settings.app.adaptableDarkMode
-      ),
+      () => this.stores.settings.app.adaptableDarkMode,
       () => {
         this._shareSettingsWithServiceProcess();
       },
     );
 
     reaction(
-      () => (
-        this.stores.settings.app.universalDarkMode
-      ),
+      () => this.stores.settings.app.universalDarkMode,
       () => {
         this._shareSettingsWithServiceProcess();
       },
     );
 
     reaction(
-      () => (
-        this.stores.settings.app.searchEngine
-      ),
+      () => this.stores.settings.app.splitMode,
       () => {
         this._shareSettingsWithServiceProcess();
       },
     );
 
     reaction(
-      () => (
-        this.stores.settings.app.clipboardNotifications
-      ),
+      () => this.stores.settings.app.searchEngine,
+      () => {
+        this._shareSettingsWithServiceProcess();
+      },
+    );
+
+    reaction(
+      () => this.stores.settings.app.clipboardNotifications,
       () => {
         this._shareSettingsWithServiceProcess();
       },
@@ -215,12 +211,12 @@ export default class ServicesStore extends Store {
    * Run various maintenance tasks on services
    */
   _serviceMaintenance() {
-    this.enabled.forEach(service => {
+    for (const service of this.enabled) {
       // Defines which services should be hibernated or woken up
       if (!service.isActive) {
         if (
           !service.lastHibernated &&
-          (Date.now() - service.lastUsed) >
+          Date.now() - service.lastUsed >
             ms(`${this.stores.settings.all.app.hibernationStrategy}s`)
         ) {
           // If service is stale, hibernate it.
@@ -230,8 +226,8 @@ export default class ServicesStore extends Store {
         if (
           service.lastHibernated &&
           Number(this.stores.settings.all.app.wakeUpStrategy) > 0 &&
-          (Date.now() - service.lastHibernated) >
-          ms(`${this.stores.settings.all.app.wakeUpStrategy}s`)
+          Date.now() - service.lastHibernated >
+            ms(`${this.stores.settings.all.app.wakeUpStrategy}s`)
         ) {
           // If service is in hibernation and the wakeup time has elapsed, wake it.
           this._awake({ serviceId: service.id });
@@ -240,7 +236,7 @@ export default class ServicesStore extends Store {
 
       if (
         service.lastPoll &&
-        (service.lastPoll - service.lastPollAnswer) > ms('1m')
+        service.lastPoll - service.lastPollAnswer > ms('1m')
       ) {
         // If service did not reply for more than 1m try to reload.
         if (!service.isActive) {
@@ -261,7 +257,7 @@ export default class ServicesStore extends Store {
         service.lostRecipeConnection = false;
         service.lostRecipeReloadAttempt = 0;
       }
-    });
+    }
   }
 
   // Computed props
@@ -270,8 +266,7 @@ export default class ServicesStore extends Store {
       const services = this.allServicesRequest.execute().result;
       if (services) {
         return observable(
-          services
-            .slice()
+          [...services]
             .slice()
             .sort((a, b) => a.order - b.order)
             .map((s, index) => {
@@ -318,11 +313,11 @@ export default class ServicesStore extends Store {
         // Check if workspace needs to be kept loaded
         if (workspace.services.includes(KEEP_WS_LOADED_USID)) {
           // Get services for workspace
-          const serviceIDs = workspace.services.filter(
-            i => i !== KEEP_WS_LOADED_USID,
+          const serviceIDs = new Set(
+            workspace.services.filter(i => i !== KEEP_WS_LOADED_USID),
           );
           const wsServices = filteredServices.filter(service =>
-            serviceIDs.includes(service.id),
+            serviceIDs.has(service.id),
           );
 
           displayedServices = [...displayedServices, ...wsServices];
@@ -410,12 +405,14 @@ export default class ServicesStore extends Store {
       customIcon: false,
       isDarkModeEnabled: false,
       spellcheckerLanguage:
-          SPELLCHECKER_LOCALES[this.stores.settings.app.spellcheckerLanguage],
+        SPELLCHECKER_LOCALES[this.stores.settings.app.spellcheckerLanguage],
       userAgentPref: '',
       ...serviceData,
     };
 
-    const data = skipCleanup ? serviceData : this._cleanUpTeamIdAndCustomUrl(recipeId, serviceData);
+    const data = skipCleanup
+      ? serviceData
+      : this._cleanUpTeamIdAndCustomUrl(recipeId, serviceData);
 
     const response = await this.createServiceRequest.execute(recipeId, data)
       ._promise;
@@ -562,7 +559,8 @@ export default class ServicesStore extends Store {
   // Write your scripts here
   console.log("Hello, World!", config);
 };
-`);
+`,
+        );
       }
     } else {
       ensureFileSync(filePath);
@@ -580,9 +578,9 @@ export default class ServicesStore extends Store {
     if (!keepActiveRoute) this.stores.router.push('/');
     const service = this.one(serviceId);
 
-    this.all.forEach(s => {
+    for (const s of this.all) {
       s.isActive = false;
-    });
+    }
     service.isActive = true;
     this._awake({ serviceId: service.id });
 
@@ -618,10 +616,12 @@ export default class ServicesStore extends Store {
       this.allDisplayed.length,
     );
 
-    this.all.forEach(s => {
+    for (const s of this.all) {
       s.isActive = false;
-    });
+    }
     this.allDisplayed[nextIndex].isActive = true;
+
+    this._focusActiveService();
   }
 
   @action _setActivePrev() {
@@ -631,10 +631,12 @@ export default class ServicesStore extends Store {
       this.allDisplayed.length,
     );
 
-    this.all.forEach(s => {
+    for (const s of this.all) {
       s.isActive = false;
-    });
+    }
     this.allDisplayed[prevIndex].isActive = true;
+
+    this._focusActiveService();
   }
 
   @action _setUnreadMessageCount({ serviceId, count }) {
@@ -676,12 +678,23 @@ export default class ServicesStore extends Store {
     }
   }
 
-  @action _focusActiveService() {
+  @action _focusActiveService(focusEvent = null) {
     if (this.stores.user.isLoggedIn) {
       // TODO: add checks to not focus service when router path is /settings or /auth
       const service = this.active;
       if (service) {
         this._focusService({ serviceId: service.id });
+        if (this.stores.settings.app.splitMode && !focusEvent) {
+          setTimeout(() => {
+            document
+              .querySelector('.services__webview-wrapper.is-active')
+              .scrollIntoView({
+                behavior: 'smooth',
+                block: 'end',
+                inline: 'nearest',
+              });
+          }, 10);
+        }
       } else {
         debug('No service is active');
       }
@@ -699,101 +712,128 @@ export default class ServicesStore extends Store {
   @action _handleIPCMessage({ serviceId, channel, args }) {
     const service = this.one(serviceId);
 
-    if (channel === 'hello') {
-      debug('Received hello event from', serviceId);
+    // eslint-disable-next-line default-case
+    switch (channel) {
+      case 'hello': {
+        debug('Received hello event from', serviceId);
 
-      this._initRecipePolling(service.id);
-      this._initializeServiceRecipeInWebview(serviceId);
-      this._shareSettingsWithServiceProcess();
-    } else if (channel === 'alive') {
-      service.lastPollAnswer = Date.now();
-    } else if (channel === 'message-counts') {
-      debug(`Received unread message info from '${serviceId}'`, args[0]);
-
-      this.actions.service.setUnreadMessageCount({
-        serviceId,
-        count: {
-          direct: args[0].direct,
-          indirect: args[0].indirect,
-        },
-      });
-    } else if (channel === 'notification') {
-      const { options } = args[0];
+        this._initRecipePolling(service.id);
+        this._initializeServiceRecipeInWebview(serviceId);
+        this._shareSettingsWithServiceProcess();
 
-      // Check if we are in scheduled Do-not-Disturb time
-      const { scheduledDNDEnabled, scheduledDNDStart, scheduledDNDEnd } =
-        this.stores.settings.all.app;
+        break;
+      }
+      case 'alive': {
+        service.lastPollAnswer = Date.now();
 
-      if (
-        scheduledDNDEnabled &&
-        isInTimeframe(scheduledDNDStart, scheduledDNDEnd)
-      ) {
-        return;
+        break;
       }
+      case 'message-counts': {
+        debug(`Received unread message info from '${serviceId}'`, args[0]);
 
-      if (
-        service.recipe.hasNotificationSound ||
-        service.isMuted ||
-        this.stores.settings.all.app.isAppMuted
-      ) {
-        Object.assign(options, {
-          silent: true,
+        this.actions.service.setUnreadMessageCount({
+          serviceId,
+          count: {
+            direct: args[0].direct,
+            indirect: args[0].indirect,
+          },
         });
+
+        break;
       }
+      case 'notification': {
+        const { options } = args[0];
 
-      if (service.isNotificationEnabled) {
-        let title = `Notification from ${service.name}`;
-        if (!this.stores.settings.all.app.privateNotifications) {
-          options.body = typeof options.body === 'string' ? options.body : '';
-          title =
-            typeof args[0].title === 'string' ? args[0].title : service.name;
-        } else {
-          // Remove message data from notification in private mode
-          options.body = '';
-          options.icon = '/assets/img/notification-badge.gif';
+        // Check if we are in scheduled Do-not-Disturb time
+        const { scheduledDNDEnabled, scheduledDNDStart, scheduledDNDEnd } =
+          this.stores.settings.all.app;
+
+        if (
+          scheduledDNDEnabled &&
+          isInTimeframe(scheduledDNDStart, scheduledDNDEnd)
+        ) {
+          return;
         }
 
-        console.log(title, options);
+        if (
+          service.recipe.hasNotificationSound ||
+          service.isMuted ||
+          this.stores.settings.all.app.isAppMuted
+        ) {
+          Object.assign(options, {
+            silent: true,
+          });
+        }
 
-        this.actions.app.notify({
-          notificationId: args[0].notificationId,
-          title,
-          options,
-          serviceId,
-        });
+        if (service.isNotificationEnabled) {
+          let title = `Notification from ${service.name}`;
+          if (!this.stores.settings.all.app.privateNotifications) {
+            options.body = typeof options.body === 'string' ? options.body : '';
+            title =
+              typeof args[0].title === 'string' ? args[0].title : service.name;
+          } else {
+            // Remove message data from notification in private mode
+            options.body = '';
+            options.icon = '/assets/img/notification-badge.gif';
+          }
+
+          console.log(title, options);
+
+          this.actions.app.notify({
+            notificationId: args[0].notificationId,
+            title,
+            options,
+            serviceId,
+          });
+        }
+
+        break;
       }
-    } else if (channel === 'avatar') {
-      const url = args[0];
-      if (service.iconUrl !== url && !service.hasCustomUploadedIcon) {
-        service.customIconUrl = url;
+      case 'avatar': {
+        const url = args[0];
+        if (service.iconUrl !== url && !service.hasCustomUploadedIcon) {
+          service.customIconUrl = url;
+
+          this.actions.service.updateService({
+            serviceId,
+            serviceData: {
+              customIconUrl: url,
+            },
+            redirect: false,
+          });
+        }
 
-        this.actions.service.updateService({
-          serviceId,
-          serviceData: {
-            customIconUrl: url,
-          },
-          redirect: false,
-        });
+        break;
       }
-    } else if (channel === 'new-window') {
-      const url = args[0];
+      case 'new-window': {
+        const url = args[0];
 
-      this.actions.app.openExternalUrl({ url });
-    } else if (channel === 'set-service-spellchecker-language') {
-      if (!args) {
-        console.warn('Did not receive locale');
-      } else {
-        this.actions.service.updateService({
-          serviceId,
-          serviceData: {
-            spellcheckerLanguage: args[0] === 'reset' ? '' : args[0],
-          },
-          redirect: false,
-        });
+        this.actions.app.openExternalUrl({ url });
+
+        break;
+      }
+      case 'set-service-spellchecker-language': {
+        if (!args) {
+          console.warn('Did not receive locale');
+        } else {
+          this.actions.service.updateService({
+            serviceId,
+            serviceData: {
+              spellcheckerLanguage: args[0] === 'reset' ? '' : args[0],
+            },
+            redirect: false,
+          });
+        }
+
+        break;
       }
-    } else if (channel === 'feature:todos') {
-      Object.assign(args[0].data, { serviceId });
-      this.actions.todos.handleHostMessage(args[0]);
+      case 'feature:todos': {
+        Object.assign(args[0].data, { serviceId });
+        this.actions.todos.handleHostMessage(args[0]);
+
+        break;
+      }
+      // No default
     }
   }
 
@@ -809,13 +849,13 @@ export default class ServicesStore extends Store {
   }
 
   @action _sendIPCMessageToAllServices({ channel, args }) {
-    this.all.forEach(s =>
+    for (const s of this.all) {
       this.actions.service.sendIPCMessage({
         serviceId: s.id,
         channel,
         args,
-      }),
-    );
+      });
+    }
   }
 
   @action _openWindow({ event }) {
@@ -863,11 +903,11 @@ export default class ServicesStore extends Store {
   }
 
   @action _reloadAll() {
-    this.enabled.forEach(s =>
+    for (const s of this.enabled) {
       this._reload({
         serviceId: s.id,
-      }),
-    );
+      });
+    }
   }
 
   @action _reloadUpdatedServices() {
@@ -901,17 +941,17 @@ export default class ServicesStore extends Store {
 
     const services = {};
     // TODO: simplify this
-    this.all.forEach((s, index) => {
+    for (const [index] of this.all.entries()) {
       services[this.all[index].id] = index;
-    });
+    }
 
     this.reorderServicesRequest.execute(services);
     this.allServicesRequest.patch(data => {
-      data.forEach(s => {
+      for (const s of data) {
         const service = s;
 
         service.order = services[s.id];
-      });
+      }
     });
   }
 
@@ -1001,13 +1041,14 @@ export default class ServicesStore extends Store {
       }`,
     );
 
+    // eslint-disable-next-line unicorn/consistent-function-scoping
     const resetTimer = service => {
       service.lastPollAnswer = Date.now();
       service.lastPoll = Date.now();
     };
 
     if (!serviceId) {
-      this.allDisplayed.forEach(service => resetTimer(service));
+      for (const service of this.allDisplayed) resetTimer(service);
     } else {
       const service = this.one(serviceId);
       if (service) {
@@ -1043,7 +1084,7 @@ export default class ServicesStore extends Store {
 
   _mapActiveServiceToServiceModelReaction() {
     const { activeService } = this.stores.settings.all.service;
-    if (this.allDisplayed.length) {
+    if (this.allDisplayed.length > 0) {
       this.allDisplayed.map(service =>
         Object.assign(service, {
           isActive: activeService
@@ -1102,14 +1143,14 @@ export default class ServicesStore extends Store {
     const { enabled } = this;
     const { isAppMuted } = this.stores.settings.app;
 
-    enabled.forEach(service => {
+    for (const service of enabled) {
       const { isAttached } = service;
       const isMuted = isAppMuted || service.isMuted;
 
       if (isAttached) {
         service.webview.audioMuted = isMuted;
       }
-    });
+    }
   }
 
   _shareSettingsWithServiceProcess() {
@@ -1151,7 +1192,7 @@ export default class ServicesStore extends Store {
 
     if (
       this.allDisplayed.findIndex(service => service.isActive) === -1 &&
-      this.allDisplayed.length !== 0
+      this.allDisplayed.length > 0
     ) {
       debug('No active service found, setting active service to index 0');
 
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 9aade974c..ec80fee7c 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,23 +1,19 @@
 import { ipcRenderer } from 'electron';
 import { getCurrentWindow } from '@electron/remote';
-import {
-  action, computed, observable, reaction,
-} from 'mobx';
+import { action, computed, observable, reaction } from 'mobx';
 import localStorage from 'mobx-localstorage';
-import {
-  FILE_SYSTEM_SETTINGS_TYPES, LOCAL_SERVER, SEARCH_ENGINE_DDG,
-} from '../config';
-import { API, DEFAULT_APP_SETTINGS } from '../environment';
-import { getLocale } from '../helpers/i18n-helpers';
+import { DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES, LOCAL_SERVER } from '../config';
 import { hash } from '../helpers/password-helpers';
-import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 import Request from './lib/Request';
 import Store from './lib/Store';
 
 const debug = require('debug')('Ferdi:SettingsStore');
 
 export default class SettingsStore extends Store {
-  @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings');
+  @observable updateAppSettingsRequest = new Request(
+    this.api.local,
+    'updateAppSettings',
+  );
 
   startup = true;
 
@@ -40,9 +36,7 @@ export default class SettingsStore extends Store {
     await this._migrate();
 
     reaction(
-      () => (
-        this.all.app.autohideMenuBar
-      ),
+      () => this.all.app.autohideMenuBar,
       () => {
         const currentWindow = getCurrentWindow();
         currentWindow.setMenuBarVisibility(!this.all.app.autohideMenuBar);
@@ -51,10 +45,8 @@ export default class SettingsStore extends Store {
     );
 
     reaction(
-      () => (
-        this.all.app.server
-      ),
-      (server) => {
+      () => this.all.app.server,
+      server => {
         if (server === LOCAL_SERVER) {
           ipcRenderer.send('startLocalServer');
         }
@@ -65,7 +57,10 @@ export default class SettingsStore extends Store {
     // Inactivity lock timer
     let inactivityTimer;
     getCurrentWindow().on('blur', () => {
-      if (this.all.app.lockingFeatureEnabled && this.all.app.inactivityLock !== 0) {
+      if (
+        this.all.app.lockingFeatureEnabled &&
+        this.all.app.inactivityLock !== 0
+      ) {
         inactivityTimer = setTimeout(() => {
           this.actions.settings.update({
             type: 'app',
@@ -84,7 +79,11 @@ export default class SettingsStore extends Store {
 
     ipcRenderer.on('appSettings', (event, resp) => {
       // Lock on startup if enabled in settings
-      if (this.startup && resp.type === 'app' && resp.data.lockingFeatureEnabled) {
+      if (
+        this.startup &&
+        resp.type === 'app' &&
+        resp.data.lockingFeatureEnabled
+      ) {
         this.startup = false;
         process.nextTick(() => {
           if (!this.all.app.locked) {
@@ -97,9 +96,9 @@ export default class SettingsStore extends Store {
       ipcRenderer.send('initialAppSettings', resp);
     });
 
-    this.fileSystemSettingsTypes.forEach((type) => {
+    for (const type of this.fileSystemSettingsTypes) {
       ipcRenderer.send('getAppSettings', type);
-    });
+    }
   }
 
   @computed get app() {
@@ -111,15 +110,19 @@ export default class SettingsStore extends Store {
   }
 
   @computed get service() {
-    return localStorage.getItem('service') || {
-      activeService: '',
-    };
+    return (
+      localStorage.getItem('service') || {
+        activeService: '',
+      }
+    );
   }
 
   @computed get stats() {
-    return localStorage.getItem('stats') || {
-      activeService: '',
-    };
+    return (
+      localStorage.getItem('stats') || {
+        activeService: '',
+      }
+    );
   }
 
   @computed get migration() {
@@ -183,78 +186,6 @@ export default class SettingsStore extends Store {
   async _migrate() {
     const legacySettings = localStorage.getItem('app') || {};
 
-    this._ensureMigrationAndMarkDone('5.0.0-beta.17-settings', () => {
-      this.actions.settings.update({
-        type: 'app',
-        data: {
-          autoLaunchInBackground: legacySettings.autoLaunchInBackground,
-          runInBackground: legacySettings.runInBackground,
-          enableSystemTray: legacySettings.enableSystemTray,
-          minimizeToSystemTray: legacySettings.minimizeToSystemTray,
-          closeToSystemTray: legacySettings.closeToSystemTray,
-          server: API,
-          isAppMuted: legacySettings.isAppMuted,
-          enableGPUAcceleration: legacySettings.enableGPUAcceleration,
-          showMessageBadgeWhenMuted: legacySettings.showMessageBadgeWhenMuted,
-          showDisabledServices: legacySettings.showDisabledServices,
-          enableSpellchecking: legacySettings.enableSpellchecking,
-        },
-      });
-
-      this.actions.settings.update({
-        type: 'service',
-        data: {
-          activeService: legacySettings.activeService,
-        },
-      });
-
-      localStorage.removeItem('app');
-
-      debug('Migrated settings to split stores');
-    });
-
-    this._ensureMigrationAndMarkDone('5.0.0-beta.19-settings', () => {
-      const spellcheckerLanguage = getLocale({
-        locale: this.stores.settings.app.locale,
-        locales: SPELLCHECKER_LOCALES,
-        defaultLocale: DEFAULT_APP_SETTINGS.spellcheckerLanguage,
-        fallbackLocale: DEFAULT_APP_SETTINGS.spellcheckerLanguage,
-      });
-
-      this.actions.settings.update({
-        type: 'app',
-        data: {
-          spellcheckerLanguage,
-        },
-      });
-    });
-
-    this._ensureMigrationAndMarkDone('5.4.4-beta.2-settings', () => {
-      const {
-        showServiceNavigationBar,
-      } = this.all.app;
-
-      this.actions.settings.update({
-        type: 'app',
-        data: {
-          navigationBarBehaviour: showServiceNavigationBar ? 'custom' : 'never',
-        },
-      });
-    });
-
-    this._ensureMigrationAndMarkDone('5.4.4-beta.4-settings', () => {
-      this.actions.settings.update({
-        type: 'app',
-        data: {
-          todoServer: 'isUsingCustomTodoService',
-          customTodoServer: legacySettings.todoServer,
-          automaticUpdates: !(legacySettings.noUpdates),
-        },
-      });
-
-      debug('Migrated old todo setting to new custom todo setting');
-    });
-
     this._ensureMigrationAndMarkDone('password-hashing', () => {
       if (this.stores.settings.app.lockedPassword !== '') {
         this.actions.settings.update({
@@ -272,7 +203,7 @@ export default class SettingsStore extends Store {
       this.actions.settings.update({
         type: 'app',
         data: {
-          searchEngine: SEARCH_ENGINE_DDG,
+          searchEngine: DEFAULT_APP_SETTINGS.searchEngine,
         },
       });
     });
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.ts
index be675d5ed..6ab63c2ee 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.ts
@@ -1,13 +1,15 @@
-import {
-  action, observable, computed, reaction,
-} from 'mobx';
-import { theme } from '@meetfranz/theme';
+import { action, observable, computed, reaction } from 'mobx';
+import { theme, ThemeType } from '@meetfranz/theme';
 import { nativeTheme, systemPreferences } from '@electron/remote';
 
 import Store from './lib/Store';
 import { isMac, isWindows } from '../environment';
 
 export default class UIStore extends Store {
+  actions: any;
+
+  stores: any;
+
   @observable showServicesUpdatedInfoBar = false;
 
   @observable isOsDarkThemeActive = nativeTheme.shouldUseDarkColors;
@@ -43,38 +45,54 @@ export default class UIStore extends Store {
 
   setup() {
     reaction(
-      () => (
-        this.isDarkThemeActive
-      ),
+      () => this.isDarkThemeActive,
       () => {
         this._setupThemeInDOM();
       },
       { fireImmediately: true },
     );
+    reaction(
+      () => this.isSplitModeActive,
+      () => {
+        this._setupModeInDOM();
+      },
+      { fireImmediately: true },
+    );
   }
 
   @computed get showMessageBadgesEvenWhenMuted() {
     const settings = this.stores.settings.all;
 
     return (
-      (settings.app.isAppMuted && settings.app.showMessageBadgeWhenMuted)
-      || !settings.app.isAppMuted
+      (settings.app.isAppMuted && settings.app.showMessageBadgeWhenMuted) ||
+      !settings.app.isAppMuted
     );
   }
 
   @computed get isDarkThemeActive() {
-    const isWithAdaptableInDarkMode = this.stores.settings.all.app.adaptableDarkMode
-      && this.isOsDarkThemeActive;
-    const isWithoutAdaptableInDarkMode = this.stores.settings.all.app.darkMode
-      && !this.stores.settings.all.app.adaptableDarkMode;
+    const isWithAdaptableInDarkMode =
+      this.stores.settings.all.app.adaptableDarkMode &&
+      this.isOsDarkThemeActive;
+    const isWithoutAdaptableInDarkMode =
+      this.stores.settings.all.app.darkMode &&
+      !this.stores.settings.all.app.adaptableDarkMode;
     const isInDarkMode = this.stores.settings.all.app.darkMode;
-    return !!(isWithAdaptableInDarkMode
-      || isWithoutAdaptableInDarkMode
-      || isInDarkMode);
+    return !!(
+      isWithAdaptableInDarkMode ||
+      isWithoutAdaptableInDarkMode ||
+      isInDarkMode
+    );
+  }
+
+  @computed get isSplitModeActive() {
+    return this.stores.settings.app.splitMode;
   }
 
   @computed get theme() {
-    const themeId = (this.isDarkThemeActive || this.stores.settings.app.darkMode) ? 'dark' : 'default';
+    const themeId =
+      this.isDarkThemeActive || this.stores.settings.app.darkMode
+        ? ThemeType.dark
+        : ThemeType.default;
     const { accentColor } = this.stores.settings.app;
     return theme(themeId, accentColor);
   }
@@ -102,9 +120,19 @@ export default class UIStore extends Store {
     const body = document.querySelector('body');
 
     if (!this.isDarkThemeActive) {
-      body.classList.remove('theme__dark');
+      body?.classList.remove('theme__dark');
+    } else {
+      body?.classList.add('theme__dark');
+    }
+  }
+
+  _setupModeInDOM() {
+    const body = document.querySelector('body');
+
+    if (!this.isSplitModeActive) {
+      body?.classList.remove('mode__split');
     } else {
-      body.classList.add('theme__dark');
+      body?.classList.add('mode__split');
     }
   }
 }
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 2e009893a..9f222d2d3 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -2,13 +2,13 @@ import { observable, computed, action } from 'mobx';
 import moment from 'moment';
 import jwt from 'jsonwebtoken';
 import localStorage from 'mobx-localstorage';
-import { session } from '@electron/remote';
+import { ipcRenderer } from 'electron';
 
-import { isDevMode } from '../environment';
+import { TODOS_PARTITION_ID } from '../config';
+import { isDevMode } from '../environment-remote';
 import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
-import { TODOS_PARTITION_ID } from '../config';
 
 const debug = require('debug')('Ferdi:UserStore');
 
@@ -46,7 +46,10 @@ export default class UserStore extends Store {
 
   @observable updateUserInfoRequest = new Request(this.api.user, 'updateInfo');
 
-  @observable getLegacyServicesRequest = new CachedRequest(this.api.user, 'getLegacyServices');
+  @observable getLegacyServicesRequest = new CachedRequest(
+    this.api.user,
+    'getLegacyServices',
+  );
 
   @observable deleteAccountRequest = new CachedRequest(this.api.user, 'delete');
 
@@ -81,13 +84,17 @@ export default class UserStore extends Store {
 
     // Register action handlers
     this.actions.user.login.listen(this._login.bind(this));
-    this.actions.user.retrievePassword.listen(this._retrievePassword.bind(this));
+    this.actions.user.retrievePassword.listen(
+      this._retrievePassword.bind(this),
+    );
     this.actions.user.logout.listen(this._logout.bind(this));
     this.actions.user.signup.listen(this._signup.bind(this));
     this.actions.user.invite.listen(this._invite.bind(this));
     this.actions.user.update.listen(this._update.bind(this));
     this.actions.user.resetStatus.listen(this._resetStatus.bind(this));
-    this.actions.user.importLegacyServices.listen(this._importLegacyServices.bind(this));
+    this.actions.user.importLegacyServices.listen(
+      this._importLegacyServices.bind(this),
+    );
     this.actions.user.delete.listen(this._delete.bind(this));
 
     // Reactions
@@ -176,7 +183,14 @@ export default class UserStore extends Store {
   }
 
   @action async _signup({
-    firstname, lastname, email, password, accountType, company, plan, currency,
+    firstname,
+    lastname,
+    email,
+    password,
+    accountType,
+    company,
+    plan,
+    currency,
   }) {
     const authToken = await this.signupRequest.execute({
       firstname,
@@ -205,7 +219,7 @@ export default class UserStore extends Store {
   }
 
   @action async _invite({ invites }) {
-    const data = invites.filter((invite) => invite.email !== '');
+    const data = invites.filter(invite => invite.email !== '');
 
     const response = await this.inviteRequest.execute(data)._promise;
 
@@ -220,7 +234,8 @@ export default class UserStore extends Store {
   @action async _update({ userData }) {
     if (!this.isLoggedIn) return;
 
-    const response = await this.updateUserInfoRequest.execute(userData)._promise;
+    const response = await this.updateUserInfoRequest.execute(userData)
+      ._promise;
 
     this.getUserInfoRequest.patch(() => response.data);
     this.actionStatus = response.status || [];
@@ -241,8 +256,7 @@ export default class UserStore extends Store {
     this.stores.services.allServicesRequest.invalidate().reset();
 
     if (this.stores.todos.isTodosEnabled) {
-      const sess = session.fromPartition(TODOS_PARTITION_ID);
-      sess.clearStorageData();
+      ipcRenderer.send('clear-storage-data', { sessionId: TODOS_PARTITION_ID });
     }
   }
 
@@ -250,19 +264,27 @@ export default class UserStore extends Store {
     this.isImportLegacyServicesExecuting = true;
 
     // Reduces recipe duplicates
-    const recipes = services.filter((obj, pos, arr) => arr.map((mapObj) => mapObj.recipe.id).indexOf(obj.recipe.id) === pos).map((s) => s.recipe.id);
+    const recipes = services
+      .filter(
+        (obj, pos, arr) =>
+          arr.map(mapObj => mapObj.recipe.id).indexOf(obj.recipe.id) === pos,
+      )
+      .map(s => s.recipe.id);
 
     // Install recipes
-    for (const recipe of recipes) { // eslint-disable-line no-unused-vars
-      // eslint-disable-next-line
+    for (const recipe of recipes) {
+      // eslint-disable-line no-unused-vars
+      // eslint-disable-next-line no-await-in-loop
       await this.stores.recipes._install({ recipeId: recipe });
     }
 
-    for (const service of services) { // eslint-disable-line no-unused-vars
+    for (const service of services) {
+      // eslint-disable-line no-unused-vars
       this.actions.service.createFromLegacyService({
         data: service,
       });
-      await this.stores.services.createServiceRequest._promise; // eslint-disable-line
+      // eslint-disable-next-line no-await-in-loop
+      await this.stores.services.createServiceRequest._promise;
     }
 
     this.isImportLegacyServicesExecuting = false;
@@ -281,8 +303,7 @@ export default class UserStore extends Store {
 
     const { router } = this.stores;
     const currentRoute = window.location.hash;
-    if (!this.isLoggedIn
-      && currentRoute.includes('token=')) {
+    if (!this.isLoggedIn && currentRoute.includes('token=')) {
       router.push(this.WELCOME_ROUTE);
       const token = currentRoute.split('=')[1];
 
@@ -293,20 +314,18 @@ export default class UserStore extends Store {
           this._tokenLogin(token);
         }, 1000);
       }
-    } else if (!this.isLoggedIn
-      && !currentRoute.includes(this.BASE_ROUTE)) {
+    } else if (!this.isLoggedIn && !currentRoute.includes(this.BASE_ROUTE)) {
       router.push(this.WELCOME_ROUTE);
-    } else if (this.isLoggedIn
-      && currentRoute === this.LOGOUT_ROUTE) {
+    } else if (this.isLoggedIn && currentRoute === this.LOGOUT_ROUTE) {
       this.actions.user.logout();
       router.push(this.LOGIN_ROUTE);
-    } else if (this.isLoggedIn
-      && currentRoute.includes(this.BASE_ROUTE)
-      && (this.hasCompletedSignup
-        || this.hasCompletedSignup === null)) {
-      if (!isDevMode) {
-        this.stores.router.push('/');
-      }
+    } else if (
+      this.isLoggedIn &&
+      currentRoute.includes(this.BASE_ROUTE) &&
+      (this.hasCompletedSignup || this.hasCompletedSignup === null) &&
+      !isDevMode
+    ) {
+      this.stores.router.push('/');
     }
   };
 
@@ -316,7 +335,7 @@ export default class UserStore extends Store {
       let data;
       try {
         data = await this.getUserInfoRequest.execute()._promise;
-      } catch (e) {
+      } catch {
         return false;
       }
 
@@ -336,12 +355,12 @@ export default class UserStore extends Store {
     try {
       const decoded = jwt.decode(authToken);
 
-      return ({
+      return {
         id: decoded.userId,
         tokenExpiry: moment.unix(decoded.exp).toISOString(),
         authToken,
-      });
-    } catch (err) {
+      };
+    } catch {
       this._logout();
       return false;
     }
@@ -372,7 +391,7 @@ export default class UserStore extends Store {
   async _migrateUserLocale() {
     try {
       await this.getUserInfoRequest._promise;
-    } catch (e) {
+    } catch {
       return false;
     }
 
diff --git a/src/stores/index.ts b/src/stores/index.ts
index 4cd4e92ea..1760ddfa2 100644
--- a/src/stores/index.ts
+++ b/src/stores/index.ts
@@ -34,10 +34,10 @@ export default (api, actions, router) => {
   });
 
   // Initialize all stores
-  Object.keys(stores).forEach(name => {
+  for (const name of Object.keys(stores)) {
     if (stores[name] && stores[name].initialize) {
       stores[name].initialize();
     }
-  });
+  }
   return stores;
 };
diff --git a/src/stores/lib/CachedRequest.js b/src/stores/lib/CachedRequest.js
index 94f615144..a6dd47f7d 100644
--- a/src/stores/lib/CachedRequest.js
+++ b/src/stores/lib/CachedRequest.js
@@ -1,4 +1,3 @@
-// @flow
 import { action } from 'mobx';
 import { isEqual, remove } from 'lodash';
 import Request from './Request';
@@ -30,48 +29,60 @@ export default class CachedRequest extends Request {
 
     // This timeout is necessary to avoid warnings from mobx
     // regarding triggering actions as side-effect of getters
-    setTimeout(action(() => {
-      this.isExecuting = true;
-      // Apply the previous result from this call immediately (cached)
-      if (existingApiCall) {
-        this.result = existingApiCall.result;
-      }
-    }), 0);
+    setTimeout(
+      action(() => {
+        this.isExecuting = true;
+        // Apply the previous result from this call immediately (cached)
+        if (existingApiCall) {
+          this.result = existingApiCall.result;
+        }
+      }),
+      0,
+    );
 
     // Issue api call & save it as promise that is handled to update the results of the operation
-    this._promise = new Promise((resolve) => {
+    this._promise = new Promise(resolve => {
       this._api[this._method](...callArgs)
-        .then((result) => {
-          setTimeout(action(() => {
-            this.result = result;
-            if (this._currentApiCall) this._currentApiCall.result = result;
-            this.isExecuting = false;
-            this.isError = false;
-            this.wasExecuted = true;
-            this._isInvalidated = false;
-            this._isWaitingForResponse = false;
-            this._triggerHooks();
-            resolve(result);
-          }), 1);
+        .then(result => {
+          setTimeout(
+            action(() => {
+              this.result = result;
+              if (this._currentApiCall) this._currentApiCall.result = result;
+              this.isExecuting = false;
+              this.isError = false;
+              this.wasExecuted = true;
+              this._isInvalidated = false;
+              this._isWaitingForResponse = false;
+              this._triggerHooks();
+              resolve(result);
+            }),
+            1,
+          );
           return result;
         })
-        .catch(action((error) => {
-          setTimeout(action(() => {
-            this.error = error;
-            this.isExecuting = false;
-            this.isError = true;
-            this.wasExecuted = true;
-            this._isWaitingForResponse = false;
-            this._triggerHooks();
-            // reject(error);
-          }), 1);
-        }));
+        .catch(
+          action(error => {
+            setTimeout(
+              action(() => {
+                this.error = error;
+                this.isExecuting = false;
+                this.isError = true;
+                this.wasExecuted = true;
+                this._isWaitingForResponse = false;
+                this._triggerHooks();
+                // reject(error);
+              }),
+              1,
+            );
+          }),
+        );
     });
 
     this._isWaitingForResponse = true;
     return this;
   }
 
+  // eslint-disable-next-line unicorn/no-object-as-default-parameter
   invalidate(options = { immediately: false }) {
     this._isInvalidated = true;
     if (options.immediately && this._currentApiCall) {
@@ -81,18 +92,21 @@ export default class CachedRequest extends Request {
   }
 
   patch(modify) {
-    return new Promise((resolve) => {
-      setTimeout(action(() => {
-        const override = modify(this.result);
-        if (override !== undefined) this.result = override;
-        if (this._currentApiCall) this._currentApiCall.result = this.result;
-        resolve(this);
-      }), 0);
+    return new Promise(resolve => {
+      setTimeout(
+        action(() => {
+          const override = modify(this.result);
+          if (override !== undefined) this.result = override;
+          if (this._currentApiCall) this._currentApiCall.result = this.result;
+          resolve(this);
+        }),
+        0,
+      );
     });
   }
 
   removeCacheForCallWith(...args) {
-    remove(this._apiCalls, (c) => isEqual(c.args, args));
+    remove(this._apiCalls, c => isEqual(c.args, args));
   }
 
   _addApiCall(args) {
@@ -102,6 +116,6 @@ export default class CachedRequest extends Request {
   }
 
   _findApiCall(args) {
-    return this._apiCalls.find((c) => isEqual(c.args, args));
+    return this._apiCalls.find(c => isEqual(c.args, args));
   }
 }
diff --git a/src/stores/lib/Request.js b/src/stores/lib/Request.js
index 32ffe4367..39f32729a 100644
--- a/src/stores/lib/Request.js
+++ b/src/stores/lib/Request.js
@@ -107,7 +107,7 @@ export default class Request {
   }
 
   _triggerHooks() {
-    Request._hooks.forEach((hook) => hook(this));
+    for (const hook of Request._hooks) hook(this);
   }
 
   reset = () => {
diff --git a/src/stores/lib/Store.js b/src/stores/lib/Store.js
index b03a7e725..b39070ce8 100644
--- a/src/stores/lib/Store.js
+++ b/src/stores/lib/Store.js
@@ -28,18 +28,18 @@ export default class Store {
   }
 
   registerReactions(reactions) {
-    reactions.forEach((reaction) => this._reactions.push(new Reaction(reaction)));
+    for (const reaction of reactions) this._reactions.push(new Reaction(reaction));
   }
 
   setup() {}
 
   initialize() {
     this.setup();
-    this._reactions.forEach((reaction) => reaction.start());
+    for (const reaction of this._reactions) reaction.start();
   }
 
   teardown() {
-    this._reactions.forEach((reaction) => reaction.stop());
+    for (const reaction of this._reactions) reaction.stop();
   }
 
   resetStatus() {
diff --git a/src/styles/layout.scss b/src/styles/layout.scss
index 49e041022..b5d4d86d0 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -82,6 +82,10 @@ body.win32:not(.isFullScreen) .app .app__content {
   height: calc(100% - 28px);
 }
 
+.mode__split .app .app__service {
+  overflow-x: auto;
+}
+
 .app {
   .app__content {
     display: flex;
diff --git a/src/styles/services.scss b/src/styles/services.scss
index 8b8c27e10..dd053e93d 100644
--- a/src/styles/services.scss
+++ b/src/styles/services.scss
@@ -18,6 +18,24 @@
   }
 }
 
+.mode__split .services {
+  display: flex;
+  overflow: visible;
+
+  .services__webview {
+    position: relative;
+    flex: 1 0 50%;
+
+    @media (min-width: 1280px) {
+      flex-basis: 33.33%;
+    }
+
+    @media (min-width: 2048px) {
+      flex-basis: 25%;
+    }
+  }
+}
+
 .services {
   background: #FFF;
   flex: 1;
@@ -71,7 +89,7 @@
   }
 
   .services__info-layer {
-    position: absolut;
+    position: absolute;
     z-index: 110;
   }
 
diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss
index df10da77c..16318b9f6 100644
--- a/src/styles/tabs.scss
+++ b/src/styles/tabs.scss
@@ -120,6 +120,19 @@
     }
   }
 
+  .tab-item__shortcut-index {
+    align-items: center;
+    background: $theme-gray-light;
+    bottom: 8px;
+    color: #fff;
+    display: flex;
+    font-size: 11px;
+    min-height: 17px;
+    padding: 0px 5px;
+    position: absolute;
+    left: 8px;
+  }
+
   &.is-reordering {
     z-index: 99999;
   }
diff --git a/src/webview/badge.ts b/src/webview/badge.ts
index 753e90fef..8e8b66c0c 100644
--- a/src/webview/badge.ts
+++ b/src/webview/badge.ts
@@ -21,22 +21,22 @@ export class BadgeHandler {
     // Parse number to integer
     // This will correct errors that recipes may introduce, e.g.
     // by sending a String instead of an integer
-    const parsedNumber = parseInt(text.toString(), 10);
+    const parsedNumber = Number.parseInt(text.toString(), 10);
     const adjustedNumber = Number.isNaN(parsedNumber) ? 0 : parsedNumber;
     return Math.max(adjustedNumber, 0);
   }
 
-  setBadge(direct: string | number, indirect: string | number) {
-    if (this.countCache.direct.toString() === direct.toString()
-        && this.countCache.indirect.toString() === indirect.toString()) {
-      return;
-    }
-
+  setBadge(direct: string | number | undefined | null, indirect: string | number | undefined | null) {
     const count = {
       direct: this.safeParseInt(direct),
       indirect: this.safeParseInt(indirect),
     };
 
+    if (this.countCache.direct.toString() === count.direct.toString()
+        && this.countCache.indirect.toString() === count.indirect.toString()) {
+      return;
+    }
+
     debug('Sending badge count to host', count);
     ipcRenderer.sendToHost('message-counts', count);
 
diff --git a/src/webview/contextMenuBuilder.js b/src/webview/contextMenuBuilder.js
index 8c39e6d04..938eade1e 100644
--- a/src/webview/contextMenuBuilder.js
+++ b/src/webview/contextMenuBuilder.js
@@ -6,7 +6,8 @@
  *
  * Source: https://github.com/electron-userland/electron-spellchecker/blob/master/src/context-menu-builder.js
  */
-import { clipboard, ipcRenderer, nativeImage } from 'electron';
+// eslint-disable-next-line no-unused-vars
+import { clipboard, ipcRenderer, nativeImage, WebContents } from 'electron';
 import { Menu, MenuItem } from '@electron/remote';
 import { cmdOrCtrlShortcutKey, isMac } from '../environment';
 
@@ -16,7 +17,8 @@ import { openExternalUrl } from '../helpers/url-helpers';
 const { URL } = require('url');
 
 function matchesWord(string) {
-  const regex = /[\u0041-\u005A\u0061-\u007A\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]+/g;
+  const regex =
+    /[A-Za-z\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]+/g;
 
   return string.match(regex);
 }
@@ -56,12 +58,12 @@ module.exports = class ContextMenuBuilder {
   /**
    * Creates an instance of ContextMenuBuilder
    *
-   * @param  {webContents} webContents  Current webContents
+   * @param  {WebContents} webContents  Current webContents
    * @param  {Boolean} debugMode    If true, display the "Inspect Element" menu item.
    * @param  {function} processMenu If passed, this method will be passed the menu to change
    *                                it prior to display. Signature: (menu, info) => menu
    */
-  constructor(webContents, debugMode = false, processMenu = (m) => m) {
+  constructor(webContents, debugMode = false, processMenu = m => m) {
     this.debugMode = debugMode;
     this.processMenu = processMenu;
     this.menu = null;
@@ -96,7 +98,7 @@ module.exports = class ContextMenuBuilder {
   async showPopupMenu(contextInfo) {
     const menu = await this.buildMenuForElement(contextInfo);
     if (!menu) return;
-    menu.popup({});
+    menu.popup();
   }
 
   /**
@@ -115,7 +117,10 @@ module.exports = class ContextMenuBuilder {
       return this.buildMenuForImage(info);
     }
 
-    if (info.isEditable || (info.inputFieldType && info.inputFieldType !== 'none')) {
+    if (
+      info.isEditable ||
+      (info.inputFieldType && info.inputFieldType !== 'none')
+    ) {
       return this.buildMenuForTextInput(info);
     }
 
@@ -157,12 +162,17 @@ module.exports = class ContextMenuBuilder {
     const isEmailAddress = menuInfo.linkURL.startsWith('mailto:');
 
     const copyLink = new MenuItem({
-      label: isEmailAddress ? this.stringTable.copyMail() : this.stringTable.copyLinkUrl(),
+      label: isEmailAddress
+        ? this.stringTable.copyMail()
+        : this.stringTable.copyLinkUrl(),
       click: () => {
         // Omit the mailto: portion of the link; we just want the address
         const url = isEmailAddress ? menuInfo.linkText : menuInfo.linkURL;
         clipboard.writeText(url);
-        this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Link URL copied: ${url}`);
+        this._sendNotificationOnClipboardEvent(
+          menuInfo.clipboardNotifications,
+          () => `Link URL copied: ${url}`,
+        );
       },
     });
 
@@ -250,11 +260,13 @@ module.exports = class ContextMenuBuilder {
     const webContents = this.getWebContents();
     // Add each spelling suggestion
     for (const suggestion of menuInfo.dictionarySuggestions) {
-      menu.append(new MenuItem({
-        label: suggestion,
-        // eslint-disable-next-line no-loop-func
-        click: () => webContents.replaceMisspelling(suggestion),
-      }));
+      menu.append(
+        new MenuItem({
+          label: suggestion,
+          // eslint-disable-next-line no-loop-func
+          click: () => webContents.replaceMisspelling(suggestion),
+        }),
+      );
     }
 
     // Allow users to add the misspelled word to the dictionary
@@ -262,7 +274,10 @@ module.exports = class ContextMenuBuilder {
       menu.append(
         new MenuItem({
           label: this.stringTable.addToDictionary(),
-          click: () => webContents.session.addWordToSpellCheckerDictionary(menuInfo.misspelledWord),
+          click: () =>
+            webContents.session.addWordToSpellCheckerDictionary(
+              menuInfo.misspelledWord,
+            ),
         }),
       );
     }
@@ -274,7 +289,7 @@ module.exports = class ContextMenuBuilder {
    * Adds search-related menu items.
    */
   addSearchItems(menu, menuInfo) {
-    if (!menuInfo.selectionText || menuInfo.selectionText.length < 1) {
+    if (!menuInfo.selectionText || menuInfo.selectionText.length === 0) {
       return menu;
     }
 
@@ -287,7 +302,9 @@ module.exports = class ContextMenuBuilder {
       const webContents = this.getWebContents();
 
       const lookUpDefinition = new MenuItem({
-        label: this.stringTable.lookUpDefinition({ word: menuInfo.selectionText.trim() }),
+        label: this.stringTable.lookUpDefinition({
+          word: menuInfo.selectionText.trim(),
+        }),
         click: () => webContents.showDefinitionForSelection(),
       });
 
@@ -295,9 +312,13 @@ module.exports = class ContextMenuBuilder {
     }
 
     const search = new MenuItem({
-      label: this.stringTable.searchWith({ searchEngine: SEARCH_ENGINE_NAMES[menuInfo.searchEngine] }),
+      label: this.stringTable.searchWith({
+        searchEngine: SEARCH_ENGINE_NAMES[menuInfo.searchEngine],
+      }),
       click: () => {
-        const url = SEARCH_ENGINE_URLS[menuInfo.searchEngine]({ searchTerm: encodeURIComponent(menuInfo.selectionText) });
+        const url = SEARCH_ENGINE_URLS[menuInfo.searchEngine]({
+          searchTerm: encodeURIComponent(menuInfo.selectionText),
+        });
         openExternalUrl(url, true);
       },
     });
@@ -319,10 +340,14 @@ module.exports = class ContextMenuBuilder {
     const copyImage = new MenuItem({
       label: this.stringTable.copyImage(),
       click: () => {
-        const result = this.convertImageToBase64(menuInfo.srcURL,
-          (dataURL) => clipboard.writeImage(nativeImage.createFromDataURL(dataURL)));
-
-        this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Image copied from URL: ${menuInfo.srcURL}`);
+        const result = this.convertImageToBase64(menuInfo.srcURL, dataURL =>
+          clipboard.writeImage(nativeImage.createFromDataURL(dataURL)),
+        );
+
+        this._sendNotificationOnClipboardEvent(
+          menuInfo.clipboardNotifications,
+          () => `Image copied from URL: ${menuInfo.srcURL}`,
+        );
         return result;
       },
     });
@@ -333,7 +358,10 @@ module.exports = class ContextMenuBuilder {
       label: this.stringTable.copyImageUrl(),
       click: () => {
         const result = clipboard.writeText(menuInfo.srcURL);
-        this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Image URL copied: ${menuInfo.srcURL}`);
+        this._sendNotificationOnClipboardEvent(
+          menuInfo.clipboardNotifications,
+          () => `Image URL copied: ${menuInfo.srcURL}`,
+        );
         return result;
       },
     });
@@ -345,20 +373,22 @@ module.exports = class ContextMenuBuilder {
       const downloadImage = new MenuItem({
         label: this.stringTable.downloadImage(),
         click: () => {
-          const urlWithoutBlob = menuInfo.srcURL.substr(5);
-          this.convertImageToBase64(menuInfo.srcURL,
-            (dataURL) => {
-              const url = new window.URL(urlWithoutBlob);
-              const fileName = url.pathname.substr(1);
-              ipcRenderer.send('download-file', {
-                content: dataURL,
-                fileOptions: {
-                  name: fileName,
-                  mime: 'image/png',
-                },
-              });
+          const urlWithoutBlob = menuInfo.srcURL.slice(5);
+          this.convertImageToBase64(menuInfo.srcURL, dataURL => {
+            const url = new window.URL(urlWithoutBlob);
+            const fileName = url.pathname.slice(1);
+            ipcRenderer.send('download-file', {
+              content: dataURL,
+              fileOptions: {
+                name: fileName,
+                mime: 'image/png',
+              },
             });
-          this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Image downloaded: ${urlWithoutBlob}`);
+          });
+          this._sendNotificationOnClipboardEvent(
+            menuInfo.clipboardNotifications,
+            () => `Image downloaded: ${urlWithoutBlob}`,
+          );
         },
       });
 
@@ -373,12 +403,14 @@ module.exports = class ContextMenuBuilder {
    */
   addCut(menu, menuInfo) {
     const webContents = this.getWebContents();
-    menu.append(new MenuItem({
-      label: this.stringTable.cut(),
-      accelerator: `${cmdOrCtrlShortcutKey()}+X`,
-      enabled: menuInfo.editFlags.canCut,
-      click: () => webContents.cut(),
-    }));
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.cut(),
+        accelerator: `${cmdOrCtrlShortcutKey()}+X`,
+        enabled: menuInfo.editFlags.canCut,
+        click: () => webContents.cut(),
+      }),
+    );
 
     return menu;
   }
@@ -388,12 +420,14 @@ module.exports = class ContextMenuBuilder {
    */
   addCopy(menu, menuInfo) {
     const webContents = this.getWebContents();
-    menu.append(new MenuItem({
-      label: this.stringTable.copy(),
-      accelerator: `${cmdOrCtrlShortcutKey()}+C`,
-      enabled: menuInfo.editFlags.canCopy,
-      click: () => webContents.copy(),
-    }));
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.copy(),
+        accelerator: `${cmdOrCtrlShortcutKey()}+C`,
+        enabled: menuInfo.editFlags.canCopy,
+        click: () => webContents.copy(),
+      }),
+    );
 
     return menu;
   }
@@ -403,21 +437,23 @@ module.exports = class ContextMenuBuilder {
    */
   addPaste(menu, menuInfo) {
     const webContents = this.getWebContents();
-    menu.append(new MenuItem({
-      label: this.stringTable.paste(),
-      accelerator: `${cmdOrCtrlShortcutKey()}+V`,
-      enabled: menuInfo.editFlags.canPaste,
-      click: () => webContents.paste(),
-    }));
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.paste(),
+        accelerator: `${cmdOrCtrlShortcutKey()}+V`,
+        enabled: menuInfo.editFlags.canPaste,
+        click: () => webContents.paste(),
+      }),
+    );
 
     return menu;
   }
 
   addPastePlain(menu, menuInfo) {
     if (
-      menuInfo.editFlags.canPaste
-      && !menuInfo.linkText
-      && !menuInfo.hasImageContents
+      menuInfo.editFlags.canPaste &&
+      !menuInfo.linkText &&
+      !menuInfo.hasImageContents
     ) {
       const webContents = this.getWebContents();
       menu.append(
@@ -463,21 +499,21 @@ module.exports = class ContextMenuBuilder {
    * @param  {String} outputFormat  The image format to use, defaults to 'image/png'
    */
   convertImageToBase64(url, callback, outputFormat = 'image/png') {
-    let canvas = document.createElement('CANVAS');
+    let canvas = document.createElement('canvas');
     const ctx = canvas.getContext('2d');
     // eslint-disable-next-line no-undef
     const img = new Image();
     img.crossOrigin = 'Anonymous';
 
-    img.onload = () => {
+    img.addEventListener('load', () => {
       canvas.height = img.height;
       canvas.width = img.width;
-      ctx.drawImage(img, 0, 0);
+      ctx?.drawImage(img, 0, 0);
 
       const dataURL = canvas.toDataURL(outputFormat);
       canvas = null;
       callback(dataURL);
-    };
+    });
 
     img.src = url;
   }
@@ -487,12 +523,14 @@ module.exports = class ContextMenuBuilder {
    */
   goBack(menu) {
     const webContents = this.getWebContents();
-    menu.append(new MenuItem({
-      label: this.stringTable.goBack(),
-      accelerator: `${cmdOrCtrlShortcutKey()}+left`,
-      enabled: webContents.canGoBack(),
-      click: () => webContents.goBack(),
-    }));
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.goBack(),
+        accelerator: `${cmdOrCtrlShortcutKey()}+left`,
+        enabled: webContents.canGoBack(),
+        click: () => webContents.goBack(),
+      }),
+    );
 
     return menu;
   }
@@ -502,12 +540,14 @@ module.exports = class ContextMenuBuilder {
    */
   goForward(menu) {
     const webContents = this.getWebContents();
-    menu.append(new MenuItem({
-      label: this.stringTable.goForward(),
-      accelerator: `${cmdOrCtrlShortcutKey()}+right`,
-      enabled: webContents.canGoForward(),
-      click: () => webContents.goForward(),
-    }));
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.goForward(),
+        accelerator: `${cmdOrCtrlShortcutKey()}+right`,
+        enabled: webContents.canGoForward(),
+        click: () => webContents.goForward(),
+      }),
+    );
 
     return menu;
   }
@@ -516,14 +556,19 @@ module.exports = class ContextMenuBuilder {
    * Adds the 'copy page url' menu item.
    */
   copyPageUrl(menu, menuInfo) {
-    menu.append(new MenuItem({
-      label: this.stringTable.copyPageUrl(),
-      enabled: true,
-      click: () => {
-        clipboard.writeText(window.location.href);
-        this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Page URL copied: ${window.location.href}`);
-      },
-    }));
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.copyPageUrl(),
+        enabled: true,
+        click: () => {
+          clipboard.writeText(window.location.href);
+          this._sendNotificationOnClipboardEvent(
+            menuInfo.clipboardNotifications,
+            () => `Page URL copied: ${window.location.href}`,
+          );
+        },
+      }),
+    );
 
     return menu;
   }
@@ -533,15 +578,17 @@ module.exports = class ContextMenuBuilder {
    */
   goToHomePage(menu, menuInfo) {
     const baseURL = new URL(menuInfo.pageURL);
-    menu.append(new MenuItem({
-      label: this.stringTable.goToHomePage(),
-      accelerator: `${cmdOrCtrlShortcutKey()}+Home`,
-      enabled: true,
-      click: () => {
-        // webContents.loadURL(baseURL.origin);
-        window.location.href = baseURL.origin;
-      },
-    }));
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.goToHomePage(),
+        accelerator: `${cmdOrCtrlShortcutKey()}+Home`,
+        enabled: true,
+        click: () => {
+          // webContents.loadURL(baseURL.origin);
+          window.location.href = baseURL.origin;
+        },
+      }),
+    );
 
     return menu;
   }
@@ -550,13 +597,15 @@ module.exports = class ContextMenuBuilder {
    * Adds the 'open in browser' menu item.
    */
   openInBrowser(menu, menuInfo) {
-    menu.append(new MenuItem({
-      label: this.stringTable.openInBrowser(),
-      enabled: true,
-      click: () => {
-        openExternalUrl(menuInfo.pageURL, true);
-      },
-    }));
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.openInBrowser(),
+        enabled: true,
+        click: () => {
+          openExternalUrl(menuInfo.pageURL, true);
+        },
+      }),
+    );
 
     return menu;
   }
@@ -566,9 +615,8 @@ module.exports = class ContextMenuBuilder {
       return;
     }
     // eslint-disable-next-line no-new
-    new window.Notification('Data copied into Clipboard',
-      {
-        body: notificationText(),
-      });
+    new window.Notification('Data copied into Clipboard', {
+      body: notificationText(),
+    });
   }
 };
diff --git a/src/webview/darkmode.ts b/src/webview/darkmode.ts
index e06c22f11..7b9407049 100644
--- a/src/webview/darkmode.ts
+++ b/src/webview/darkmode.ts
@@ -1,5 +1,3 @@
-/* eslint no-bitwise: ["error", { "int32Hint": true }] */
-
 import { join } from 'path';
 import { pathExistsSync, readFileSync } from 'fs-extra';
 
@@ -7,7 +5,9 @@ const debug = require('debug')('Ferdi:DarkMode');
 
 const chars = [...'abcdefghijklmnopqrstuvwxyz'];
 
-const ID = [...Array(20)].map(() => chars[Math.random() * chars.length | 0]).join('');
+const ID = [...Array.from({ length: 20 })]
+  .map(() => chars[Math.trunc(Math.random() * chars.length)])
+  .join('');
 
 export function injectDarkModeStyle(recipePath: string) {
   const darkModeStyle = join(recipePath, 'darkmode.css');
diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js
index 2bd6bad8d..f1d493e7c 100644
--- a/src/webview/lib/RecipeWebview.js
+++ b/src/webview/lib/RecipeWebview.js
@@ -1,12 +1,14 @@
 import { ipcRenderer } from 'electron';
-import { exists, pathExistsSync, readFileSync } from 'fs-extra';
+import { BrowserWindow } from '@electron/remote';
+import { pathExistsSync, readFileSync, existsSync } from 'fs-extra';
 
 const debug = require('debug')('Ferdi:Plugin:RecipeWebview');
 
 class RecipeWebview {
-  constructor(badgeHandler, notificationsHandler) {
+  constructor(badgeHandler, notificationsHandler, sessionHandler) {
     this.badgeHandler = badgeHandler;
     this.notificationsHandler = notificationsHandler;
+    this.sessionHandler = sessionHandler;
 
     ipcRenderer.on('poll', () => {
       this.loopFunc();
@@ -23,6 +25,16 @@ class RecipeWebview {
 
   darkModeHandler = false;
 
+  // TODO Remove this once we implement a proper wrapper.
+  get ipcRenderer() {
+    return ipcRenderer;
+  }
+
+  // TODO Remove this once we implement a proper wrapper.
+  get BrowserWindow() {
+    return BrowserWindow;
+  }
+
   /**
    * Initialize the loop
    *
@@ -35,12 +47,12 @@ class RecipeWebview {
   /**
    * Set the unread message badge
    *
-   * @param {int} direct      Set the count of direct messages
-   *                          eg. Slack direct mentions, or a
-   *                          message to @channel
-   * @param {int} indirect    Set a badge that defines there are
-   *                          new messages but they do not involve
-   *                          me directly to me eg. in a channel
+   * @param {string | number | undefined | null} direct      Set the count of direct messages
+   *                                                         eg. Slack direct mentions, or a
+   *                                                         message to @channel
+   * @param {string | number | undefined | null} indirect    Set a badge that defines there are
+   *                                                         new messages but they do not involve
+   *                                                         me directly to me eg. in a channel
    */
   setBadge(direct = 0, indirect = 0) {
     this.badgeHandler.setBadge(direct, indirect);
@@ -62,12 +74,13 @@ class RecipeWebview {
    *                          be an absolute path to the file
    */
   injectCSS(...files) {
-    files.forEach(async (file) => {
+    // eslint-disable-next-line unicorn/no-array-for-each
+    files.forEach(file => {
       if (pathExistsSync(file)) {
         const styles = document.createElement('style');
         styles.innerHTML = readFileSync(file, 'utf8');
 
-        document.querySelector('head').appendChild(styles);
+        document.querySelector('head').append(styles);
 
         debug('Append styles', styles);
       }
@@ -75,14 +88,16 @@ class RecipeWebview {
   }
 
   injectJSUnsafe(...files) {
-    Promise.all(files.map(async (file) => {
-      if (await exists(file)) {
-        return readFileSync(file, 'utf8');
-      }
-      debug('Script not found', file);
-      return null;
-    })).then(async (scripts) => {
-      const scriptsFound = scripts.filter((script) => script !== null);
+    Promise.all(
+      files.map(file => {
+        if (existsSync(file)) {
+          return readFileSync(file, 'utf8');
+        }
+        debug('Script not found', file);
+        return null;
+      }),
+    ).then(scripts => {
+      const scriptsFound = scripts.filter(script => script !== null);
       if (scriptsFound.length > 0) {
         debug('Inject scripts to main world', scriptsFound);
         ipcRenderer.sendToHost('inject-js-unsafe', ...scriptsFound);
@@ -110,6 +125,22 @@ class RecipeWebview {
       fn();
     }
   }
+
+  clearStorageData(serviceId, targetsToClear) {
+    ipcRenderer.send('clear-storage-data', { serviceId, targetsToClear });
+  }
+
+  releaseServiceWorkers() {
+    this.sessionHandler.releaseServiceWorkers();
+  }
+
+  setAvatarImage(avatarUrl) {
+    ipcRenderer.sendToHost('avatar', avatarUrl);
+  }
+
+  openNewWindow(url) {
+    ipcRenderer.sendToHost('new-window', url);
+  }
 }
 
 export default RecipeWebview;
diff --git a/src/webview/lib/Userscript.js b/src/webview/lib/Userscript.js
index 2043d9fff..bed2b1ff8 100644
--- a/src/webview/lib/Userscript.js
+++ b/src/webview/lib/Userscript.js
@@ -28,7 +28,7 @@ export default class Userscript {
    *
    * @param {*} settings
    */
-  // eslint-disable-next-line
+  // eslint-disable-next-line camelcase
   internal_setSettings(settings) {
     // This is needed to get a clean JS object from the settings itself to provide better accessibility
     // Otherwise this will be a mobX instance
@@ -95,9 +95,7 @@ export default class Userscript {
    * @param {*} value
    */
   set(key, value) {
-    window.localStorage.setItem(
-      `ferdi-user-${key}`, JSON.stringify(value),
-    );
+    window.localStorage.setItem(`ferdi-user-${key}`, JSON.stringify(value));
   }
 
   /**
@@ -107,9 +105,7 @@ export default class Userscript {
    * @return Value of the key
    */
   get(key) {
-    return JSON.parse(window.localStorage.getItem(
-      `ferdi-user-${key}`,
-    ));
+    return JSON.parse(window.localStorage.getItem(`ferdi-user-${key}`));
   }
 
   /**
diff --git a/src/webview/notifications.js b/src/webview/notifications.js
index 205a3220c..22960d818 100644
--- a/src/webview/notifications.js
+++ b/src/webview/notifications.js
@@ -1,22 +1,26 @@
 import { ipcRenderer } from 'electron';
-import uuidV1 from 'uuid/v1';
+
+import { v1 as uuidV1 } from 'uuid';
 
 const debug = require('debug')('Ferdi:Notifications');
 
 export class NotificationsHandler {
-  onNotify = (data) => data;
+  onNotify = data => data;
 
   displayNotification(title, options) {
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
       debug('New notification', title, options);
 
       const notificationId = uuidV1();
 
-      ipcRenderer.sendToHost('notification', this.onNotify({
-        title,
-        options,
-        notificationId,
-      }));
+      ipcRenderer.sendToHost(
+        'notification',
+        this.onNotify({
+          title,
+          options,
+          notificationId,
+        }),
+      );
 
       ipcRenderer.once(`notification-onclick:${notificationId}`, () => {
         resolve();
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index a3ae4513f..5cab28c09 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -1,6 +1,6 @@
+/* eslint-disable global-require */
 /* eslint-disable import/first */
-import { contextBridge, desktopCapturer, ipcRenderer } from 'electron';
-import { BrowserWindow, getCurrentWebContents } from '@electron/remote';
+import { contextBridge, ipcRenderer } from 'electron';
 import { join } from 'path';
 import { autorun, computed, observable } from 'mobx';
 import { pathExistsSync, readFileSync } from 'fs-extra';
@@ -45,7 +45,7 @@ import {
   getSpellcheckerLocaleByFuzzyIdentifier,
 } from './spellchecker';
 
-import { DEFAULT_APP_SETTINGS } from '../environment';
+import { DEFAULT_APP_SETTINGS } from '../config';
 
 const debug = require('debug')('Ferdi:Plugin');
 
@@ -100,26 +100,15 @@ window.open = (url, frameName, features) => {
   }
 };
 
-// We can't override APIs here, so we first expose functions via window.ferdi,
+// We can't override APIs here, so we first expose functions via 'window.ferdi',
 // then overwrite the corresponding field of the window object by injected JS.
 contextBridge.exposeInMainWorld('ferdi', {
   open: window.open,
-  setBadge: (direct, indirect) =>
-    badgeHandler.setBadge(direct, indirect),
-  safeParseInt: (text) =>
-    badgeHandler.safeParseInt(text),
+  setBadge: (direct, indirect) => badgeHandler.setBadge(direct, indirect),
+  safeParseInt: text => 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(
@@ -173,12 +162,12 @@ class RecipeController {
   findInPage = null;
 
   async initialize() {
-    Object.keys(this.ipcEvents).forEach(channel => {
+    for (const channel of Object.keys(this.ipcEvents)) {
       ipcRenderer.on(channel, (...args) => {
         debug('Received IPC event for channel', channel, 'with', ...args);
         this[this.ipcEvents[channel]](...args);
       });
-    });
+    }
 
     debug('Send "hello" to host');
     setTimeout(() => ipcRenderer.sendToHost('hello'), 100);
@@ -209,8 +198,12 @@ class RecipeController {
     // Delete module from cache
     delete require.cache[require.resolve(modulePath)];
     try {
-      this.recipe = new RecipeWebview(badgeHandler, notificationsHandler);
-      // eslint-disable-next-line
+      this.recipe = new RecipeWebview(
+        badgeHandler,
+        notificationsHandler,
+        sessionHandler,
+      );
+      // eslint-disable-next-line import/no-dynamic-require
       require(modulePath)(this.recipe, { ...config, recipe });
       debug('Initialize Recipe', config, recipe);
 
@@ -218,8 +211,8 @@ class RecipeController {
 
       // Make sure to update the WebView, otherwise the custom darkmode handler may not be used
       this.update();
-    } catch (err) {
-      console.error('Recipe initialization failed', err);
+    } catch (error) {
+      console.error('Recipe initialization failed', error);
     }
 
     this.loadUserFiles(recipe, config);
@@ -234,12 +227,12 @@ class RecipeController {
       const data = readFileSync(userCss);
       styles.innerHTML += data.toString();
     }
-    document.querySelector('head').appendChild(styles);
+    document.querySelector('head').append(styles);
 
     const userJs = join(recipe.path, 'user.js');
     if (pathExistsSync(userJs)) {
       const loadUserJs = () => {
-        // eslint-disable-next-line
+        // eslint-disable-next-line import/no-dynamic-require
         const userJsModule = require(userJs);
 
         if (typeof userJsModule === 'function') {
@@ -281,8 +274,8 @@ class RecipeController {
     }
 
     if (this.settings.app.enableSpellchecking) {
-      debug('Setting spellchecker language to', this.spellcheckerLanguage);
       let { spellcheckerLanguage } = this;
+      debug(`Setting spellchecker language to ${spellcheckerLanguage}`);
       if (spellcheckerLanguage.includes('automatic')) {
         this.automaticLanguageDetection();
         debug(
@@ -291,7 +284,7 @@ class RecipeController {
         );
         spellcheckerLanguage = this.settings.app.locale;
       }
-      switchDict(spellcheckerLanguage);
+      switchDict(spellcheckerLanguage, this.settings.service.id);
     } else {
       debug('Disable spellchecker');
     }
@@ -392,15 +385,14 @@ class RecipeController {
     }
 
     // Remove dark reader if (universal) dark mode was just disabled
-    if (this.universalDarkModeInjected) {
-      if (
-        !this.settings.app.darkMode ||
+    if (
+      this.universalDarkModeInjected &&
+      (!this.settings.app.darkMode ||
         !this.settings.service.isDarkModeEnabled ||
-        !this.settings.app.universalDarkMode
-      ) {
-        disableDarkMode();
-        this.universalDarkModeInjected = false;
-      }
+        !this.settings.app.universalDarkMode)
+    ) {
+      disableDarkMode();
+      this.universalDarkModeInjected = false;
     }
   }
 
@@ -447,7 +439,7 @@ class RecipeController {
           spellcheckerLocale,
         );
         if (spellcheckerLocale) {
-          switchDict(spellcheckerLocale);
+          switchDict(spellcheckerLocale, this.settings.service.id);
         }
       }, 225),
     );
diff --git a/src/webview/sessionHandler.ts b/src/webview/sessionHandler.ts
index 6a7e62ac5..0c6d23f23 100644
--- a/src/webview/sessionHandler.ts
+++ b/src/webview/sessionHandler.ts
@@ -1,28 +1,16 @@
-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();
+      const registrations =
+        await window.navigator.serviceWorker.getRegistrations();
+      for (const registration of registrations) {
+        registration.unregister();
         debug('ServiceWorker unregistered');
-      });
-    } catch (err) {
-      debug(err);
+      }
+    } catch (error) {
+      debug(error);
     }
   }
 }
diff --git a/src/webview/spellchecker.ts b/src/webview/spellchecker.ts
index 30b4ef075..468a1b4ae 100644
--- a/src/webview/spellchecker.ts
+++ b/src/webview/spellchecker.ts
@@ -1,35 +1,25 @@
-import { getCurrentWebContents } from '@electron/remote';
+import { ipcRenderer } from 'electron';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
-import { DEFAULT_APP_SETTINGS, isMac } from '../environment';
+import { isMac } from '../environment';
 
 const debug = require('debug')('Ferdi:spellchecker');
 
-const { session } = getCurrentWebContents();
-const [defaultLocale] = session.getSpellCheckerLanguages();
-debug('Spellchecker default locale is', defaultLocale);
-
 export function getSpellcheckerLocaleByFuzzyIdentifier(identifier: string) {
   const locales = Object.keys(SPELLCHECKER_LOCALES).filter((key) => key.toLocaleLowerCase() === identifier.toLowerCase() || key.split('-')[0] === identifier.toLowerCase());
 
-  return locales.length >= 1 ? locales[0] : null;
+  return locales.length > 0 ? locales[0] : null;
 }
 
-export function switchDict(locale: string) {
+export function switchDict(fuzzyLocale: string, serviceId: string) {
   if (isMac) {
     debug('Ignoring dictionary changes on macOS');
     return;
   }
 
-  debug('Setting spellchecker locale to', locale);
-
-  const locales: string[] = [];
-
-  const foundLocale = getSpellcheckerLocaleByFuzzyIdentifier(locale);
-  if (foundLocale) {
-    locales.push(foundLocale);
+  debug(`Setting spellchecker locale from: ${fuzzyLocale}`);
+  const locale = getSpellcheckerLocaleByFuzzyIdentifier(fuzzyLocale);
+  if (locale) {
+    debug(`Sending spellcheck locales to host: ${locale}`);
+    ipcRenderer.send('set-spellchecker-locales', { locale, serviceId });
   }
-
-  locales.push(defaultLocale, DEFAULT_APP_SETTINGS.fallbackLocale);
-
-  session.setSpellCheckerLanguages(locales);
 }
diff --git a/tsconfig.json b/tsconfig.json
index 2676f392d..2d9889286 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,34 @@
 {
-  "extends": "./tsconfig.settings.json",
   "compilerOptions": {
     "outDir": ".tmp",
-    "rootDir": "./"
+    "rootDir": "./",
+    "baseUrl": ".",
+    "strict": true,
+    "target": "esnext",
+    "lib": ["esnext", "dom"],
+    "module": "commonjs",
+    "jsx": "react",
+    "typeRoots": ["@types", "node_modules/@types"],
+    "moduleResolution": "node",
+    "types": ["node", "mocha"],
+    "sourceMap": true,
+    "skipLibCheck": true,
+    "noImplicitAny": false, // TODO: Need to switch
+    "allowSyntheticDefaultImports": true,
+    "experimentalDecorators": true,
+    "composite": true,
+    "esModuleInterop": true,
+    "importHelpers": true,
+    "removeComments": true,
+    "allowUnreachableCode": false,
+    "allowUnusedLabels": false,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noImplicitReturns": true,
+    "noImplicitThis": true,
+    "preserveConstEnums": true,
+    "strictNullChecks": true,
+    "resolveJsonModule": true,
+    "forceConsistentCasingInFileNames": true
   }
 }
diff --git a/tsconfig.settings.json b/tsconfig.settings.json
deleted file mode 100644
index bd4669e01..000000000
--- a/tsconfig.settings.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "extends": "@tsconfig/node14/tsconfig.json",
-  "compilerOptions": {
-    "baseUrl": ".",
-    "target": "esnext",
-    "lib": ["es2015", "es2017", "dom"],
-    "jsx": "react",
-    "typeRoots": ["node_modules/@types"],
-    "moduleResolution": "node",
-    "types": ["node"],
-    "sourceMap": true,
-    "noImplicitAny": false,   // TODO: Need to switch
-    "allowSyntheticDefaultImports": true,
-    "experimentalDecorators": true,
-    "composite": true,
-    "esModuleInterop": true,
-    "importHelpers": true,
-    "removeComments": true,
-    "allowUnreachableCode": false,
-    "allowUnusedLabels": false,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitReturns": true,
-    "noImplicitThis": true,
-    "preserveConstEnums": true,
-    "strictNullChecks": true,
-  }
-}
diff --git a/uidev/src/index.tsx b/uidev/src/index.tsx
index 99658b184..5aa3979c8 100644
--- a/uidev/src/index.tsx
+++ b/uidev/src/index.tsx
@@ -6,4 +6,4 @@ const app = () => (
   <App />
 );
 
-render(app(), document.getElementById('root'));
+render(app(), document.querySelector('#root'));
diff --git a/uidev/src/stories/input.stories.tsx b/uidev/src/stories/input.stories.tsx
index 889539266..c92ebb36a 100644
--- a/uidev/src/stories/input.stories.tsx
+++ b/uidev/src/stories/input.stories.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import uuid from 'uuid/v4';
 
 import { Input } from '@meetfranz/forms';
+import { v4 as uuid } from 'uuid';
 import { storiesOf } from '../stores/stories';
 
 const defaultProps = () => {
@@ -10,7 +10,8 @@ const defaultProps = () => {
     label: 'Label',
     id: `test-${id}`,
     name: `test-${id}`,
-    onChange: (e: React.ChangeEvent<HTMLInputElement>) => console.log('changed event', e),
+    onChange: (e: React.ChangeEvent<HTMLInputElement>) =>
+      console.log('changed event', e),
   };
 };
 
@@ -21,44 +22,23 @@ const defaultPasswordProps = () => {
     id: `test-${id}`,
     name: `test-${id}`,
     type: 'password',
-    onChange: (e: React.ChangeEvent<HTMLInputElement>) => console.log('changed event', e),
+    onChange: (e: React.ChangeEvent<HTMLInputElement>) =>
+      console.log('changed event', e),
   };
 };
 
 storiesOf('Input')
   .add('Basic', () => (
-    <Input
-      {...defaultProps()}
-      placeholder="Placeholder text"
-    />
-  ))
-  .add('Without Label', () => (
-    <Input
-      {...defaultProps()}
-      showLabel={false}
-    />
-  ))
-  .add('Disabled', () => (
-    <Input {...defaultProps()} disabled />
-  ))
-  .add('With prefix', () => (
-    <Input
-      {...defaultProps()}
-      prefix="https://"
-    />
+    <Input {...defaultProps()} placeholder="Placeholder text" />
   ))
+  .add('Without Label', () => <Input {...defaultProps()} showLabel={false} />)
+  .add('Disabled', () => <Input {...defaultProps()} disabled />)
+  .add('With prefix', () => <Input {...defaultProps()} prefix="https://" />)
   .add('With suffix', () => (
-    <Input
-      {...defaultProps()}
-      suffix=".meetfranz.com"
-    />
+    <Input {...defaultProps()} suffix=".meetfranz.com" />
   ))
   .add('With pre-suffix', () => (
-    <Input
-      {...defaultProps()}
-      prefix="https://"
-      suffix=".meetfranz.com"
-    />
+    <Input {...defaultProps()} prefix="https://" suffix=".meetfranz.com" />
   ))
   .add('With error', () => (
     <Input
@@ -68,32 +48,16 @@ storiesOf('Input')
     />
   ))
   .add('Type number with min & max', () => (
-    <Input
-      {...defaultProps()}
-      type="number"
-      min={1}
-      max={10}
-    />
+    <Input {...defaultProps()} type="number" min={1} max={10} />
   ));
 
 storiesOf('Password')
-  .add('Basic', () => (
-    <Input
-      {...defaultPasswordProps()}
-    />
-  ))
+  .add('Basic', () => <Input {...defaultPasswordProps()} />)
   .add('Show password toggle', () => (
-    <Input
-      {...defaultPasswordProps()}
-      showPasswordToggle
-    />
+    <Input {...defaultPasswordProps()} showPasswordToggle />
   ))
   .add('Score password', () => (
-    <Input
-      {...defaultPasswordProps()}
-      showPasswordToggle
-      scorePassword
-    />
+    <Input {...defaultPasswordProps()} showPasswordToggle scorePassword />
   ))
   .add('Score password with error', () => (
     <Input
diff --git a/uidev/src/stories/select.stories.tsx b/uidev/src/stories/select.stories.tsx
index 51ec6ed88..93e072cd9 100644
--- a/uidev/src/stories/select.stories.tsx
+++ b/uidev/src/stories/select.stories.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import uuid from 'uuid/v4';
+import { v4 as uuid } from 'uuid';
 
 import { Select } from '@meetfranz/forms';
 import { storiesOf } from '../stores/stories';
@@ -282,35 +282,18 @@ const defaultProps = () => {
     },
     actionText: 'Select country',
     // defaultValue: 'AT',
-    onChange: (e: React.ChangeEvent<HTMLInputElement>) => console.log('changed event', e),
+    onChange: (e: React.ChangeEvent<HTMLInputElement>) =>
+      console.log('changed event', e),
   };
 };
 
 storiesOf('Select')
-  .add('Basic', () => (
-    <Select
-      {...defaultProps()}
-    />
-  ))
+  .add('Basic', () => <Select {...defaultProps()} />)
   .add('With preselection', () => (
-    <Select
-      {...defaultProps()}
-      defaultValue="AT"
-    />
-  ))
-  .add('With search', () => (
-    <Select
-      {...defaultProps()}
-      showSearch
-    />
-  ))
-  .add('Disabled', () => (
-    <Select
-      {...defaultProps()}
-      showSearch
-      disabled
-    />
+    <Select {...defaultProps()} defaultValue="AT" />
   ))
+  .add('With search', () => <Select {...defaultProps()} showSearch />)
+  .add('Disabled', () => <Select {...defaultProps()} showSearch disabled />)
   .add('With error', () => (
     <Select
       {...defaultProps()}
diff --git a/uidev/src/stories/textarea.stories.tsx b/uidev/src/stories/textarea.stories.tsx
index 1ab21820b..09b9fef70 100644
--- a/uidev/src/stories/textarea.stories.tsx
+++ b/uidev/src/stories/textarea.stories.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import uuid from 'uuid/v4';
+import { v4 as uuid } from 'uuid';
 
 import { Textarea } from '@meetfranz/forms';
 import { storiesOf } from '../stores/stories';
@@ -11,7 +11,8 @@ const defaultProps = () => {
     id: `test-${id}`,
     name: `test-${id}`,
     rows: 5,
-    onChange: (e: React.ChangeEvent<HTMLInputElement>) => console.log('changed event', e),
+    onChange: (e: React.ChangeEvent<HTMLInputElement>) =>
+      console.log('changed event', e),
   };
 };
 
@@ -22,22 +23,8 @@ storiesOf('Textarea')
       // placeholder="Placeholder text"
     />
   ))
-  .add('10 rows', () => (
-    <Textarea
-      {...defaultProps()}
-      rows={10}
-    />
-  ))
+  .add('10 rows', () => <Textarea {...defaultProps()} rows={10} />)
   .add('With error', () => (
-    <Textarea
-      {...defaultProps()}
-      error="This is a generic error message."
-    />
+    <Textarea {...defaultProps()} error="This is a generic error message." />
   ))
-  .add('Disabled', () => (
-    <Textarea
-      {...defaultProps()}
-      rows={2}
-      disabled
-    />
-  ));
+  .add('Disabled', () => <Textarea {...defaultProps()} rows={2} disabled />);
diff --git a/uidev/src/stories/toggle.stories.tsx b/uidev/src/stories/toggle.stories.tsx
index af6b282bc..f54e67596 100644
--- a/uidev/src/stories/toggle.stories.tsx
+++ b/uidev/src/stories/toggle.stories.tsx
@@ -1,7 +1,7 @@
 import { observable } from 'mobx';
 import { observer } from 'mobx-react';
 import React from 'react';
-import uuid from 'uuid/v4';
+import { v4 as uuid } from 'uuid';
 
 import { Toggle } from '@meetfranz/forms';
 import { storiesOf } from '../stores/stories';
@@ -16,14 +16,17 @@ interface IStoreArgs {
   error?: string;
 }
 
-const createStore = (args?: IStoreArgs) => observable({ id: `element-${uuid()}`,
+const createStore = (args?: IStoreArgs) =>
+  observable({
+    id: `element-${uuid()}`,
     name: 'toggle',
     label: 'Label',
     value: true,
     checked: false,
     disabled: false,
     error: '',
-...args });
+    ...args,
+  });
 
 const WithStoreToggle = observer(({ store }: { store: any }) => (
   <>
@@ -35,37 +38,40 @@ const WithStoreToggle = observer(({ store }: { store: any }) => (
       name={store.name}
       disabled={store.disabled}
       error={store.error}
-      onChange={() => store.checked = !store.checked}
+      onChange={() => (store.checked = !store.checked)}
     />
   </>
 ));
 
 storiesOf('Toggle')
-  .add('Basic', () => (
-    <WithStoreToggle store={createStore()} />
-  ))
+  .add('Basic', () => <WithStoreToggle store={createStore()} />)
   .add('Checked', () => (
-    <WithStoreToggle store={createStore({
-      checked: true,
-    })}
+    <WithStoreToggle
+      store={createStore({
+        checked: true,
+      })}
     />
   ))
   .add('Disabled', () => (
-    <WithStoreToggle store={createStore({
-      checked: true,
-      disabled: true,
-    })}
+    <WithStoreToggle
+      store={createStore({
+        checked: true,
+        disabled: true,
+      })}
     />
   ))
   .add('Long label', () => (
-    <WithStoreToggle store={createStore({
-      label: 'Hello world, this is an insanely long label for this toggle. We need to make sure that it will be displayed correctly.',
-    })}
+    <WithStoreToggle
+      store={createStore({
+        label:
+          'Hello world, this is an insanely long label for this toggle. We need to make sure that it will be displayed correctly.',
+      })}
     />
   ))
   .add('With error', () => (
-    <WithStoreToggle store={createStore({
-      error: 'Something went wrong',
-    })}
+    <WithStoreToggle
+      store={createStore({
+        error: 'Something went wrong',
+      })}
     />
   ));
diff --git a/uidev/tsconfig.json b/uidev/tsconfig.json
index fb57639c8..60459d69e 100644
--- a/uidev/tsconfig.json
+++ b/uidev/tsconfig.json
@@ -1,14 +1,16 @@
 {
-  "extends": "../tsconfig.settings.json",
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "baseUrl": "..",
     "outDir": "lib",
-    "rootDir": "src",
+    "rootDir": "src"
   },
-  "references": [{
-    "path": "../packages/theme"
-  },
-  {
-    "path": "../packages/forms"
-  }]
+  "references": [
+    {
+      "path": "../packages/theme"
+    },
+    {
+      "path": "../packages/forms"
+    }
+  ]
 }