Merge branch 'develop'

79 files changed, 1576 insertions, 916 deletions

diff --git a/.all-contributorsrc b/.all-contributorsrc
index e5ae29a91..0c891c555 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -463,7 +463,8 @@
       "avatar_url": "https://avatars2.githubusercontent.com/u/46404814?v=4",
       "profile": "https://github.com/yourcontact",
       "contributions": [
-        "code"
+        "code",
+        "ideas"
       ]
     },
     {
@@ -474,7 +475,10 @@
       "contributions": [
         "code",
         "ideas",
-        "review"
+        "review",
+        "bug",
+        "doc",
+        "userTesting"
       ]
     },
     {
@@ -493,7 +497,11 @@
       "profile": "https://github.com/sampathBlam",
       "contributions": [
         "code",
-        "review"
+        "review",
+        "ideas",
+        "bug",
+        "doc",
+        "userTesting"
       ]
     },
     {
@@ -667,6 +675,80 @@
       "contributions": [
         "translation"
       ]
+    },
+    {
+      "login": "gega7",
+      "name": "gega7",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/20799911?v=4",
+      "profile": "https://github.com/gega7",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "tristanplouz",
+      "name": "tristanplouz",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/6893466?v=4",
+      "profile": "https://github.com/tristanplouz",
+      "contributions": [
+        "code",
+        "ideas"
+      ]
+    },
+    {
+      "login": "dannyqiu",
+      "name": "Danny Qiu",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/1170755?v=4",
+      "profile": "https://github.com/dannyqiu",
+      "contributions": [
+        "code",
+        "bug"
+      ]
+    },
+    {
+      "login": "belyazidi56",
+      "name": "Youssef Belyazidi",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/35711540?v=4",
+      "profile": "https://github.com/belyazidi56",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "gabspeck",
+      "name": "Gabriel Speckhahn",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/749488?v=4",
+      "profile": "https://github.com/gabspeck",
+      "contributions": [
+        "platform"
+      ]
+    },
+    {
+      "login": "dandelionadia",
+      "name": "Nadiia Ridko",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/33199975?v=4",
+      "profile": "https://github.com/dandelionadia",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "janhohner",
+      "name": "Jan Hohner",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/649895?v=4",
+      "profile": "https://hohner.dev",
+      "contributions": [
+        "userTesting"
+      ]
+    },
+    {
+      "login": "kris7t",
+      "name": "Kristóf Marussy",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/38888?v=4",
+      "profile": "https://marussy.com",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 6,
diff --git a/.github/FEATURE_PROPOSAL_TEMPLATE.md b/.github/FEATURE_PROPOSAL_TEMPLATE.md
deleted file mode 100644
index e8cdd41ed..000000000
--- a/.github/FEATURE_PROPOSAL_TEMPLATE.md
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--- Provide a general summary of your changes in the Title above -->
-
-### Feature Description
-<!--- Describe your feature in detail -->
-
-### Motivation and Context
-<!---
-* Why is this change required?
-* How is this improving the Ferdi experience?
-* What problem does it solve?
--->
-
-### Mockups, Screenshots (if available):
-<!--- A picture says more than a thousand words. -->
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index c0ce853ae..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--- Provide a general summary of the issue in the Title above -->
-
-<!-- This repository is only for the Ferdi client. Please use this form ( https://bitly.com/franz-service-request ) for service requests or check out the guide ( https://github.com/meetfranz/plugins ) to create your own service integration. -->
-
-<!--- If you want to propose a feature, use this template: https://raw.githubusercontent.com/meetfranz/franz/master/.github/FEATURE_PROPOSAL_TEMPLATE.md -->
-
-### Expected Behavior
-<!--- If you're describing a bug, tell us what should happen -->
-<!--- If you're suggesting a change/improvement, tell us how it should work -->
-
-### Current Behavior
-<!--- If describing a bug, tell us what happens instead of the expected behavior -->
-<!--- If suggesting a change/improvement, explain the difference from current behavior -->
-
-### Screenshots (if appropriate):
-
-### Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-<!--- or ideas how to implement the addition or change -->
-
-### Steps to Reproduce (for bugs)
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
-
-### Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-### Your Environment
-<!--- Include as many relevant details about the environment you experienced the bug in -->
-* Ferdi Version used:
-* Operating System and version:
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index e206b128f..efad9f6a2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -8,12 +8,11 @@ Please fill our form below, this way we can analyse and fix the problem as fast
 Please keep in mind that any text inside "<!--" and "--\>" are comments from us and won't be
 visible in your bug report, so please don't put any text in them.
 -->
-**Describe the bug**
+**Bug description:**
 <!-- Add a clear and concise description of what the bug is -->
 
-**To Reproduce**
+**Steps to reproduce:**
 <!-- Explain to us how we can reproduce your bug on our computer -->
-Steps to reproduce the behavior:
 
 1. Go to '...'
 2. Click on '....'
@@ -27,27 +26,18 @@ Steps to reproduce the behavior:
 <!-- If applicable, add screenshots to help explain your problem. -->
 <!-- You can simply drag and drop any image file into the editor to add it to the report -->
 
-**Desktop:**
+**Environment:**
 
-- OS: [e.g. macOS, Windows 10 etc.]
-- Ferdi Version [e.g. 5.4.3]
-<!-- ℹ You can find Ferdi's version by opening File > About Ferdi or Help > About Ferdi, depending on your Operating System -->
-- Server Used: [e.g. https://api.getferdi.com]
-<!-- ℹ You can find Ferdi's server in Ferdi's settings under "Server". If you self-host or use Ferdi without an account please say so. -->
+- Operating System: <!-- e.g. macOS Catalina, Windows 10, etc. -->
+- Ferdi Version: <!-- e.g. 5.4.3 -->
+- Server: <!-- e.g. Ferdi, Franz, Using without an account -->
 
+- Debug information:
 <!-- 
-If you are using Ferdi >= 5.4.4-beta.2 please publish your debugging information and share them in your bug report.
-To publish a bug report, inside Ferdi's menu bar click on "Help" > "Publish debug information", accept our terms
-and copy the link given to you.
+Get your debug information via Ferdi "Help" menu ("Copy/Publish Debug Information") then
+share a debug information file or your published link with us.
 -->
-Debug information: https://debug.getferdi.com/...
 
-**Additional context**
-<!-- Add any other context about the problem here. -->
-
-<!-- 
-Love Ferdi? Please consider supporting our open-collective:
-👉  https://opencollective.com/getferdi/donate
-or following us on Twitter:
-👉  https://twitter.com/getferdi
--->
+<!-- Please consider supporting Ferdi!
+👉  https://github.com/sponsors/getferdi
+👉  https://opencollective.com/getferdi/donate -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 5535496d2..61353797c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -15,5 +15,6 @@ A clear and concise description of any alternative solutions or features you've
 **Additional context**
 Add any other context or screenshots about the feature request here.
 
-<!-- Love Ferdi? Please consider supporting our collective:
+<!-- Please consider supporting Ferdi!
+👉  https://github.com/sponsors/getferdi
 👉  https://opencollective.com/getferdi/donate -->
diff --git a/.github/ISSUE_TEMPLATE/open_issue.md b/.github/ISSUE_TEMPLATE/open_issue.md
new file mode 100644
index 000000000..c7c279643
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/open_issue.md
@@ -0,0 +1,8 @@
+---
+name: Open issue
+about: For everything that's neither a feature request, nor a bug
+---
+
+<!-- Please consider supporting Ferdi!
+👉  https://github.com/sponsors/getferdi
+👉  https://opencollective.com/getferdi/donate -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6c4384695..5a6f95002 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,28 +1,18 @@
-<!--- Provide a general summary of your changes in the Title above -->
+<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+<!-- Please start by naming your pull request properly e.g. "Add Google Tasks to Todo providers". -->
 
 ### Description
-<!--- Describe your changes in detail -->
+<!-- Describe your changes in detail. -->
 
 ### Motivation and Context
-<!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here. -->
+<!-- Why is this change required? What problem does it solve? -->
+<!-- If it fixes an open issue, please link to the issue here. -->
 
-### How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-<!--- Include details of your testing environment, tests ran to see how -->
-<!--- your change affects other areas of the code, etc. -->
-
-### Screenshots (if appropriate):
-
-### Types of changes
-<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
-- [ ] Bug fix (non-breaking change which fixes an issue)
-- [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+### Screenshots
+<!-- Remove the section if this does not apply. -->
 
 ### Checklist:
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-- [ ] My code follows the code style of this project (run `$ yarn lint`).
-<!---- [ ] My change requires a change to the documentation.
-- [ ] I have updated the documentation accordingly. -->
+<!-- Go over all the following points, and put an `x` in all the boxes that apply. -->
+- [ ] My pull request is properly named
+- [ ] The changes respect the code style of the project (`$ npm run lint`)
+- [ ] I tested/previewed my changes locally
\ No newline at end of file
diff --git a/.github/issue_label_bot.yaml b/.github/issue_label_bot.yaml
new file mode 100644
index 000000000..bc1c64d59
--- /dev/null
+++ b/.github/issue_label_bot.yaml
@@ -0,0 +1,2 @@
+label-alias:
+  feature_request: 'enhancement'
diff --git a/.travis.yml b/.travis.yml
index 7579878b7..29d31c4a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ matrix:
             - libxkbfile-dev
             - rpm
     - os: osx
-      if: branch = release
+      if: branch IN (nightly, release)
       osx_image: xcode11
 
 language: node_js
@@ -22,6 +22,7 @@ branches:
   only:
     - develop
     - release
+    - nightly
 cache: npm
 
 before_install:
@@ -34,6 +35,14 @@ before_script:
 script:
   - |
     if [ $TRAVIS_BRANCH == "release" ]; then
-      travis_retry travis_wait 100 npm run build
+      travis_retry travis_wait 100 npm run build 
+    fi
+  - |
+    if [ $TRAVIS_BRANCH == "nightly" ]; then
+      npm version prerelease --preid=nightly -m "%s [skip ci]"
+      travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies
+      if [ $TRAVIS_OS_NAME == "osx" ]; then
+        git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1
+        git push --quiet --set-upstream nightly HEAD:nightly >/dev/null 2>&1
+      fi
     fi
-
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e573ea76..d36e75ed9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,34 @@
+# [5.6.0-beta.1](https://github.com/getferdi/ferdi/compare/v5.5.0...v5.6.0-beta.1) (2020-06-14)
+
+### Features
+- Make the notifications badge work with LauncherAPI-compliant (#736) 💖 @gabspeck
+
+### Minor changes
+- Update node-sass to 4.14.0 for compatibility with Node 14.x (#656) 💖 @dpeukert
+- Change Keyboard shortcut tooltip text in Sidebar for Settings (#665) 💖 @sampathBlam
+- Restore "delete service" option in sidebar (#692) 💖 @sampathBlam
+- Add Google Tasks to Todo providers (#695) 💖 @dannyqiu
+- Restore window last closed maximize/fullscreen state (#733) 💖 @dannyqiu
+- Add password hashing to lock password (#694)
+- Close/open window when clicking on tray menu item (#630) 💖 @dandelionadia
+- Use Tray popUpContextMenu on macOS/Windows only (#741)
+- Setup nightly releases deployment pipeline (#730)
+- Make Tray icons more robust on Linux (#748) 💖 @kris7t
+- Load disable hibernation per service status on startup (#754) 💖 @kris7t
+- Update global user agent to conform with spec (#779) 💖 @dannyqiu
+
+### Bug Fixes
+- Prevent unnecessary electron popup windows for links (#685) 💖 @mahadevans87
+- Refactor locking feature (#693)
+- Review launch on startup for macOS, start Ferdi app, not renderer (#696) 💖 @dannyqiu
+- Fix TodosWebview user agent (#713) 💖 @mahadevans87
+- Fix crash when using Password Lock with TouchID API unavailable (#737) 💖 @mahadevans87
+- Fix setting of webview disablewebsecurity attribute (#772) 💖 @dannyqiu
+
 # [5.5.0](https://github.com/getferdi/ferdi/compare/v5.4.3...v5.5.0) (2020-04-26)
 ### Features
 - Merge Franz 5.5.0-beta.2
+- Add modifyRequestHeaders, enable properly setting headers for services (#639), 💖 @mahadevans87 @sampathBlam 
 - Add dropdown list to choose Todo service (#418, #477), 💖 @yourcontact
 - Add hotkey for darkmode (#530, #537), 💖 @Room4O4 & @mahadevans87
 - Add option to start Ferdi minimized (#490, #534)
diff --git a/README.md b/README.md
index bf3f18ea7..dd9fc3d72 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,9 @@
 
 <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-67-default.svg?logo=github' alt='Contributors'/></a><!-- ALL-CONTRIBUTORS-BADGE:END --> 
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+<a href='#contributors-'><img src='https://img.shields.io/badge/contributors-75-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://ci.appveyor.com/project/kytwb/ferdi"><img alt="Build Status Windows" src="https://img.shields.io/appveyor/ci/kytwb/ferdi/master?logo=appveyor"></a>
@@ -280,18 +282,33 @@ Deliverables will be available in the `out` folder.
 
 ### Release
 
+Create a new [draft release](https://github.com/getferdi/ferdi/releases/new) that targets the `release` branch, then:
+
 ```bash
 $ git checkout develop && git pull
+$ git checkout release
 $ git submodule update --remote --force
 $ git add .
 $ git commit -m "Update submodules"
-$ git checkout master
 $ git merge --no-ff develop
-$ git tag v5.3.4-beta.4
-$ git push --tags
+$ git push
 ```
 
-When pushing a new tag, the CI builds will create a draft GitHub release and upload the deliverables in the draft release assets. Wait for all the assets to be uploaded before publishing the draft release.
+Once the draft release assets are uploaded (13 assets), publish the release. The last commit of the `release` branch will be tagged. You can then merge `release` into `master` and back into `develop` if needed.
+
+#### Nightly
+
+```bash
+$ git checkout develop && git pull
+$ git checkout nightly
+$ git submodule update --remote --force
+$ git add .
+$ git commit -m "Update submodules"
+$ git merge --no-ff develop
+$ git push
+```
+
+The draft release and assets will be available in [getferdi/nightlies releases](https://github.com/getferdi/nightlies/releases). You need to manually publish the draft release as a pre-release for now.
 
 ## Contributors ✨
 
@@ -302,95 +319,105 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <!-- markdownlint-disable -->
 <table>
   <tr>
-    <td align="center"><a href="https://vantezzen.io"><img src="https://avatars2.githubusercontent.com/u/10333196?v=4" width="40px;" alt="Bennett"/><br /><sub><b>Bennett</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Code">💻</a> <a href="#design-vantezzen" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Documentation">📖</a> <a href="#ideas-vantezzen" title="Ideas, Planning, & Feedback">🤔</a> <a href="#translation-vantezzen" title="Translation">�</a> <a href="#example-vantezzen" title="Examples">💡</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Avantezzen" title="Bug reports">�</a> <a href="#content-vantezzen" title="Content">🖋</a> <a href="#infra-vantezzen" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#userTesting-vantezzen" title="User Testing">📓</a> <a href="#question-vantezzen" title="Answering Questions">💬</a> <a href="#projectManagement-vantezzen" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3Avantezzen" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://twitter.com/kytwb"><img src="https://avatars0.githubusercontent.com/u/412895?v=4" width="40px;" alt="Amine Mouafik"/><br /><sub><b>Amine Mouafik</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=kytwb" title="Code">💻</a> <a href="#design-kytwb" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=kytwb" title="Documentation">📖</a> <a href="#ideas-kytwb" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Akytwb" title="Bug reports">�</a> <a href="#content-kytwb" title="Content">🖋</a> <a href="#infra-kytwb" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#userTesting-kytwb" title="User Testing">📓</a> <a href="#question-kytwb" title="Answering Questions">💬</a> <a href="#projectManagement-kytwb" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3Akytwb" title="Reviewed Pull Requests">👀</a> <a href="#maintenance-kytwb" title="Maintenance">🚧</a> <a href="#platform-kytwb" title="Packaging/porting to new platform">📦</a> <a href="#fundingFinding-kytwb" title="Funding Finding">�</a> <a href="#blog-kytwb" title="Blogposts">�</a> <a href="#translation-kytwb" title="Translation">�</a></td>
-    <td align="center"><a href="http://www.adlk.io"><img src="https://avatars1.githubusercontent.com/u/3265004?v=4" width="40px;" alt="Stefan Malzner"/><br /><sub><b>Stefan Malzner</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Code">💻</a> <a href="#content-adlk" title="Content">🖋</a> <a href="#design-adlk" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Documentation">📖</a> <a href="#ideas-adlk" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-adlk" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#projectManagement-adlk" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Tests">⚠�</a> <a href="#translation-adlk" title="Translation">�</a></td>
-    <td align="center"><a href="https://github.com/Makazzz"><img src="https://avatars2.githubusercontent.com/u/49844464?v=4" width="40px;" alt="Makazzz"/><br /><sub><b>Makazzz</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3AMakazzz" title="Bug reports">�</a> <a href="https://github.com/getferdi/ferdi/commits?author=Makazzz" title="Code">💻</a> <a href="#translation-Makazzz" title="Translation">�</a> <a href="#content-Makazzz" title="Content">🖋</a> <a href="https://github.com/getferdi/ferdi/commits?author=Makazzz" title="Documentation">📖</a> <a href="#platform-Makazzz" title="Packaging/porting to new platform">📦</a></td>
-    <td align="center"><a href="http://seriesgt.com"><img src="https://avatars3.githubusercontent.com/u/5977640?v=4" width="40px;" alt="ZeroCool"/><br /><sub><b>ZeroCool</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=ZeroCool940711" title="Code">💻</a> <a href="#ideas-ZeroCool940711" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/rseitbekov"><img src="https://avatars2.githubusercontent.com/u/35684439?v=4" width="40px;" alt="rseitbekov"/><br /><sub><b>rseitbekov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=rseitbekov" title="Code">💻</a></td>
+    <td align="center"><a href="https://vantezzen.io"><img src="https://avatars2.githubusercontent.com/u/10333196?v=4" width="40px;" alt=""/><br /><sub><b>Bennett</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Code">💻</a> <a href="#design-vantezzen" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Documentation">📖</a> <a href="#ideas-vantezzen" title="Ideas, Planning, & Feedback">🤔</a> <a href="#translation-vantezzen" title="Translation">�</a> <a href="#example-vantezzen" title="Examples">💡</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Avantezzen" title="Bug reports">�</a> <a href="#content-vantezzen" title="Content">🖋</a> <a href="#infra-vantezzen" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#userTesting-vantezzen" title="User Testing">📓</a> <a href="#question-vantezzen" title="Answering Questions">💬</a> <a href="#projectManagement-vantezzen" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3Avantezzen" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://twitter.com/kytwb"><img src="https://avatars0.githubusercontent.com/u/412895?v=4" width="40px;" alt=""/><br /><sub><b>Amine Mouafik</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=kytwb" title="Code">💻</a> <a href="#design-kytwb" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=kytwb" title="Documentation">📖</a> <a href="#ideas-kytwb" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Akytwb" title="Bug reports">�</a> <a href="#content-kytwb" title="Content">🖋</a> <a href="#infra-kytwb" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#userTesting-kytwb" title="User Testing">📓</a> <a href="#question-kytwb" title="Answering Questions">💬</a> <a href="#projectManagement-kytwb" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3Akytwb" title="Reviewed Pull Requests">👀</a> <a href="#maintenance-kytwb" title="Maintenance">🚧</a> <a href="#platform-kytwb" title="Packaging/porting to new platform">📦</a> <a href="#fundingFinding-kytwb" title="Funding Finding">�</a> <a href="#blog-kytwb" title="Blogposts">�</a> <a href="#translation-kytwb" title="Translation">�</a></td>
+    <td align="center"><a href="http://www.adlk.io"><img src="https://avatars1.githubusercontent.com/u/3265004?v=4" width="40px;" alt=""/><br /><sub><b>Stefan Malzner</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Code">💻</a> <a href="#content-adlk" title="Content">🖋</a> <a href="#design-adlk" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Documentation">📖</a> <a href="#ideas-adlk" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-adlk" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#projectManagement-adlk" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Tests">⚠�</a> <a href="#translation-adlk" title="Translation">�</a></td>
+    <td align="center"><a href="https://github.com/Makazzz"><img src="https://avatars2.githubusercontent.com/u/49844464?v=4" width="40px;" alt=""/><br /><sub><b>Makazzz</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3AMakazzz" title="Bug reports">�</a> <a href="https://github.com/getferdi/ferdi/commits?author=Makazzz" title="Code">💻</a> <a href="#translation-Makazzz" title="Translation">�</a> <a href="#content-Makazzz" title="Content">🖋</a> <a href="https://github.com/getferdi/ferdi/commits?author=Makazzz" title="Documentation">📖</a> <a href="#platform-Makazzz" title="Packaging/porting to new platform">📦</a></td>
+    <td align="center"><a href="http://seriesgt.com"><img src="https://avatars3.githubusercontent.com/u/5977640?v=4" width="40px;" alt=""/><br /><sub><b>ZeroCool</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=ZeroCool940711" title="Code">💻</a> <a href="#ideas-ZeroCool940711" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/rseitbekov"><img src="https://avatars2.githubusercontent.com/u/35684439?v=4" width="40px;" alt=""/><br /><sub><b>rseitbekov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=rseitbekov" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://djangogigs.com/developers/peter-bittner/"><img src="https://avatars2.githubusercontent.com/u/665072?v=4" width="40px;" alt=""/><br /><sub><b>Peter Bittner</b></sub></a><br /><a href="#ideas-bittner" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Abittner" title="Bug reports">�</a></td>
+    <td align="center"><a href="https://github.com/justus-saul"><img src="https://avatars1.githubusercontent.com/u/5861826?v=4" width="40px;" alt=""/><br /><sub><b>Justus Saul</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Ajustus-saul" title="Bug reports">�</a> <a href="#ideas-justus-saul" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/igreil"><img src="https://avatars0.githubusercontent.com/u/17239151?v=4" width="40px;" alt=""/><br /><sub><b>igreil</b></sub></a><br /><a href="#ideas-igreil" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="http://marcolopes.eu"><img src="https://avatars1.githubusercontent.com/u/431889?v=4" width="40px;" alt=""/><br /><sub><b>Marco Lopes</b></sub></a><br /><a href="#ideas-marcolopes" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/dayzlun"><img src="https://avatars3.githubusercontent.com/u/17259690?v=4" width="40px;" alt=""/><br /><sub><b>dayzlun</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Adayzlun" title="Bug reports">�</a></td>
+    <td align="center"><a href="https://twitter.com/tobigue_"><img src="https://avatars2.githubusercontent.com/u/1560152?v=4" width="40px;" alt=""/><br /><sub><b>Tobias Günther</b></sub></a><br /><a href="#ideas-tobigue" title="Ideas, Planning, & Feedback">🤔</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://djangogigs.com/developers/peter-bittner/"><img src="https://avatars2.githubusercontent.com/u/665072?v=4" width="40px;" alt="Peter Bittner"/><br /><sub><b>Peter Bittner</b></sub></a><br /><a href="#ideas-bittner" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Abittner" title="Bug reports">�</a></td>
-    <td align="center"><a href="https://github.com/justus-saul"><img src="https://avatars1.githubusercontent.com/u/5861826?v=4" width="40px;" alt="Justus Saul"/><br /><sub><b>Justus Saul</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Ajustus-saul" title="Bug reports">�</a> <a href="#ideas-justus-saul" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/igreil"><img src="https://avatars0.githubusercontent.com/u/17239151?v=4" width="40px;" alt="igreil"/><br /><sub><b>igreil</b></sub></a><br /><a href="#ideas-igreil" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="http://marcolopes.eu"><img src="https://avatars1.githubusercontent.com/u/431889?v=4" width="40px;" alt="Marco Lopes"/><br /><sub><b>Marco Lopes</b></sub></a><br /><a href="#ideas-marcolopes" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/dayzlun"><img src="https://avatars3.githubusercontent.com/u/17259690?v=4" width="40px;" alt="dayzlun"/><br /><sub><b>dayzlun</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Adayzlun" title="Bug reports">�</a></td>
-    <td align="center"><a href="https://twitter.com/tobigue_"><img src="https://avatars2.githubusercontent.com/u/1560152?v=4" width="40px;" alt="Tobias Günther"/><br /><sub><b>Tobias Günther</b></sub></a><br /><a href="#ideas-tobigue" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/AGCaesar"><img src="https://avatars3.githubusercontent.com/u/7844066?v=4" width="40px;" alt=""/><br /><sub><b>AGCaesar</b></sub></a><br /><a href="#platform-AGCaesar" title="Packaging/porting to new platform">📦</a></td>
+    <td align="center"><a href="https://github.com/xthursdayx"><img src="https://avatars0.githubusercontent.com/u/18044308?v=4" width="40px;" alt=""/><br /><sub><b>xthursdayx</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=xthursdayx" title="Code">💻</a> <a href="https://github.com/getferdi/ferdi/commits?author=xthursdayx" title="Documentation">📖</a> <a href="#infra-xthursdayx" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#platform-xthursdayx" title="Packaging/porting to new platform">📦</a></td>
+    <td align="center"><a href="https://github.com/Gaboris"><img src="https://avatars2.githubusercontent.com/u/9462372?v=4" width="40px;" alt=""/><br /><sub><b>Gaboris</b></sub></a><br /><a href="#question-Gaboris" title="Answering Questions">💬</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3AGaboris" title="Bug reports">�</a></td>
+    <td align="center"><a href="http://www.cu3ed.com/"><img src="https://avatars1.githubusercontent.com/u/61343?v=4" width="40px;" alt=""/><br /><sub><b>Ce</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aincace" title="Bug reports">�</a></td>
+    <td align="center"><a href="http://pztrn.name/"><img src="https://avatars1.githubusercontent.com/u/869402?v=4" width="40px;" alt=""/><br /><sub><b>Stanislav N.</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Apztrn" title="Bug reports">�</a></td>
+    <td align="center"><a href="http://www.patrickcurl.com"><img src="https://avatars1.githubusercontent.com/u/1470061?v=4" width="40px;" alt=""/><br /><sub><b>Patrick Curl</b></sub></a><br /><a href="#ideas-patrickcurl" title="Ideas, Planning, & Feedback">🤔</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://github.com/AGCaesar"><img src="https://avatars3.githubusercontent.com/u/7844066?v=4" width="40px;" alt="AGCaesar"/><br /><sub><b>AGCaesar</b></sub></a><br /><a href="#platform-AGCaesar" title="Packaging/porting to new platform">📦</a></td>
-    <td align="center"><a href="https://github.com/xthursdayx"><img src="https://avatars0.githubusercontent.com/u/18044308?v=4" width="40px;" alt="xthursdayx"/><br /><sub><b>xthursdayx</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=xthursdayx" title="Code">💻</a> <a href="https://github.com/getferdi/ferdi/commits?author=xthursdayx" title="Documentation">📖</a> <a href="#infra-xthursdayx" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#platform-xthursdayx" title="Packaging/porting to new platform">📦</a></td>
-    <td align="center"><a href="https://github.com/Gaboris"><img src="https://avatars2.githubusercontent.com/u/9462372?v=4" width="40px;" alt="Gaboris"/><br /><sub><b>Gaboris</b></sub></a><br /><a href="#question-Gaboris" title="Answering Questions">💬</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3AGaboris" title="Bug reports">�</a></td>
-    <td align="center"><a href="http://www.cu3ed.com/"><img src="https://avatars1.githubusercontent.com/u/61343?v=4" width="40px;" alt="Ce"/><br /><sub><b>Ce</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aincace" title="Bug reports">�</a></td>
-    <td align="center"><a href="http://pztrn.name/"><img src="https://avatars1.githubusercontent.com/u/869402?v=4" width="40px;" alt="Stanislav N."/><br /><sub><b>Stanislav N.</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Apztrn" title="Bug reports">�</a></td>
-    <td align="center"><a href="http://www.patrickcurl.com"><img src="https://avatars1.githubusercontent.com/u/1470061?v=4" width="40px;" alt="Patrick Curl"/><br /><sub><b>Patrick Curl</b></sub></a><br /><a href="#ideas-patrickcurl" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/Stanzilla"><img src="https://avatars3.githubusercontent.com/u/75278?v=4" width="40px;" alt=""/><br /><sub><b>Benjamin Staneck</b></sub></a><br /><a href="#design-Stanzilla" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/ammarmalhas"><img src="https://avatars1.githubusercontent.com/u/57057209?v=4" width="40px;" alt=""/><br /><sub><b>ammarmalhas</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aammarmalhas" title="Bug reports">�</a> <a href="#security-ammarmalhas" title="Security">🛡�</a></td>
+    <td align="center"><a href="https://github.com/steliyan"><img src="https://avatars1.githubusercontent.com/u/1850292?v=4" width="40px;" alt=""/><br /><sub><b>Steliyan Stoyanov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=steliyan" title="Code">💻</a> <a href="#ideas-steliyan" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/brorbw"><img src="https://avatars2.githubusercontent.com/u/5909562?v=4" width="40px;" alt=""/><br /><sub><b>Bror Winther</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=brorbw" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://fwdekker.com/"><img src="https://avatars0.githubusercontent.com/u/13442533?v=4" width="40px;" alt=""/><br /><sub><b>Felix W. Dekker</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=FWDekker" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/Sauceee"><img src="https://avatars2.githubusercontent.com/u/17987941?v=4" width="40px;" alt=""/><br /><sub><b>Sauceee</b></sub></a><br /><a href="#design-Sauceee" title="Design">🎨</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://github.com/Stanzilla"><img src="https://avatars3.githubusercontent.com/u/75278?v=4" width="40px;" alt="Benjamin Staneck"/><br /><sub><b>Benjamin Staneck</b></sub></a><br /><a href="#design-Stanzilla" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/ammarmalhas"><img src="https://avatars1.githubusercontent.com/u/57057209?v=4" width="40px;" alt="ammarmalhas"/><br /><sub><b>ammarmalhas</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aammarmalhas" title="Bug reports">�</a> <a href="#security-ammarmalhas" title="Security">🛡�</a></td>
-    <td align="center"><a href="https://github.com/steliyan"><img src="https://avatars1.githubusercontent.com/u/1850292?v=4" width="40px;" alt="Steliyan Stoyanov"/><br /><sub><b>Steliyan Stoyanov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=steliyan" title="Code">💻</a> <a href="#ideas-steliyan" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/brorbw"><img src="https://avatars2.githubusercontent.com/u/5909562?v=4" width="40px;" alt="Bror Winther"/><br /><sub><b>Bror Winther</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=brorbw" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://fwdekker.com/"><img src="https://avatars0.githubusercontent.com/u/13442533?v=4" width="40px;" alt="Felix W. Dekker"/><br /><sub><b>Felix W. Dekker</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=FWDekker" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/Sauceee"><img src="https://avatars2.githubusercontent.com/u/17987941?v=4" width="40px;" alt="Sauceee"/><br /><sub><b>Sauceee</b></sub></a><br /><a href="#design-Sauceee" title="Design">🎨</a></td>
+    <td align="center"><a href="http://lhw.ring0.de"><img src="https://avatars2.githubusercontent.com/u/351875?v=4" width="40px;" alt=""/><br /><sub><b>Lennart Weller</b></sub></a><br /><a href="#platform-lhw" title="Packaging/porting to new platform">📦</a></td>
+    <td align="center"><a href="https://github.com/jereksel"><img src="https://avatars0.githubusercontent.com/u/1307829?v=4" width="40px;" alt=""/><br /><sub><b>Andrzej Ressel</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=jereksel" title="Code">💻</a></td>
+    <td align="center"><a href="https://gitlab.com/dpeukert"><img src="https://avatars2.githubusercontent.com/u/3451904?v=4" width="40px;" alt=""/><br /><sub><b>Daniel Peukert</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=dpeukert" title="Code">💻</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/Ali_Shiple"><img src="https://crowdin-static.downloads.crowdin.com/avatar/12895436/small/00917d09ca1b4b6d8e0ef36af07ecf6b.jpg" width="40px;" alt=""/><br /><sub><b>Ali M. Shiple</b></sub></a><br /><a href="#translation-Ali_Shiple" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/elviseras"><img src="https://www.gravatar.com/avatar/25c2cf0d8cb4a4141e71c3b8a2e9324f" width="40px;" alt=""/><br /><sub><b>elviseras</b></sub></a><br /><a href="#translation-elviseras" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/J370"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14141203/small/7b12b5db419d8796450221c2eaaf6003.png" width="40px;" alt=""/><br /><sub><b>J370</b></sub></a><br /><a href="#translation-J370" title="Translation">�</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="http://lhw.ring0.de"><img src="https://avatars2.githubusercontent.com/u/351875?v=4" width="40px;" alt="Lennart Weller"/><br /><sub><b>Lennart Weller</b></sub></a><br /><a href="#platform-lhw" title="Packaging/porting to new platform">📦</a></td>
-    <td align="center"><a href="https://github.com/jereksel"><img src="https://avatars0.githubusercontent.com/u/1307829?v=4" width="40px;" alt="Andrzej Ressel"/><br /><sub><b>Andrzej Ressel</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=jereksel" title="Code">💻</a></td>
-    <td align="center"><a href="https://gitlab.com/dpeukert"><img src="https://avatars2.githubusercontent.com/u/3451904?v=4" width="40px;" alt="Daniel Peukert"/><br /><sub><b>Daniel Peukert</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=dpeukert" title="Code">💻</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/Ali_Shiple"><img src="https://crowdin-static.downloads.crowdin.com/avatar/12895436/small/00917d09ca1b4b6d8e0ef36af07ecf6b.jpg" width="40px;" alt="Ali M. Shiple"/><br /><sub><b>Ali M. Shiple</b></sub></a><br /><a href="#translation-Ali_Shiple" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/elviseras"><img src="https://www.gravatar.com/avatar/25c2cf0d8cb4a4141e71c3b8a2e9324f" width="40px;" alt="elviseras"/><br /><sub><b>elviseras</b></sub></a><br /><a href="#translation-elviseras" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/J370"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14141203/small/7b12b5db419d8796450221c2eaaf6003.png" width="40px;" alt="J370"/><br /><sub><b>J370</b></sub></a><br /><a href="#translation-J370" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/keunes"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13018172/small/829115c606347b10218f34c637a2100c.png" width="40px;" alt=""/><br /><sub><b>Koen</b></sub></a><br /><a href="#translation-keunes" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/leandrogehlen"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14099621/small/1d9503523839c310dbce0af3c226e894.jpeg" width="40px;" alt=""/><br /><sub><b>Leandro Gehlen</b></sub></a><br /><a href="#translation-leandrogehlen" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/Matthieu42"><img src="https://www.gravatar.com/avatar/735217ccccf11ba97573deee517ddb19" width="40px;" alt=""/><br /><sub><b>Matthieu42</b></sub></a><br /><a href="#translation-Matthieu42" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/nicky18013"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13468928/small/2b31e7ac19645d950a79b33ffd5721b8.png" width="40px;" alt=""/><br /><sub><b>Nikita Bibanaev</b></sub></a><br /><a href="#translation-nicky18013" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/Tatjana1998"><img src="https://www.gravatar.com/avatar/ade202a04fcbb2c177e4f1d9936af29e" width="40px;" alt=""/><br /><sub><b>Tatjana1998</b></sub></a><br /><a href="#translation-Tatjana1998" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/seayko"><img src="https://www.gravatar.com/avatar/65e2aef738ddf828f822d8463fd04918" width="40px;" alt=""/><br /><sub><b>tinect</b></sub></a><br /><a href="#translation-seayko" title="Translation">�</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://crowdin.com/profile/keunes"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13018172/small/829115c606347b10218f34c637a2100c.png" width="40px;" alt="Koen"/><br /><sub><b>Koen</b></sub></a><br /><a href="#translation-keunes" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/leandrogehlen"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14099621/small/1d9503523839c310dbce0af3c226e894.jpeg" width="40px;" alt="Leandro Gehlen"/><br /><sub><b>Leandro Gehlen</b></sub></a><br /><a href="#translation-leandrogehlen" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/Matthieu42"><img src="https://www.gravatar.com/avatar/735217ccccf11ba97573deee517ddb19" width="40px;" alt="Matthieu42"/><br /><sub><b>Matthieu42</b></sub></a><br /><a href="#translation-Matthieu42" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/nicky18013"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13468928/small/2b31e7ac19645d950a79b33ffd5721b8.png" width="40px;" alt="Nikita Bibanaev"/><br /><sub><b>Nikita Bibanaev</b></sub></a><br /><a href="#translation-nicky18013" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/Tatjana1998"><img src="https://www.gravatar.com/avatar/ade202a04fcbb2c177e4f1d9936af29e" width="40px;" alt="Tatjana1998"/><br /><sub><b>Tatjana1998</b></sub></a><br /><a href="#translation-Tatjana1998" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/seayko"><img src="https://www.gravatar.com/avatar/65e2aef738ddf828f822d8463fd04918" width="40px;" alt="tinect"/><br /><sub><b>tinect</b></sub></a><br /><a href="#translation-seayko" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/Pusnow"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13514833/small/65f0b45587cc7e34f2827830cd324b16.jpeg" width="40px;" alt=""/><br /><sub><b>Wonsup Yoon</b></sub></a><br /><a href="#translation-Pusnow" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/zutt"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13320003/small/50fdf9f8c7e54a446925bd79696ea625.JPG" width="40px;" alt=""/><br /><sub><b>zutt</b></sub></a><br /><a href="#translation-zutt" title="Translation">�</a></td>
+    <td align="center"><a href="http://twitter.com/noemis_exec"><img src="https://avatars3.githubusercontent.com/u/22817873?v=4" width="40px;" alt=""/><br /><sub><b>n0emis</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=n0emis" title="Code">💻</a> <a href="#translation-n0emis" title="Translation">�</a></td>
+    <td align="center"><a href="https://www.monke-agency.com/equipe.html"><img src="https://avatars2.githubusercontent.com/u/3405028?v=4" width="40px;" alt=""/><br /><sub><b>gmarec</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=gmarec" title="Code">💻</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/127oo1"><img src="https://www.gravatar.com/avatar/060c722be11da16ae31902e9c98326b2" width="40px;" alt=""/><br /><sub><b>127oo1</b></sub></a><br /><a href="#translation-127oo1" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/ChTBoner"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13273153/small/a810886febf5199cfa1c98644444dea7.jpeg" width="40px;" alt=""/><br /><sub><b>ChTBoner</b></sub></a><br /><a href="#translation-ChTBoner" title="Translation">�</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://crowdin.com/profile/Pusnow"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13514833/small/65f0b45587cc7e34f2827830cd324b16.jpeg" width="40px;" alt="Wonsup Yoon"/><br /><sub><b>Wonsup Yoon</b></sub></a><br /><a href="#translation-Pusnow" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/zutt"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13320003/small/50fdf9f8c7e54a446925bd79696ea625.JPG" width="40px;" alt="zutt"/><br /><sub><b>zutt</b></sub></a><br /><a href="#translation-zutt" title="Translation">�</a></td>
-    <td align="center"><a href="http://twitter.com/noemis_exec"><img src="https://avatars3.githubusercontent.com/u/22817873?v=4" width="40px;" alt="n0emis"/><br /><sub><b>n0emis</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=n0emis" title="Code">💻</a> <a href="#translation-n0emis" title="Translation">�</a></td>
-    <td align="center"><a href="https://www.monke-agency.com/equipe.html"><img src="https://avatars2.githubusercontent.com/u/3405028?v=4" width="40px;" alt="gmarec"/><br /><sub><b>gmarec</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=gmarec" title="Code">💻</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/127oo1"><img src="https://www.gravatar.com/avatar/060c722be11da16ae31902e9c98326b2" width="40px;" alt="127oo1"/><br /><sub><b>127oo1</b></sub></a><br /><a href="#translation-127oo1" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/ChTBoner"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13273153/small/a810886febf5199cfa1c98644444dea7.jpeg" width="40px;" alt="ChTBoner"/><br /><sub><b>ChTBoner</b></sub></a><br /><a href="#translation-ChTBoner" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/johanengstrand"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14152801/small/fd395f120efca971ca9b34c57fd02cca.png" width="40px;" alt=""/><br /><sub><b>Johan Engstrand</b></sub></a><br /><a href="#translation-johanengstrand" title="Translation">�</a></td>
+    <td align="center"><a href="https://mrassili.com"><img src="https://avatars0.githubusercontent.com/u/25288435?v=4" width="40px;" alt=""/><br /><sub><b>Marouane R</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=mrassili" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/yourcontact"><img src="https://avatars2.githubusercontent.com/u/46404814?v=4" width="40px;" alt=""/><br /><sub><b>Roman</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=yourcontact" title="Code">💻</a> <a href="#ideas-yourcontact" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/mahadevans87"><img src="https://avatars1.githubusercontent.com/u/1255523?v=4" width="40px;" alt=""/><br /><sub><b>Mahadevan Sreenivasan</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=mahadevans87" title="Code">💻</a> <a href="#ideas-mahadevans87" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3Amahadevans87" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Amahadevans87" title="Bug reports">�</a> <a href="https://github.com/getferdi/ferdi/commits?author=mahadevans87" title="Documentation">📖</a> <a href="#userTesting-mahadevans87" title="User Testing">📓</a></td>
+    <td align="center"><a href="https://jakelee.co.uk"><img src="https://avatars2.githubusercontent.com/u/12380876?v=4" width="40px;" alt=""/><br /><sub><b>Jake Lee</b></sub></a><br /><a href="#content-JakeSteam" title="Content">🖋</a></td>
+    <td align="center"><a href="https://github.com/sampathBlam"><img src="https://avatars1.githubusercontent.com/u/17728976?v=4" width="40px;" alt=""/><br /><sub><b>Sampath Kumar Krishnan</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=sampathBlam" title="Code">💻</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3AsampathBlam" title="Reviewed Pull Requests">👀</a> <a href="#ideas-sampathBlam" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3AsampathBlam" title="Bug reports">�</a> <a href="https://github.com/getferdi/ferdi/commits?author=sampathBlam" title="Documentation">📖</a> <a href="#userTesting-sampathBlam" title="User Testing">📓</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://crowdin.com/profile/johanengstrand"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14152801/small/fd395f120efca971ca9b34c57fd02cca.png" width="40px;" alt="Johan Engstrand"/><br /><sub><b>Johan Engstrand</b></sub></a><br /><a href="#translation-johanengstrand" title="Translation">�</a></td>
-    <td align="center"><a href="https://mrassili.com"><img src="https://avatars0.githubusercontent.com/u/25288435?v=4" width="40px;" alt="Marouane R"/><br /><sub><b>Marouane R</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=mrassili" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/yourcontact"><img src="https://avatars2.githubusercontent.com/u/46404814?v=4" width="40px;" alt="Roman"/><br /><sub><b>Roman</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=yourcontact" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/mahadevans87"><img src="https://avatars1.githubusercontent.com/u/1255523?v=4" width="40px;" alt="Mahadevan Sreenivasan"/><br /><sub><b>Mahadevan Sreenivasan</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=mahadevans87" title="Code">💻</a> <a href="#ideas-mahadevans87" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3Amahadevans87" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://jakelee.co.uk"><img src="https://avatars2.githubusercontent.com/u/12380876?v=4" width="40px;" alt="Jake Lee"/><br /><sub><b>Jake Lee</b></sub></a><br /><a href="#content-JakeSteam" title="Content">🖋</a></td>
-    <td align="center"><a href="https://github.com/sampathBlam"><img src="https://avatars1.githubusercontent.com/u/17728976?v=4" width="40px;" alt="Sampath Kumar Krishnan"/><br /><sub><b>Sampath Kumar Krishnan</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=sampathBlam" title="Code">💻</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3AsampathBlam" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/saruwman"><img src="https://avatars2.githubusercontent.com/u/41330038?v=4" width="40px;" alt=""/><br /><sub><b>saruwman</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=saruwman" title="Documentation">📖</a> <a href="https://github.com/getferdi/ferdi/commits?author=saruwman" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/dorukkarinca"><img src="https://avatars0.githubusercontent.com/u/9303867?v=4" width="40px;" alt=""/><br /><sub><b>dorukkarinca</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Adorukkarinca" title="Bug reports">�</a></td>
+    <td align="center"><a href="https://www.linkedin.com/in/gautamsi"><img src="https://avatars2.githubusercontent.com/u/5769869?v=4" width="40px;" alt=""/><br /><sub><b>Gautam Singh</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=gautamsi" title="Code">💻</a></td>
+    <td align="center"><a href="https://feikojoosten.com"><img src="https://avatars0.githubusercontent.com/u/10920052?v=4" width="40px;" alt=""/><br /><sub><b>Feiko Joosten</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=FeikoJoosten" title="Code">💻</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/2bdelghafour"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14219410/small/31ff20f60d352fb46e314f3c180a77b0.jpeg" width="40px;" alt=""/><br /><sub><b>2bdelghafour</b></sub></a><br /><a href="#translation-2bdelghafour" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/abdoutanta"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14213908/small/5b2fc8166f8a0a2b7313fbf49ee5b6b6.jpeg" width="40px;" alt=""/><br /><sub><b>Abderrahim Tantaoui</b></sub></a><br /><a href="#translation-abdoutanta" title="Translation">�</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://github.com/saruwman"><img src="https://avatars2.githubusercontent.com/u/41330038?v=4" width="40px;" alt="saruwman"/><br /><sub><b>saruwman</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=saruwman" title="Documentation">📖</a> <a href="https://github.com/getferdi/ferdi/commits?author=saruwman" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/dorukkarinca"><img src="https://avatars0.githubusercontent.com/u/9303867?v=4" width="40px;" alt="dorukkarinca"/><br /><sub><b>dorukkarinca</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Adorukkarinca" title="Bug reports">�</a></td>
-    <td align="center"><a href="https://www.linkedin.com/in/gautamsi"><img src="https://avatars2.githubusercontent.com/u/5769869?v=4" width="40px;" alt="Gautam Singh"/><br /><sub><b>Gautam Singh</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=gautamsi" title="Code">💻</a></td>
-    <td align="center"><a href="https://feikojoosten.com"><img src="https://avatars0.githubusercontent.com/u/10920052?v=4" width="40px;" alt="Feiko Joosten"/><br /><sub><b>Feiko Joosten</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=FeikoJoosten" title="Code">💻</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/2bdelghafour"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14219410/small/31ff20f60d352fb46e314f3c180a77b0.jpeg" width="40px;" alt="2bdelghafour"/><br /><sub><b>2bdelghafour</b></sub></a><br /><a href="#translation-2bdelghafour" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/abdoutanta"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14213908/small/5b2fc8166f8a0a2b7313fbf49ee5b6b6.jpeg" width="40px;" alt="Abderrahim Tantaoui"/><br /><sub><b>Abderrahim Tantaoui</b></sub></a><br /><a href="#translation-abdoutanta" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/AndiLeni"><img src="https://www.gravatar.com/avatar/4bd0da860de38afa735425ce2d4e10b5" width="40px;" alt=""/><br /><sub><b>AndiLeni</b></sub></a><br /><a href="#translation-AndiLeni" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/brunofalmada"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14200540/small/f6f1addceeeabc02488f9b08520a902f.jpeg" width="40px;" alt=""/><br /><sub><b>Bruno Almada</b></sub></a><br /><a href="#translation-brunofalmada" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/Catarino"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14208802/small/07287eb2de671257ca3d6bb4ba1cca67.jpeg" width="40px;" alt=""/><br /><sub><b>Catarino Gonçalo</b></sub></a><br /><a href="#translation-Catarino" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/Alzemand"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14184269/small/f5e68247f01988ae7951a282f0fd4d06.jpeg" width="40px;" alt=""/><br /><sub><b>Edilson Alzemand Sigmaringa Junior</b></sub></a><br /><a href="#translation-Alzemand" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/MAT-OUT"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14201550/small/68dd2402bf2879bc3ca312d627710400.png" width="40px;" alt=""/><br /><sub><b>MAT-OUT</b></sub></a><br /><a href="#translation-MAT-OUT" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/mazzo98"><img src="https://crowdin-static.downloads.crowdin.com/avatar/12864917/small/69799b5fd7be2f67282715d5cdfd4ae1.png" width="40px;" alt=""/><br /><sub><b>mazzo98</b></sub></a><br /><a href="#translation-mazzo98" title="Translation">�</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://crowdin.com/profile/AndiLeni"><img src="https://www.gravatar.com/avatar/4bd0da860de38afa735425ce2d4e10b5" width="40px;" alt="AndiLeni"/><br /><sub><b>AndiLeni</b></sub></a><br /><a href="#translation-AndiLeni" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/brunofalmada"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14200540/small/f6f1addceeeabc02488f9b08520a902f.jpeg" width="40px;" alt="Bruno Almada"/><br /><sub><b>Bruno Almada</b></sub></a><br /><a href="#translation-brunofalmada" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/Catarino"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14208802/small/07287eb2de671257ca3d6bb4ba1cca67.jpeg" width="40px;" alt="Catarino Gonçalo"/><br /><sub><b>Catarino Gonçalo</b></sub></a><br /><a href="#translation-Catarino" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/Alzemand"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14184269/small/f5e68247f01988ae7951a282f0fd4d06.jpeg" width="40px;" alt="Edilson Alzemand Sigmaringa Junior"/><br /><sub><b>Edilson Alzemand Sigmaringa Junior</b></sub></a><br /><a href="#translation-Alzemand" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/MAT-OUT"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14201550/small/68dd2402bf2879bc3ca312d627710400.png" width="40px;" alt="MAT-OUT"/><br /><sub><b>MAT-OUT</b></sub></a><br /><a href="#translation-MAT-OUT" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/mazzo98"><img src="https://crowdin-static.downloads.crowdin.com/avatar/12864917/small/69799b5fd7be2f67282715d5cdfd4ae1.png" width="40px;" alt="mazzo98"/><br /><sub><b>mazzo98</b></sub></a><br /><a href="#translation-mazzo98" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/paprika-naught-tiffin-flyspeck"><img src="https://www.gravatar.com/avatar/8671ebe7a7164dfa7624fbdbff69ed96" width="40px;" alt=""/><br /><sub><b>paprika-naught-tiffin-flyspeck</b></sub></a><br /><a href="#translation-paprika-naught-tiffin-flyspeck" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/patrickvalle"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14217484/small/8b73f313ee79fe33625e819cdac86551.jpg" width="40px;" alt=""/><br /><sub><b>Patrick Valle</b></sub></a><br /><a href="#translation-patrickvalle" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/peq42"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14155811/small/b62a94dde7ec29948ec6a6af9fd24b1d.png" width="40px;" alt=""/><br /><sub><b>peq42_</b></sub></a><br /><a href="#translation-peq42" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/karlinhos"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14161139/small/96450eb44c22b3141ab4401e547109b8.png" width="40px;" alt=""/><br /><sub><b>Pumbinha</b></sub></a><br /><a href="#translation-karlinhos" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/dies"><img src="https://crowdin-static.downloads.crowdin.com/avatar/1/small/e84bcdf6c084ffd52527931f988fb410.png" width="40px;" alt=""/><br /><sub><b>Serhiy Dmytryshyn</b></sub></a><br /><a href="#translation-dies" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/SMile61"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14177585/small/1bb4f6ba39bff3df8f579e61460ce016.png" width="40px;" alt=""/><br /><sub><b>SMile61</b></sub></a><br /><a href="#translation-SMile61" title="Translation">�</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://crowdin.com/profile/paprika-naught-tiffin-flyspeck"><img src="https://www.gravatar.com/avatar/8671ebe7a7164dfa7624fbdbff69ed96" width="40px;" alt="paprika-naught-tiffin-flyspeck"/><br /><sub><b>paprika-naught-tiffin-flyspeck</b></sub></a><br /><a href="#translation-paprika-naught-tiffin-flyspeck" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/patrickvalle"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14217484/small/8b73f313ee79fe33625e819cdac86551.jpg" width="40px;" alt="Patrick Valle"/><br /><sub><b>Patrick Valle</b></sub></a><br /><a href="#translation-patrickvalle" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/peq42"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14155811/small/b62a94dde7ec29948ec6a6af9fd24b1d.png" width="40px;" alt="peq42_"/><br /><sub><b>peq42_</b></sub></a><br /><a href="#translation-peq42" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/karlinhos"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14161139/small/96450eb44c22b3141ab4401e547109b8.png" width="40px;" alt="Pumbinha"/><br /><sub><b>Pumbinha</b></sub></a><br /><a href="#translation-karlinhos" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/dies"><img src="https://crowdin-static.downloads.crowdin.com/avatar/1/small/e84bcdf6c084ffd52527931f988fb410.png" width="40px;" alt="Serhiy Dmytryshyn"/><br /><sub><b>Serhiy Dmytryshyn</b></sub></a><br /><a href="#translation-dies" title="Translation">�</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/SMile61"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14177585/small/1bb4f6ba39bff3df8f579e61460ce016.png" width="40px;" alt="SMile61"/><br /><sub><b>SMile61</b></sub></a><br /><a href="#translation-SMile61" title="Translation">�</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/tinect"><img src="https://crowdin-static.downloads.crowdin.com/avatar/12521988/small/56c2041645746af9e51dd28782b828c3.jpeg" width="40px;" alt=""/><br /><sub><b>tinect</b></sub></a><br /><a href="#translation-tinect" title="Translation">�</a></td>
+    <td align="center"><a href="https://github.com/gega7"><img src="https://avatars0.githubusercontent.com/u/20799911?v=4" width="40px;" alt=""/><br /><sub><b>gega7</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Agega7" title="Bug reports">�</a></td>
+    <td align="center"><a href="https://github.com/tristanplouz"><img src="https://avatars2.githubusercontent.com/u/6893466?v=4" width="40px;" alt=""/><br /><sub><b>tristanplouz</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=tristanplouz" title="Code">💻</a> <a href="#ideas-tristanplouz" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/dannyqiu"><img src="https://avatars1.githubusercontent.com/u/1170755?v=4" width="40px;" alt=""/><br /><sub><b>Danny Qiu</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=dannyqiu" title="Code">💻</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Adannyqiu" title="Bug reports">�</a></td>
+    <td align="center"><a href="https://github.com/belyazidi56"><img src="https://avatars3.githubusercontent.com/u/35711540?v=4" width="40px;" alt=""/><br /><sub><b>Youssef Belyazidi</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=belyazidi56" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/gabspeck"><img src="https://avatars2.githubusercontent.com/u/749488?v=4" width="40px;" alt=""/><br /><sub><b>Gabriel Speckhahn</b></sub></a><br /><a href="#platform-gabspeck" title="Packaging/porting to new platform">📦</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://crowdin.com/profile/tinect"><img src="https://crowdin-static.downloads.crowdin.com/avatar/12521988/small/56c2041645746af9e51dd28782b828c3.jpeg" width="40px;" alt="tinect"/><br /><sub><b>tinect</b></sub></a><br /><a href="#translation-tinect" title="Translation">�</a></td>
+    <td align="center"><a href="https://github.com/dandelionadia"><img src="https://avatars0.githubusercontent.com/u/33199975?v=4" width="40px;" alt=""/><br /><sub><b>Nadiia Ridko</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=dandelionadia" title="Code">💻</a></td>
+    <td align="center"><a href="https://hohner.dev"><img src="https://avatars0.githubusercontent.com/u/649895?v=4" width="40px;" alt=""/><br /><sub><b>Jan Hohner</b></sub></a><br /><a href="#userTesting-janhohner" title="User Testing">📓</a></td>
+    <td align="center"><a href="https://marussy.com"><img src="https://avatars1.githubusercontent.com/u/38888?v=4" width="40px;" alt=""/><br /><sub><b>Kristóf Marussy</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=kris7t" title="Code">💻</a></td>
   </tr>
 </table>
 
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..48516db61
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,17 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 5.5.0   | :white_check_mark: |
+| 5.4.3   | :x:                |
+| < 5.4.3 | :x:                |
+
+## Reporting a Vulnerability
+
+If you discover a minor vulnerability in Ferdi, please create a new issue on GitHub. Minor vulnerabilities are those, that do not leave the user at immediate danger, i.e. though remote code execution.
+
+If you discover a major vulnerability in Ferdi, please report it to us via E-Mail to `hello@getferdi.com`, prefixing your E-Mail subject with "[Security]". We will then come in contact with you as quickly as possible.
+
+Please keep in mind that some vulnerabilities you find may not be due to Ferdi but instead due to ElectronJS or Chromium. In that case, please contact the owners of those projects instead.
diff --git a/appveyor.yml b/appveyor.yml
index acdd94e13..d6e909f9c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,6 +2,7 @@ version: build-{build}
 branches:
   only:
     - release
+    - nightly
 skip_tags: true
 skip_branch_with_pr: true
 
@@ -20,3 +21,13 @@ before_build:
 
 build_script:
   - appveyor-retry npm run build
+
+for:
+-
+  branches:
+    only:
+      - nightly
+  before_build:
+    - npm version prerelease --preid=nightly --no-git-tag-version
+  build_script:
+    - appveyor-retry npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies
diff --git a/build-helpers/notarize.js b/build-helpers/notarize.js
index fc463f749..cb83808ad 100644
--- a/build-helpers/notarize.js
+++ b/build-helpers/notarize.js
@@ -2,7 +2,7 @@ const { notarize } = require("electron-notarize");
 
 exports.default = async function notarizing(context) {
   const { electronPlatformName, appOutDir } = context;
-  if (electronPlatformName !== "darwin" || process.env.TRAVIS_BRANCH !== 'release') {
+  if (electronPlatformName !== "darwin" || (process.env.TRAVIS_BRANCH !== 'release' && process.env.TRAVIS_BRANCH !== 'nightly')) {
     return;
   }
 
diff --git a/package-lock.json b/package-lock.json
index 65294a3a6..c3d3e2474 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ferdi",
-  "version": "5.5.0",
+  "version": "5.5.1-nightly.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -4403,6 +4403,11 @@
       "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
       "dev": true
     },
+    "@nornagon/put": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/@nornagon/put/-/put-0.0.8.tgz",
+      "integrity": "sha512-ugvXJjwF5ldtUpa7D95kruNJ41yFQDEKyF5CW4TgKJnh+W/zmlBzXXeKTyqIgwMFrkePN2JqOBqcF0M0oOunow=="
+    },
     "@octokit/endpoint": {
       "version": "5.5.1",
       "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.5.1.tgz",
@@ -5140,6 +5145,16 @@
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
+    "abstract-socket": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/abstract-socket/-/abstract-socket-2.1.1.tgz",
+      "integrity": "sha512-YZJizsvS1aBua5Gd01woe4zuyYBGgSMeqDOB6/ChwdTI904KP6QGtJswXl4hcqWxbz86hQBe++HWV0hF1aGUtA==",
+      "optional": true,
+      "requires": {
+        "bindings": "^1.2.1",
+        "nan": "^2.12.1"
+      }
+    },
     "accepts": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz",
@@ -9134,6 +9149,21 @@
       "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
       "dev": true
     },
+    "dbus-next": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/dbus-next/-/dbus-next-0.8.2.tgz",
+      "integrity": "sha512-E2wkbhZzzsgmY+jxIdeuhA1nVT697I5koRIRJTk3doTeukwtzqSFG89RC5XK8OsLG/eHDZ8PVNptUuEPkhdPbA==",
+      "requires": {
+        "@nornagon/put": "0.0.8",
+        "abstract-socket": "^2.0.0",
+        "event-stream": "3.3.4",
+        "hexy": "^0.2.10",
+        "jsbi": "^2.0.5",
+        "long": "^4.0.0",
+        "safe-buffer": "^5.1.1",
+        "xml2js": "^0.4.17"
+      }
+    },
     "debug": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -11452,6 +11482,30 @@
       "resolved": "https://registry.npmjs.org/event-kit/-/event-kit-2.5.3.tgz",
       "integrity": "sha512-b7Qi1JNzY4BfAYfnIRanLk0DOD1gdkWHT4GISIn8Q2tAf3LpU8SP2CMwWaq40imYoKWbtN4ZhbSRxvsnikooZQ=="
     },
+    "event-stream": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
+      "requires": {
+        "duplexer": "~0.1.1",
+        "from": "~0",
+        "map-stream": "~0.1.0",
+        "pause-stream": "0.0.11",
+        "split": "0.3",
+        "stream-combiner": "~0.0.4",
+        "through": "~2.3.1"
+      },
+      "dependencies": {
+        "split": {
+          "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+          "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
+          "requires": {
+            "through": "2"
+          }
+        }
+      }
+    },
     "eventemitter2": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz",
@@ -12426,6 +12480,11 @@
       "integrity": "sha1-lzHc9WeMf660T7kDxPct9VGH+nc=",
       "dev": true
     },
+    "from": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
+      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4="
+    },
     "from2": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
@@ -13985,13 +14044,13 @@
       }
     },
     "globule": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
-      "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz",
+      "integrity": "sha512-OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==",
       "dev": true,
       "requires": {
         "glob": "~7.1.1",
-        "lodash": "~4.17.10",
+        "lodash": "~4.17.12",
         "minimatch": "~3.0.2"
       }
     },
@@ -15628,6 +15687,11 @@
       "resolved": "https://registry.npmjs.org/hex-to-rgba/-/hex-to-rgba-1.0.2.tgz",
       "integrity": "sha512-fL+4NFccs86iOuDnFl1Mhyn471qTPAkpE7k39+JYGPMB3+S9LoUnauQI2nz6BUb3DpYQCx8RqENbaf8IFdKYOg=="
     },
+    "hexy": {
+      "version": "0.2.11",
+      "resolved": "https://registry.npmjs.org/hexy/-/hexy-0.2.11.tgz",
+      "integrity": "sha512-ciq6hFsSG/Bpt2DmrZJtv+56zpPdnq+NQ4ijEFrveKN0ZG1mhl/LdT1NQZ9se6ty1fACcI4d4vYqC9v8EYpH2A=="
+    },
     "history": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/history/-/history-3.3.0.tgz",
@@ -16098,9 +16162,9 @@
       "dev": true
     },
     "in-publish": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
-      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz",
+      "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==",
       "dev": true
     },
     "indefinite-observable": {
@@ -17465,9 +17529,9 @@
       }
     },
     "js-base64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
-      "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz",
+      "integrity": "sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==",
       "dev": true
     },
     "js-levenshtein": {
@@ -17490,6 +17554,11 @@
         "esprima": "^4.0.0"
       }
     },
+    "jsbi": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/jsbi/-/jsbi-2.0.5.tgz",
+      "integrity": "sha512-TzO/62Hxeb26QMb4IGlI/5X+QLr9Uqp1FPkwp2+KOICW+Q+vSuFj61c8pkT6wAns4WcK56X7CmSHhJeDGWOqxQ=="
+    },
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
@@ -18507,6 +18576,11 @@
       "integrity": "sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==",
       "dev": true
     },
+    "long": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
+      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
+    },
     "longest": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
@@ -18826,6 +18900,11 @@
       "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
       "dev": true
     },
+    "map-stream": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ="
+    },
     "map-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
@@ -20083,9 +20162,9 @@
       }
     },
     "node-sass": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.0.tgz",
-      "integrity": "sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA==",
+      "version": "4.14.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.0.tgz",
+      "integrity": "sha512-AxqU+DFpk0lEz95sI6jO0hU0Rwyw7BXVEv6o9OItoXLyeygPeaSpiV4rwQb10JiTghHaa0gZeD21sz+OsQluaw==",
       "dev": true,
       "requires": {
         "async-foreach": "^0.1.3",
@@ -20215,9 +20294,9 @@
           }
         },
         "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
           "dev": true
         },
         "node-gyp": {
@@ -21352,6 +21431,14 @@
         "pify": "^3.0.0"
       }
     },
+    "pause-stream": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
+      "requires": {
+        "through": "~2.3"
+      }
+    },
     "pbkdf2": {
       "version": "3.0.17",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
@@ -24896,9 +24983,9 @@
       },
       "dependencies": {
         "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -24975,6 +25062,14 @@
         }
       }
     },
+    "stream-combiner": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+      "requires": {
+        "duplexer": "~0.1.1"
+      }
+    },
     "stream-each": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
@@ -27873,6 +27968,20 @@
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
       "dev": true
     },
+    "xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "requires": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      }
+    },
+    "xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+    },
     "xmlhttprequest": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
diff --git a/package.json b/package.json
index 01b902bc0..0abb3bb7d 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,9 @@
 {
   "name": "ferdi",
   "productName": "Ferdi",
+  "desktopName": "ferdi.desktop",
   "appId": "com.kytwb.ferdi",
-  "version": "5.5.0",
+  "version": "5.6.0-beta.1",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "kytwb",
   "main": "index.js",
@@ -67,6 +68,7 @@
     "cld3-asm": "1.0.1",
     "css": "2.2.4",
     "darkreader": "4.7.15",
+    "dbus-next": "0.8.2",
     "du": "^0.1.0",
     "electron-dl": "1.14.0",
     "electron-fetch": "1.4.0",
@@ -184,7 +186,7 @@
     "lerna": "3.19.0",
     "mobx-react-devtools": "6.1.1",
     "mocha": "5.2.0",
-    "node-sass": "4.13.0",
+    "node-sass": "4.14.0",
     "prettier": "1.19.1",
     "react-intl-translations-manager": "5.0.3",
     "terser-webpack-plugin": "1.2.1",
diff --git a/src/app.js b/src/app.js
index 0e24420c3..aab1729d7 100644
--- a/src/app.js
+++ b/src/app.js
@@ -5,7 +5,7 @@ import { render } from 'react-dom';
 import { Provider } from 'mobx-react';
 import { syncHistoryWithStore, RouterStore } from 'mobx-react-router';
 import {
-  Router, Route, hashHistory, IndexRedirect,
+  hashHistory,
 } from 'react-router';
 
 import '@babel/polyfill';
@@ -20,33 +20,7 @@ import MenuFactory from './lib/Menu';
 import TouchBarFactory from './lib/TouchBar';
 
 import I18N from './I18n';
-import AppLayoutContainer from './containers/layout/AppLayoutContainer';
-import SettingsWindow from './containers/settings/SettingsWindow';
-import RecipesScreen from './containers/settings/RecipesScreen';
-import ServicesScreen from './containers/settings/ServicesScreen';
-import EditServiceScreen from './containers/settings/EditServiceScreen';
-import AccountScreen from './containers/settings/AccountScreen';
-import TeamScreen from './containers/settings/TeamScreen';
-import EditUserScreen from './containers/settings/EditUserScreen';
-import EditSettingsScreen from './containers/settings/EditSettingsScreen';
-import InviteSettingsScreen from './containers/settings/InviteScreen';
-import SupportFerdiScreen from './containers/settings/SupportScreen';
-import WelcomeScreen from './containers/auth/WelcomeScreen';
-import LoginScreen from './containers/auth/LoginScreen';
-import LockedScreen from './containers/auth/LockedScreen';
-import PasswordScreen from './containers/auth/PasswordScreen';
-import ChangeServerScreen from './containers/auth/ChangeServerScreen';
-import SignupScreen from './containers/auth/SignupScreen';
-import ImportScreen from './containers/auth/ImportScreen';
-import PricingScreen from './containers/auth/PricingScreen';
-import InviteScreen from './containers/auth/InviteScreen';
-import AuthLayoutContainer from './containers/auth/AuthLayoutContainer';
-import SubscriptionPopupScreen from './containers/subscription/SubscriptionPopupScreen';
-import WorkspacesScreen from './features/workspaces/containers/WorkspacesScreen';
-import EditWorkspaceScreen from './features/workspaces/containers/EditWorkspaceScreen';
-import { WORKSPACES_ROUTES } from './features/workspaces';
-import AnnouncementScreen from './features/announcements/components/AnnouncementScreen';
-import { ANNOUNCEMENTS_ROUTES } from './features/announcements';
+import Routes from './routes';
 
 // Add Polyfills
 smoothScroll.polyfill();
@@ -74,44 +48,7 @@ window.addEventListener('load', () => {
       const preparedApp = (
         <Provider stores={stores} actions={actions}>
           <I18N>
-            <Router history={history}>
-              <Route path="/" component={AppLayoutContainer}>
-                <Route path={ANNOUNCEMENTS_ROUTES.TARGET} component={AnnouncementScreen} />
-                <Route path="/settings" component={SettingsWindow}>
-                  <IndexRedirect to="/settings/recipes" />
-                  <Route path="/settings/recipes" component={RecipesScreen} />
-                  <Route path="/settings/recipes/:filter" component={RecipesScreen} />
-                  <Route path="/settings/services" component={ServicesScreen} />
-                  <Route path="/settings/services/:action/:id" component={EditServiceScreen} />
-                  <Route path={WORKSPACES_ROUTES.ROOT} component={WorkspacesScreen} />
-                  <Route path={WORKSPACES_ROUTES.EDIT} component={EditWorkspaceScreen} />
-                  <Route path="/settings/user" component={AccountScreen} />
-                  <Route path="/settings/user/edit" component={EditUserScreen} />
-                  <Route path="/settings/team" component={TeamScreen} />
-                  <Route path="/settings/app" component={EditSettingsScreen} />
-                  <Route path="/settings/invite" component={InviteSettingsScreen} />
-                  <Route path="/settings/support" component={SupportFerdiScreen} />
-                </Route>
-              </Route>
-              <Route path="/auth" component={AuthLayoutContainer}>
-                <IndexRedirect to="/auth/welcome" />
-                <Route path="/auth/welcome" component={WelcomeScreen} />
-                <Route path="/auth/login" component={LoginScreen} />
-                <Route path="/auth/locked" component={LockedScreen} />
-                <Route path="/auth/server" component={ChangeServerScreen} />
-                <Route path="/auth/signup">
-                  <IndexRedirect to="/auth/signup/form" />
-                  <Route path="/auth/signup/form" component={SignupScreen} />
-                  <Route path="/auth/signup/pricing" component={PricingScreen} />
-                  <Route path="/auth/signup/import" component={ImportScreen} />
-                  <Route path="/auth/signup/invite" component={InviteScreen} />
-                </Route>
-                <Route path="/auth/password" component={PasswordScreen} />
-                <Route path="/auth/logout" component={LoginScreen} />
-              </Route>
-              <Route path="/payment/:url" component={SubscriptionPopupScreen} />
-              <Route path="*" component={AppLayoutContainer} />
-            </Router>
+            <Routes history={history} />
           </I18N>
         </Provider>
       );
diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js
index 433334b6c..68c2303a4 100644
--- a/src/components/auth/ChangeServer.js
+++ b/src/components/auth/ChangeServer.js
@@ -2,10 +2,12 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
-
 import Form from '../../lib/Form';
 import Input from '../ui/Input';
+import Select from '../ui/Select';
 import Button from '../ui/Button';
+import Infobox from '../ui/Infobox';
+import { url, required } from '../../helpers/validation-helpers';
 
 const messages = defineMessages({
   headline: {
@@ -16,10 +18,23 @@ const messages = defineMessages({
     id: 'changeserver.label',
     defaultMessage: '!!!Server',
   },
+  warning: {
+    id: 'changeserver.warning',
+    defaultMessage: '!!!Extra settings offered by Ferdi will not be saved',
+  },
+  customServerLabel: {
+    id: 'changeserver.customServerLabel',
+    defaultMessage: '!!!Custom server',
+  },
+  urlError: {
+    id: 'changeserver.urlError',
+    defaultMessage: '!!!Enter a valid URL',
+  },
   submit: {
     id: 'changeserver.submit',
     defaultMessage: '!!!Submit',
   },
+
 });
 
 export default @observer class ChangeServer extends Component {
@@ -32,42 +47,75 @@ export default @observer class ChangeServer extends Component {
     intl: intlShape,
   };
 
+  ferdiServer='https://api.getferdi.com';
+
+  franzServer='https://api.franzinfra.com';
+
+  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],
       },
     },
   }, this.context.intl);
 
   componentDidMount() {
-    this.form.$('server').value = this.props.server;
+    if (this.defaultServers.includes(this.props.server)) {
+      this.form.$('server').value = this.props.server;
+    } else {
+      this.form.$('server').value = '';
+      this.form.$('customServer').value = this.props.server;
+    }
   }
 
   submit(e) {
     e.preventDefault();
     this.form.submit({
       onSuccess: (form) => {
+        if (!this.defaultServers.includes(form.values().server)) {
+          form.$('server').onChange(form.values().customServer);
+        }
         this.props.onSubmit(form.values());
       },
-      onError: () => { },
+      onError: (form) => {
+        if (this.defaultServers.includes(form.values().server)) {
+          this.props.onSubmit(form.values());
+        }
+      },
     });
   }
 
   render() {
     const { form } = this;
     const { intl } = this.context;
-
     return (
       <div className="auth__container">
         <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
           <h1>{intl.formatMessage(messages.headline)}</h1>
-
-          <Input
-            field={form.$('server')}
-            focus
-          />
+          {form.$('server').value === this.franzServer
+          && (
+            <Infobox type="warning">
+              {intl.formatMessage(messages.warning)}
+            </Infobox>
+          )}
+          <Select field={form.$('server')} />
+          {!this.defaultServers.includes(form.$('server').value)
+          && (
+            <Input
+              placeholder="Custom Server"
+              onChange={e => this.submit(e)}
+              field={form.$('customServer')}
+            />
+          )}
           <Button
             type="submit"
             className="auth__button"
diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js
index 6142e78c6..c5e8a5aad 100644
--- a/src/components/auth/Locked.js
+++ b/src/components/auth/Locked.js
@@ -8,6 +8,7 @@ import Form from '../../lib/Form';
 import Input from '../ui/Input';
 import Button from '../ui/Button';
 import Infobox from '../ui/Infobox';
+import { isMac } from '../../environment';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
@@ -100,7 +101,7 @@ export default @observer class Locked extends Component {
       useTouchIdToUnlock,
     } = this.props;
 
-    const touchIdEnabled = useTouchIdToUnlock && systemPreferences.canPromptTouchID();
+    const touchIdEnabled = isMac ? (useTouchIdToUnlock && systemPreferences.canPromptTouchID()) : false;
     const submitButtonLabel = touchIdEnabled ? intl.formatMessage(messages.unlockWithPassword) : intl.formatMessage(messages.submitButtonLabel);
 
     return (
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index bd10ccb4a..90bbe86e9 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -6,11 +6,14 @@ import { inject, observer } from 'mobx-react';
 import { Link } from 'react-router';
 
 import Tabbar from '../services/tabs/Tabbar';
-import { ctrlKey } from '../../environment';
+import { ctrlKey, isMac } from '../../environment';
 import { workspaceStore } from '../../features/workspaces';
 import { todosStore } from '../../features/todos';
 import { todoActions } from '../../features/todos/actions';
 
+// Platform specific shortcut keys
+const settingsShortcutKey = isMac ? ',' : 'P';
+
 const messages = defineMessages({
   settings: {
     id: 'sidebar.settings',
@@ -189,7 +192,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
           type="button"
           onClick={() => openSettings({ path: 'app' })}
           className="sidebar__button sidebar__button--settings"
-          data-tip={`${intl.formatMessage(messages.settings)} (${ctrlKey}+,)`}
+          data-tip={`${intl.formatMessage(messages.settings)} (${ctrlKey}+${settingsShortcutKey})`}
         >
           <i className="mdi mdi-settings" />
           { (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 210a6ab6b..2e3354279 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -79,7 +79,7 @@ class ServiceWebview extends Component {
         }}
         onUpdateTargetUrl={this.updateTargetUrl}
         useragent={service.userAgent}
-        disablewebsecurity={service.recipe.disablewebsecurity}
+        disablewebsecurity={service.recipe.disablewebsecurity ? true : undefined}
         allowpopups
       />
     );
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index ea7a66a62..efa5fa60c 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -7,7 +7,7 @@ import classnames from 'classnames';
 import { SortableElement } from 'react-sortable-hoc';
 
 import ServiceModel from '../../../models/Service';
-import { isDevMode, ctrlKey } from '../../../environment';
+import { ctrlKey } from '../../../environment';
 
 const { Menu } = remote;
 
@@ -119,14 +119,10 @@ class TabItem extends Component {
       click: () => (service.isEnabled ? disableService() : enableService()),
     }, {
       type: 'separator',
+    }, {
+      label: intl.formatMessage(messages.deleteService),
+      click: () => deleteService(),
     }];
-
-    if (isDevMode) {
-      menuTemplate.push({
-        label: intl.formatMessage(messages.deleteService),
-        click: () => deleteService(),
-      });
-    }
     const menu = Menu.buildFromTemplate(menuTemplate);
 
     let notificationBadge = null;
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 8faea708b..50358c36f 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -367,7 +367,7 @@ export default @observer class EditSettingsForm extends Component {
                 <Toggle field={form.$('lockingFeatureEnabled')} />
                 {lockingFeatureEnabled && (
                   <>
-                    {systemPreferences.canPromptTouchID() && (
+                    {isMac && systemPreferences.canPromptTouchID() && (
                       <Toggle field={form.$('useTouchIdToUnlock')} />
                     )}
 
diff --git a/src/config.js b/src/config.js
index 2467ab706..b8af16419 100644
--- a/src/config.js
+++ b/src/config.js
@@ -60,6 +60,7 @@ export const TODO_APPS = {
   'https://app.nozbe.com/#login': 'Nozbe',
   'https://www.rememberthemilk.com/login/': 'Remember The Milk',
   'https://desktop.any.do/': 'Any.do',
+  'https://tasks.google.com/embed/?origin=https%3A%2F%2Fcalendar.google.com&fullWidth=1': 'Google Tasks',
   isUsingCustomTodoService: 'Other service',
 };
 
diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js
index aced64a98..a04107072 100644
--- a/src/containers/auth/LockedScreen.js
+++ b/src/containers/auth/LockedScreen.js
@@ -4,13 +4,9 @@ import { inject, observer } from 'mobx-react';
 import Locked from '../../components/auth/Locked';
 import SettingsStore from '../../stores/SettingsStore';
 
-import { globalError as globalErrorPropType } from '../../prop-types';
+import { hash } from '../../helpers/password-helpers';
 
 export default @inject('stores', 'actions') @observer class LockedScreen extends Component {
-  static propTypes = {
-    error: globalErrorPropType.isRequired,
-  };
-
   state = {
     error: false,
   }
@@ -30,7 +26,7 @@ export default @inject('stores', 'actions') @observer class LockedScreen extends
       correctPassword = '';
     }
 
-    if (String(password) === String(correctPassword)) {
+    if (hash(String(password)) === String(correctPassword)) {
       this.props.actions.settings.update({
         type: 'app',
         data: {
@@ -56,17 +52,23 @@ export default @inject('stores', 'actions') @observer class LockedScreen extends
   }
 
   render() {
-    const { stores, error } = this.props;
+    const { stores } = this.props;
     const { useTouchIdToUnlock } = this.props.stores.settings.all.app;
 
     return (
-      <Locked
-        onSubmit={this.onSubmit}
-        unlock={this.unlock}
-        useTouchIdToUnlock={useTouchIdToUnlock}
-        isSubmitting={stores.user.loginRequest.isExecuting}
-        error={this.state.error || error}
-      />
+      <div className="auth">
+        <div className="auth__layout">
+          <div className="auth__container">
+            <Locked
+              onSubmit={this.onSubmit}
+              unlock={this.unlock}
+              useTouchIdToUnlock={useTouchIdToUnlock}
+              isSubmitting={stores.user.loginRequest.isExecuting}
+              error={this.state.error || {}}
+            />
+          </div>
+        </div>
+      </div>
     );
   }
 }
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index f6c2d4360..3dba3bc11 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -16,6 +16,7 @@ import {
 import { config as spellcheckerConfig } from '../../features/spellchecker';
 
 import { getSelectOptions } from '../../helpers/i18n-helpers';
+import { hash } from '../../helpers/password-helpers';
 
 import EditSettingsForm from '../../components/settings/settings/EditSettingsForm';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
@@ -185,6 +186,14 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
     intl: intlShape,
   };
 
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      lockedPassword: '',
+    };
+  }
+
   onSubmit(settingsData) {
     const { todos, workspaces } = this.props.stores;
     const {
@@ -195,6 +204,10 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       workspaces: workspaceActions,
     } = this.props.actions;
 
+    this.setState({
+      lockedPassword: settingsData.lockedPassword,
+    });
+
     app.launchOnStartup({
       enable: settingsData.autoLaunchOnStart,
       openInBackground: settingsData.autoLaunchInBackground,
@@ -217,7 +230,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         predefinedTodoServer: settingsData.predefinedTodoServer,
         customTodoServer: settingsData.customTodoServer,
         lockingFeatureEnabled: settingsData.lockingFeatureEnabled,
-        lockedPassword: settingsData.lockedPassword,
+        lockedPassword: hash(String(settingsData.lockedPassword)),
         useTouchIdToUnlock: settingsData.useTouchIdToUnlock,
         inactivityLock: settingsData.inactivityLock,
         scheduledDNDEnabled: settingsData.scheduledDNDEnabled,
@@ -273,6 +286,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       app, settings, user, todos, workspaces,
     } = this.props.stores;
     const { intl } = this.context;
+    const { lockedPassword } = this.state;
 
     const locales = getSelectOptions({
       locales: APP_LOCALES,
@@ -395,7 +409,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         },
         lockedPassword: {
           label: intl.formatMessage(messages.lockPassword),
-          value: settings.all.app.lockedPassword,
+          value: lockedPassword,
           default: '',
           type: 'password',
         },
diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js
index 2626186e9..c612702b0 100644
--- a/src/features/todos/components/TodosWebview.js
+++ b/src/features/todos/components/TodosWebview.js
@@ -12,15 +12,19 @@ import SettingsStore from '../../../stores/SettingsStore';
 import Appear from '../../../components/ui/effects/Appear';
 import UpgradeButton from '../../../components/ui/UpgradeButton';
 
+import userAgent from '../../../helpers/userAgent-helpers';
+
 // NOTE: https://stackoverflow.com/questions/5717093/check-if-a-javascript-string-is-a-url
 function validURL(str) {
-  const pattern = new RegExp('^(https?:\\/\\/)?' // protocol
-      + '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' // domain name
-      + '((\\d{1,3}\\.){3}\\d{1,3}))' // OR ip (v4) address
-      + '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' // port and path
-      + '(\\?[;&a-z\\d%_.~+=-]*)?' // query string
-      + '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator
-  return !!pattern.test(str);
+  let url;
+
+  try {
+    url = new URL(str);
+  } catch (_) {
+    return false;
+  }
+
+  return url.protocol === 'http:' || url.protocol === 'https:';
 }
 
 const messages = defineMessages({
@@ -126,6 +130,11 @@ class TodosWebview extends Component {
     this.node.addEventListener('mousemove', this.resizePanel.bind(this));
     this.node.addEventListener('mouseup', this.stopResize.bind(this));
     this.node.addEventListener('mouseleave', this.stopResize.bind(this));
+
+    const webViewInstance = this;
+    this.webview.addEventListener('dom-ready', () => {
+      webViewInstance.webview.setUserAgent(userAgent(true));
+    });
   }
 
   startResize = (event) => {
diff --git a/src/helpers/userAgent-helpers.js b/src/helpers/userAgent-helpers.js
index 15edc1054..7b994c7d4 100644
--- a/src/helpers/userAgent-helpers.js
+++ b/src/helpers/userAgent-helpers.js
@@ -9,7 +9,6 @@ const ferdiVersion = remote && remote.app ? remote.app.getVersion() : app.getVer
 
 function macOS() {
   const version = macosVersion();
-
   return `Macintosh; Intel Mac OS X ${version.replace(/\./g, '_')}`;
 }
 
@@ -20,7 +19,7 @@ function windows() {
 }
 
 function linux() {
-  return 'X11; Ubuntu; Linux x86_64';
+  return 'X11; Linux x86_64';
 }
 
 export default function userAgent(removeChromeVersion = false) {
@@ -34,12 +33,17 @@ export default function userAgent(removeChromeVersion = false) {
     platformString = linux();
   }
 
+  let chromeVersion = 'Chrome';
+  if (!removeChromeVersion) {
+    chromeVersion = `Chrome/${process.versions.chrome}`;
+  }
+
   let applicationString = '';
   if (!removeChromeVersion) {
-    applicationString = ` Ferdi/${ferdiVersion} (Electron ${process.versions.electron})`;
+    applicationString = ` Ferdi/${ferdiVersion} Electron/${process.versions.electron}`;
   }
 
-  // TODO: Update AppleWebKit and Safari version after electron update
-  return `Mozilla/5.0 (${platformString}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome${!removeChromeVersion ? `/${process.versions.chrome}` : ''} Safari/537.36${applicationString}`;
-  // Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) old-airport-include/1.0.0 Chrome Electron/7.1.7 Safari/537.36
+  // Chrome is pinned to WebKit 537.36, the latest version before hard forking to Blink.
+  return `Mozilla/5.0 (${platformString}) AppleWebKit/537.36 (KHTML, like Gecko) ${chromeVersion} Safari/537.36${applicationString}`;
+  // Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36 Ferdi/5.5.1-nightly.13 Electron/8.2.3
 }
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index 9d676c0a9..356c1fc1e 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index 88f970da9..baceec651 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "إعادة التحميل",
   "app.errorHandler.headline": "لقد حدث خطب ما",
+  "changeserver.customServerLabel": "خادم مخصص",
   "changeserver.headline": "تغيير الخادم",
   "changeserver.label": "خادم",
-  "changeserver.submit": "Submit",
+  "changeserver.submit": "إرسال",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "إعادة تحميل الخدمة",
   "connectionLostBanner.informationLink": "ماذا حدث؟",
   "connectionLostBanner.message": "أوه لا! �قد �ردي الاتصال بـ.",
@@ -37,7 +40,7 @@
   "feature.publishDebugInfo.privacy": "سياسة الخصوصية",
   "feature.publishDebugInfo.publish": "قبول ونشر",
   "feature.publishDebugInfo.published": "تم نشر سجل تصحيح الأخطاء الخاص بك وهو متاح الآن �ي",
-  "feature.publishDebugInfo.terms": "Terms of service",
+  "feature.publishDebugInfo.terms": "بنود الخدمة",
   "feature.publishDebugInfo.title": "نشر معلومات تصحيح الأخطاء",
   "feature.quickSwitch.info": "حدد خدمة من خلال زر تاب، ↑ و ↓. ا�تح الخدمة بالظغط على زر الدخول.",
   "feature.quickSwitch.search": "بحث...",
@@ -121,7 +124,7 @@
   "menu.edit.copy": "نسخ",
   "menu.edit.cut": "قص",
   "menu.edit.delete": "حذ�",
-  "menu.edit.emojiSymbols": "Emoji & Symbols",
+  "menu.edit.emojiSymbols": "الابتسامات والرموز التعبيرية",
   "menu.edit.findInPage": "البحث �ي الص�حة",
   "menu.edit.paste": "لصق",
   "menu.edit.pasteAndMatchStyle": "لصق ومطابقة النمط",
@@ -134,7 +137,7 @@
   "menu.edit.undo": "تراجع",
   "menu.file": "المل�",
   "menu.help": "مساعدة",
-  "menu.help.changelog": "س�جل التغييرات",
+  "menu.help.changelog": "س�جل التغيرات",
   "menu.help.debugInfo": "نسخ معلومات تصحيح الأخطاء",
   "menu.help.debugInfoCopiedBody": "تم نسخ معلومات تصحيح الأخطاء الخاصة بك إلى الحا�ظة.",
   "menu.help.debugInfoCopiedHeadline": "معلومات تصحيح الأخطاء ل�ردي",
@@ -164,49 +167,49 @@
   "menu.view.toggleDevTools": "�تح أدوات المطور",
   "menu.view.toggleFullScreen": "ت�عيل وضع ملء الشاشة",
   "menu.view.toggleServiceDevTools": "�تح أدوات المطور للخدمة",
-  "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",
+  "menu.view.toggleTodosDevTools": "ادخل إلى أدوات مطوري تودوس",
+  "menu.view.zoomIn": "تكبير",
+  "menu.view.zoomOut": "تصغير",
+  "menu.window": "النا�ذة",
+  "menu.window.close": "إغلاق",
+  "menu.window.minimize": "تصغير النا�ذة",
+  "menu.workspaces": "مساحات� العمل",
+  "menu.workspaces.addNewWorkspace": "إضا�ة مساحة عمل جديدة...",
+  "menu.workspaces.closeWorkspaceDrawer": "غلق� د�رج� مساحة العمل",
+  "menu.workspaces.defaultWorkspace": "جميع الخدمات",
+  "menu.workspaces.openWorkspaceDrawer": "�تح� د�رج� مساحة العمل",
   "password.email.label": "البريد الإلكتروني",
   "password.headline": "إعادة تعيين كلمة المرور",
-  "password.link.login": "Sign in to your account",
+  "password.link.login": "سجل الدخول لحسابك",
   "password.link.signup": "إنشاء حساب مجاني",
-  "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
-  "password.successInfo": "Please check your email",
+  "password.noUser": "لم ي�عثر على م�ستخدم� بعنوان� البريد� هذا",
+  "password.submit.label": "إرسال",
+  "password.successInfo": "رجاءً تحقق من عنوان بريدك الإلكتروني",
   "premiumFeature.button.upgradeAccount": "ترقية الحساب",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
+  "pricing.features.accountSync": "مزامنة� الحساب",
+  "pricing.features.adFree": "خال� من الإعلانات للأبد",
+  "pricing.features.appDelays": "لا شاشات� انتظار",
+  "pricing.features.appDelaysEnabled": "شاشات� انتظار هنا وهنا",
+  "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.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
-  "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
+  "pricing.features.recipes": "اختر من بين ما يزيد على 70 خدمة",
+  "pricing.features.serviceProxies": "وكلاء الخدمة",
+  "pricing.features.spellchecker": "دعم المدقق الإملائي",
+  "pricing.features.teamManagement": "�ريق الإدارة",
+  "pricing.features.thirdPartyServices": "تنصيب خدمات الطر� الثالث",
+  "pricing.features.unlimitedServices": "إمكانية إضا�ة خدمات غير محدودة",
+  "pricing.features.upToSixServices": "إضا�ة ما يصل إلى 6 خدمات",
+  "pricing.features.upToThreeServices": "إضا�ة ما يصل إلى 3 خدمات",
+  "pricing.features.workspaces": "مساحات� العمل",
+  "pricing.plan.free": "�يردي المجاني",
+  "pricing.plan.legacy": "�يردي الإصدار الممتاز",
+  "pricing.plan.personal": "�يردي الإصدار الشخصي",
+  "pricing.plan.personal-monthly": "�يردي الإصدار الشخصي الشهري",
+  "pricing.plan.personal-yearly": "�يردي الإصدار الشخصي السنوي",
+  "pricing.plan.pro": "�يردي الإصدار الاحترا�ي",
+  "pricing.plan.pro-monthly": "�يردي الإصدار الاحترا�ي الشهري",
+  "pricing.plan.pro-yearly": "�يردي الإصدار الاحترا�ي السنوي",
   "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
   "pricing.trial.cta.skip": "Continue to Ferdi",
   "pricing.trial.cta.start": "Start using Ferdi",
@@ -220,20 +223,20 @@
   "pricing.trial.terms.headline": "No strings attached",
   "pricing.trial.terms.noCreditCard": "No credit card required",
   "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
-  "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.crashHandler.action": "أعادة تحميل {name}",
+  "service.crashHandler.autoReload": "محاولة الاستعادة التلقائية {name} �ي غضون {seconds} ثانية",
+  "service.crashHandler.headline": "أوه لا!",
+  "service.crashHandler.text": "{name} تسبب �ي خطأ.",
+  "service.disabledHandler.action": "تمكين {name}",
+  "service.disabledHandler.headline": "{name} معطل",
+  "service.errorHandler.action": "أعادة تحميل {name}",
+  "service.errorHandler.editAction": "تحرير {name}",
+  "service.errorHandler.headline": "أوه لا!",
+  "service.errorHandler.message": "خطأ",
+  "service.errorHandler.text": "�شل {name} �ي التحميل.",
   "service.restrictedHandler.action": "ترقية الحساب",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
+  "service.restrictedHandler.customUrl.headline": "مطلوب الخطة الاحترا�ية ل�يردي",
+  "service.restrictedHandler.customUrl.text": "يرجى الترقية إلى خطة �يردي الاحترا�ية لاستخدام العناوين الإلكترونية المخصصة وخدمات الاستضا�ة الذاتية.",
   "service.restrictedHandler.serviceLimit.headline": "لقد وصلت إلى حد الخدمة الخاص بك.",
   "service.restrictedHandler.serviceLimit.text": "الرجاء ترقية حسابك لاستخدام أكثر من {count} خدمة.",
   "service.webviewLoader.loading": "جاري تحميل {service}",
@@ -257,7 +260,7 @@
   "settings.account.headlineInvoices": "ال�واتير",
   "settings.account.headlinePassword": "تغيير كلمة المرور",
   "settings.account.headlineProfile": "تحديث المل� الشخصي",
-  "settings.account.headlineSubscription": "الإشتراك الخاصة بك",
+  "settings.account.headlineSubscription": "الاشتراك الخاص بك",
   "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
   "settings.account.headlineUpgradeAccount": "قم بترقية حسابك واحصل على تجربة �ردي الكاملة",
   "settings.account.invoiceDownload": "تنزيل",
@@ -276,7 +279,7 @@
   "settings.app.buttonInstallUpdate": "إعادة التشغيل وتثبيت التحديث",
   "settings.app.buttonSearchForUpdate": "التحقق من وجود تحديثات",
   "settings.app.cacheInfo": "التخزين المؤقت ل�ردي يستخدم حاليا {size} من مساحة القرص.",
-  "settings.app.cacheNotCleared": "Couldn't clear all cache",
+  "settings.app.cacheNotCleared": "تعذر مسح كل ذاكرة التخزين المؤقت",
   "settings.app.currentVersion": "الإصدار الحالي:",
   "settings.app.form.accentColor": "لون التمييز",
   "settings.app.form.adaptableDarkMode": "مزامنة الوضع المظلم مع إعداد الوضع المظلم لنظام التشغيل الخاص بي",
@@ -294,235 +297,235 @@
   "settings.app.form.hibernate": "ت�عيل وضع النوم للخدمة",
   "settings.app.form.hibernateOnStartup": "الإبقاء على الخدمات �ي وضع النوم عند بدء التشغيل",
   "settings.app.form.hibernationStrategy": "استراتيجية وضع النوم",
-  "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.iconSize": "حجم أيقونة الخدمة",
+  "settings.app.form.inactivityLock": "الإغلاق عن عدم استخدامك ل�ترة",
+  "settings.app.form.keepAllWorkspacesLoaded": "حا�ظ على جميع مساحات العمل م�حملة",
+  "settings.app.form.language": "اللغة",
   "settings.app.form.lockPassword": "كلمة المرور",
-  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
-  "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.predefinedTodoServer": "Todo Server",
-  "settings.app.form.privateNotifications": "Don't show message content in notifications",
-  "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
-  "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
+  "settings.app.form.minimizeToSystemTray": "تصغير النا�ذة إلى جانب شريط المهام",
+  "settings.app.form.navigationBarBehaviour": "سلوك شريط التنقل",
+  "settings.app.form.predefinedTodoServer": "خادم Todo",
+  "settings.app.form.privateNotifications": "عدم إظهار محتوى الرسالة �ي الإشعارات",
+  "settings.app.form.reloadAfterResume": "إعادة تحميل �يردي بعد أعادة تشغيل النظام",
+  "settings.app.form.runInBackground": "إبقاء �ردي �ي الخل�ية عند إغلاق النا�ذة",
   "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
-  "settings.app.form.scheduledDNDEnd": "To",
-  "settings.app.form.scheduledDNDStart": "From",
+  "settings.app.form.scheduledDNDEnd": "الى",
+  "settings.app.form.scheduledDNDStart": "من",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.serviceRibbonWidth": "Sidebar width",
-  "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showDragArea": "Show draggable area on window",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.startMinimized": "Start minimized",
-  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
-  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
+  "settings.app.form.serviceRibbonWidth": "عرض الشريط الجانبي",
+  "settings.app.form.showDisabledServices": "عرض تبويبات الخدمات المعطلة",
+  "settings.app.form.showDragArea": "إظهار المنطقة القابلة للسحب على النا�ذة",
+  "settings.app.form.showMessagesBadgesWhenMuted": "إظهار شارة رسالة غير مقروءة عند تعطيل الإشعارات",
+  "settings.app.form.startMinimized": "البدء بنا�ذة مصغرة",
+  "settings.app.form.universalDarkMode": "تمكين الوضع المظلم الكامل",
+  "settings.app.form.useTouchIdToUnlock": "السماح باستخدام TouchID ل�تح �ردي",
   "settings.app.headline": "الإعدادات",
-  "settings.app.headlineAdvanced": "Advanced",
-  "settings.app.headlineAppearance": "Appearance",
-  "settings.app.headlineGeneral": "General",
-  "settings.app.headlineLanguage": "Language",
-  "settings.app.headlineUpdates": "Updates",
+  "settings.app.headlineAdvanced": "متقدم",
+  "settings.app.headlineAppearance": "المظهر",
+  "settings.app.headlineGeneral": "عام",
+  "settings.app.headlineLanguage": "اللغة",
+  "settings.app.headlineUpdates": "التحديثات",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
+  "settings.app.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 CMD/CTRL+Shift+L.",
   "settings.app.lockedPassword": "كلمة المرور",
-  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
-  "settings.app.restartRequired": "Changes require restart",
+  "settings.app.lockedPasswordInfo": "الرجاء التأكد من تعيين كلمة مرور سو� تتذكرها.\nإذما �قدت كلمة المرور هذه، سو� تضطر إلى إعادة تثبيت �يردي.",
+  "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.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.subheadlineCache": "Cache",
+  "settings.app.subheadlineCache": "الذاكرة المؤقتة",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
-  "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "settings.app.translationHelp": "ساعدنا على ترجمة �يردي إلى لغتك.",
   "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.app.updateStatusAvailable": "التحديث متو�ر! يتم التحميل...",
+  "settings.app.updateStatusSearching": "يبحث عن تحديث",
+  "settings.app.updateStatusUpToDate": "أنت تستخدم الإصدار الأخير من �يردي",
+  "settings.invite.headline": "أدع� الأصدقاء",
   "settings.navigation.account": "الحساب",
-  "settings.navigation.availableServices": "Available services",
-  "settings.navigation.logout": "Logout",
+  "settings.navigation.availableServices": "الخدمات المتاحة",
+  "settings.navigation.logout": "تسجيل خروج",
   "settings.navigation.settings": "الإعدادات",
-  "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.navigation.supportFerdi": "ادعم �يردي",
+  "settings.navigation.team": "إدارة ال�ريق",
+  "settings.navigation.yourServices": "خدماتك",
+  "settings.navigation.yourWorkspaces": "مساحات عملك",
+  "settings.recipes.all": "جميع الخدمات",
+  "settings.recipes.custom": "خدماتٌ مخصصة",
   "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.openDevDocs": "وثائق المطور",
   "settings.recipes.customService.openFolder": "�تح المجلد",
-  "settings.recipes.headline": "Available services",
+  "settings.recipes.headline": "الخدمات المتاحة",
   "settings.recipes.missingService": "خدمة م�قودة؟",
   "settings.recipes.mostPopular": "الأكثر شعبية",
   "settings.recipes.nothingFound": "عذراً، ولكن لا توجد خدمة تطابق مصطلح البحث الخاص بك.",
   "settings.recipes.servicesSuccessfulAddedInfo": "تمت إضا�ة الخدمة بنجاح",
   "settings.searchService": "البحث عن خدمة",
   "settings.service.error.goBack": "العودة إلى الخدمات",
-  "settings.service.error.headline": "Error",
+  "settings.service.error.headline": "خطأ",
   "settings.service.error.message": "تعذر تحميل وص�ة الخدمة.",
   "settings.service.form.addServiceHeadline": "إضا�ة {name}",
-  "settings.service.form.availableServices": "Available services",
+  "settings.service.form.availableServices": "الخدمات المتاحة",
   "settings.service.form.customUrl": "خادم مخصص",
   "settings.service.form.customUrlPremiumInfo": "لإضا�ة الخدمات المستضا�ة بن�سك، تحتاج إلى حساب الدعم المد�وع ل�ردي.",
   "settings.service.form.customUrlUpgradeAccount": "ترقية حسابك",
   "settings.service.form.customUrlValidationError": "تعذر التحقق من خادم {name} المخصص.",
-  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderBrightness": "سطوع الشاشة �ي وضع القراءة المظلم",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.deleteButton": "حذ� الخدمة",
   "settings.service.form.disableHibernation": "Disable hibernation",
   "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
-  "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.headlineDarkReaderSettings": "Dark Reader Settings",
-  "settings.service.form.headlineGeneral": "General",
-  "settings.service.form.headlineNotifications": "Notifications",
-  "settings.service.form.icon": "Custom icon",
+  "settings.service.form.editServiceHeadline": "تحرير {name}",
+  "settings.service.form.enableAudio": "تمكين الصوت",
+  "settings.service.form.enableBadge": "إظهار شارات الرسائل غير المقروءة",
+  "settings.service.form.enableDarkMode": "تمكين الوضع المظلم",
+  "settings.service.form.enableNotification": "ت�عيل الإشعارات",
+  "settings.service.form.enableService": "ت�عيل الخدمة",
+  "settings.service.form.headlineBadges": "شارات الرسائل غير المقروءة",
+  "settings.service.form.headlineDarkReaderSettings": "إعدادات وضع القارئ المظلم",
+  "settings.service.form.headlineGeneral": "عام",
+  "settings.service.form.headlineNotifications": "الإشعارات",
+  "settings.service.form.icon": "أيقونة مخصصة",
   "settings.service.form.iconDelete": "حذ�",
-  "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.iconUpload": "إسقط صورتك، أو انقر هنا",
+  "settings.service.form.indirectMessageInfo": "سيتم إعلامك عن جميع الرسائل الجديدة �ي القناة، وليس �قط @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": "الاسم",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
-  "settings.service.form.openUserCss": "Open user.css",
-  "settings.service.form.openUserJs": "Open user.js",
+  "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.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.proxy.isEnabled": "استخدام بروكسي",
+  "settings.service.form.proxy.password": "كلمة المرور (اختياري)",
+  "settings.service.form.proxy.port": "المن�ذ",
+  "settings.service.form.proxy.restartInfo": "الرجاء إعادة تشغيل �يردي بعد تغيير إعدادات البروكسي.",
+  "settings.service.form.proxy.user": "المستخدم (اختياري)",
   "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
-  "settings.service.form.saveButton": "Save service",
+  "settings.service.form.saveButton": "ح�ظ الخدمة",
   "settings.service.form.tabHosted": "Hosted",
-  "settings.service.form.tabOnPremise": "Self hosted ��",
-  "settings.service.form.team": "Team",
+  "settings.service.form.tabOnPremise": "استضا�ة ذاتية �",
+  "settings.service.form.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.service.form.yourServices": "خدماتك",
+  "settings.services.deletedInfo": "تم حذ� الخدمة",
+  "settings.services.discoverServices": "اكتش� الخدمات",
+  "settings.services.headline": "خدماتك",
+  "settings.services.noServicesAdded": "لم تقم بإضا�ة أي خدمات حتى الآن.",
+  "settings.services.servicesRequestFailed": "تعذرَ تحميل خدماتك",
+  "settings.services.tooltip.isDisabled": "الخدمة معطّلة",
+  "settings.services.tooltip.isMuted": "تم كتم جميع الأصوات",
+  "settings.services.tooltip.notificationsDisabled": "الإشعارات م�عَطَّلة",
   "settings.services.updatedInfo": "تم ح�ظ التغييرات الخاصة بك",
-  "settings.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": "Franz Team Management",
+  "settings.supportFerdi.github": "أبدأ على منصة GitHub",
+  "settings.supportFerdi.headline": "ادعم �يردي",
+  "settings.supportFerdi.openCollective": "ادعم مجتمعنا الم�توح",
+  "settings.supportFerdi.share": "أخبر أصدقائك",
+  "settings.supportFerdi.title": "هل تحب �يردي؟ انشر الحب!",
+  "settings.team.contentHeadline": "�ريق أدارة �رانز",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
-  "settings.team.headline": "Team",
+  "settings.team.headline": "�ريق",
   "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
-  "settings.team.manageAction": "Manage your Team on meetfranz.com",
-  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.manageAction": "ادر �ريقك على meetfranz.com",
+  "settings.team.teamsUnavailable": "ال�رق غير متو�رة",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.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.team.upgradeAction": "ترقية حسابك",
+  "settings.user.form.accountType.company": "اسم الشركة",
+  "settings.user.form.accountType.individual": "شخصي",
+  "settings.user.form.accountType.label": "نوع الحساب",
+  "settings.user.form.accountType.non-profit": "غير ربحي",
+  "settings.user.form.currentPassword": "الكلمة السرية الحالية",
+  "settings.user.form.email": "البريد الألكتروني",
+  "settings.user.form.firstname": "الاسم الأول",
+  "settings.user.form.lastname": "اسم العائلة",
+  "settings.user.form.newPassword": "كلمة سرّ جديدة",
   "settings.workspace.add.form.name": "الاسم",
-  "settings.workspace.add.form.submitButton": "Create workspace",
-  "settings.workspace.form.buttonDelete": "Delete workspace",
-  "settings.workspace.form.buttonSave": "Save workspace",
-  "settings.workspace.form.keepLoaded": "Keep this workspace loaded*",
+  "settings.workspace.add.form.submitButton": "إنشاء مساحة عمل",
+  "settings.workspace.form.buttonDelete": "حذ� مساحة العمل",
+  "settings.workspace.form.buttonSave": "ح�ظ مساحة العمل",
+  "settings.workspace.form.keepLoaded": "حا�ظ على مساحة العمل هذه م�حملة*",
   "settings.workspace.form.keepLoadedInfo": "*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
   "settings.workspace.form.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.workspace.form.servicesInWorkspaceHeadline": "الخدمات �ي مساحة العمل هذه",
+  "settings.workspace.form.yourWorkspaces": "مساحات عملك",
+  "settings.workspaces.deletedInfo": "تم حذ� مساحة العمل",
+  "settings.workspaces.headline": "مساحات عملك",
+  "settings.workspaces.noWorkspacesAdded": "لم تقم بإضا�ة أي مساحات عمل حتى الآن.",
   "settings.workspaces.tryReloadWorkspaces": "حاول مجددًا",
   "settings.workspaces.updatedInfo": "تم ح�ظ التغييرات الخاصة بك",
   "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces",
   "settings.workspaces.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",
+  "settings.workspaces.workspacesRequestFailed": "تعذر تحميل مساحات عملك",
+  "sidebar.addNewService": "إضا�ة خدمة جديدة",
+  "sidebar.closeTodosDrawer": "أغلق Todos �يردي",
+  "sidebar.closeWorkspaceDrawer": "غلق� د�رج� مساحة العمل",
   "sidebar.lockFerdi": "ق�ل �ردي",
-  "sidebar.muteApp": "Disable notifications & audio",
-  "sidebar.openTodosDrawer": "Open Ferdi Todos",
-  "sidebar.openWorkspaceDrawer": "Open workspace drawer",
+  "sidebar.muteApp": "تعطيل الإشعارات والصوت",
+  "sidebar.openTodosDrawer": "�تح Todos �يردي",
+  "sidebar.openWorkspaceDrawer": "�تح� د�رج� مساحة العمل",
   "sidebar.settings": "الإعدادات",
-  "sidebar.unmuteApp": "Enable notifications & audio",
+  "sidebar.unmuteApp": "تمكين الإشعارات والصوت",
   "signup.email.label": "البريد الإلكتروني",
-  "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.emailDuplicate": "مستخدم بهذا البريد الإلكتروني موجود بال�عل",
+  "signup.firstname.label": "الاسم الأول",
+  "signup.headline": "التسجيل",
+  "signup.lastname.label": "اسم العائلة",
+  "signup.legal.info": "من خلال إنشاء حساب �يردي �إنك تقبل",
   "signup.legal.privacy": "بيان الخصوصية",
-  "signup.legal.terms": "Terms of service",
-  "signup.link.login": "Already have an account, sign in?",
+  "signup.legal.terms": "بنود الخدمة",
+  "signup.link.login": "ألديك حساب, سجل الدخول؟",
   "signup.password.label": "كلمة المرور",
-  "signup.submit.label": "Create account",
+  "signup.submit.label": "أنشئ حساب",
   "subscription.bestValue": "Best value",
   "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
+  "subscription.cta.allOptions": "مشاهدة جميع الخيارات",
+  "subscription.cta.choosePlan": "اختر خطة اشتراكك",
+  "subscription.includedProFeatures": "وتشمل خطة اشتراك �يردي الاحترا�ية ما يلي:",
+  "subscription.interval.per": "لكل {interval}",
+  "subscription.interval.perMonth": "�ي الشهر",
+  "subscription.interval.perMonthPerUser": "�ي الشهر وعدد المستخدمين",
   "subscription.planItem.upgradeAccount": "ترقية الحساب",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cancel",
-  "subscriptionPopup.buttonDone": "Done",
-  "tabs.item.deleteService": "Delete service",
-  "tabs.item.disableAudio": "Disable audio",
-  "tabs.item.disableNotifications": "Disable notifications",
-  "tabs.item.disableService": "Disable service",
+  "subscription.teaser.includedFeatures": "تشمل خطة الاشتراك المد�وعة ل�ريدي:",
+  "subscription.teaser.intro": "يأتي �ردي 5 مع مجموعة واسعة من الميزات الجديدة لتعزيز تواصلك اليومي - ويشمل ذلك البطاريات. تحقق من خطط اشتراكاتنا الجديدة واكتش� أي واحد تناسبك أكثر!",
+  "subscriptionPopup.buttonCancel": "إلغاء",
+  "subscriptionPopup.buttonDone": "تم",
+  "tabs.item.deleteService": "حذ� الخدمة",
+  "tabs.item.disableAudio": "تعطيل الصوت",
+  "tabs.item.disableNotifications": "تعطيل الإشعارات",
+  "tabs.item.disableService": "تعطيل الخدمة",
   "tabs.item.edit": "تعديل",
-  "tabs.item.enableAudio": "Enable audio",
-  "tabs.item.enableNotification": "Enable notifications",
-  "tabs.item.enableService": "Enable service",
+  "tabs.item.enableAudio": "تمكين الصوت",
+  "tabs.item.enableNotification": "ت�عيل الإشعارات",
+  "tabs.item.enableService": "ت�عيل الخدمة",
   "tabs.item.reload": "إعادة التحميل",
-  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} should be at least {length} characters long",
+  "validation.email": "{field} غير صالح",
+  "validation.minLength": "{field} يجب أن يكون على الأقل {length} حر�اً",
   "validation.oneRequired": "At least one is required",
-  "validation.required": "{field} is required",
-  "validation.url": "{field} is not a valid URL",
+  "validation.required": "{field} مطلوب",
+  "validation.url": "{field} ليس عنوان URL صالح",
   "webControls.back": "الرجوع",
   "webControls.forward": "تقدم",
   "webControls.goHome": "الرئيسية",
-  "webControls.openInBrowser": "Open in Browser",
+  "webControls.openInBrowser": "�تح �ي المتص�ح",
   "webControls.reload": "إعادة التحميل",
-  "welcome.loginButton": "Login to your account",
+  "welcome.loginButton": "تسجيل الدخول إلى حسابك",
   "welcome.signupButton": "إنشاء حساب مجاني",
-  "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.proFeatureBadge": "Premium feature",
-  "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"
+  "workspaceDrawer.addNewWorkspaceLabel": "إضا�ة مساحة عمل جديدة",
+  "workspaceDrawer.allServices": "جميع الخدمات",
+  "workspaceDrawer.headline": "مساحات� العمل",
+  "workspaceDrawer.item.contextMenuEdit": "تعديل",
+  "workspaceDrawer.item.noServicesAddedYet": "لم تض� أي خدمات بعد",
+  "workspaceDrawer.premiumCtaButtonLabel": "أنشئ مساحة عملك الأولى",
+  "workspaceDrawer.proFeatureBadge": "المزايا المد�وعة",
+  "workspaceDrawer.reactivatePremiumAccountLabel": "إعادة تنشيط الحساب المد�وع",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>ي�مكنك �يردي من التركيز على ما هو مهم لديك الآن. أنشاء مجموعات مختل�ة من الخدمات وإداراتها والتنقل بينها بسهولة �ي أي وقت.<p><p/>أنتَ  من يقرر أيّ الخدمات تحتاج ساعة تحتاج وأين تحتاج, لذا نستطيع مساعدتك لتبقى محا�ظ مع مستجدات ما تقوم به أو تستريح إن شئت.<p/>",
+  "workspaceDrawer.workspacesSettingsTooltip": "تعديل إعدادات مساحات العمل",
+  "workspaces.switchingIndicator.switchingTo": "التبديل إلى"
 }
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index 9d676c0a9..356c1fc1e 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index b0e8d2ded..bfb6391f1 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -1,14 +1,17 @@
 {
   "app.errorHandler.action": "Recarrega",
   "app.errorHandler.headline": "Quelcom ha anat malament",
-  "changeserver.headline": "Change server",
-  "changeserver.label": "Server",
+  "changeserver.customServerLabel": "Servidor personalitzat",
+  "changeserver.headline": "Canvía de Servidor",
+  "changeserver.label": "Servidor",
   "changeserver.submit": "Enviar",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Torna a carregar el servei",
-  "connectionLostBanner.informationLink": "What happened?",
-  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
+  "connectionLostBanner.informationLink": "Què ha passat?",
+  "connectionLostBanner.message": "Oh no! Ferdi ha perdut la connexió a {name}.",
   "feature.announcements.changelog.headline": "Canvis en Ferdi {version}",
-  "feature.debugger.title": "Publish debugging information",
+  "feature.debugger.title": "Registra la informació de depuració",
   "feature.delayApp.headline": "Si us plau, compra una llicència de suport per a Ferdi per saltar l'espera",
   "feature.delayApp.text": "Ferdi continuarà en {seconds} segons",
   "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
@@ -32,17 +35,17 @@
   "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
   "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
   "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
-  "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.error": "S'ha produït un error en intentar publicar la informació de depuració. Torneu-ho a provar més tard o visualitzeu la consola per obtenir més informació.",
+  "feature.publishDebugInfo.info": "La publicació de la informació de depuració ens ajuda a trobar problemes i errors a Ferdi. En publicar la informació de depuració, accepteu la política de privadesa i els termes del servei de Ferdi Debugger",
+  "feature.publishDebugInfo.privacy": "Política de privacitat",
+  "feature.publishDebugInfo.publish": "Accepta i publica",
+  "feature.publishDebugInfo.published": "El vostre registre de depuració es va publicar i ja es pot consultar a",
   "feature.publishDebugInfo.terms": "Termes del Servei",
-  "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.publishDebugInfo.title": "Publicar informació de depuració",
+  "feature.quickSwitch.info": "Seleccioneu un servei amb TAB, ↑ i ↓. Obriu un servei amb ENTER.",
+  "feature.quickSwitch.search": "Cerca...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
+  "feature.serviceLimit.limitReached": "Heu afegit {amount} de {limit} serveis inclosos al vostre pla. Actualitzeu el vostre compte per afegir més serveis.",
   "feature.shareFranz.action.email": "Envia com a correu",
   "feature.shareFranz.action.facebook": "Compartir en Facebook",
   "feature.shareFranz.action.twitter": "Compartir a Twitter",
@@ -50,9 +53,9 @@
   "feature.shareFranz.shareText.email": "He afegit {count} serveis a Ferdi! Obtén l'aplicació gratuïta per a Whatsapp, Messenger, Slack, Skype a www,getferdi.com",
   "feature.shareFranz.shareText.twitter": "He afegit {count} serveis a Ferdi! Obtén l'aplicació gratuïta  de Whatsapp, Messenger, Slack, Skype i altres a www.getferdi.com/cc @FerdiMessenger",
   "feature.shareFranz.text": "Digues als teus amics i col·legues l'increïble que és Ferdi i ajuda'ns a còrrer la veu ",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
+  "feature.todos.premium.info": "Les Tasques de Ferdi ja estan disponibles per a usuaris premium!",
+  "feature.todos.premium.rollout": "Tothom haurà d'esperar una mica més.",
+  "feature.todos.premium.upgrade": "Actualitzar el compte",
   "feature.trialStatusBar.cta": "Upgrade now",
   "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
   "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
@@ -61,18 +64,18 @@
   "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
   "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "No es pot connectar amb els serveis en línia de Ferdi",
-  "global.franzProRequired": "Ferdi Professional Required",
+  "global.franzProRequired": "Professional de Ferdi obligatori",
   "global.notConnectedToTheInternet": "No esteu connectat a Internet.",
   "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.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
+  "global.upgradeButton.upgradeToPro": "Actualitza a Ferdi Professional",
   "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",
-  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
+  "infobar.authRequestFailed": "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.buttonInstallUpdate": "Reinicia i instal·la l'actualització",
   "infobar.buttonReloadServices": "Recarrega els serveis",
@@ -86,15 +89,15 @@
   "invite.skip.label": "Ho vull fer més tard",
   "invite.submit.label": "Enviar invitacions",
   "invite.successInfo": "Invitacions enviades correctament",
-  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
-  "locked.invalidCredentials": "Password invalid",
-  "locked.password.label": "Password",
-  "locked.submit.label": "Unlock",
-  "locked.touchId": "Unlock with Touch ID",
-  "locked.touchIdPrompt": "unlock via Touch ID",
-  "locked.unlockWithPassword": "Unlock with Password",
-  "login.changeServer": "Change server",
+  "locked.headline": "Bloquejat",
+  "locked.info": "Actualment, Ferdi està bloquejat. Desbloqueu Ferdi amb la vostra contrasenya per veure els vostres missatges.",
+  "locked.invalidCredentials": "Contrasenya incorrecte",
+  "locked.password.label": "Contrasenya",
+  "locked.submit.label": "Desbloqueja",
+  "locked.touchId": "Desbloqueja amb Touch ID",
+  "locked.touchIdPrompt": "desbloqueja amb Touch ID",
+  "locked.unlockWithPassword": "Desbloqueja amb contrasenya",
+  "login.changeServer": "Canvía de Servidor",
   "login.customServerQuestion": "Using a custom Ferdi server?",
   "login.customServerSuggestion": "Try importing your Franz account",
   "login.email.label": "Correu electrònic",
@@ -102,15 +105,15 @@
   "login.invalidCredentials": "El correu electrònic o la contrasenya no són vàlids",
   "login.link.password": "Restablir la contrasenya",
   "login.link.signup": "Crea un compte gratuït",
-  "login.password.label": "Password",
+  "login.password.label": "Contrasenya",
   "login.serverLogout": "La teva sessió ha caducat, torna-la a iniciar.",
   "login.submit.label": "Accedir-hi",
   "login.tokenExpired": "La teva sessió ha caducat, torna-la a iniciar.",
-  "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
-  "menu.Todoss.openTodosDrawer": "Open Todos drawer",
+  "menu.Todoss.closeTodosDrawer": "Tanca el calaix de tasques",
+  "menu.Todoss.openTodosDrawer": "Obre el calaix de tasques",
   "menu.app.about": "Sobre Ferdi",
   "menu.app.announcement": "Què hi ha de nou?",
-  "menu.app.autohideMenuBar": "Auto-hide menu bar",
+  "menu.app.autohideMenuBar": "Amaga automàticament la barra de menú",
   "menu.app.checkForUpdates": "Comprova si hi ha actualitzacions",
   "menu.app.hide": "Amaga",
   "menu.app.hideOthers": "Amaga altres",
@@ -122,7 +125,7 @@
   "menu.edit.cut": "Retalla",
   "menu.edit.delete": "Suprimeix",
   "menu.edit.emojiSymbols": "Emoji i Símbols",
-  "menu.edit.findInPage": "Find in Page",
+  "menu.edit.findInPage": "Troba a la pàgina",
   "menu.edit.paste": "Enganxa",
   "menu.edit.pasteAndMatchStyle": "Enganxa amb els estils",
   "menu.edit.redo": "Refés",
@@ -135,46 +138,46 @@
   "menu.file": "Fitxer",
   "menu.help": "Ajuda",
   "menu.help.changelog": "Registre de canvis",
-  "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.debugInfo": "Copia la informació de depuració",
+  "menu.help.debugInfoCopiedBody": "La informació de depuració s'ha copiat al porta-retalls.",
+  "menu.help.debugInfoCopiedHeadline": "Informació de depuració de Ferdi",
   "menu.help.learnMore": "Conegueu-ne més detalls",
   "menu.help.privacy": "Declaració de privacitat",
-  "menu.help.publishDebugInfo": "Publish Debug Information",
+  "menu.help.publishDebugInfo": "Publicar informació de depuració",
   "menu.help.support": "Suport",
   "menu.help.tos": "Condicions del Servei",
   "menu.services": "Serveis",
-  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.activatePreviousService": "Activa el servei anterior",
   "menu.services.addNewService": "Afegeix un servei...",
-  "menu.services.goHome": "Home",
-  "menu.services.setNextServiceActive": "Activate next service",
-  "menu.todos": "Todos",
-  "menu.todos.enableTodos": "Enable Todos",
+  "menu.services.goHome": "Inici",
+  "menu.services.setNextServiceActive": "Activa el següent servei",
+  "menu.todos": "Tasques",
+  "menu.todos.enableTodos": "Activar Tasques",
   "menu.view": "Visualitza",
-  "menu.view.back": "Back",
+  "menu.view.back": "Enrere",
   "menu.view.enterFullScreen": "Inicia la pantalla completa",
   "menu.view.exitFullScreen": "Surt de pantalla completa",
-  "menu.view.forward": "Forward",
-  "menu.view.lockFerdi": "Lock Ferdi",
-  "menu.view.openQuickSwitch": "Open Quick Switch",
+  "menu.view.forward": "Endavant",
+  "menu.view.lockFerdi": "Bloqueja Ferdi",
+  "menu.view.openQuickSwitch": "Obre Quick Switch",
   "menu.view.reloadFranz": "Torna a carregar Ferdi",
   "menu.view.reloadService": "Torna a carregar el servei",
   "menu.view.resetZoom": "Mida real",
-  "menu.view.toggleDarkMode": "Toggle Dark Mode",
+  "menu.view.toggleDarkMode": "Canvia a Mode Fosc",
   "menu.view.toggleDevTools": "Activa serveis per a desenvolupadors",
   "menu.view.toggleFullScreen": "Activa la pantalla completa",
   "menu.view.toggleServiceDevTools": "Habilita les eines de desenvolupador de serveis",
-  "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
+  "menu.view.toggleTodosDevTools": "Activa serveis per a desenvolupadors a Tasques",
   "menu.view.zoomIn": "Amplia",
   "menu.view.zoomOut": "Redueix",
   "menu.window": "Finestra",
   "menu.window.close": "Tanca",
   "menu.window.minimize": "Minimitza",
-  "menu.workspaces": "Workspaces",
-  "menu.workspaces.addNewWorkspace": "Add New Workspace...",
-  "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
+  "menu.workspaces": "Espais de treball",
+  "menu.workspaces.addNewWorkspace": "Afegir un Espai de Treball...",
+  "menu.workspaces.closeWorkspaceDrawer": "Tancar el calaix d'espais de treball",
   "menu.workspaces.defaultWorkspace": "Tots els serveis",
-  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
+  "menu.workspaces.openWorkspaceDrawer": "Obrir el calaix d'espais de treball",
   "password.email.label": "Correu electrònic",
   "password.headline": "Restablir la contrasenya",
   "password.link.login": "Inicia la sessió al teu compte",
@@ -183,12 +186,12 @@
   "password.submit.label": "Enviar",
   "password.successInfo": "Comproveu el vostre correu electrònic",
   "premiumFeature.button.upgradeAccount": "Millorar el teu compte",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
+  "pricing.features.accountSync": "Sincronització de Conte",
+  "pricing.features.adFree": "Sense publicitat per sempre",
+  "pricing.features.appDelays": "Cap pantalla d’espera",
+  "pricing.features.appDelaysEnabled": "Pantalles d’espera ocasionals",
+  "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",
@@ -198,7 +201,7 @@
   "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",
+  "pricing.features.workspaces": "Espais de treball",
   "pricing.plan.free": "Ferdi Free",
   "pricing.plan.legacy": "Ferdi Premium",
   "pricing.plan.personal": "Ferdi Personal",
@@ -231,7 +234,7 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} ha fallat al carregar",
-  "service.restrictedHandler.action": "Upgrade Account",
+  "service.restrictedHandler.action": "Actualitzar el compte",
   "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
@@ -268,7 +271,7 @@
   "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Torna a provar-ho",
   "settings.account.tryReloadUserInfoRequest": "Torna a provar-ho",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
+  "settings.account.upgradeToPro.label": "Actualitza a Ferdi Professional",
   "settings.account.userInfoRequestFailed": "No s'ha pogut carregar la informació de l'usuari",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: #7367f0)",
@@ -298,7 +301,7 @@
   "settings.app.form.inactivityLock": "Lock after inactivity",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Idioma",
-  "settings.app.form.lockPassword": "Password",
+  "settings.app.form.lockPassword": "Contrasenya",
   "settings.app.form.minimizeToSystemTray": "Minimitza Ferdi a la safata del sistema",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
@@ -326,7 +329,7 @@
   "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 CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Password",
+  "settings.app.lockedPassword": "Contrasenya",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Els canvis requereixen reiniciar",
   "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.",
@@ -462,11 +465,11 @@
   "settings.workspaces.workspacesRequestFailed": "Could not load your workspaces",
   "sidebar.addNewService": "Afegeix nou servei",
   "sidebar.closeTodosDrawer": "Close Ferdi Todos",
-  "sidebar.closeWorkspaceDrawer": "Close workspace drawer",
-  "sidebar.lockFerdi": "Lock Ferdi",
+  "sidebar.closeWorkspaceDrawer": "Tancar el calaix d'espais de treball",
+  "sidebar.lockFerdi": "Bloqueja Ferdi",
   "sidebar.muteApp": "Desactivar notificacions i àudio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
-  "sidebar.openWorkspaceDrawer": "Open workspace drawer",
+  "sidebar.openWorkspaceDrawer": "Obrir el calaix d'espais de treball",
   "sidebar.settings": "Configuració",
   "sidebar.unmuteApp": "Activar notificacions i àudio",
   "signup.email.label": "Correu electrònic",
@@ -478,7 +481,7 @@
   "signup.legal.privacy": "Declaració de privacitat",
   "signup.legal.terms": "Termes del Servei",
   "signup.link.login": "Ja teniu un compte, iniciar la sessió?",
-  "signup.password.label": "Password",
+  "signup.password.label": "Contrasenya",
   "signup.submit.label": "Crea un compte",
   "subscription.bestValue": "Best value",
   "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
@@ -488,7 +491,7 @@
   "subscription.interval.per": "per {interval}",
   "subscription.interval.perMonth": "per month",
   "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
+  "subscription.planItem.upgradeAccount": "Actualitzar el compte",
   "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
   "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
   "subscriptionPopup.buttonCancel": "Cancel·la",
@@ -507,16 +510,16 @@
   "validation.oneRequired": "At least one is required",
   "validation.required": "{field} es requerit",
   "validation.url": "{field} es una URL no vàlida",
-  "webControls.back": "Back",
-  "webControls.forward": "Forward",
-  "webControls.goHome": "Home",
+  "webControls.back": "Enrere",
+  "webControls.forward": "Endavant",
+  "webControls.goHome": "Inici",
   "webControls.openInBrowser": "Open in Browser",
   "webControls.reload": "Recarrega",
   "welcome.loginButton": "Inicia sessió al teu compte",
   "welcome.signupButton": "Crea un compte gratuït",
   "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "Tots els serveis",
-  "workspaceDrawer.headline": "Workspaces",
+  "workspaceDrawer.headline": "Espais de treball",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
   "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 136602524..5ac77ec4d 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Obnovit",
   "app.errorHandler.headline": "Něco se pokazilo",
+  "changeserver.customServerLabel": "Vlastní server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Odeslat",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Obnovit službu",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index 9d676c0a9..356c1fc1e 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 38772d36a..fd36c91a7 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Neu laden",
   "app.errorHandler.headline": "Es ist ein Fehler aufgetreten",
+  "changeserver.customServerLabel": "Eigener Server",
   "changeserver.headline": "Server wechseln",
   "changeserver.label": "Server",
   "changeserver.submit": "Absenden",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Dienst neu laden",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index c80574aa8..244ceb521 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -49,39 +49,78 @@
         "defaultMessage": "!!!Change server",
         "end": {
           "column": 3,
-          "line": 14
+          "line": 16
         },
         "file": "src/components/auth/ChangeServer.js",
         "id": "changeserver.headline",
         "start": {
           "column": 12,
-          "line": 11
+          "line": 13
         }
       },
       {
         "defaultMessage": "!!!Server",
         "end": {
           "column": 3,
-          "line": 18
+          "line": 20
         },
         "file": "src/components/auth/ChangeServer.js",
         "id": "changeserver.label",
         "start": {
           "column": 9,
-          "line": 15
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Extra settings offered by Ferdi will not be saved",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/components/auth/ChangeServer.js",
+        "id": "changeserver.warning",
+        "start": {
+          "column": 11,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Custom server",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/auth/ChangeServer.js",
+        "id": "changeserver.customServerLabel",
+        "start": {
+          "column": 21,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Enter a valid URL",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/components/auth/ChangeServer.js",
+        "id": "changeserver.urlError",
+        "start": {
+          "column": 12,
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Submit",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 36
         },
         "file": "src/components/auth/ChangeServer.js",
         "id": "changeserver.submit",
         "start": {
           "column": 10,
-          "line": 19
+          "line": 33
         }
       }
     ],
@@ -1074,117 +1113,117 @@
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 18
+          "line": 21
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.settings",
         "start": {
           "column": 12,
-          "line": 15
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!!Add new service",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 25
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.addNewService",
         "start": {
           "column": 17,
-          "line": 19
+          "line": 22
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 29
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 8,
-          "line": 23
+          "line": 26
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 33
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 10,
-          "line": 27
+          "line": 30
         }
       },
       {
         "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 37
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.openWorkspaceDrawer",
         "start": {
           "column": 23,
-          "line": 31
+          "line": 34
         }
       },
       {
         "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
-          "line": 38
+          "line": 41
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.closeWorkspaceDrawer",
         "start": {
           "column": 24,
-          "line": 35
+          "line": 38
         }
       },
       {
         "defaultMessage": "!!!Open Franz Todos",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 45
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.openTodosDrawer",
         "start": {
           "column": 19,
-          "line": 39
+          "line": 42
         }
       },
       {
         "defaultMessage": "!!!Close Franz Todos",
         "end": {
           "column": 3,
-          "line": 46
+          "line": 49
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.closeTodosDrawer",
         "start": {
           "column": 20,
-          "line": 43
+          "line": 46
         }
       },
       {
         "defaultMessage": "!!!Lock Ferdi",
         "end": {
           "column": 3,
-          "line": 50
+          "line": 53
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.lockFerdi",
         "start": {
           "column": 13,
-          "line": 47
+          "line": 50
         }
       }
     ],
@@ -4541,494 +4580,494 @@
         "defaultMessage": "!!!Launch Ferdi on start",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 33
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.autoLaunchOnStart",
         "start": {
           "column": 21,
-          "line": 29
+          "line": 30
         }
       },
       {
         "defaultMessage": "!!!Open in background",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 37
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.autoLaunchInBackground",
         "start": {
           "column": 26,
-          "line": 33
+          "line": 34
         }
       },
       {
         "defaultMessage": "!!!Keep Ferdi in background when closing the window",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 41
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.runInBackground",
         "start": {
           "column": 19,
-          "line": 37
+          "line": 38
         }
       },
       {
         "defaultMessage": "!!!Start minimized",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 45
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.startMinimized",
         "start": {
           "column": 18,
-          "line": 41
+          "line": 42
         }
       },
       {
         "defaultMessage": "!!!Always show Ferdi in system tray",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 49
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSystemTray",
         "start": {
           "column": 20,
-          "line": 45
+          "line": 46
         }
       },
       {
         "defaultMessage": "!!!Reload Ferdi after system resume",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 53
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.reloadAfterResume",
         "start": {
           "column": 21,
-          "line": 49
+          "line": 50
         }
       },
       {
         "defaultMessage": "!!!Minimize Ferdi to system tray",
         "end": {
           "column": 3,
-          "line": 56
+          "line": 57
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.minimizeToSystemTray",
         "start": {
           "column": 24,
-          "line": 53
+          "line": 54
         }
       },
       {
         "defaultMessage": "!!!Don't show message content in notifications",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 61
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.privateNotifications",
         "start": {
           "column": 24,
-          "line": 57
+          "line": 58
         }
       },
       {
         "defaultMessage": "!!!Navigation bar behaviour",
         "end": {
           "column": 3,
-          "line": 64
+          "line": 65
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.navigationBarBehaviour",
         "start": {
           "column": 26,
-          "line": 61
+          "line": 62
         }
       },
       {
         "defaultMessage": "!!!Send telemetry data",
         "end": {
           "column": 3,
-          "line": 68
+          "line": 69
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.sentry",
         "start": {
           "column": 10,
-          "line": 65
+          "line": 66
         }
       },
       {
         "defaultMessage": "!!!Enable service hibernation",
         "end": {
           "column": 3,
-          "line": 72
+          "line": 73
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.hibernate",
         "start": {
           "column": 13,
-          "line": 69
+          "line": 70
         }
       },
       {
         "defaultMessage": "!!!Keep services in hibernation on startup",
         "end": {
           "column": 3,
-          "line": 76
+          "line": 77
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.hibernateOnStartup",
         "start": {
           "column": 22,
-          "line": 73
+          "line": 74
         }
       },
       {
         "defaultMessage": "!!!Hibernation strategy",
         "end": {
           "column": 3,
-          "line": 80
+          "line": 81
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.hibernationStrategy",
         "start": {
           "column": 23,
-          "line": 77
+          "line": 78
         }
       },
       {
         "defaultMessage": "!!!Todo Server",
         "end": {
           "column": 3,
-          "line": 84
+          "line": 85
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.predefinedTodoServer",
         "start": {
           "column": 24,
-          "line": 81
+          "line": 82
         }
       },
       {
         "defaultMessage": "!!!Custom TodoServer",
         "end": {
           "column": 3,
-          "line": 88
+          "line": 89
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.customTodoServer",
         "start": {
           "column": 20,
-          "line": 85
+          "line": 86
         }
       },
       {
         "defaultMessage": "!!!Enable Password Lock",
         "end": {
           "column": 3,
-          "line": 92
+          "line": 93
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableLock",
         "start": {
           "column": 14,
-          "line": 89
+          "line": 90
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 96
+          "line": 97
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.lockPassword",
         "start": {
           "column": 16,
-          "line": 93
+          "line": 94
         }
       },
       {
         "defaultMessage": "!!!Allow using Touch ID to unlock",
         "end": {
           "column": 3,
-          "line": 100
+          "line": 101
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.useTouchIdToUnlock",
         "start": {
           "column": 22,
-          "line": 97
+          "line": 98
         }
       },
       {
         "defaultMessage": "!!!Lock after inactivity",
         "end": {
           "column": 3,
-          "line": 104
+          "line": 105
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.inactivityLock",
         "start": {
           "column": 18,
-          "line": 101
+          "line": 102
         }
       },
       {
         "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
         "end": {
           "column": 3,
-          "line": 108
+          "line": 109
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDEnabled",
         "start": {
           "column": 23,
-          "line": 105
+          "line": 106
         }
       },
       {
         "defaultMessage": "!!!From",
         "end": {
           "column": 3,
-          "line": 112
+          "line": 113
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDStart",
         "start": {
           "column": 21,
-          "line": 109
+          "line": 110
         }
       },
       {
         "defaultMessage": "!!!To",
         "end": {
           "column": 3,
-          "line": 116
+          "line": 117
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDEnd",
         "start": {
           "column": 19,
-          "line": 113
+          "line": 114
         }
       },
       {
         "defaultMessage": "!!!Language",
         "end": {
           "column": 3,
-          "line": 120
+          "line": 121
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.language",
         "start": {
           "column": 12,
-          "line": 117
+          "line": 118
         }
       },
       {
         "defaultMessage": "!!!Dark Mode",
         "end": {
           "column": 3,
-          "line": 124
+          "line": 125
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.darkMode",
         "start": {
           "column": 12,
-          "line": 121
+          "line": 122
         }
       },
       {
         "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
         "end": {
           "column": 3,
-          "line": 128
+          "line": 129
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.adaptableDarkMode",
         "start": {
           "column": 21,
-          "line": 125
+          "line": 126
         }
       },
       {
         "defaultMessage": "!!!Enable universal Dark Mode",
         "end": {
           "column": 3,
-          "line": 132
+          "line": 133
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.universalDarkMode",
         "start": {
           "column": 21,
-          "line": 129
+          "line": 130
         }
       },
       {
         "defaultMessage": "!!!Sidebar width",
         "end": {
           "column": 3,
-          "line": 136
+          "line": 137
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.serviceRibbonWidth",
         "start": {
           "column": 22,
-          "line": 133
+          "line": 134
         }
       },
       {
         "defaultMessage": "!!!Service icon size",
         "end": {
           "column": 3,
-          "line": 140
+          "line": 141
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.iconSize",
         "start": {
           "column": 12,
-          "line": 137
+          "line": 138
         }
       },
       {
         "defaultMessage": "!!!Accent color",
         "end": {
           "column": 3,
-          "line": 144
+          "line": 145
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.accentColor",
         "start": {
           "column": 15,
-          "line": 141
+          "line": 142
         }
       },
       {
         "defaultMessage": "!!!Display disabled services tabs",
         "end": {
           "column": 3,
-          "line": 148
+          "line": 149
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDisabledServices",
         "start": {
           "column": 24,
-          "line": 145
+          "line": 146
         }
       },
       {
         "defaultMessage": "!!!Show unread message badge when notifications are disabled",
         "end": {
           "column": 3,
-          "line": 152
+          "line": 153
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showMessagesBadgesWhenMuted",
         "start": {
           "column": 29,
-          "line": 149
+          "line": 150
         }
       },
       {
         "defaultMessage": "!!!Show draggable area on window",
         "end": {
           "column": 3,
-          "line": 156
+          "line": 157
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDragArea",
         "start": {
           "column": 16,
-          "line": 153
+          "line": 154
         }
       },
       {
         "defaultMessage": "!!!Enable spell checking",
         "end": {
           "column": 3,
-          "line": 160
+          "line": 161
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSpellchecking",
         "start": {
           "column": 23,
-          "line": 157
+          "line": 158
         }
       },
       {
         "defaultMessage": "!!!Enable GPU Acceleration",
         "end": {
           "column": 3,
-          "line": 164
+          "line": 165
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableGPUAcceleration",
         "start": {
           "column": 25,
-          "line": 161
+          "line": 162
         }
       },
       {
         "defaultMessage": "!!!Include beta versions",
         "end": {
           "column": 3,
-          "line": 168
+          "line": 169
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.beta",
         "start": {
           "column": 8,
-          "line": 165
+          "line": 166
         }
       },
       {
         "defaultMessage": "!!!Enable updates",
         "end": {
           "column": 3,
-          "line": 172
+          "line": 173
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.automaticUpdates",
         "start": {
           "column": 20,
-          "line": 169
+          "line": 170
         }
       },
       {
         "defaultMessage": "!!!Enable Franz Todos",
         "end": {
           "column": 3,
-          "line": 176
+          "line": 177
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableTodos",
         "start": {
           "column": 15,
-          "line": 173
+          "line": 174
         }
       },
       {
         "defaultMessage": "!!!Keep all workspaces loaded",
         "end": {
           "column": 3,
-          "line": 180
+          "line": 181
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.keepAllWorkspacesLoaded",
         "start": {
           "column": 27,
-          "line": 177
+          "line": 178
         }
       }
     ],
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 88fe5a81d..b7fe119aa 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -1,21 +1,24 @@
 {
   "app.errorHandler.action": "Επαναφό�τωση",
   "app.errorHandler.headline": "Κάτι δεν λειτου�γεί",
+  "changeserver.customServerLabel": "Π�οσα�μοσμένος διακομιστής",
   "changeserver.headline": "Change server",
-  "changeserver.label": "Server",
+  "changeserver.label": "Διακομιστής",
   "changeserver.submit": "Υποβολή",
+  "changeserver.urlError": "Εισάγετε μια έγκυ�η διε�θυνση URL",
+  "changeserver.warning": "Οι επιπλέον �υθμίσεις από το Ferdi δεν θα αποθηκευτο�ν",
   "connectionLostBanner.cta": "Ανανέωση Υπη�εσίας",
-  "connectionLostBanner.informationLink": "What happened?",
-  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
-  "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
-  "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
+  "connectionLostBanner.informationLink": "Τι συνέβη;",
+  "connectionLostBanner.message": "Ωχ όχι! Ο Ferdi έχασε την επικοινωνία με το",
+  "feature.announcements.changelog.headline": "Αλλαγές σχετικά με το Ferdi",
+  "feature.debugger.title": "Εγγ�αφή πλη�οφο�ιών εντοπισμο� σφαλμάτων",
+  "feature.delayApp.headline": "Πα�ακαλο�με αγο�άστε μία άδεια Ferdi για να πα�αλείψετε την αναμονή",
   "feature.delayApp.text": "Ferdi θα συνεχίσει σε {seconds} δευτε�όλεπτα.",
   "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
   "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
   "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
+  "feature.delayApp.upgrade.action": "Αγο�άστε μία άδεια Ferdi",
+  "feature.delayApp.upgrade.actionShort": "Αναβαθμίστε τον λογα�ιασμό σας ",
   "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
   "feature.planSelection.cta.stayOnFree": "Stay on Free",
   "feature.planSelection.cta.trial": "Start my free 14-days Trial",
@@ -182,7 +185,7 @@
   "password.noUser": "Δεν β�έθηκε χ�ήστης με τη συγκεκ�ιμένη διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου",
   "password.submit.label": "Υποβολή",
   "password.successInfo": "Ελέγξτε το email σας",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
+  "premiumFeature.button.upgradeAccount": "Αναβαθμίστε τον λογα�ιασμό σας ",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 5c33daf86..dcaa2466a 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index a8518b5e3..03207e904 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,9 +1,12 @@
 {
-  "app.errorHandler.action": "Volver a cargar",
+  "app.errorHandler.action": "Recargar",
   "app.errorHandler.headline": "Algo salió mal.",
+  "changeserver.customServerLabel": "Servidor personalizado",
   "changeserver.headline": "Cambiar servidor",
   "changeserver.label": "Servidor",
   "changeserver.submit": "Enviar",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Recargar Servicio",
   "connectionLostBanner.informationLink": "¿Qué ocurrió?",
   "connectionLostBanner.message": "¡Oh no! Ferdi perdió la conexión con {name}.",
@@ -276,7 +279,7 @@
   "settings.app.buttonInstallUpdate": "Reiniciar e instalar actualización",
   "settings.app.buttonSearchForUpdate": "Comprobar actualizaciones",
   "settings.app.cacheInfo": "El cache de Ferdi actualmente usa {size} de espacio en disco.",
-  "settings.app.cacheNotCleared": "Couldn't clear all cache",
+  "settings.app.cacheNotCleared": "No se ha podido eliminar el cache",
   "settings.app.currentVersion": "Versión actual:",
   "settings.app.form.accentColor": "Color de realce",
   "settings.app.form.adaptableDarkMode": "Sincroniza el modo oscuro con el ajuste del modo oscuro de mi Sistema Operativo",
@@ -292,7 +295,7 @@
   "settings.app.form.enableSystemTray": "Mostrar Ferdi en la bandeja del sistema",
   "settings.app.form.enableTodos": "Activar Ferdi Todos",
   "settings.app.form.hibernate": "Habilitar hibernación del servicio",
-  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
+  "settings.app.form.hibernateOnStartup": "Mantener los servicios en hibernación al iniciar",
   "settings.app.form.hibernationStrategy": "Estrategia de hibernación",
   "settings.app.form.iconSize": "Tamaño del icono del servicio",
   "settings.app.form.inactivityLock": "Bloquear tras inactividad",
@@ -371,9 +374,9 @@
   "settings.service.form.customUrlPremiumInfo": "Para añadir tus propios servicios, necesitas una Cuenta Colaborador Premium de Ferdi.",
   "settings.service.form.customUrlUpgradeAccount": "Mejora tu cuenta",
   "settings.service.form.customUrlValidationError": "No se pudo validar el servidor personalizado {name}.",
-  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
-  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
-  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
+  "settings.service.form.darkReaderBrightness": "Brillo del Lector Oscuro",
+  "settings.service.form.darkReaderContrast": "Contraste del Lector Oscuro",
+  "settings.service.form.darkReaderSepia": "Lector Oscuro Sepia",
   "settings.service.form.deleteButton": "Eliminar servicio",
   "settings.service.form.disableHibernation": "Desactivar hibernación",
   "settings.service.form.disableHibernationInfo": "Actualmente tienes la hibernación habilitada, pero puedes desactivar la hibernación para servicios individuales usando esta opción.",
@@ -384,7 +387,7 @@
   "settings.service.form.enableNotification": "Activar notificaciones",
   "settings.service.form.enableService": "Activar servicio",
   "settings.service.form.headlineBadges": "Insignias de mensaje no leídos",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
+  "settings.service.form.headlineDarkReaderSettings": "Configuración del Lector Oscuro",
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notificaciones",
   "settings.service.form.icon": "Icono Personalizado",
@@ -447,8 +450,8 @@
   "settings.workspace.add.form.submitButton": "Crear un sitio de trabajo",
   "settings.workspace.form.buttonDelete": "Eliminar espacio de trabajo",
   "settings.workspace.form.buttonSave": "Guardar espacio de trabajo",
-  "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.keepLoaded": "Mantener este espacio de trabajo cargado*",
+  "settings.workspace.form.keepLoadedInfo": "*Esta opción será sobrescrita por la opción global \"Mantener todas las áreas de trabajo cargadas\".",
   "settings.workspace.form.name": "Nombre",
   "settings.workspace.form.servicesInWorkspaceHeadline": "Servicios en este espacio de trabajo",
   "settings.workspace.form.yourWorkspaces": "Tus espacios de trabajo",
@@ -458,10 +461,10 @@
   "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": "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",
+  "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.workspacesRequestFailed": "No se han podido cargar sus áreas de trabajo",
   "sidebar.addNewService": "Añadir nuevo servicio",
-  "sidebar.closeTodosDrawer": "Close Ferdi Todos",
+  "sidebar.closeTodosDrawer": "Cerrar Ferdi Todos",
   "sidebar.closeWorkspaceDrawer": "Cerrar cajón de espacio de trabajo",
   "sidebar.lockFerdi": "Bloquear Ferdi",
   "sidebar.muteApp": "Desactivar notificaciones y sonido",
@@ -482,15 +485,15 @@
   "signup.submit.label": "Crear cuenta",
   "subscription.bestValue": "Best value",
   "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
+  "subscription.cta.allOptions": "Ver todas las opciones",
+  "subscription.cta.choosePlan": "Elije tu plan",
+  "subscription.includedProFeatures": "El Plan Profesional de Ferdi incluye:",
+  "subscription.interval.per": "por {interval}",
+  "subscription.interval.perMonth": "al mes",
+  "subscription.interval.perMonthPerUser": "por mes y usuario",
   "subscription.planItem.upgradeAccount": "Actualizar cuenta",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
+  "subscription.teaser.includedFeatures": "Los planes de pago de Ferdi incluyen:",
+  "subscription.teaser.intro": "Ferdi 5 viene con una amplia gama de nuevas características para mejorar tu comunicación diaria - baterías incluidas. ¡Echa un vistazo a nuestros nuevos planes y descubra cuál le conviene más!",
   "subscriptionPopup.buttonCancel": "Cancelar",
   "subscriptionPopup.buttonDone": "Listo",
   "tabs.item.deleteService": "Eliminar servicio",
@@ -501,7 +504,7 @@
   "tabs.item.enableAudio": "Habilitar audio",
   "tabs.item.enableNotification": "Activar notificaciones",
   "tabs.item.enableService": "Activar servicio",
-  "tabs.item.reload": "Volver a cargar",
+  "tabs.item.reload": "Recargar",
   "validation.email": "{field} no es válido",
   "validation.minLength": "{field} debería tener al menos {length} caracteres",
   "validation.oneRequired": "Al menos uno es requerido",
@@ -510,19 +513,19 @@
   "webControls.back": "Volver",
   "webControls.forward": "Siguiente",
   "webControls.goHome": "Inicio",
-  "webControls.openInBrowser": "Open in Browser",
-  "webControls.reload": "Volver a cargar",
+  "webControls.openInBrowser": "Abrir en navegador",
+  "webControls.reload": "Recargar",
   "welcome.loginButton": "Accede a tu cuenta",
   "welcome.signupButton": "Crear una cuenta gratuita",
-  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
+  "workspaceDrawer.addNewWorkspaceLabel": "Añadir nuevo espacio de trabajo",
   "workspaceDrawer.allServices": "Todos los servicios",
   "workspaceDrawer.headline": "Espacios de trabajo",
-  "workspaceDrawer.item.contextMenuEdit": "edit",
-  "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "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"
+  "workspaceDrawer.item.contextMenuEdit": "editar",
+  "workspaceDrawer.item.noServicesAddedYet": "Ningún servicio ha sido añadido",
+  "workspaceDrawer.premiumCtaButtonLabel": "Crea tu primer área de trabajo",
+  "workspaceDrawer.proFeatureBadge": "Función Premium",
+  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivar cuenta premium",
+  "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.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 9d676c0a9..356c1fc1e 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index c898f47f2..78c08558e 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Actualiser",
   "app.errorHandler.headline": "On dirait que quelque chose ne va pas",
+  "changeserver.customServerLabel": "Serveur personnalisé",
   "changeserver.headline": "Changer de serveur",
   "changeserver.label": "Serveur",
   "changeserver.submit": "Soumettre",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Redémarrer le service",
   "connectionLostBanner.informationLink": "Que s'est-il passé?",
   "connectionLostBanner.message": "Oh non ! Ferdi a perdu la connexion avec {name}.",
@@ -276,7 +279,7 @@
   "settings.app.buttonInstallUpdate": "Redémarrer et installer la mise à jour",
   "settings.app.buttonSearchForUpdate": "Vérifier les mises à jour",
   "settings.app.cacheInfo": "Le cache de Ferdi occupe actuellement {size} en espace disque.",
-  "settings.app.cacheNotCleared": "Couldn't clear all cache",
+  "settings.app.cacheNotCleared": "Impossible de vider toute la cache",
   "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",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index d930ab415..a937b084e 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Athlódáil",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.customServerLabel": "Freastalaí saincheaptha",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Cuir isteach",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Athlódáil seirbhís",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 9d676c0a9..356c1fc1e 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 79616f9f5..99916d529 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Ponovno u�itavanje",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.customServerLabel": "Prilagođen server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Pošalji",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 07603df52..0c27f706d 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -1,14 +1,17 @@
 {
   "app.errorHandler.action": "Újratöltés",
   "app.errorHandler.headline": "Valami nem jött össze",
+  "changeserver.customServerLabel": "Egyéni szerver",
   "changeserver.headline": "Change server",
-  "changeserver.label": "Server",
+  "changeserver.label": "Szerver",
   "changeserver.submit": "Küldés",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Szolgáltatás újraindítása",
-  "connectionLostBanner.informationLink": "What happened?",
-  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
+  "connectionLostBanner.informationLink": "Mi történt?",
+  "connectionLostBanner.message": "Ja ne! Ferdi nem tud kapcsolodni {name}-hez.",
   "feature.announcements.changelog.headline": "Ferdi {version} változásai",
-  "feature.debugger.title": "Publish debugging information",
+  "feature.debugger.title": "Hibakeresési napló publikálása",
   "feature.delayApp.headline": "Kérjük vásárolj egy Franc Támogatói Liszencet a várakozás átugrásához",
   "feature.delayApp.text": "A Ferdi továbblép {seconds} másodperc múlva.",
   "feature.delayApp.trial.action": "Igen, szeretném kipróbálni 14 napig a Ferdi Professional-t ingyen",
@@ -32,15 +35,15 @@
   "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
   "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
   "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
-  "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
+  "feature.publishDebugInfo.error": "Hiba történt a hibakeresési napló publikálása közben. Kérem próbálja meg később.",
   "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.privacy": "Adatvédelmi szabályzat",
+  "feature.publishDebugInfo.publish": "Elfogadás és közzététel",
   "feature.publishDebugInfo.published": "Your debug log was published and is now availible at",
   "feature.publishDebugInfo.terms": "Felhasználási Feltételeket",
-  "feature.publishDebugInfo.title": "Publish debug information",
+  "feature.publishDebugInfo.title": "Hibakeresési napló publikálása",
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
-  "feature.quickSwitch.search": "Search...",
+  "feature.quickSwitch.search": "Keresés...",
   "feature.quickSwitch.title": "QuickSwitch",
   "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Küldés email-ben",
@@ -86,14 +89,14 @@
   "invite.skip.label": "Későbbre halasztom",
   "invite.submit.label": "Meghívók küldése",
   "invite.successInfo": "Meghívás sikeresen elküldve",
-  "locked.headline": "Locked",
+  "locked.headline": "Zárolva",
   "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
   "locked.invalidCredentials": "Password invalid",
   "locked.password.label": "Password",
-  "locked.submit.label": "Unlock",
-  "locked.touchId": "Unlock with Touch ID",
-  "locked.touchIdPrompt": "unlock via Touch ID",
-  "locked.unlockWithPassword": "Unlock with Password",
+  "locked.submit.label": "Feloldás",
+  "locked.touchId": "Feloldás ujjlenyomattal",
+  "locked.touchIdPrompt": "feloldás ujjlenyomattal",
+  "locked.unlockWithPassword": "Feloldás jelszóval",
   "login.changeServer": "Change server",
   "login.customServerQuestion": "Using a custom Ferdi server?",
   "login.customServerSuggestion": "Try importing your Franz account",
@@ -151,10 +154,10 @@
   "menu.todos": "Tennivalók",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Nézet",
-  "menu.view.back": "Back",
+  "menu.view.back": "Vissza",
   "menu.view.enterFullScreen": "Kilépés a teljes képernyős módból",
   "menu.view.exitFullScreen": "Kilépés a teljes képernyős módból",
-  "menu.view.forward": "Forward",
+  "menu.view.forward": "Előre",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
   "menu.view.reloadFranz": "Ferdi újrainditása",
@@ -200,7 +203,7 @@
   "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Munkaterületek",
   "pricing.plan.free": "Ingyenes Ferdi",
-  "pricing.plan.legacy": "Ferdi Premium",
+  "pricing.plan.legacy": "Ferdi Prémium",
   "pricing.plan.personal": "Ferdi Personal",
   "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
   "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
@@ -507,8 +510,8 @@
   "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",
-  "webControls.back": "Back",
-  "webControls.forward": "Forward",
+  "webControls.back": "Vissza",
+  "webControls.forward": "Előre",
   "webControls.goHome": "Home",
   "webControls.openInBrowser": "Open in Browser",
   "webControls.reload": "Újratöltés",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 433fde229..566139d1f 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Muat Ulang",
   "app.errorHandler.headline": "Terjadi kesalahan",
+  "changeserver.customServerLabel": "Server khusus",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Kirim",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Muat ulang Layanan",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 78474b496..ac9d410e0 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -1,14 +1,17 @@
 {
   "app.errorHandler.action": "Ricarica",
   "app.errorHandler.headline": "Qualcosa è andato storto",
+  "changeserver.customServerLabel": "Server personalizzato",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Invia",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Ricarica Servizio",
-  "connectionLostBanner.informationLink": "What happened?",
-  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
+  "connectionLostBanner.informationLink": "Cos'è successo?",
+  "connectionLostBanner.message": "Oh no! Ferdi ha perso la connessione con {name}.",
   "feature.announcements.changelog.headline": "Modifiche in Ferdi {Version}",
-  "feature.debugger.title": "Publish debugging information",
+  "feature.debugger.title": "Pubblica informazioni di debug",
   "feature.delayApp.headline": "Per favore, compra una Licenza Supporter di Ferdi per saltare l'attesa",
   "feature.delayApp.text": "Ferdi continuerà tra {seconds} secondi.",
   "feature.delayApp.trial.action": "Sì, voglio la prova gratuita di 14 giorni di Ferdi Professional",
@@ -32,10 +35,10 @@
   "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
   "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
   "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
-  "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.error": "Si è verificato un errore durante il tentativo di pubblicare le informazioni di debug. Riprova più tardi o vedi la console per maggiori informazioni.",
+  "feature.publishDebugInfo.info": "Pubblicare le informazioni di debug ci aiuta a trovare problemi ed errori in Ferdi. Pubblicando le informazioni di debug accetti l'informativa sulla privacy e i termini di servizio di Ferdi Debugger",
+  "feature.publishDebugInfo.privacy": "Informativa sulla privacy",
+  "feature.publishDebugInfo.publish": "Accetta e pubblica",
   "feature.publishDebugInfo.published": "Your debug log was published and is now availible at",
   "feature.publishDebugInfo.terms": "Termini di Servizio",
   "feature.publishDebugInfo.title": "Publish debug information",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 3c8f938aa..4ca76c329 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "�読�込�",
   "app.errorHandler.headline": "間����る部分��り��",
+  "changeserver.customServerLabel": "独自サー�ー",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "�信",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "サービスをリロード�る",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 3768274ff..0422f6879 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "ჩ�ტვირთვ�",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.customServerLabel": "კერძ� სერვერი",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "დ�დ�სტურებ�",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index 462990547..36aae0dd6 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "새로고침",
   "app.errorHandler.headline": "문제가 발�했습니다.",
+  "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index f166fd1c9..dcbd84636 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Herladen",
   "app.errorHandler.headline": "Er ging iets mis",
+  "changeserver.customServerLabel": "Aangepaste server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Verzenden",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Service Herladen",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 3ac8186bd..9de45b28c 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Herladen",
   "app.errorHandler.headline": "Er is iets mis gegaan",
+  "changeserver.customServerLabel": "Aangepaste server",
   "changeserver.headline": "Server wijzigen",
   "changeserver.label": "Server",
   "changeserver.submit": "Verzenden",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Een service opnieuw laden",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index 9d676c0a9..356c1fc1e 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index f6193a1fd..7a28f7cac 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Odśwież",
   "app.errorHandler.headline": "Coś poszło nie tak.",
+  "changeserver.customServerLabel": "Spersonalizowany serwer",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Wyślij",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Przeładuj usługę",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 190ef31de..bce72e369 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Recarregar",
   "app.errorHandler.headline": "Algo deu errado",
+  "changeserver.customServerLabel": "Servidor personalizado",
   "changeserver.headline": "Alterar servidor",
   "changeserver.label": "Servidor",
   "changeserver.submit": "Submeter",
+  "changeserver.urlError": "Informe uma URL válida",
+  "changeserver.warning": "As configurações extras oferecidas pelo Ferdi não serão salvas",
   "connectionLostBanner.cta": "Recarregar serviço",
   "connectionLostBanner.informationLink": "O que aconteceu?",
   "connectionLostBanner.message": "Ah não! Ferdi perdeu a conexão com {name}.",
@@ -186,7 +189,7 @@
   "pricing.features.accountSync": "Sincronização Automática",
   "pricing.features.adFree": "Sem publicidade para sempre",
   "pricing.features.appDelays": "Sem Telas de Espera",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Telas de Carregamento Ocasionais",
   "pricing.features.customWebsites": "Adicionar Websites Personalizados",
   "pricing.features.desktopNotifications": "Notificações no ambiente de trabalho",
   "pricing.features.onPremise": "On-Premise & Outros serviços hospedados",
@@ -328,7 +331,7 @@
   "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 veze que o Ferdi for iniciado ou você solicite o bloqueio.",
   "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.restartRequired": "Alterações requerem reinício",
+  "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.",
   "settings.app.sentryInfo": "O envio de dados de telemetria nos permite encontrar erros no Ferdi. Não enviaremos nenhuma informação pessoal como seus dados de mensagem! Alterar esta opção requer que você reinicie o Ferdi.",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 7a6ed77cc..785d95b48 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Actualizar",
   "app.errorHandler.headline": "Alguma coisa correu mal",
+  "changeserver.customServerLabel": "Servidor personalizado",
   "changeserver.headline": "Alterar servidor",
   "changeserver.label": "Servidor",
   "changeserver.submit": "Enviar",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reiniciar serviço",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index 9d676c0a9..356c1fc1e 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index a16bde739..beecb46e6 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Перезагрузить",
   "app.errorHandler.headline": "Что-то пошло не так",
+  "changeserver.customServerLabel": "Пользователь�кий �ервер",
   "changeserver.headline": "Изменить �ервер",
   "changeserver.label": "Server",
   "changeserver.submit": "Прин�ть",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Перезапу�тить �ерви�",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index fd73bc773..3810cb235 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Obnoviť",
   "app.errorHandler.headline": "Nie�o sa pokazilo",
+  "changeserver.customServerLabel": "Vlastný server",
   "changeserver.headline": "Zmeniť server",
   "changeserver.label": "Server",
   "changeserver.submit": "Odoslať",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Obnoviť službu",
   "connectionLostBanner.informationLink": "ÄŒo sa stalo?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index 9d676c0a9..356c1fc1e 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 33cde814c..62c4d40a4 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Ponovno u�itavanje",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.customServerLabel": "Prilagođen server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Pošalji",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Поново учирај у�лугу",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index 418624a66..0ef654419 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Ladda om",
   "app.errorHandler.headline": "NÃ¥gonting gick snett",
+  "changeserver.customServerLabel": "Anpassad server",
   "changeserver.headline": "Byt server",
   "changeserver.label": "Server",
   "changeserver.submit": "Skicka",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Ladda om tjänst",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 428d9f18f..784c80c57 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Yenile",
   "app.errorHandler.headline": "Bir terslik çıktı",
+  "changeserver.customServerLabel": "Özel sunucu",
   "changeserver.headline": "Sunucuyu deÄŸiÅŸtir",
   "changeserver.label": "Sunucu",
   "changeserver.submit": "Gönder",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Servisi Tekrar Yükle",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 25e09ea49..e481eee8c 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Перезавантажити",
   "app.errorHandler.headline": "Що�ь пішло не так",
+  "changeserver.customServerLabel": "Кори�тувацький �ервер",
   "changeserver.headline": "Змінити �ервер",
   "changeserver.label": "Сервер",
   "changeserver.submit": "Подати",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Перезавантажити �ерві�",
   "connectionLostBanner.informationLink": "Що трапило�ь?",
   "connectionLostBanner.message": "О ні! Ферді втратив з'єднанн� з {name}.",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index 9d676c0a9..356c1fc1e 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index 3bba232fd..9e1c43a0f 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "�新加載",
   "app.errorHandler.headline": "出�錯誤",
+  "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "切��務器",
   "changeserver.label": "伺�器",
   "changeserver.submit": "�出",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "�新載入",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index 2c7b75e42..c5b65d015 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "�新加载",
   "app.errorHandler.headline": "出了些问题",
+  "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "�务器：",
   "changeserver.submit": "Submit",
+  "changeserver.urlError": "Enter a valid URL",
+  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "�新加载�务",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
diff --git a/src/i18n/messages/src/components/auth/ChangeServer.json b/src/i18n/messages/src/components/auth/ChangeServer.json
index 3a122d50c..8cdfc6623 100644
--- a/src/i18n/messages/src/components/auth/ChangeServer.json
+++ b/src/i18n/messages/src/components/auth/ChangeServer.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Change server",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 11,
+      "line": 13,
       "column": 12
     },
     "end": {
-      "line": 14,
+      "line": 16,
       "column": 3
     }
   },
@@ -17,11 +17,50 @@
     "defaultMessage": "!!!Server",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 15,
+      "line": 17,
       "column": 9
     },
     "end": {
-      "line": 18,
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "changeserver.warning",
+    "defaultMessage": "!!!Extra settings offered by Ferdi will not be saved",
+    "file": "src/components/auth/ChangeServer.js",
+    "start": {
+      "line": 21,
+      "column": 11
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "changeserver.customServerLabel",
+    "defaultMessage": "!!!Custom server",
+    "file": "src/components/auth/ChangeServer.js",
+    "start": {
+      "line": 25,
+      "column": 21
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "changeserver.urlError",
+    "defaultMessage": "!!!Enter a valid URL",
+    "file": "src/components/auth/ChangeServer.js",
+    "start": {
+      "line": 29,
+      "column": 12
+    },
+    "end": {
+      "line": 32,
       "column": 3
     }
   },
@@ -30,11 +69,11 @@
     "defaultMessage": "!!!Submit",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 19,
+      "line": 33,
       "column": 10
     },
     "end": {
-      "line": 22,
+      "line": 36,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json
index ddd9cd094..0495aa970 100644
--- a/src/i18n/messages/src/components/layout/Sidebar.json
+++ b/src/i18n/messages/src/components/layout/Sidebar.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 15,
+      "line": 18,
       "column": 12
     },
     "end": {
-      "line": 18,
+      "line": 21,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Add new service",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 19,
+      "line": 22,
       "column": 17
     },
     "end": {
-      "line": 22,
+      "line": 25,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 23,
+      "line": 26,
       "column": 8
     },
     "end": {
-      "line": 26,
+      "line": 29,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 27,
+      "line": 30,
       "column": 10
     },
     "end": {
-      "line": 30,
+      "line": 33,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 31,
+      "line": 34,
       "column": 23
     },
     "end": {
-      "line": 34,
+      "line": 37,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 35,
+      "line": 38,
       "column": 24
     },
     "end": {
-      "line": 38,
+      "line": 41,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Open Franz Todos",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 39,
+      "line": 42,
       "column": 19
     },
     "end": {
-      "line": 42,
+      "line": 45,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Close Franz Todos",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 43,
+      "line": 46,
       "column": 20
     },
     "end": {
-      "line": 46,
+      "line": 49,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Lock Ferdi",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 47,
+      "line": 50,
       "column": 13
     },
     "end": {
-      "line": 50,
+      "line": 53,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index f6afe5246..df5e7714a 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Launch Ferdi on start",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 29,
+      "line": 30,
       "column": 21
     },
     "end": {
-      "line": 32,
+      "line": 33,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Open in background",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 33,
+      "line": 34,
       "column": 26
     },
     "end": {
-      "line": 36,
+      "line": 37,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Keep Ferdi in background when closing the window",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 37,
+      "line": 38,
       "column": 19
     },
     "end": {
-      "line": 40,
+      "line": 41,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Start minimized",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 41,
+      "line": 42,
       "column": 18
     },
     "end": {
-      "line": 44,
+      "line": 45,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Always show Ferdi in system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 45,
+      "line": 46,
       "column": 20
     },
     "end": {
-      "line": 48,
+      "line": 49,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Reload Ferdi after system resume",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 49,
+      "line": 50,
       "column": 21
     },
     "end": {
-      "line": 52,
+      "line": 53,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Minimize Ferdi to system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 53,
+      "line": 54,
       "column": 24
     },
     "end": {
-      "line": 56,
+      "line": 57,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Don't show message content in notifications",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 57,
+      "line": 58,
       "column": 24
     },
     "end": {
-      "line": 60,
+      "line": 61,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Navigation bar behaviour",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 61,
+      "line": 62,
       "column": 26
     },
     "end": {
-      "line": 64,
+      "line": 65,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Send telemetry data",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 65,
+      "line": 66,
       "column": 10
     },
     "end": {
-      "line": 68,
+      "line": 69,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Enable service hibernation",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 69,
+      "line": 70,
       "column": 13
     },
     "end": {
-      "line": 72,
+      "line": 73,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Keep services in hibernation on startup",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 73,
+      "line": 74,
       "column": 22
     },
     "end": {
-      "line": 76,
+      "line": 77,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Hibernation strategy",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 77,
+      "line": 78,
       "column": 23
     },
     "end": {
-      "line": 80,
+      "line": 81,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Todo Server",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 81,
+      "line": 82,
       "column": 24
     },
     "end": {
-      "line": 84,
+      "line": 85,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!Custom TodoServer",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 85,
+      "line": 86,
       "column": 20
     },
     "end": {
-      "line": 88,
+      "line": 89,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Enable Password Lock",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 89,
+      "line": 90,
       "column": 14
     },
     "end": {
-      "line": 92,
+      "line": 93,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 93,
+      "line": 94,
       "column": 16
     },
     "end": {
-      "line": 96,
+      "line": 97,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!Allow using Touch ID to unlock",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 97,
+      "line": 98,
       "column": 22
     },
     "end": {
-      "line": 100,
+      "line": 101,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Lock after inactivity",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 101,
+      "line": 102,
       "column": 18
     },
     "end": {
-      "line": 104,
+      "line": 105,
       "column": 3
     }
   },
@@ -251,11 +251,11 @@
     "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 105,
+      "line": 106,
       "column": 23
     },
     "end": {
-      "line": 108,
+      "line": 109,
       "column": 3
     }
   },
@@ -264,11 +264,11 @@
     "defaultMessage": "!!!From",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 109,
+      "line": 110,
       "column": 21
     },
     "end": {
-      "line": 112,
+      "line": 113,
       "column": 3
     }
   },
@@ -277,11 +277,11 @@
     "defaultMessage": "!!!To",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 113,
+      "line": 114,
       "column": 19
     },
     "end": {
-      "line": 116,
+      "line": 117,
       "column": 3
     }
   },
@@ -290,11 +290,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 117,
+      "line": 118,
       "column": 12
     },
     "end": {
-      "line": 120,
+      "line": 121,
       "column": 3
     }
   },
@@ -303,11 +303,11 @@
     "defaultMessage": "!!!Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 121,
+      "line": 122,
       "column": 12
     },
     "end": {
-      "line": 124,
+      "line": 125,
       "column": 3
     }
   },
@@ -316,11 +316,11 @@
     "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 125,
+      "line": 126,
       "column": 21
     },
     "end": {
-      "line": 128,
+      "line": 129,
       "column": 3
     }
   },
@@ -329,11 +329,11 @@
     "defaultMessage": "!!!Enable universal Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 129,
+      "line": 130,
       "column": 21
     },
     "end": {
-      "line": 132,
+      "line": 133,
       "column": 3
     }
   },
@@ -342,11 +342,11 @@
     "defaultMessage": "!!!Sidebar width",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 133,
+      "line": 134,
       "column": 22
     },
     "end": {
-      "line": 136,
+      "line": 137,
       "column": 3
     }
   },
@@ -355,11 +355,11 @@
     "defaultMessage": "!!!Service icon size",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 137,
+      "line": 138,
       "column": 12
     },
     "end": {
-      "line": 140,
+      "line": 141,
       "column": 3
     }
   },
@@ -368,11 +368,11 @@
     "defaultMessage": "!!!Accent color",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 141,
+      "line": 142,
       "column": 15
     },
     "end": {
-      "line": 144,
+      "line": 145,
       "column": 3
     }
   },
@@ -381,11 +381,11 @@
     "defaultMessage": "!!!Display disabled services tabs",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 145,
+      "line": 146,
       "column": 24
     },
     "end": {
-      "line": 148,
+      "line": 149,
       "column": 3
     }
   },
@@ -394,11 +394,11 @@
     "defaultMessage": "!!!Show unread message badge when notifications are disabled",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 149,
+      "line": 150,
       "column": 29
     },
     "end": {
-      "line": 152,
+      "line": 153,
       "column": 3
     }
   },
@@ -407,11 +407,11 @@
     "defaultMessage": "!!!Show draggable area on window",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 153,
+      "line": 154,
       "column": 16
     },
     "end": {
-      "line": 156,
+      "line": 157,
       "column": 3
     }
   },
@@ -420,11 +420,11 @@
     "defaultMessage": "!!!Enable spell checking",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 157,
+      "line": 158,
       "column": 23
     },
     "end": {
-      "line": 160,
+      "line": 161,
       "column": 3
     }
   },
@@ -433,11 +433,11 @@
     "defaultMessage": "!!!Enable GPU Acceleration",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 161,
+      "line": 162,
       "column": 25
     },
     "end": {
-      "line": 164,
+      "line": 165,
       "column": 3
     }
   },
@@ -446,11 +446,11 @@
     "defaultMessage": "!!!Include beta versions",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 165,
+      "line": 166,
       "column": 8
     },
     "end": {
-      "line": 168,
+      "line": 169,
       "column": 3
     }
   },
@@ -459,11 +459,11 @@
     "defaultMessage": "!!!Enable updates",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 169,
+      "line": 170,
       "column": 20
     },
     "end": {
-      "line": 172,
+      "line": 173,
       "column": 3
     }
   },
@@ -472,11 +472,11 @@
     "defaultMessage": "!!!Enable Franz Todos",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 173,
+      "line": 174,
       "column": 15
     },
     "end": {
-      "line": 176,
+      "line": 177,
       "column": 3
     }
   },
@@ -485,11 +485,11 @@
     "defaultMessage": "!!!Keep all workspaces loaded",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 177,
+      "line": 178,
       "column": 27
     },
     "end": {
-      "line": 180,
+      "line": 181,
       "column": 3
     }
   }
diff --git a/src/index.js b/src/index.js
index 027884826..dac8ec770 100644
--- a/src/index.js
+++ b/src/index.js
@@ -35,6 +35,7 @@ import {
 import { mainIpcHandler as basicAuthHandler } from './features/basicAuth';
 import ipcApi from './electron/ipc-api';
 import Tray from './lib/Tray';
+import DBus from './lib/DBus';
 import Settings from './electron/Settings';
 import handleDeepLink from './electron/deepLinking';
 import { isPositionValid } from './electron/windowUtils';
@@ -152,8 +153,8 @@ const createWindow = () => {
   const mainWindowState = windowStateKeeper({
     defaultWidth: DEFAULT_WINDOW_OPTIONS.width,
     defaultHeight: DEFAULT_WINDOW_OPTIONS.height,
-    maximize: false,
-    fullScreen: false,
+    maximize: true, // Automatically maximizes the window, if it was last clsoed maximized
+    fullScreen: true, // Automatically restores the window to full screen, if it was last closed full screen
   });
 
   let posX = mainWindowState.x || DEFAULT_WINDOW_OPTIONS.x;
@@ -192,6 +193,14 @@ const createWindow = () => {
     },
   });
 
+  app.on('web-contents-created', (e, contents) => {
+    if (contents.getType() === 'webview') {
+      contents.on('new-window', (event) => {
+        event.preventDefault();
+      });
+    }
+  });
+
   mainWindow.webContents.on('did-finish-load', () => {
     const fns = onDidLoadFns;
     onDidLoadFns = null;
@@ -205,6 +214,9 @@ const createWindow = () => {
   // Initialize System Tray
   const trayIcon = new Tray();
 
+  // Initialize DBus interface
+  const dbus = new DBus(trayIcon);
+
   // Initialize ipcApi
   ipcApi({
     mainWindow,
@@ -215,6 +227,9 @@ const createWindow = () => {
     trayIcon,
   });
 
+  // Connect to the DBus after ipcApi took care of the System Tray
+  dbus.start();
+
   // Manage Window State
   mainWindowState.manage(mainWindow);
 
@@ -257,6 +272,7 @@ const createWindow = () => {
         mainWindow.hide();
       }
     } else {
+      dbus.stop();
       app.quit();
     }
   });
@@ -316,7 +332,7 @@ const createWindow = () => {
     e.preventDefault();
 
     if (isValidExternalURL(url)) {
-      shell.openExternal(url);
+        shell.openExternal(url);
     }
   });
 
@@ -395,6 +411,15 @@ ipcMain.on('feature-basic-auth-credentials', (e, { user, password }) => {
   authCallback = noop;
 });
 
+ipcMain.on('open-browser-window', (e, {disposition, url}, serviceId) => {
+  if (disposition === 'foreground-tab') {
+    let serviceSession = session.fromPartition(`persist:service-${serviceId}`)
+    let child = new BrowserWindow({ parent: mainWindow, webPreferences: {session: serviceSession}});
+    child.show();
+    child.loadURL(url);
+  }
+  debug('Received open-browser-window', disposition, url);
+});
 
 ipcMain.on('modifyRequestHeaders', (e, { modifiedRequestHeaders, serviceId }) => {
   debug('Received modifyRequestHeaders', modifiedRequestHeaders, serviceId);
diff --git a/src/lib/DBus.js b/src/lib/DBus.js
new file mode 100644
index 000000000..957912efa
--- /dev/null
+++ b/src/lib/DBus.js
@@ -0,0 +1,49 @@
+import {
+  sessionBus,
+} from 'dbus-next';
+import {
+  isLinux,
+} from '../environment';
+
+export default class DBus {
+  bus = null;
+
+  constructor(trayIcon) {
+    this.trayIcon = trayIcon;
+  }
+
+  start() {
+    if (!isLinux || this.bus) return;
+
+    try {
+      this.bus = sessionBus();
+    } catch {
+      // Error connecting to the bus.
+      return;
+    }
+
+    // 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'");
+    const mangled = JSON.stringify({
+      path: '/org/freedesktop/DBus',
+      interface: 'org.freedesktop.DBus',
+      member: 'NameOwnerChanged',
+    });
+    this.bus._signals.on(mangled, (msg) => {
+      const [name, oldOwner, newOwner] = msg.body;
+      if (name === 'org.kde.StatusNotifierWatcher' && oldOwner !== newOwner && newOwner !== '') {
+        // Leave ample time for the StatusNotifierWatcher to be initialized
+        setTimeout(() => {
+          this.trayIcon.recreateIfVisible();
+        }, 400);
+      }
+    });
+  }
+
+  stop() {
+    if (!this.bus) return;
+
+    this.bus.disconnect();
+    this.bus = null;
+  }
+}
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 07a29a224..3c5fc6530 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -921,7 +921,7 @@ export default class FranzMenu {
         tpl[5].submenu = this.todosMenu();
       }
     } else {
-      const touchIdEnabled = this.stores.settings.app.useTouchIdToUnlock && systemPreferences.canPromptTouchID();
+      const touchIdEnabled = isMac ? (this.stores.settings.app.useTouchIdToUnlock && systemPreferences.canPromptTouchID()) : false;
 
       tpl[0].submenu.unshift({
         label: intl.formatMessage(menuItems.touchId),
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index d6d49b0c8..c6d9db004 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -2,6 +2,11 @@ import {
   app, Menu, nativeImage, nativeTheme, systemPreferences, Tray, ipcMain,
 } from 'electron';
 import path from 'path';
+import {
+  isMac,
+  isWindows,
+  isLinux,
+} from '../environment';
 
 const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png';
 const INDICATOR_TRAY_PLAIN = 'tray';
@@ -17,15 +22,20 @@ export default class TrayIcon {
 
   trayMenu = null;
 
+  visible = false;
+
   trayMenuTemplate = [
     {
       label: 'Show Ferdi',
       click() {
         if (app.mainWindow.isMinimized()) {
           app.mainWindow.restore();
+        } else if (app.mainWindow.isVisible()) {
+          app.mainWindow.hide();
+        } else {
+          app.mainWindow.show();
+          app.mainWindow.focus();
         }
-        app.mainWindow.show();
-        app.mainWindow.focus();
       },
     },
     {
@@ -42,15 +52,35 @@ export default class TrayIcon {
     },
   ];
 
+  constructor() {
+    ipcMain.on('initialAppSettings', (event, appSettings) => {
+      this._updateTrayMenu(appSettings);
+    });
+
+    ipcMain.on('updateAppSettings', (event, appSettings) => {
+      this._updateTrayMenu(appSettings);
+    });
+  }
+
   _updateTrayMenu(appSettings) {
+    if (!this.trayIcon) return;
+
     if (appSettings.type === 'app') {
       const { isAppMuted } = appSettings.data;
       this.trayMenuTemplate[1].label = isAppMuted ? 'Enable Notifications && Audio' : 'Disable Notifications && Audio';
       this.trayMenu = Menu.buildFromTemplate(this.trayMenuTemplate);
+      if (isLinux) {
+        this.trayIcon.setContextMenu(this.trayMenu);
+      }
     }
   }
 
   show() {
+    this.visible = true;
+    this._show();
+  }
+
+  _show() {
     if (this.trayIcon) return;
 
     this.trayIcon = new Tray(this._getAsset('tray', INDICATOR_TRAY_PLAIN));
@@ -58,14 +88,9 @@ export default class TrayIcon {
     this.trayIcon.setToolTip('Ferdi');
 
     this.trayMenu = Menu.buildFromTemplate(this.trayMenuTemplate);
-
-    ipcMain.on('initialAppSettings', (event, appSettings) => {
-      this._updateTrayMenu(appSettings);
-    });
-
-    ipcMain.on('updateAppSettings', (event, appSettings) => {
-      this._updateTrayMenu(appSettings);
-    });
+    if (isLinux) {
+      this.trayIcon.setContextMenu(this.trayMenu);
+    }
 
     this.trayIcon.on('click', () => {
       if (app.mainWindow.isMinimized()) {
@@ -78,9 +103,11 @@ export default class TrayIcon {
       }
     });
 
-    this.trayIcon.on('right-click', () => {
-      this.trayIcon.popUpContextMenu(this.trayMenu);
-    });
+    if (isMac || isWindows) {
+      this.trayIcon.on('right-click', () => {
+        this.trayIcon.popUpContextMenu(this.trayMenu);
+      });
+    }
 
     if (process.platform === 'darwin') {
       this.themeChangeSubscriberId = systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
@@ -90,6 +117,11 @@ export default class TrayIcon {
   }
 
   hide() {
+    this.visible = false;
+    this._hide();
+  }
+
+  _hide() {
     if (!this.trayIcon) return;
 
     this.trayIcon.destroy();
@@ -101,6 +133,17 @@ export default class TrayIcon {
     }
   }
 
+  recreateIfVisible() {
+    if (this.visible) {
+      this._hide();
+      setTimeout(() => {
+        if (this.visible) {
+          this._show();
+        }
+      }, 100);
+    }
+  }
+
   setIndicator(indicator) {
     this.indicator = indicator;
     this._refreshIcon();
diff --git a/src/models/Service.js b/src/models/Service.js
index 5b3ad7bd8..45dc55fce 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -77,7 +77,7 @@ export default class Service {
 
   @observable restrictionType = null;
 
-  @observable isHibernationEnabled = false;
+  @observable disableHibernation = false;
 
   @observable lastUsed = Date.now(); // timestamp
 
@@ -136,7 +136,7 @@ export default class Service {
 
     this.spellcheckerLanguage = data.spellcheckerLanguage !== undefined ? data.spellcheckerLanguage : this.spellcheckerLanguage;
 
-    this.isHibernationEnabled = data.isHibernationEnabled !== undefined ? data.isHibernationEnabled : this.isHibernationEnabled;
+    this.disableHibernation = data.disableHibernation !== undefined ? data.disableHibernation : this.disableHibernation;
 
     this.recipe = recipe;
 
@@ -266,12 +266,17 @@ export default class Service {
     }));
 
     this.webview.addEventListener('new-window', (event, url, frameName, options) => {
-      openWindow({
-        event,
-        url,
-        frameName,
-        options,
-      });
+      debug('new-window', event, url, frameName, options);
+      if (event.disposition === 'foreground-tab') {
+        ipcRenderer.send('open-browser-window', event, this.id);
+      } else {
+        openWindow({
+          event,
+          url,
+          frameName,
+          options,
+        });
+      }
     });
 
 
diff --git a/src/routes.js b/src/routes.js
new file mode 100644
index 000000000..9986cdde5
--- /dev/null
+++ b/src/routes.js
@@ -0,0 +1,100 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { inject, observer } from 'mobx-react';
+import {
+  Router, Route, IndexRedirect,
+} from 'react-router';
+
+import AppLayoutContainer from './containers/layout/AppLayoutContainer';
+import SettingsWindow from './containers/settings/SettingsWindow';
+import RecipesScreen from './containers/settings/RecipesScreen';
+import ServicesScreen from './containers/settings/ServicesScreen';
+import EditServiceScreen from './containers/settings/EditServiceScreen';
+import AccountScreen from './containers/settings/AccountScreen';
+import TeamScreen from './containers/settings/TeamScreen';
+import EditUserScreen from './containers/settings/EditUserScreen';
+import EditSettingsScreen from './containers/settings/EditSettingsScreen';
+import InviteSettingsScreen from './containers/settings/InviteScreen';
+import SupportFerdiScreen from './containers/settings/SupportScreen';
+import WelcomeScreen from './containers/auth/WelcomeScreen';
+import LoginScreen from './containers/auth/LoginScreen';
+import LockedScreen from './containers/auth/LockedScreen';
+import PasswordScreen from './containers/auth/PasswordScreen';
+import ChangeServerScreen from './containers/auth/ChangeServerScreen';
+import SignupScreen from './containers/auth/SignupScreen';
+import ImportScreen from './containers/auth/ImportScreen';
+import PricingScreen from './containers/auth/PricingScreen';
+import InviteScreen from './containers/auth/InviteScreen';
+import AuthLayoutContainer from './containers/auth/AuthLayoutContainer';
+import SubscriptionPopupScreen from './containers/subscription/SubscriptionPopupScreen';
+import WorkspacesScreen from './features/workspaces/containers/WorkspacesScreen';
+import EditWorkspaceScreen from './features/workspaces/containers/EditWorkspaceScreen';
+import { WORKSPACES_ROUTES } from './features/workspaces';
+import AnnouncementScreen from './features/announcements/components/AnnouncementScreen';
+import { ANNOUNCEMENTS_ROUTES } from './features/announcements';
+
+import SettingsStore from './stores/SettingsStore';
+
+export default @inject('stores', 'actions') @observer class Routes extends Component {
+  render() {
+    const {
+      locked,
+      lockingFeatureEnabled,
+    } = this.props.stores.settings.app;
+
+    const { history } = this.props;
+
+    if (lockingFeatureEnabled && locked) {
+      return (
+        <LockedScreen />
+      );
+    }
+
+    return (
+      <Router history={history}>
+        <Route path="/" component={AppLayoutContainer}>
+          <Route path={ANNOUNCEMENTS_ROUTES.TARGET} component={AnnouncementScreen} />
+          <Route path="/settings" component={SettingsWindow}>
+            <IndexRedirect to="/settings/recipes" />
+            <Route path="/settings/recipes" component={RecipesScreen} />
+            <Route path="/settings/recipes/:filter" component={RecipesScreen} />
+            <Route path="/settings/services" component={ServicesScreen} />
+            <Route path="/settings/services/:action/:id" component={EditServiceScreen} />
+            <Route path={WORKSPACES_ROUTES.ROOT} component={WorkspacesScreen} />
+            <Route path={WORKSPACES_ROUTES.EDIT} component={EditWorkspaceScreen} />
+            <Route path="/settings/user" component={AccountScreen} />
+            <Route path="/settings/user/edit" component={EditUserScreen} />
+            <Route path="/settings/team" component={TeamScreen} />
+            <Route path="/settings/app" component={EditSettingsScreen} />
+            <Route path="/settings/invite" component={InviteSettingsScreen} />
+            <Route path="/settings/support" component={SupportFerdiScreen} />
+          </Route>
+        </Route>
+        <Route path="/auth" component={AuthLayoutContainer}>
+          <IndexRedirect to="/auth/welcome" />
+          <Route path="/auth/welcome" component={WelcomeScreen} />
+          <Route path="/auth/login" component={LoginScreen} />
+          <Route path="/auth/server" component={ChangeServerScreen} />
+          <Route path="/auth/signup">
+            <IndexRedirect to="/auth/signup/form" />
+            <Route path="/auth/signup/form" component={SignupScreen} />
+            <Route path="/auth/signup/pricing" component={PricingScreen} />
+            <Route path="/auth/signup/import" component={ImportScreen} />
+            <Route path="/auth/signup/invite" component={InviteScreen} />
+          </Route>
+          <Route path="/auth/password" component={PasswordScreen} />
+          <Route path="/auth/logout" component={LoginScreen} />
+        </Route>
+        <Route path="/payment/:url" component={SubscriptionPopupScreen} />
+        <Route path="*" component={AppLayoutContainer} />
+      </Router>
+    );
+  }
+}
+
+Routes.wrappedComponent.propTypes = {
+  stores: PropTypes.shape({
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
+  }).isRequired,
+  history: PropTypes.any.isRequired,
+};
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 96142787e..153fdb2c8 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -33,8 +33,11 @@ const {
 const mainWindow = remote.getCurrentWindow();
 
 const defaultLocale = DEFAULT_APP_SETTINGS.locale;
+
+const executablePath = isMac ? remote.process.execPath : process.execPath;
 const autoLauncher = new AutoLaunch({
   name: 'Ferdi',
+  path: executablePath,
 });
 
 const CATALINA_NOTIFICATION_HACK_KEY = '_temp_askedForCatalinaNotificationPermissions';
@@ -324,8 +327,10 @@ export default class AppStore extends Store {
 
     try {
       if (enable) {
+        debug('enabling launch on startup', executablePath);
         autoLauncher.enable();
       } else {
+        debug('disabling launch on startup');
         autoLauncher.disable();
       }
     } catch (err) {
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 0ad523374..a8d9cc1fb 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -631,7 +631,8 @@ export default class ServicesStore extends Store {
   }
 
   @action _openWindow({ event }) {
-    if (event.disposition !== 'new-window' && event.url !== 'about:blank') {
+    if (event.url !== 'about:blank') {
+      event.preventDefault();
       this.actions.app.openExternalUrl({ url: event.url });
     }
   }
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 227eb2145..c50475819 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -6,6 +6,7 @@ import localStorage from 'mobx-localstorage';
 import { DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES, LOCAL_SERVER } from '../config';
 import { API } from '../environment';
 import { getLocale } from '../helpers/i18n-helpers';
+import { hash } from '../helpers/password-helpers';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 import Request from './lib/Request';
 import Store from './lib/Store';
@@ -56,21 +57,6 @@ export default class SettingsStore extends Store {
       },
     );
 
-    reaction(
-      () => this.all.app.locked,
-      () => {
-        const { router } = window.ferdi.stores;
-        if (this.all.app.locked && this.all.app.lockingFeatureEnabled) {
-          // App just got locked, redirect to unlock screen
-          router.push('/auth/locked');
-        } else if (router.location.pathname.includes('/auth/locked')) {
-          // App is unlocked but user is still on locked screen
-          // Redirect to homepage
-          router.push('/');
-        }
-      },
-    );
-
     // Inactivity lock timer
     let inactivityTimer;
     remote.getCurrentWindow().on('blur', () => {
@@ -96,15 +82,8 @@ export default class SettingsStore extends Store {
       if (this.startup && resp.type === 'app' && resp.data.lockingFeatureEnabled) {
         this.startup = false;
         process.nextTick(() => {
-          // If the app was previously closed unlocked
-          // we can update the `locked` setting and rely on the reaction to lock at startup
           if (!this.all.app.locked) {
             this.all.app.locked = true;
-          } else {
-            // Otherwise the app previously closed in a locked state
-            // We can't rely on updating the locked setting for the reaction to be triggered
-            // So we lock manually
-            window.ferdi.stores.router.push('/auth/locked');
           }
         });
       }
@@ -301,5 +280,25 @@ export default class SettingsStore extends Store {
 
       debug('Migrated updates settings');
     }
+
+    if (!this.all.migration['password-hashing']) {
+      if (this.stores.settings.app.lockedPassword !== '') {
+        this.actions.settings.update({
+          type: 'app',
+          data: {
+            lockedPassword: hash(String(legacySettings.lockedPassword)),
+          },
+        });
+      }
+
+      this.actions.settings.update({
+        type: 'migration',
+        data: {
+          'password-hashing': true,
+        },
+      });
+
+      debug('Migrated updates settings');
+    }
   }
 }