Merge branch 'develop'

author: Amine Mouafik <amine@mouafik.fr> 2019-12-18 19:23:49 +0100
committer: Amine Mouafik <amine@mouafik.fr> 2019-12-18 19:23:49 +0100
commit: 91276bb61df9d6c2ce9b7a3f5433a93454918bc2 (patch)
tree: 90199ee67af8ec08f492cf162294a52a917cb2b9
parent: Remove travis_wait for npx lerna bootstrap (diff)
parent: 5.4.1-beta.3 (diff)
download: ferdium-app-91276bb61df9d6c2ce9b7a3f5433a93454918bc2.tar.gz
ferdium-app-91276bb61df9d6c2ce9b7a3f5433a93454918bc2.tar.zst
ferdium-app-91276bb61df9d6c2ce9b7a3f5433a93454918bc2.zip
72 files changed, 812 insertions, 624 deletions
diff --git a/.all-contributorsrc b/.all-contributorsrc
index 487175335..20179d7dc 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -251,7 +251,17 @@
      "contributions": [
        "doc"
      ]
+    },
+    {
+      "login": "FWDekker",
+      "name": "Felix W. Dekker",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/13442533?v=4",
+      "profile": "https://fwdekker.com/",
+      "contributions": [
+        "doc"
+      ]
    }
  ],
-  "contributorsPerLine": 6
+  "contributorsPerLine": 6,
+  "skipCi": true
 }
diff --git a/.eslintignore b/.eslintignore
index 00ae892aa..52fde4c3e 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,5 @@
 build/
 out/
 packages/*/lib
-src/server
+src/internal-server
 recipes/
 \ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 78e0c5221..81b6b6246 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,8 +3,8 @@
        url = https://github.com/getferdi/recipes.git
        ignore = all
        branch = master
-[submodule "src/server"]
+[submodule "src/internal-server"]
-        path = src/server
+        path = src/internal-server
        url = https://github.com/getferdi/internal-server.git
        ignore = all
        branch = master
diff --git a/README.md b/README.md
index 662fc37f3..c2a4f4aeb 100644
--- a/README.md
+++ b/README.md
@@ -16,16 +16,16 @@
 ### Table of contents
 <details>
-<summary>Ferdi</summary>
+<summary>Toggle navigation</summary>
 <ul>
-<li><a href="#what-is-ferdi-">What is Ferdi ?</a></li>
+<li><a href="#what-is-ferdi">What is Ferdi?</a></li>
-<li><a href="#what-ferdi-looks-like-">What Ferdi looks like ?</a></li>
+<li><a href="#what-does-ferdi-look-like">What does Ferdi look like?</a></li>
 <li><a href="#download-ferdi">Download Ferdi</a>
 <ul>
 <li><a href="#or-use-homebrew-macos-only">Or use homebrew</a></li>
 </ul>
 </li>
-<li><a href="#ferdi-specific-features">Ferdi-specific Features</a></li>
+<li><a href="#ferdi-specific-features">Ferdi-specific features</a></li>
 <li><a href="#development">Development</a></li>
 <ul>
 <li><a href="#install-os-dependencies">Install OS dependencies</a></li>
@@ -42,14 +42,14 @@
 </ul>
 </details>
-### What is Ferdi ?
+### What is Ferdi?
 Ferdi is a messaging browser that allows you to combine your favorite messaging services into one application. It is based on Franz - a software already used by thousands of people - with the difference that Ferdi gives you many additonal features and doesn't restrict its usage! Ferdi is compatible with your existing Franz account so you can continue right where you left off. Find out more about Ferdi and its features on [getferdi.com](https://getferdi.com).
-### What Ferdi looks like ?
+### What does Ferdi look like?
 <details>
-<summary>Screenshots</summary>
+<summary>Toggle screenshots</summary>
 <p align="center">
 <img alt="Keep all your messaging services in one place." src="./branding/screenshots/hero.png">
 <em>"Keep all your messaging services in one place."</em>
@@ -75,10 +75,10 @@ You can find the installers in the [latest stable release](https://github.com/ge
 ### Or use AUR (Arch Linux)
 Ferdi has two seperate AUR packages you can use:
- **ferdi-build**: Uses your debian build and extracts it to Arch
+- **ferdi-bin**: Uses your debian build and extracts it to Arch
 - **ferdi-git**: Uses system electron version
-If you use a AUR Helper e.g. yay, simply install it via ´yay -S ferdi-bin´
+If you use an AUR Helper e.g. yay, simply install it via `yay -S ferdi-bin`.
 `ferdi-git` may not work on all systems so we advice you to use `ferdi-bin` instead.
@@ -95,8 +95,8 @@ If you use a AUR Helper e.g. yay, simply install it via ´yay -S ferdi-bin´
 - [x] Add "Private Notification"-Mode, that hides message content from notifications ([franz#879](https://github.com/meetfranz/franz/issues/879))
 - [x] Add Password Lock feature to keep your messages protected ([#41](https://github.com/getferdi/ferdi/issues/41), [franz#810](https://github.com/meetfranz/franz/issues/810), [franz#950](https://github.com/meetfranz/franz/issues/950), [franz#1430](https://github.com/meetfranz/franz/issues/1430))
 - [x] Add an option to keep individual workspaces always loaded ([#37](https://github.com/getferdi/ferdi/issues/37))
- [x] Add universal Dark-Mode via the [DarkReader extension](https://github.com/darkreader/darkreader) ([#71](https://github.com/getferdi/ferdi/issues/71))
+- [x] Add Universal Dark Mode via the [DarkReader extension](https://github.com/darkreader/darkreader) ([#71](https://github.com/getferdi/ferdi/issues/71))
- [x] Add adaptable Dark Mode that will respect the system's darkmode setting ([#173](https://github.com/getferdi/ferdi/issues/173))
+- [x] Add adaptable Dark Mode that will respect the system's Dark Mode setting ([#173](https://github.com/getferdi/ferdi/issues/173))
 - [x] Add an option to auto-hide the menubar ([#7](https://github.com/getferdi/ferdi/issues/7), [franz#833](https://github.com/meetfranz/franz/issues/833))
 - [x] Add "Quick Switch" feature to help you navigate a long list of services (similar to Rambox's [Quick Switcher](https://rambox.pro/#feature-details/quick_switcher))
 - [x] Add "Service Hibernation" that will automatically unload services when they are unused
@@ -206,40 +206,44 @@ When pushing a new tag, the CI builds will create a draft GitHub release and upl
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-<!-- prettier-ignore -->
+<!-- prettier-ignore-start -->
+<!-- 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="#review-vantezzen" title="Reviewed Pull Requests">👀</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="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="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://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="#question-kytwb" title="Answering Questions">💬</a> <a href="https://github.com/getferdi/ferdi/commits?author=kytwb" title="Code">💻</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="#maintenance-kytwb" title="Maintenance">🚧</a> <a href="#platform-kytwb" title="Packaging/porting to new platform">📦</a> <a href="#projectManagement-kytwb" title="Project Management">📆</a> <a href="#review-kytwb" title="Reviewed Pull Requests">👀</a> <a href="#infra-kytwb" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#fundingFinding-kytwb" title="Funding Finding">🔍</a> <a href="#blog-kytwb" title="Blogposts">📝</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="#question-kytwb" title="Answering Questions">💬</a> <a href="https://github.com/getferdi/ferdi/commits?author=kytwb" title="Code">💻</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="#maintenance-kytwb" title="Maintenance">🚧</a> <a href="#platform-kytwb" title="Packaging/porting to new platform">📦</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="#infra-kytwb" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#fundingFinding-kytwb" title="Funding Finding">🔍</a> <a href="#blog-kytwb" title="Blogposts">📝</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="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="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://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>
-    <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://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>
  </tr>
  <tr>
-    <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/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="igreil"/><br /><sub><b>igreil</b></sub></a><br /><a href="#ideas-igreil" 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="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="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="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://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="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://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>
-    <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/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>
  </tr>
  <tr>
-    <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="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="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/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="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="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="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://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="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://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="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="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/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/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="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/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="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/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="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://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>
  </tr>
 </table>
+<!-- markdownlint-enable -->
+<!-- prettier-ignore-end -->
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
diff --git a/appveyor.yml b/appveyor.yml
index a0b33d1e1..693fdb700 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
 environment:
  APPVEYOR_CACHE_SKIP_RESTORE: true
-version: 5.4.1-beta.2.{build}
+version: 5.4.1-beta.3.{build}
 install:
  - git submodule update --init --recursive
diff --git a/package-lock.json b/package-lock.json
index c551ecf2f..2ffd534e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "ferdi",
-  "version": "5.4.1-beta.2",
+  "version": "5.4.1-beta.3",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -2592,9 +2592,9 @@
      }
    },
    "@electron/get": {
-      "version": "1.7.1",
+      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.7.2.tgz",
-      "integrity": "sha512-+BOIzkmYbe+oOBGqSByq8zXYXCFztccoymR3uNkvX5ckJ/5xU+4peVyEvFyH6+zfv58hCo99RxgIpwuaMfRtRg==",
+      "integrity": "sha512-LSE4LZGMjGS9TloDx0yO44D2UTbaeKRk+QjlhWLiQlikV6J4spgDCjb6z4YIcqmPAwNzlNCnWF4dubytwI+ATA==",
      "dev": true,
      "requires": {
        "debug": "^4.1.1",
@@ -2604,7 +2604,7 @@
        "global-tunnel-ng": "^2.7.1",
        "got": "^9.6.0",
        "sanitize-filename": "^1.6.2",
-        "sumchecker": "^3.0.0"
+        "sumchecker": "^3.0.1"
      },
      "dependencies": {
        "env-paths": {
@@ -4509,108 +4509,103 @@
        "@types/node": ">= 8"
      }
    },
+    "@sentry/apm": {
+      "version": "5.10.2",
+      "resolved": "https://registry.npmjs.org/@sentry/apm/-/apm-5.10.2.tgz",
+      "integrity": "sha512-rPeAFsD/6ontvs7bsuHh+XAg1ohWo04ms08SNWqEvLRQJx7WfiWnjziyC0S3dXIYZDGdhruSsqQJPJN8r6Aj5g==",
+      "requires": {
+        "@sentry/hub": "5.10.2",
+        "@sentry/minimal": "5.10.2",
+        "@sentry/types": "5.10.0",
+        "@sentry/utils": "5.10.2",
+        "tslib": "^1.9.3"
+      }
+    },
    "@sentry/browser": {
-      "version": "4.6.6",
+      "version": "5.10.2",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-4.6.6.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.10.2.tgz",
-      "integrity": "sha512-+9VsQ+oQYU+PYlLJG2ex7JCMSVQbnUvWPI2uZOofWdI9sWIPUub3boWItMzRQNQ1T4S3FZd4FqAWNFd3azdnBw==",
+      "integrity": "sha512-r3eyBu2ln7odvWtXARCZPzpuGrKsD6U9F3gKTu4xdFkA0swSLUvS7AC2FUksj/1BE23y+eB/zzPT+RYJ58tidA==",
      "requires": {
-        "@sentry/core": "4.6.6",
+        "@sentry/core": "5.10.2",
-        "@sentry/types": "4.5.3",
+        "@sentry/types": "5.10.0",
-        "@sentry/utils": "4.6.5",
+        "@sentry/utils": "5.10.2",
        "tslib": "^1.9.3"
      }
    },
    "@sentry/core": {
-      "version": "4.6.6",
+      "version": "5.10.2",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-4.6.6.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.10.2.tgz",
-      "integrity": "sha512-7z9HKLTNr3zVBR3tBRheTxkkkuK2IqISUc5Iyo3crN2OecOLtpptT96f5XjLndBEL2ab39eCBPpA5OFjbpzrIA==",
+      "integrity": "sha512-sKVeFH3v8K8xw2vM5MKMnnyAAwih+JSE3pbNL0CcCCA+/SwX+3jeAo2BhgXev2SAR/TjWW+wmeC9TdIW7KyYbg==",
-      "requires": {
+      "requires": {
-        "@sentry/hub": "4.6.5",
+        "@sentry/hub": "5.10.2",
-        "@sentry/minimal": "4.6.5",
+        "@sentry/minimal": "5.10.2",
-        "@sentry/types": "4.5.3",
+        "@sentry/types": "5.10.0",
-        "@sentry/utils": "4.6.5",
+        "@sentry/utils": "5.10.2",
        "tslib": "^1.9.3"
      }
    },
    "@sentry/electron": {
-      "version": "0.17.4",
+      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@sentry/electron/-/electron-0.17.4.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/electron/-/electron-1.1.0.tgz",
-      "integrity": "sha512-1IU0o+E8eY5Lrthj6Pqf+Dh8MptddHsFFmcOwKlft/bbZ+6RTKEefLtFOclKUMLR64C7GTqa80Yddq0ssjOv5w==",
+      "integrity": "sha512-ot6nYOhZOjylSlK2LEaBuqzPEEcmRn76SDf+VZpujOxig5Jv/LIbgwha/xou/mggOD2y3a5cM2o8ubbs5U5Bfg==",
-      "requires": {
+      "requires": {
-        "@sentry/browser": "4.6.2 || ~4.6.4",
+        "@sentry/browser": "~5.10.0",
-        "@sentry/core": "4.6.2 || ~4.6.4",
+        "@sentry/core": "~5.10.0",
-        "@sentry/minimal": "^4.5.0",
+        "@sentry/minimal": "~5.10.0",
-        "@sentry/node": "4.6.2 || ~4.6.4",
+        "@sentry/node": "~5.10.0",
-        "@sentry/types": "^4.5.0",
+        "@sentry/types": "~5.10.0",
-        "@sentry/utils": "4.6.2 || ~4.6.4",
+        "@sentry/utils": "~5.10.0",
-        "electron-fetch": "1.3.0",
+        "form-data": "2.5.1",
-        "form-data": "2.3.2",
+        "node-fetch": "^2.6.0",
-        "util.promisify": "1.0.0"
+        "util.promisify": "1.0.0",
+        "win-ca": "^3.1.1"
      },
      "dependencies": {
-        "combined-stream": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
-          "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-          "requires": {
-            "delayed-stream": "~1.0.0"
-          }
-        },
-        "electron-fetch": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/electron-fetch/-/electron-fetch-1.3.0.tgz",
-          "integrity": "sha512-WzHnWZqKdiCKHqqHu+GphezoWRSUVH6BQ/f13vu16VwYKJRZNt2dUrx40eZJcyZcDGn6RJDTAHS6jVoHoglgNw==",
-          "requires": {
-            "encoding": "^0.1.12"
-          }
-        },
        "form-data": {
-          "version": "2.3.2",
+          "version": "2.5.1",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
-          "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+          "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
          "requires": {
            "asynckit": "^0.4.0",
-            "combined-stream": "1.0.6",
+            "combined-stream": "^1.0.6",
            "mime-types": "^2.1.12"
          }
        }
      }
    },
    "@sentry/hub": {
-      "version": "4.6.5",
+      "version": "5.10.2",
-      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-4.6.5.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.10.2.tgz",
-      "integrity": "sha512-v9vee8s8C1fK/DPtNOzv6r+AMbPDOWfnasouNcBUkbQUSN5wUNyCDvt51QbWaw5kMMY5TSqjdVqY6gXQZI0APQ==",
+      "integrity": "sha512-hSlZIiu3hcR/I5yEhlpN9C0nip+U7hiRzRzUQaBiHO4YG4TC58NqnOPR89D/ekiuHIXzFpjW9OQmqtAMRoSUYA==",
      "requires": {
-        "@sentry/types": "4.5.3",
+        "@sentry/types": "5.10.0",
-        "@sentry/utils": "4.6.5",
+        "@sentry/utils": "5.10.2",
        "tslib": "^1.9.3"
      }
    },
    "@sentry/minimal": {
-      "version": "4.6.5",
+      "version": "5.10.2",
-      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-4.6.5.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.10.2.tgz",
-      "integrity": "sha512-tf+J+uUNmSgzC7d9JSN8Ekw1HeBAX87Efa/jyFbzLvaw80oibvTiLSLqDjQ9PgvyIzBUuuPImkS2NpvPQGWFtg==",
+      "integrity": "sha512-GalixiM9sckYfompH5HHTp9XT2BcjawBkcl1DMEKUBEi37+kUq0bivOBmnN1G/I4/wWOUdnAI/kagDWaWpbZPg==",
      "requires": {
-        "@sentry/hub": "4.6.5",
+        "@sentry/hub": "5.10.2",
-        "@sentry/types": "4.5.3",
+        "@sentry/types": "5.10.0",
        "tslib": "^1.9.3"
      }
    },
    "@sentry/node": {
-      "version": "4.6.6",
+      "version": "5.10.2",
-      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-4.6.6.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-5.10.2.tgz",
-      "integrity": "sha512-+zZHE2uOwQTgypP6N9oBd0Io6BKXaJh6mdmZBauF0G46/8V28sBQ/dXBtJJNZ8tW7eVlLGpLSGuJb9Ai7c/rNw==",
+      "integrity": "sha512-1ib1hAhVtmfXOThpcCfR4S6wFopd6lHqgOMrAUPo9saHy8zseZPRC7iTWGoSPy2RMwjrURAk54VvFnLe7G+PdQ==",
-      "requires": {
+      "requires": {
-        "@sentry/core": "4.6.6",
+        "@sentry/apm": "5.10.2",
-        "@sentry/hub": "4.6.5",
+        "@sentry/core": "5.10.2",
-        "@sentry/types": "4.5.3",
+        "@sentry/hub": "5.10.2",
-        "@sentry/utils": "4.6.5",
+        "@sentry/types": "5.10.0",
-        "@types/stack-trace": "0.0.29",
+        "@sentry/utils": "5.10.2",
-        "cookie": "0.3.1",
+        "cookie": "^0.3.1",
-        "https-proxy-agent": "2.2.1",
+        "https-proxy-agent": "^3.0.0",
-        "lru_map": "0.3.3",
+        "lru_map": "^0.3.3",
-        "lsmod": "1.0.0",
-        "stack-trace": "0.0.10",
        "tslib": "^1.9.3"
      },
      "dependencies": {
@@ -4623,27 +4618,27 @@
          }
        },
        "https-proxy-agent": {
-          "version": "2.2.1",
+          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz",
-          "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==",
+          "integrity": "sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==",
          "requires": {
-            "agent-base": "^4.1.0",
+            "agent-base": "^4.3.0",
            "debug": "^3.1.0"
          }
        }
      }
    },
    "@sentry/types": {
-      "version": "4.5.3",
+      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-4.5.3.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.10.0.tgz",
-      "integrity": "sha512-7ll1PAFNjrBNX9rzy3P2qAQrpQwHaDO3uKj735qsnGw34OtAS8Xr8WYrjI14f9fMPa/XIeWvMPb4GMic28V/ag=="
+      "integrity": "sha512-TW20GzkCWsP6uAxR2JIpIkiitCKyIOfkyDsKBeLqYj4SaZjfvBPnzgNCcYR0L0UsP1/Es6oHooZfIGSkp6GGxQ=="
    },
    "@sentry/utils": {
-      "version": "4.6.5",
+      "version": "5.10.2",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-4.6.5.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.10.2.tgz",
-      "integrity": "sha512-rTISJtRRbWsd3UE+TkA3QG1C0VzPKPW8w74tieBwYhtTCGmOHNwz2nDC/MZGbGj4OgDmNKKl4CCyQr88EX08hA==",
+      "integrity": "sha512-UcbbaFpYrGSV448lQ16Cr+W/MPuKUflQQUdrMCt5vgaf5+M7kpozlcji4GGGZUCXIA7oRP93ABoXj55s1OM9zw==",
      "requires": {
-        "@sentry/types": "4.5.3",
+        "@sentry/types": "5.10.0",
        "tslib": "^1.9.3"
      }
    },
@@ -4874,11 +4869,6 @@
      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-6.2.0.tgz",
      "integrity": "sha512-1OzrNb4RuAzIT7wHSsgZRlMBlNsJl+do6UblR7JMW4oB7bbR+uBEYtUh7gEc/jM84GGilh68lSOokyM/zNUlBA=="
    },
-    "@types/stack-trace": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/stack-trace/-/stack-trace-0.0.29.tgz",
-      "integrity": "sha512-TgfOX+mGY/NyNxJLIbDWrO9DjGoVSW9+aB8H2yy1fy32jsvxijhmyJI9fDFgvz3YP4lvJaq9DzdR/M1bOgVc9g=="
-    },
    "@types/stack-utils": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
@@ -9634,9 +9624,9 @@
      "dev": true
    },
    "electron": {
-      "version": "7.1.2",
+      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-7.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-7.1.6.tgz",
-      "integrity": "sha512-7hjONYt2GlQfKuKgQrhhUL1P9lbGWLBfMUq+2QFU3yeLtCvM0ROfPJCRP4OF5pVp3KDyfFp4DtmhuVzAnxV3jA==",
+      "integrity": "sha512-0QSxQYYzSrBRbctKgAWS79k/I+vm95I7bz/zTuF0Qv4PvTtQf5hK21q6wtyKVPPJFFXnmSyvfQ2ce6iktfgK8g==",
      "dev": true,
      "requires": {
        "@electron/get": "^1.0.1",
@@ -13497,9 +13487,9 @@
      },
      "dependencies": {
        "core-js": {
-          "version": "3.4.4",
+          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.4.4.tgz",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.5.0.tgz",
-          "integrity": "sha512-vKea1DrcLA80Hrfc7AQgfoGvEaByfR5mH08t+zuWOWY94TFBmabdEL56mUbcijvadG9RxsXR2gUUFrfj4/iTcA==",
+          "integrity": "sha512-Ifh3kj78gzQ7NAoJXeTu+XwzDld0QRIwjBLRqAMhuLhP3d2Av5wmgE9ycfnvK6NAEjTkQ1sDPeoEZAWO3Hx1Uw==",
          "dev": true,
          "optional": true
        },
@@ -13563,15 +13553,13 @@
      "dev": true
    },
    "globalthis": {
-      "version": "1.0.0",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz",
-      "integrity": "sha512-vcCAZTJ3r5Qcu5l8/2oyVdoFwxKgfYnMTR2vwWeux/NAVZK3PwcMaWkdUIn4GJbmKuRK7xcvDsLuK+CKcXyodg==",
+      "integrity": "sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==",
      "dev": true,
      "optional": true,
      "requires": {
-        "define-properties": "^1.1.2",
+        "define-properties": "^1.1.3"
-        "function-bind": "^1.1.1",
-        "object-keys": "^1.0.12"
      }
    },
    "globby": {
@@ -16047,6 +16035,11 @@
      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
      "dev": true
    },
+    "is-electron": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-electron/-/is-electron-2.2.0.tgz",
+      "integrity": "sha512-SpMppC2XR3YdxSzczXReBjqs2zGscWQpBIKqwXYBFic0ERaxNVgwLCHwOLZeESfdJQjX0RDvrJ1lBXX2ij+G1Q=="
+    },
    "is-equal-shallow": {
      "version": "0.1.3",
      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
@@ -18183,11 +18176,6 @@
      "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz",
      "integrity": "sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0="
    },
-    "lsmod": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lsmod/-/lsmod-1.0.0.tgz",
-      "integrity": "sha1-mgD3bco26yP6BTUK/htYXUKZ5ks="
-    },
    "macos-notification-state": {
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/macos-notification-state/-/macos-notification-state-1.3.1.tgz",
@@ -18222,7 +18210,6 @@
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-      "dev": true,
      "requires": {
        "pify": "^3.0.0"
      }
@@ -20901,8 +20888,7 @@
    "pify": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
-      "dev": true
    },
    "pinkie": {
      "version": "2.0.4",
@@ -24225,7 +24211,6 @@
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-      "dev": true,
      "requires": {
        "through": "2"
      }
@@ -25187,8 +25172,7 @@
    "through": {
      "version": "2.3.8",
      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-      "dev": true
    },
    "through2": {
      "version": "3.0.1",
@@ -26954,6 +26938,24 @@
        "string-width": "^2.1.1"
      }
    },
+    "win-ca": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/win-ca/-/win-ca-3.1.1.tgz",
+      "integrity": "sha512-uZj8zifF459u1apoVjXKVBBnh4NyILbC0W5asVtILwseNenc+krP44C0FWn6RXGjOHvxLKfYoIm0xl/R8wlw+g==",
+      "requires": {
+        "is-electron": "^2.2.0",
+        "make-dir": "^1.3.0",
+        "node-forge": "^0.8.2",
+        "split": "^1.0.1"
+      },
+      "dependencies": {
+        "node-forge": {
+          "version": "0.8.5",
+          "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.8.5.tgz",
+          "integrity": "sha512-vFMQIWt+J/7FLNyKouZ9TazT74PRV3wgv9UT4cRjC8BffxFbKXkgIWR42URCPSnHm/QDz6BOlb2Q0U4+VQT67Q=="
+        }
+      }
+    },
    "window-size": {
      "version": "0.1.4",
      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
diff --git a/package.json b/package.json
index f60556f51..2641cb721 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "ferdi",
  "productName": "Ferdi",
  "appId": "com.kytwb.ferdi",
-  "version": "5.4.1-beta.2",
+  "version": "5.4.1-beta.3",
  "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
  "copyright": "kytwb",
  "main": "index.js",
@@ -56,7 +56,7 @@
    "@meetfranz/forms": "file:packages/forms",
    "@meetfranz/theme": "file:packages/theme",
    "@meetfranz/ui": "file:packages/ui",
-    "@sentry/electron": "0.17.4",
+    "@sentry/electron": "1.1.0",
    "address-rfc2822": "^2.0.1",
    "atob": "2.1.2",
    "auto-launch": "5.0.5",
@@ -152,7 +152,7 @@
    "cross-env": "^5.0.5",
    "cz-conventional-changelog": "2.1.0",
    "dotenv": "^4.0.0",
-    "electron": "7.1.2",
+    "electron": "7.1.6",
    "electron-builder": "21.2.0",
    "electron-notarize": "0.2.1",
    "electron-rebuild": "1.8.8",
diff --git a/recipes b/recipes
-Subproject 77d016a530adf3cc25cf6942e792b9aa6fb500f
+Subproject ecf037c35f39f283bca2078486d5eb4ad42ec2d
diff --git a/src/api/RecipePreviewsApi.js b/src/api/RecipePreviewsApi.js
index d9c675d76..a56fa587f 100644
--- a/src/api/RecipePreviewsApi.js
+++ b/src/api/RecipePreviewsApi.js
@@ -1,4 +1,4 @@
-export default class ServicesApi {
+export default class RecipePreviewsApi {
  constructor(server) {
    this.server = server;
  }
diff --git a/src/assets/images/appearance/ribbon_large.png b/src/assets/images/appearance/ribbon_large.png
new file mode 100644
index 000000000..ac11c9b30
--- /dev/null
+++ b/src/assets/images/appearance/ribbon_large.png
Binary files differ
diff --git a/src/assets/images/appearance/ribbon_medium.png b/src/assets/images/appearance/ribbon_medium.png
new file mode 100644
index 000000000..1867b2a27
--- /dev/null
+++ b/src/assets/images/appearance/ribbon_medium.png
Binary files differ
diff --git a/src/assets/images/appearance/ribbon_small.png b/src/assets/images/appearance/ribbon_small.png
new file mode 100644
index 000000000..3440d97e5
--- /dev/null
+++ b/src/assets/images/appearance/ribbon_small.png
Binary files differ
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 83dc34a52..7d6bad883 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -3,9 +3,7 @@ import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import ReactTooltip from 'react-tooltip';
-import {
+import { ProBadge, H1, H2 } from '@meetfranz/ui';
-  ProBadge, H1, H2,
-} from '@meetfranz/ui';
 import moment from 'moment';
 import Loader from '../../ui/Loader';
@@ -13,6 +11,7 @@ import Button from '../../ui/Button';
 import Infobox from '../../ui/Infobox';
 import SubscriptionForm from '../../../containers/subscription/SubscriptionFormScreen';
 import { i18nPlanName } from '../../../helpers/plan-helpers';
+import { LOCAL_SERVER } from '../../../config';
 const messages = defineMessages({
  headline: {
@@ -69,11 +68,13 @@ const messages = defineMessages({
  },
  deleteInfo: {
    id: 'settings.account.deleteInfo',
-    defaultMessage: '!!!If you don\'t need your Ferdi account any longer, you can delete your account and all related data here.',
+    defaultMessage:
+      "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
  },
  deleteEmailSent: {
    id: 'settings.account.deleteEmailSent',
-    defaultMessage: '!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!',
+    defaultMessage:
+      '!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!',
  },
  trial: {
    id: 'settings.account.trial',
@@ -89,7 +90,16 @@ const messages = defineMessages({
  },
  trialUpdateBillingInformation: {
    id: 'settings.account.trialUpdateBillingInfo',
-    defaultMessage: '!!!Please update your billing info to continue using {license} after your trial period.',
+    defaultMessage:
+      '!!!Please update your billing info to continue using {license} after your trial period.',
+  },
+  accountUnavailable: {
+    id: 'settings.account.accountUnavailable',
+    defaultMessage: 'Account is unavailable',
+  },
+  accountUnavailableInfo: {
+    id: 'settings.account.accountUnavailableInfo',
+    defaultMessage: 'You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.',
  },
 });
@@ -110,6 +120,7 @@ class AccountDashboard extends Component {
    upgradeToPro: PropTypes.func.isRequired,
    openInvoices: PropTypes.func.isRequired,
    onCloseSubscriptionWindow: PropTypes.func.isRequired,
+    server: PropTypes.string.isRequired,
  };
  static contextTypes = {
@@ -132,6 +143,7 @@ class AccountDashboard extends Component {
      upgradeToPro,
      openInvoices,
      onCloseSubscriptionWindow,
+      server,
    } = this.props;
    const { intl } = this.context;
@@ -141,6 +153,8 @@ class AccountDashboard extends Component {
      planName = i18nPlanName(user.team.plan, intl);
    }
+    const isUsingWithoutAccount = server === LOCAL_SERVER;
    return (
      <div className="settings__main">
        <div className="settings__header">
@@ -149,154 +163,186 @@ class AccountDashboard extends Component {
          </span>
        </div>
        <div className="settings__body">
-          {isLoading && (
+          {isUsingWithoutAccount && (
-            <Loader />
+            <>
+              <h1 style={{ marginBottom: 0 }}>
+                {intl.formatMessage(messages.accountUnavailable)}
+              </h1>
+              <p
+                className="settings__message"
+                style={{
+                  borderTop: 0,
+                  marginTop: 0,
+                }}
+              >
+                {intl.formatMessage(messages.accountUnavailableInfo)}
+              </p>
+            </>
          )}
+          {!isUsingWithoutAccount && (
+            <>
+              {isLoading && <Loader />}
-          {!isLoading && userInfoRequestFailed && (
+              {!isLoading && userInfoRequestFailed && (
-            <Infobox
+                <Infobox
-              icon="alert"
+                  icon="alert"
-              type="danger"
+                  type="danger"
-              ctaLabel={intl.formatMessage(messages.tryReloadUserInfoRequest)}
+                  ctaLabel={intl.formatMessage(
-              ctaLoading={isLoading}
+                    messages.tryReloadUserInfoRequest,
-              ctaOnClick={retryUserInfoRequest}
+                  )}
-            >
+                  ctaLoading={isLoading}
-              {intl.formatMessage(messages.userInfoRequestFailed)}
+                  ctaOnClick={retryUserInfoRequest}
-            </Infobox>
+                >
-          )}
+                  {intl.formatMessage(messages.userInfoRequestFailed)}
+                </Infobox>
+              )}
-          {!userInfoRequestFailed && (
+              {!userInfoRequestFailed && (
-            <>
-              {!isLoading && (
                <>
-                  <div className="account">
+                  {!isLoading && (
-                    <div className="account__box account__box--flex">
+                    <>
-                      <div className="account__avatar">
+                      <div className="account">
-                        <img
+                        <div className="account__box account__box--flex">
-                          src="./assets/images/logo.svg"
+                          <div className="account__avatar">
-                          alt=""
+                            <img src="./assets/images/logo.svg" alt="" />
-                        />
+                          </div>
-                      </div>
+                          <div className="account__info">
-                      <div className="account__info">
+                            <H1>
-                        <H1>
+                              <span className="username">{`${user.firstname} ${user.lastname}`}</span>
-                          <span className="username">{`${user.firstname} ${user.lastname}`}</span>
+                              {user.isPremium && (
-                          {user.isPremium && (
+                                <>
-                            <>
+                                  {' '}
-                              {' '}
+                                  <ProBadge />
-                              <ProBadge />
+                                </>
-                            </>
+                              )}
-                          )}
+                            </H1>
-                        </H1>
+                            <p>
-                        <p>
+                              {user.organization && `${user.organization}, `}
-                          {user.organization && `${user.organization}, `}
+                              {user.email}
-                          {user.email}
+                            </p>
-                        </p>
+                            {user.isPremium && (
-                        {user.isPremium && (
+                              <div className="manage-user-links">
-                          <div className="manage-user-links">
+                                <Button
+                                  label={intl.formatMessage(
+                                    messages.accountEditButton,
+                                  )}
+                                  className="franz-form__button--inverted"
+                                  onClick={openEditAccount}
+                                />
+                              </div>
+                            )}
+                          </div>
+                          {!user.isPremium && (
                            <Button
-                              label={intl.formatMessage(messages.accountEditButton)}
+                              label={intl.formatMessage(
+                                messages.accountEditButton,
+                              )}
                              className="franz-form__button--inverted"
                              onClick={openEditAccount}
                            />
-                          </div>
-                        )}
-                      </div>
-                      {!user.isPremium && (
-                        <Button
-                          label={intl.formatMessage(messages.accountEditButton)}
-                          className="franz-form__button--inverted"
-                          onClick={openEditAccount}
-                        />
-                      )}
-                    </div>
-                  </div>
-                  {user.isPremium && user.isSubscriptionOwner && (
-                    <div className="account">
-                      <div className="account__box">
-                        <H2>
-                          {intl.formatMessage(messages.yourLicense)}
-                        </H2>
-                        <p>
-                          Franz
-                          {' '}
-                          {isPremiumOverrideUser ? 'Premium' : planName}
-                          {user.team.isTrial && (
-                            <>
-                              {' – '}
-                              {intl.formatMessage(messages.trial)}
-                            </>
                          )}
-                        </p>
+                        </div>
-                        {user.team.isTrial && (
+                      </div>
-                          <>
+                      {user.isPremium && user.isSubscriptionOwner && (
-                            <br />
+                        <div className="account">
-                            <p>
+                          <div className="account__box">
-                              {intl.formatMessage(messages.trialEndsIn, {
+                            <H2>{intl.formatMessage(messages.yourLicense)}</H2>
-                                duration: moment.duration(moment().diff(user.team.trialEnd)).humanize(),
-                              })}
-                            </p>
                            <p>
-                              {intl.formatMessage(messages.trialUpdateBillingInformation, {
+                              Franz
-                                license: planName,
+                              {' '}
-                              })}
+                              {isPremiumOverrideUser ? 'Premium' : planName}
+                              {user.team.isTrial && (
+                                <>
+                                  {' – '}
+                                  {intl.formatMessage(messages.trial)}
+                                </>
+                              )}
                            </p>
-                          </>
+                            {user.team.isTrial && (
-                        )}
+                              <>
-                        {!isProUser && (
+                                <br />
-                          <div className="manage-user-links">
+                                <p>
-                            <Button
+                                  {intl.formatMessage(messages.trialEndsIn, {
-                              label={intl.formatMessage(messages.upgradeAccountToPro)}
+                                    duration: moment
-                              className="franz-form__button--primary"
+                                      .duration(
-                              onClick={upgradeToPro}
+                                        moment().diff(user.team.trialEnd),
+                                      )
+                                      .humanize(),
+                                  })}
+                                </p>
+                                <p>
+                                  {intl.formatMessage(
+                                    messages.trialUpdateBillingInformation,
+                                    {
+                                      license: planName,
+                                    },
+                                  )}
+                                </p>
+                              </>
+                            )}
+                            {!isProUser && (
+                              <div className="manage-user-links">
+                                <Button
+                                  label={intl.formatMessage(
+                                    messages.upgradeAccountToPro,
+                                  )}
+                                  className="franz-form__button--primary"
+                                  onClick={upgradeToPro}
+                                />
+                              </div>
+                            )}
+                            <div className="manage-user-links">
+                              <Button
+                                label={intl.formatMessage(
+                                  messages.manageSubscriptionButtonLabel,
+                                )}
+                                className="franz-form__button--inverted"
+                                onClick={openBilling}
+                              />
+                              <Button
+                                label={intl.formatMessage(
+                                  messages.invoicesButton,
+                                )}
+                                className="franz-form__button--inverted"
+                                onClick={openInvoices}
+                              />
+                            </div>
+                          </div>
+                        </div>
+                      )}
+                      {!user.isPremium && (
+                        <div className="account franz-form">
+                          <div className="account__box">
+                            <SubscriptionForm
+                              onCloseWindow={onCloseSubscriptionWindow}
                            />
                          </div>
-                        )}
+                        </div>
-                        <div className="manage-user-links">
+                      )}
-                          <Button
+                    </>
-                            label={intl.formatMessage(messages.manageSubscriptionButtonLabel)}
+                  )}
-                            className="franz-form__button--inverted"
-                            onClick={openBilling}
+                  <div className="account franz-form">
-                          />
+                    <div className="account__box">
+                      <H2>{intl.formatMessage(messages.headlineDangerZone)}</H2>
+                      {!isDeleteAccountSuccessful && (
+                        <div className="account__subscription">
+                          <p>{intl.formatMessage(messages.deleteInfo)}</p>
                          <Button
-                            label={intl.formatMessage(messages.invoicesButton)}
+                            label={intl.formatMessage(messages.deleteAccount)}
-                            className="franz-form__button--inverted"
+                            buttonType="danger"
-                            onClick={openInvoices}
+                            onClick={() => deleteAccount()}
+                            loaded={!isLoadingDeleteAccount}
                          />
                        </div>
-                      </div>
+                      )}
-                    </div>
+                      {isDeleteAccountSuccessful && (
-                  )}
+                        <p>{intl.formatMessage(messages.deleteEmailSent)}</p>
-                  {!user.isPremium && (
+                      )}
-                    <div className="account franz-form">
-                      <div className="account__box">
-                        <SubscriptionForm
-                          onCloseWindow={onCloseSubscriptionWindow}
-                        />
-                      </div>
                    </div>
-                  )}
+                  </div>
                </>
              )}
-              <div className="account franz-form">
-                <div className="account__box">
-                  <H2>{intl.formatMessage(messages.headlineDangerZone)}</H2>
-                  {!isDeleteAccountSuccessful && (
-                  <div className="account__subscription">
-                    <p>{intl.formatMessage(messages.deleteInfo)}</p>
-                    <Button
-                      label={intl.formatMessage(messages.deleteAccount)}
-                      buttonType="danger"
-                      onClick={() => deleteAccount()}
-                      loaded={!isLoadingDeleteAccount}
-                    />
-                  </div>
-                  )}
-                  {isDeleteAccountSuccessful && (
-                  <p>{intl.formatMessage(messages.deleteEmailSent)}</p>
-                  )}
-                </div>
-              </div>
            </>
          )}
        </div>
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 192cfde7a..eb3249fa0 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -119,6 +119,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
          to="/settings/services"
          className="settings-navigation__link"
          activeClassName="is-active"
+          disabled={!isLoggedIn}
        >
          {intl.formatMessage(messages.yourServices)}
          {' '}
@@ -134,6 +135,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
            to="/settings/workspaces"
            className="settings-navigation__link"
            activeClassName="is-active"
+            disabled={!isLoggedIn}
          >
            {intl.formatMessage(messages.yourWorkspaces)}
            {' '}
@@ -148,6 +150,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
          to="/settings/user"
          className="settings-navigation__link"
          activeClassName="is-active"
+          disabled={!isLoggedIn}
        >
          {intl.formatMessage(messages.account)}
        </Link>
@@ -155,6 +158,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
          to="/settings/team"
          className="settings-navigation__link"
          activeClassName="is-active"
+          disabled={!isLoggedIn}
        >
          {intl.formatMessage(messages.team)}
          {!user.data.isPremium && (
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index 877cbc588..d08e6cbc2 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -153,6 +153,8 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
    const communityRecipes = recipes.filter(r => !r.isDevRecipe);
    const devRecipes = recipes.filter(r => r.isDevRecipe);
+    const isLoggedIn = Boolean(localStorage.getItem('authToken'));
    return (
      <div className="settings__main">
        <div className="settings__header">
@@ -265,7 +267,7 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
                    <RecipeItem
                      key={recipe.id}
                      recipe={recipe}
-                      onClick={() => showAddServiceInterface({ recipeId: recipe.id })}
+                      onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: recipe.id })}
                    />
                  ))}
                </div>
@@ -278,7 +280,7 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
                      <RecipeItem
                        key={recipe.id}
                        recipe={recipe}
-                        onClick={() => showAddServiceInterface({ recipeId: recipe.id })}
+                        onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: recipe.id })}
                      />
                    ))}
                  </div>
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 3d0213f81..74f5924ea 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -50,7 +50,7 @@ const messages = defineMessages({
  },
  lockedPassword: {
    id: 'settings.app.lockedPassword',
-    defaultMessage: '!!!Ferdi Lock Password',
+    defaultMessage: '!!!Password',
  },
  lockedPasswordInfo: {
    id: 'settings.app.lockedPasswordInfo',
@@ -58,7 +58,7 @@ const messages = defineMessages({
  },
  lockInfo: {
    id: 'settings.app.lockInfo',
-    defaultMessage: '!!!Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.',
+    defaultMessage: '!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.',
  },
  scheduledDNDTimeInfo: {
    id: 'settings.app.scheduledDNDTimeInfo',
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js
index 5f729844b..7930d98b4 100644
--- a/src/components/ui/Link.js
+++ b/src/components/ui/Link.js
@@ -11,7 +11,8 @@ import { matchRoute } from '../../helpers/routing-helpers';
 // TODO: create container component for this component
 export default @inject('stores') @observer class Link extends Component {
  onClick(e) {
-    if (this.props.target === '_blank') {
+    if (this.props.disabled) e.preventDefault();
+    else if (this.props.target === '_blank') {
      e.preventDefault();
      shell.openExternal(this.props.to);
    }
@@ -39,6 +40,7 @@ export default @inject('stores') @observer class Link extends Component {
    const linkClasses = classnames({
      [`${className}`]: true,
      [`${activeClassName}`]: match,
+      'is-disabled': this.props.disabled,
    });
    return (
@@ -68,12 +70,14 @@ Link.wrappedComponent.propTypes = {
  strictFilter: PropTypes.bool,
  target: PropTypes.string,
  style: PropTypes.object,
+  disabled: PropTypes.bool,
 };
 Link.wrappedComponent.defaultProps = {
  className: '',
  activeClassName: '',
  strictFilter: false,
+  disabled: false,
  target: '',
  style: {},
 };
diff --git a/src/config.js b/src/config.js
index 57ae2aae1..060b6e8cb 100644
--- a/src/config.js
+++ b/src/config.js
@@ -78,6 +78,7 @@ export const DEFAULT_APP_SETTINGS = {
  universalDarkMode: true,
  adaptableDarkMode: true,
  accentColor: '#7367f0',
+  serviceRibbonWidth: 68,
 };
 export const DEFAULT_FEATURES_CONFIG = {
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index 93ab44690..12c912bac 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -6,12 +6,16 @@ import PaymentStore from '../../stores/PaymentStore';
 import UserStore from '../../stores/UserStore';
 import AppStore from '../../stores/AppStore';
 import FeaturesStore from '../../stores/FeaturesStore';
+import SettingsStore from '../../stores/SettingsStore';
 import AccountDashboard from '../../components/settings/account/AccountDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { WEBSITE } from '../../environment';
-export default @inject('stores', 'actions') @observer class AccountScreen extends Component {
+export default
+@inject('stores', 'actions')
+@observer
+class AccountScreen extends Component {
  onCloseWindow() {
    const { user, features } = this.props.stores;
    user.getUserInfoRequest.invalidate({ immediately: true });
@@ -32,7 +36,9 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend
    let url;
    if (api === 'https://api.franzinfra.com') {
-      url = stores.user.getAuthURL(`${WEBSITE}${route}?utm_source=app&utm_medium=account_dashboard`);
+      url = stores.user.getAuthURL(
+        `${WEBSITE}${route}?utm_source=app&utm_medium=account_dashboard`,
+      );
    } else {
      url = `${api}${route}`;
    }
@@ -41,11 +47,13 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend
  }
  render() {
-    const { user, payment, features } = this.props.stores;
    const {
-      user: userActions,
+      user,
-      payment: paymentActions,
+      payment,
-    } = this.props.actions;
+      features,
+      settings,
+    } = this.props.stores;
+    const { user: userActions, payment: paymentActions } = this.props.actions;
    const isLoadingUserInfo = user.getUserInfoRequest.isExecuting;
    const isLoadingPlans = payment.plansRequest.isExecuting;
@@ -55,19 +63,29 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend
    return (
      <ErrorBoundary>
        <AccountDashboard
+          server={settings.all.app.server}
          user={user.data}
          isPremiumOverrideUser={user.isPremiumOverride}
          isProUser={user.isPro}
          isLoading={isLoadingUserInfo}
          isLoadingPlans={isLoadingPlans}
-          userInfoRequestFailed={user.getUserInfoRequest.wasExecuted && user.getUserInfoRequest.isError}
+          userInfoRequestFailed={
+            user.getUserInfoRequest.wasExecuted
+            && user.getUserInfoRequest.isError
+          }
          retryUserInfoRequest={() => this.reloadData()}
          onCloseSubscriptionWindow={() => this.onCloseWindow()}
          deleteAccount={userActions.delete}
          isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
-          isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError}
+          isDeleteAccountSuccessful={
+            user.deleteAccountRequest.wasExecuted
+            && !user.deleteAccountRequest.isError
+          }
          openEditAccount={() => this.handleWebsiteLink('/user/profile')}
-          upgradeToPro={() => upgradeAccount({ planId: features.features.pricingConfig.plans.pro.yearly.id })}
+          upgradeToPro={() => upgradeAccount({
+            planId: features.features.pricingConfig.plans.pro.yearly.id,
+          })
+          }
          openBilling={() => this.handleWebsiteLink('/user/billing')}
          openInvoices={() => this.handleWebsiteLink('/user/invoices')}
        />
@@ -81,6 +99,7 @@ AccountScreen.wrappedComponent.propTypes = {
    user: PropTypes.instanceOf(UserStore).isRequired,
    features: PropTypes.instanceOf(FeaturesStore).isRequired,
    payment: PropTypes.instanceOf(PaymentStore).isRequired,
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
    app: PropTypes.instanceOf(AppStore).isRequired,
  }).isRequired,
  actions: PropTypes.shape({
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index b64cd77be..aa4de78e9 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -72,11 +72,11 @@ const messages = defineMessages({
  },
  enableLock: {
    id: 'settings.app.form.enableLock',
-    defaultMessage: '!!!Enable Ferdi password lock',
+    defaultMessage: '!!!Enable Password Lock',
  },
  lockPassword: {
    id: 'settings.app.form.lockPassword',
-    defaultMessage: '!!!Ferdi Lock password',
+    defaultMessage: '!!!Password',
  },
  scheduledDNDEnabled: {
    id: 'settings.app.form.scheduledDNDEnabled',
diff --git a/src/electron/ipc-api/localServer.js b/src/electron/ipc-api/localServer.js
index d12fb5708..9b800fdf6 100644
--- a/src/electron/ipc-api/localServer.js
+++ b/src/electron/ipc-api/localServer.js
@@ -1,6 +1,6 @@
 import { ipcMain, app } from 'electron';
 import net from 'net';
-import startServer from '../../server/start';
+import startServer from '../../internal-server/start';
 const DEFAULT_PORT = 45569;
@@ -31,15 +31,12 @@ export default (params) => {
      let port = DEFAULT_PORT;
      (async () => {
        // eslint-disable-next-line no-await-in-loop
-        while (await portInUse(port) && port < DEFAULT_PORT + 10) {
+        while ((await portInUse(port)) && port < DEFAULT_PORT + 10) {
          port += 1;
        }
        console.log('Starting local server on port', port);
-        startServer(
+        startServer(app.getPath('userData'), port);
-          app.getPath('userData'),
-          port,
-        );
        params.mainWindow.webContents.send('localServerPort', {
          port,
diff --git a/src/features/accentColor/index.js b/src/features/accentColor/index.js
deleted file mode 100644
index 90fbcab43..000000000
--- a/src/features/accentColor/index.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import { reaction } from 'mobx';
-import themeInfo from '../../assets/themeInfo.json';
-import { DEFAULT_APP_SETTINGS } from '../../config';
-const STYLE_ELEMENT_ID = 'accent-color';
-// Additional styles needed to make accent colors work properly
-// "[ACCENT]" will be replaced with the accent color
-const ADDITIONAL_STYLES = `
-.franz-form__button {
-  background: inherit !important;
-  border: 2px solid [ACCENT] !important;
-}
-`;
-function createAccentStyleElement() {
-  const styles = document.createElement('style');
-  styles.id = STYLE_ELEMENT_ID;
-  document.querySelector('head').appendChild(styles);
-}
-function setAccentStyle(style) {
-  const styleElement = document.getElementById(STYLE_ELEMENT_ID);
-  styleElement.innerHTML = style;
-}
-function generateAccentStyle(color) {
-  let style = '';
-  Object.keys(themeInfo).forEach((property) => {
-    style += `
-      ${themeInfo[property]} {
-        ${property}: ${color};
-      }
-    `;
-  });
-  style += ADDITIONAL_STYLES.replace(/\[ACCENT\]/g, color);
-  return style;
-}
-export default function initAccentColor(stores) {
-  const { settings } = stores;
-  createAccentStyleElement();
-  // Update accent color
-  reaction(
-    () => (
-      settings.all.app.accentColor
-    ),
-    (color) => {
-      if (color === DEFAULT_APP_SETTINGS.accentColor) {
-        // Reset accent style to return to default color scheme
-        setAccentStyle('');
-      } else {
-        const style = generateAccentStyle(color);
-        setAccentStyle(style);
-      }
-    },
-    {
-      fireImmediately: true,
-    },
-  );
-}
diff --git a/src/features/appearance/index.js b/src/features/appearance/index.js
new file mode 100644
index 000000000..8a81054df
--- /dev/null
+++ b/src/features/appearance/index.js
@@ -0,0 +1,107 @@
+import { reaction } from 'mobx';
+import themeInfo from '../../assets/themeInfo.json';
+import { DEFAULT_APP_SETTINGS } from '../../config';
+const STYLE_ELEMENT_ID = 'custom-appearance-style';
+// Additional styles needed to make accent colors work properly
+// "[ACCENT]" will be replaced with the accent color
+const ACCENT_ADDITIONAL_STYLES = `
+.franz-form__button {
+  background: inherit !important;
+  border: 2px solid [ACCENT] !important;
+}
+`;
+function createStyleElement() {
+  const styles = document.createElement('style');
+  styles.id = STYLE_ELEMENT_ID;
+  document.querySelector('head').appendChild(styles);
+}
+function setAppearance(style) {
+  const styleElement = document.getElementById(STYLE_ELEMENT_ID);
+  styleElement.innerHTML = style;
+}
+function generateAccentStyle(color) {
+  let style = '';
+  Object.keys(themeInfo).forEach((property) => {
+    style += `
+      ${themeInfo[property]} {
+        ${property}: ${color};
+      }
+    `;
+  });
+  style += ACCENT_ADDITIONAL_STYLES.replace(/\[ACCENT\]/g, color);
+  return style;
+}
+function generateServiceRibbonWidthStyle(width) {
+  return `
+    .sidebar {
+      width: ${width}px !important;
+    }
+    .tab-item {
+      width: ${width - 2}px !important;
+      height: ${width - 5}px !important;
+    }
+    .tab-item .tab-item__icon {
+      width: ${width / 2}px !important;
+    }
+  `;
+}
+function generateStyle(settings) {
+  let style = '';
+  const {
+    accentColor,
+    serviceRibbonWidth,
+  } = settings;
+  if (accentColor !== DEFAULT_APP_SETTINGS.accentColor) {
+    style += generateAccentStyle(accentColor);
+  }
+  if (serviceRibbonWidth !== DEFAULT_APP_SETTINGS.serviceRibbonWidth) {
+    style += generateServiceRibbonWidthStyle(serviceRibbonWidth);
+  }
+  return style;
+}
+function updateStyle(settings) {
+  const style = generateStyle(settings);
+  setAppearance(style);
+}
+export default function initAppearance(stores) {
+  const { settings } = stores;
+  createStyleElement();
+  // Update accent color
+  reaction(
+    () => (
+      settings.all.app.accentColor
+    ),
+    () => {
+      updateStyle(settings.all.app);
+    },
+    {
+      fireImmediately: true,
+    },
+  );
+  // Update service ribbon width
+  reaction(
+    () => (
+      settings.all.app.serviceRibbonWidth
+    ),
+    () => {
+      updateStyle(settings.all.app);
+    },
+  );
+}
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Include beta versions",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Changes require restart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index c2c4a3b3c..b9294123d 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Include beta versions",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Changes require restart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Include beta versions",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Changes require restart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index f7de90243..3ecf0caaf 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Inclou versions beta",
  "settings.app.form.darkMode": "Uneix-te al Cantó Fosc",
  "settings.app.form.enableGPUAcceleration": "Activar acceleració GPU",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Habilita la comprobació ortogràfica",
  "settings.app.form.enableSystemTray": "Mostra Ferdi a la safata del sistema",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Idioma",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimitza Ferdi a la safata del sistema",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Actualitzacions",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "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.",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 7ec1ce369..0932ba6ae 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Zahrnout beta verze",
  "settings.app.form.darkMode": "Připoj se k Temné straně",
  "settings.app.form.enableGPUAcceleration": "Aktivovat GPU zrychlení",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Zapnout kontrolu pravopisu",
  "settings.app.form.enableSystemTray": "Zobrazit Ferdi v systémové liště",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Jazyk",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimalizovat Ferdi do systémové lišty",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Aktualizace",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Změny vyžadují restart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Include beta versions",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Changes require restart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 2709f7788..2905bba4c 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Beta-Versionen einbeziehen",
  "settings.app.form.darkMode": "Die dunkle Seite erwartet dich! (Dark Mode)",
  "settings.app.form.enableGPUAcceleration": "Hardwarebeschleunigung aktivieren",
-  "settings.app.form.enableLock": "Passwort Sperre aktivieren",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Rechtschreibprüfung aktivieren",
  "settings.app.form.enableSystemTray": "Ferdi im Infobereich anzeigen",
  "settings.app.form.enableTodos": "Ferdi Todos aktivieren",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "\"Service Hibernation\" Zeit",
  "settings.app.form.keepAllWorkspacesLoaded": "Alle Arbeitsbereiche geladen lassen",
  "settings.app.form.language": "Sprache",
-  "settings.app.form.lockPassword": "Passwort für die Passwort-Sperre",
+  "settings.app.form.lockPassword": "Passwort",
  "settings.app.form.minimizeToSystemTray": "Ferdi in den Infobereich minimieren",
  "settings.app.form.noUpdates": "Updates deaktivieren",
  "settings.app.form.privateNotifications": "Nachrichteninhalt nicht in Benachrichtigungen anzeigen",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "Standardmäßig öffnet Ferdi alle Ihre Dienste im Hintergrund, so dass diese bereit sind, wenn du sie verwenden möchtest. Service Hibernation wird Ihre Dienste nach einer bestimmten Zeitspanne schließen. Dies ist nützlich, um RAM zu speichern oder Dienste davon abzuhalten, deinen Computer zu verlangsamen.",
  "settings.app.languageDisclaimer": "Offizielle Übersetzungen: Englisch & Deutsch. Alle anderen Sprachen sind Übersetzungen der Ferdi Community.",
-  "settings.app.lockInfo": "Die Ferdi Passwort-Sperre erlaubt es dir, deine Nachrichten zu schützen.\nMit der Ferdi Passwort-Sperre wirst du beim Starten den Programms und, wenn du das Programm manuell sperrst, darum gebeten, dein Passwort einzugeben.\nDu kannst Ferdi über das Sperrsymbol in der unteren linken Ecke oder dem Shortcut CMD/CTRL+Shift+L sperren.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Passwort für die Passwort-Sperre",
+  "settings.app.lockedPassword": "Passwort",
  "settings.app.lockedPasswordInfo": "Bitte stelle sicher, dass du ein Passwort setzt, an welches du dich erinnern kannst.\nSolltest du dieses Passwort vergessen, musst du Ferdi neu installieren.",
  "settings.app.restartRequired": "Änderungen werden erst nach einem Neustart wirksam.",
  "settings.app.scheduledDNDInfo": "Die geplante \"Nicht-stören\"-Funktion erlaubt es dir eine Zeitspanne festzulegen, in der du keine Benachrichtigungen von Ferdi erhalten möchtest.",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index e68ec41af..429930278 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -1533,169 +1533,169 @@
        "defaultMessage": "!!!Account",
        "end": {
          "column": 3,
-          "line": 21
+          "line": 20
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.headline",
        "start": {
          "column": 12,
-          "line": 18
+          "line": 17
        }
      },
      {
        "defaultMessage": "!!!Your Subscription",
        "end": {
          "column": 3,
-          "line": 25
+          "line": 24
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.headlineSubscription",
        "start": {
          "column": 24,
-          "line": 22
+          "line": 21
        }
      },
      {
        "defaultMessage": "!!Danger Zone",
        "end": {
          "column": 3,
-          "line": 29
+          "line": 28
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.headlineDangerZone",
        "start": {
          "column": 22,
-          "line": 26
+          "line": 25
        }
      },
      {
        "defaultMessage": "!!!Manage your subscription",
        "end": {
          "column": 3,
-          "line": 33
+          "line": 32
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.manageSubscription.label",
        "start": {
          "column": 33,
-          "line": 30
+          "line": 29
        }
      },
      {
        "defaultMessage": "!!!Upgrade to Franz Professional",
        "end": {
          "column": 3,
-          "line": 37
+          "line": 36
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.upgradeToPro.label",
        "start": {
          "column": 23,
-          "line": 34
+          "line": 33
        }
      },
      {
        "defaultMessage": "!!!Basic Account",
        "end": {
          "column": 3,
-          "line": 41
+          "line": 40
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.accountType.basic",
        "start": {
          "column": 20,
-          "line": 38
+          "line": 37
        }
      },
      {
        "defaultMessage": "!!!Premium Supporter Account",
        "end": {
          "column": 3,
-          "line": 45
+          "line": 44
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.accountType.premium",
        "start": {
          "column": 22,
-          "line": 42
+          "line": 41
        }
      },
      {
        "defaultMessage": "!!!Edit Account",
        "end": {
          "column": 3,
-          "line": 49
+          "line": 48
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.account.editButton",
        "start": {
          "column": 21,
-          "line": 46
+          "line": 45
        }
      },
      {
        "defaultMessage": "!!Invoices",
        "end": {
          "column": 3,
-          "line": 53
+          "line": 52
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.headlineInvoices",
        "start": {
          "column": 18,
-          "line": 50
+          "line": 49
        }
      },
      {
        "defaultMessage": "!!!Download",
        "end": {
          "column": 3,
-          "line": 57
+          "line": 56
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.invoiceDownload",
        "start": {
          "column": 19,
-          "line": 54
+          "line": 53
        }
      },
      {
        "defaultMessage": "!!!Could not load user information",
        "end": {
          "column": 3,
-          "line": 61
+          "line": 60
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.userInfoRequestFailed",
        "start": {
          "column": 25,
-          "line": 58
+          "line": 57
        }
      },
      {
        "defaultMessage": "!!!Try again",
        "end": {
          "column": 3,
-          "line": 65
+          "line": 64
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.tryReloadUserInfoRequest",
        "start": {
          "column": 28,
-          "line": 62
+          "line": 61
        }
      },
      {
        "defaultMessage": "!!!Delete account",
        "end": {
          "column": 3,
-          "line": 69
+          "line": 68
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.deleteAccount",
        "start": {
          "column": 17,
-          "line": 66
+          "line": 65
        }
      },
      {
@@ -1708,14 +1708,14 @@
        "id": "settings.account.deleteInfo",
        "start": {
          "column": 14,
-          "line": 70
+          "line": 69
        }
      },
      {
        "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
        "end": {
          "column": 3,
-          "line": 77
+          "line": 78
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.deleteEmailSent",
@@ -1728,52 +1728,78 @@
        "defaultMessage": "!!!Free Trial",
        "end": {
          "column": 3,
-          "line": 81
+          "line": 82
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.trial",
        "start": {
          "column": 9,
-          "line": 78
+          "line": 79
        }
      },
      {
        "defaultMessage": "!!!Your Franz License:",
        "end": {
          "column": 3,
-          "line": 85
+          "line": 86
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.yourLicense",
        "start": {
          "column": 15,
-          "line": 82
+          "line": 83
        }
      },
      {
        "defaultMessage": "!!!Your free trial ends in {duration}.",
        "end": {
          "column": 3,
-          "line": 89
+          "line": 90
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.trialEndsIn",
        "start": {
          "column": 15,
-          "line": 86
+          "line": 87
        }
      },
      {
        "defaultMessage": "!!!Please update your billing info to continue using {license} after your trial period.",
        "end": {
          "column": 3,
-          "line": 93
+          "line": 95
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.trialUpdateBillingInfo",
        "start": {
          "column": 33,
-          "line": 90
+          "line": 91
+        }
+      },
+      {
+        "defaultMessage": "Account is unavailable",
+        "end": {
+          "column": 3,
+          "line": 99
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.accountUnavailable",
+        "start": {
+          "column": 22,
+          "line": 96
+        }
+      },
+      {
+        "defaultMessage": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
+        "end": {
+          "column": 3,
+          "line": 103
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.accountUnavailableInfo",
+        "start": {
+          "column": 26,
+          "line": 100
        }
      }
    ],
@@ -2683,7 +2709,7 @@
        }
      },
      {
-        "defaultMessage": "!!!Ferdi Lock Password",
+        "defaultMessage": "!!!Password",
        "end": {
          "column": 3,
          "line": 54
@@ -2709,7 +2735,7 @@
        }
      },
      {
-        "defaultMessage": "!!!Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.",
+        "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
        "end": {
          "column": 3,
          "line": 62
@@ -4175,7 +4201,7 @@
        }
      },
      {
-        "defaultMessage": "!!!Enable Ferdi password lock",
+        "defaultMessage": "!!!Enable Password Lock",
        "end": {
          "column": 3,
          "line": 76
@@ -4188,7 +4214,7 @@
        }
      },
      {
-        "defaultMessage": "!!!Ferdi Lock password",
+        "defaultMessage": "!!!Password",
        "end": {
          "column": 3,
          "line": 80
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index c383a18fb..137bd93cb 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Συμπεριλάβετε εκδόσεις beta",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Ενεργοποιήση Ενίσχυσης GPU ",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Ενεργοποίηση ορθογραφικού ελέγχου",
  "settings.app.form.enableSystemTray": "Εμφάνιση του Ferdi στη γραμμή ειδοποιήσεων",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Γλώσσα",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Ελαχιστοποίηση του Ferdi στη γραμμή ειδοποιήσεων",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "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.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Οι αλλαγές απαιτούν επανεκκίνηση",
  "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.",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index b7d81356e..ee85566bb 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -224,6 +224,8 @@
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountType.basic": "Basic Account",
  "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
  "settings.account.buttonSave": "Update profile",
  "settings.account.deleteAccount": "Delete account",
  "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
@@ -261,7 +263,7 @@
  "settings.app.form.beta": "Include beta versions",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +271,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +293,8 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Changes require restart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 1fdc74380..235e12146 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -222,14 +222,14 @@
  "settings.app.form.beta": "Cuir leagain béite san áireamh",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Cumasaigh luasghéarú APG",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Cumasaigh seiceáil litrithe",
  "settings.app.form.enableSystemTray": "Taispeáin Ferdi i dtráidire an chórais",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernate": "Enable service hibernation",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Teanga",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Íoslaghdaigh Ferdi chuig tráidire an chórais",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
  "settings.app.form.runInBackground": "Coimeád Ferdi sa chúlra nuair a dhúntar an fhuinneog",
@@ -247,8 +247,8 @@
  "settings.app.headlineLanguage": "Teanga",
  "settings.app.headlineUpdates": "Nuashonruithe",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Ní gá atosú chun athruithe a chur i bhfeidhm.",
  "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.",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 462d74d39..6df814503 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Incluir versiones beta",
  "settings.app.form.darkMode": "Únete al Lado Oscuro",
  "settings.app.form.enableGPUAcceleration": "Habilitar aceleración de GPU",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Activar corrección ortográfica",
  "settings.app.form.enableSystemTray": "Mostrar Ferdi en la bandeja del sistema",
  "settings.app.form.enableTodos": "Activar Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Mantener todas las Áreas de trabajo cargadas",
  "settings.app.form.language": "Idioma",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimizar Ferdi a la bandeja del sistema",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Actualizaciones",
  "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.languageDisclaimer": "Las traducciones oficiales son en inglés y alemán. Todos los demás idiomas son traducciones basadas en la comunidad.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Los cambios requieren 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.",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Include beta versions",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Changes require restart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 2edf358f5..84f8b3895 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Accepter les versions bêta",
  "settings.app.form.darkMode": "Joindre le côté obscure",
  "settings.app.form.enableGPUAcceleration": "Activer l'accélération GPU",
-  "settings.app.form.enableLock": "Activer le verrouillage de Ferdi",
+  "settings.app.form.enableLock": "Activer le verrouillage par mot de passe",
  "settings.app.form.enableSpellchecking": "Activer la vérification orthographique",
  "settings.app.form.enableSystemTray": "Afficher Ferdi dans la barre d'état système",
  "settings.app.form.enableTodos": "Activer Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Stratégie d'hibernation",
  "settings.app.form.keepAllWorkspacesLoaded": "Garder tous les espaces de travail charger",
  "settings.app.form.language": "Langue",
-  "settings.app.form.lockPassword": "Mot de passe de verrouillage de Ferdi",
+  "settings.app.form.lockPassword": "Mot de passe",
  "settings.app.form.minimizeToSystemTray": "Minimiser Ferdi dans la zone de notification",
  "settings.app.form.noUpdates": "Désactiver les mises à jours",
  "settings.app.form.privateNotifications": "Ne pas afficher le contenu des notifications",
@@ -292,7 +292,7 @@
  "settings.app.hibernateInfo": "Par défaut, Ferdi gardera tous vos services ouverts et chargés en arrière-plan afin qu'ils soient prêts lorsque vous voulez les utiliser. Le service d'hibernation déchargera vos services après un montant spécifié. Ceci est utile pour sauver de la RAM ou garder les services de ralentir votre ordinateur.",
  "settings.app.languageDisclaimer": "Les traductions officielles sont l'anglais et l'allemand. Toutes les autres langues sont des traductions faites par la communauté.",
  "settings.app.lockInfo": "Le mot de passe de verrouillage de Ferdi vous permet de garder vos messages protégés.\nEn utilisant le mot de passe de verrouillage de Ferdi, vous allez être demandé de rentrer un mot de passe à chaque fois que vous démarré Ferdi ou verrouillé Ferdi vous même avec le symbole de cadenas en bas à gauche dans le coins ou avec le raccourcie CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Mot de passe de verrouillage de Ferdi",
+  "settings.app.lockedPassword": "Mot de passe",
  "settings.app.lockedPasswordInfo": "S'il vous plaît soyez sûre de mettre un mot de passe que vous allez vous rappelez.\nSi vous perdez ce mot de passe vous allez devoir réinstaller Ferdi.",
  "settings.app.restartRequired": "Les modifications nécessitent un redémarrage",
  "settings.app.scheduledDNDInfo": "Planifier le Ne-pas-Déranger vous permet de définir une période de temps dans lequel vous ne voulez pas de notifications de Ferdi.",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index ebc7b1dbe..a580a03c2 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Cuir leagain béite san áireamh",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Cumasaigh luasghéarú APG",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Cumasaigh seiceáil litrithe",
  "settings.app.form.enableSystemTray": "Taispeáin Ferdi i dtráidire an chórais",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Teanga",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Íoslaghdaigh Ferdi chuig tráidire an chórais",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Nuashonruithe",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Ní gá atosú chun athruithe a chur i bhfeidhm.",
  "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.",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Include beta versions",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Changes require restart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 5d6f353f0..b94733de5 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Obuhvati i beta verzije",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Omogući provjeru pravopisa",
  "settings.app.form.enableSystemTray": "Prikaži aplikaciju u sustavskoj traci",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Jezik",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Smanji Franca u sustavsku traku",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Nadogradnje",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Promjene postavki zahtijevaju ponovni zagon",
  "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.",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 7695f5fc4..7dd0b4771 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Béta verziók keresése",
  "settings.app.form.darkMode": "Csatlakozz a Sötét Oldalhoz",
  "settings.app.form.enableGPUAcceleration": "Hardveres gyorsítás engedélyezése",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Helyesírás-ellenőrzés engedélyezése",
  "settings.app.form.enableSystemTray": "Ferdi mutatása a tálcán",
  "settings.app.form.enableTodos": "Ferdi Tennivalók bekapcsolása",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Nyelv",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Ferdi kicsinyítése a tálcára",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Frissítések",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "A hivatalos fordítások angol és német nyelven elérhetőek. Minden más nyelv közösségi fordításon alapul.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Újraindítást igénylő módosítás",
  "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.",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index e48458d07..68b37ca5b 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Sertakan versi beta",
  "settings.app.form.darkMode": "Sisi Kelam menunggu Anda (Mode Gelap)",
  "settings.app.form.enableGPUAcceleration": "Aktifkan Akselerasi GPU",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Aktifkan pemeriksaan ejaan",
  "settings.app.form.enableSystemTray": "Tampilkan Ferdi di baki sistem",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Bahasa",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Perkecil Ferdi ke baki sistem",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Versi Baru",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Penerjemahan resmi dilakukan untuk Bahasa Inggris dan Jerman. Bahasa lainnya merupakan penerjemahan oleh komunitas.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Perubahan membutuhkan mulai ulang",
  "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.",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 07a4dc98d..89e3a903e 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Includi versioni beta",
  "settings.app.form.darkMode": "Unisciti al Lato Oscuro",
  "settings.app.form.enableGPUAcceleration": "Attiva Accelerazione GPU",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Attiva controllo ortografico",
  "settings.app.form.enableSystemTray": "Mostra Ferdi nell'area di notifica",
  "settings.app.form.enableTodos": "Abilità le Attività Ferdi",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Mantieni tutti i workspace caricati",
  "settings.app.form.language": "Lingua",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimizza Ferdi nell'area di notifica",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Aggiornamenti",
  "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.languageDisclaimer": "Le traduzioni ufficiali sono in Inglese e Tedesco. Tutte le altre lingue sono tradotte dalla community.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Le modifiche richiedono un riavvio",
  "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.",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 0f5a14be1..3dcdb75eb 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Betaバージョンを含める",
  "settings.app.form.darkMode": "ダークモードを有効にする",
  "settings.app.form.enableGPUAcceleration": "GPUアクセラレーションを有効にする",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "スペルチェックを有効にする",
  "settings.app.form.enableSystemTray": "Ferdiをシステムトレイに表示する",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "言語",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Ferdiをシステムトレイに最小化する",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "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.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "変更には再起動が必要です",
  "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.",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 302b513d2..18d5d2da4 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "ჩართეთ ბეტა ვერსიები",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
  "settings.app.form.enableSystemTray": "აჩვენეთ Ferdi სისტემის უჯრაში",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "ენა",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "ჩაკეცეთ Ferdi სისტემის უჯრაში",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "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.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Changes require restart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Include beta versions",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Changes require restart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 80f33d583..f2a6895e6 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Inclusief beta versies",
  "settings.app.form.darkMode": "Word lid van de Dark Side",
  "settings.app.form.enableGPUAcceleration": "GPU Acceleratie Activeren",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Spellingcontrole inschakelen",
  "settings.app.form.enableSystemTray": "Toon Ferdi in de systeembalk",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Taal",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimaliseer Ferdi naar de systeembalk",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Officiële vertalingen zijn in het Engels en Duits. Alle andere tallen zijn op de gemeenschap gebaseerde vertalingen.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Deze wijziging heeft een herstart nodig",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index c71954427..f9c00b899 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Inclusief bètaversies",
  "settings.app.form.darkMode": "Stap over naar de donkere kant",
  "settings.app.form.enableGPUAcceleration": "Schakel videokaart-acceleratie in ",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Zet spellingcontrole aan",
  "settings.app.form.enableSystemTray": "Pictogram voor Ferdi in systeemvak tonen",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Taal",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimaliseer Ferdi naar systeemvak",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Ferdi spreekt officieel Engels en Duits. Alle andere talen worden beheerd door de community.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Deze wijziging heeft een herstart nodig",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Include beta versions",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Changes require restart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index e29e80e9f..e5496f0eb 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Uwzględnij wersje beta",
  "settings.app.form.darkMode": "Przejdź na Ciemną Stronę",
  "settings.app.form.enableGPUAcceleration": "Włącz akcelerację GPU",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Włącz sprawdzanie pisowni",
  "settings.app.form.enableSystemTray": "Pokaż Ferdia w obszarze powiadomień",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Język",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Zminimalizuj aplikację Ferdi",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Aktualizacje",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Oficjalnymi językami są Angielski i Niemiecki. Inne języki są tłumaczone przez społeczność Ferdi.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Zmiany wymagają ponownego uruchomienia",
  "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.",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 591b35610..6929864a0 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Incluir versões beta",
  "settings.app.form.darkMode": "Venha para o Lado Negro da força",
  "settings.app.form.enableGPUAcceleration": "Ativar Aceleração de GPU",
-  "settings.app.form.enableLock": "Activar o bloqueio com palavra-passe do Ferdi",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Ativar correção ortográfica",
  "settings.app.form.enableSystemTray": "Exibir o Ferdi na barra de sistema",
  "settings.app.form.enableTodos": "Activar Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Estratégia de Hibernação",
  "settings.app.form.keepAllWorkspacesLoaded": "Mantener todas las Áreas de trabajo cargadas",
  "settings.app.form.language": "Idioma",
-  "settings.app.form.lockPassword": "Palavra-passe para bloqueio do Ferdi",
+  "settings.app.form.lockPassword": "Senha",
  "settings.app.form.minimizeToSystemTray": "Minimizar o Ferdi para a área de sistema",
  "settings.app.form.noUpdates": "Desactivar actualizações",
  "settings.app.form.privateNotifications": "Não mostrar o conteúdo das mensagens nas notificações",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Atualizações",
  "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.languageDisclaimer": "As traduções oficiais são em inglês e alemão. As demais traduções são baseadas na ajuda da comunidade.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Senha",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "As mudanças exigem reiniciar o sistema",
  "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.",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 3d14d5414..645bb2043 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Incluir versões instáveis (beta)",
  "settings.app.form.darkMode": "Junta-te ao Lado Negro",
  "settings.app.form.enableGPUAcceleration": "Activar Aceleração de GPU",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Ativar verificação ortográfica",
  "settings.app.form.enableSystemTray": "Mostrar o Ferdi na barra do sistema",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Idioma",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimizar o Ferdi para a barra do sistema",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Atualizações",
  "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.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Alterações requerem reinício",
  "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.",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Include beta versions",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Changes require restart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 5d3636d9e..4828e8a37 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Включая бета версии",
  "settings.app.form.darkMode": "Перейти на Тёмную сторону",
  "settings.app.form.enableGPUAcceleration": "Включить ускорение GPU",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Включить проверку правописания",
  "settings.app.form.enableSystemTray": "Показывать Ferdi в системном трее",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Язык",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Пароль",
  "settings.app.form.minimizeToSystemTray": "Сворачивать Ferdi в системный трей",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "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.languageDisclaimer": "Официальная поддержка только для английского и немецкого языков. Остальные языки переведены сообществом.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "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": "Изменения требуют перезагрузки приложения",
  "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.",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index b9805e2a6..0c47d3844 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Vrátane beta verzií",
  "settings.app.form.darkMode": "Spustiť Dark Side",
  "settings.app.form.enableGPUAcceleration": "Zapnúť GPU zrýchlenie",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Zapnúť kontrolu pravopisu",
  "settings.app.form.enableSystemTray": "Zobrazovať Ferdi v systémovej lište",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Jazyk",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimalizovať Ferdi do systémovej lišty",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Aktualizácie",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Oficiálne preklady sú angličtina a nemčina. Všetky ostatné jazyky sú preklady založené na komunite.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Zmeny vyžadujú reštart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Include beta versions",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Changes require restart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index f1257ac1e..39ce2e022 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Obuhvati i beta verzije",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Омогући убрзање графичке јединице",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Omogući provjeru pravopisa",
  "settings.app.form.enableSystemTray": "Prikaži aplikaciju u sustavskoj traci",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Jezik",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Smanji Franca u sustavsku traku",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Nadogradnje",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Promjene postavki zahtijevaju ponovni pogon",
  "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.",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Include beta versions",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Changes require restart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 34c406981..d4998a5e9 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Beta versiyonları dahil et",
  "settings.app.form.darkMode": "Karanlık tarafa katıl",
  "settings.app.form.enableGPUAcceleration": "Grafik İşlemci Ünitesi (GPU) Hızlandırıcısını Aktif et",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Yazım denetimini etkinleştir",
  "settings.app.form.enableSystemTray": "Ferdi'ı sistem tepsisinde göster",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Dil",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Şifre",
  "settings.app.form.minimizeToSystemTray": "Ferdi'ı sistem tepsisine küçült",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Güncellemeler",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Şifre",
  "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": "Değişiklikler yeniden başlatmayı gerektiriyor",
  "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.",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index c1657b2c0..1e61b1ea7 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Включити бета-версії",
  "settings.app.form.darkMode": "Переходь на Темну Сторону",
  "settings.app.form.enableGPUAcceleration": "Ввімкнути прискорення GPU",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Увімкнути перевірку орфографії",
  "settings.app.form.enableSystemTray": "Показувати Ferdi у системному лотку",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Мова",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Мінімізувати Ferdi до системного лотка",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "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.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Зміни потребують перезапуску",
  "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.",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Include beta versions",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Changes require restart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index fd1ea9977..5c7ab6c50 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "包含開發中版本",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
  "settings.app.form.enableSystemTray": "在系統匣上顯示",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "語言",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "最小化至系統匣",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "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.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Changes require restart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -261,7 +261,7 @@
  "settings.app.form.beta": "Include beta versions",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.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": "Ferdi Lock Password",
+  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "settings.app.restartRequired": "Changes require restart",
  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/messages/src/components/settings/account/AccountDashboard.json b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
index 48078c18d..f0bb087d6 100644
--- a/src/i18n/messages/src/components/settings/account/AccountDashboard.json
+++ b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
@@ -4,11 +4,11 @@
    "defaultMessage": "!!!Account",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 18,
+      "line": 17,
      "column": 12
    },
    "end": {
-      "line": 21,
+      "line": 20,
      "column": 3
    }
  },
@@ -17,11 +17,11 @@
    "defaultMessage": "!!!Your Subscription",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 22,
+      "line": 21,
      "column": 24
    },
    "end": {
-      "line": 25,
+      "line": 24,
      "column": 3
    }
  },
@@ -30,11 +30,11 @@
    "defaultMessage": "!!Danger Zone",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 26,
+      "line": 25,
      "column": 22
    },
    "end": {
-      "line": 29,
+      "line": 28,
      "column": 3
    }
  },
@@ -43,11 +43,11 @@
    "defaultMessage": "!!!Manage your subscription",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 30,
+      "line": 29,
      "column": 33
    },
    "end": {
-      "line": 33,
+      "line": 32,
      "column": 3
    }
  },
@@ -56,11 +56,11 @@
    "defaultMessage": "!!!Upgrade to Franz Professional",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 34,
+      "line": 33,
      "column": 23
    },
    "end": {
-      "line": 37,
+      "line": 36,
      "column": 3
    }
  },
@@ -69,11 +69,11 @@
    "defaultMessage": "!!!Basic Account",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 38,
+      "line": 37,
      "column": 20
    },
    "end": {
-      "line": 41,
+      "line": 40,
      "column": 3
    }
  },
@@ -82,11 +82,11 @@
    "defaultMessage": "!!!Premium Supporter Account",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 42,
+      "line": 41,
      "column": 22
    },
    "end": {
-      "line": 45,
+      "line": 44,
      "column": 3
    }
  },
@@ -95,11 +95,11 @@
    "defaultMessage": "!!!Edit Account",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 46,
+      "line": 45,
      "column": 21
    },
    "end": {
-      "line": 49,
+      "line": 48,
      "column": 3
    }
  },
@@ -108,11 +108,11 @@
    "defaultMessage": "!!Invoices",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 50,
+      "line": 49,
      "column": 18
    },
    "end": {
-      "line": 53,
+      "line": 52,
      "column": 3
    }
  },
@@ -121,11 +121,11 @@
    "defaultMessage": "!!!Download",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 54,
+      "line": 53,
      "column": 19
    },
    "end": {
-      "line": 57,
+      "line": 56,
      "column": 3
    }
  },
@@ -134,11 +134,11 @@
    "defaultMessage": "!!!Could not load user information",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 58,
+      "line": 57,
      "column": 25
    },
    "end": {
-      "line": 61,
+      "line": 60,
      "column": 3
    }
  },
@@ -147,11 +147,11 @@
    "defaultMessage": "!!!Try again",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 62,
+      "line": 61,
      "column": 28
    },
    "end": {
-      "line": 65,
+      "line": 64,
      "column": 3
    }
  },
@@ -160,11 +160,11 @@
    "defaultMessage": "!!!Delete account",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 66,
+      "line": 65,
      "column": 17
    },
    "end": {
-      "line": 69,
+      "line": 68,
      "column": 3
    }
  },
@@ -173,7 +173,7 @@
    "defaultMessage": "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 70,
+      "line": 69,
      "column": 14
    },
    "end": {
@@ -190,7 +190,7 @@
      "column": 19
    },
    "end": {
-      "line": 77,
+      "line": 78,
      "column": 3
    }
  },
@@ -199,11 +199,11 @@
    "defaultMessage": "!!!Free Trial",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 78,
+      "line": 79,
      "column": 9
    },
    "end": {
-      "line": 81,
+      "line": 82,
      "column": 3
    }
  },
@@ -212,11 +212,11 @@
    "defaultMessage": "!!!Your Franz License:",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 82,
+      "line": 83,
      "column": 15
    },
    "end": {
-      "line": 85,
+      "line": 86,
      "column": 3
    }
  },
@@ -225,11 +225,11 @@
    "defaultMessage": "!!!Your free trial ends in {duration}.",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 86,
+      "line": 87,
      "column": 15
    },
    "end": {
-      "line": 89,
+      "line": 90,
      "column": 3
    }
  },
@@ -238,11 +238,37 @@
    "defaultMessage": "!!!Please update your billing info to continue using {license} after your trial period.",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 90,
+      "line": 91,
      "column": 33
    },
    "end": {
-      "line": 93,
+      "line": 95,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.accountUnavailable",
+    "defaultMessage": "Account is unavailable",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 96,
+      "column": 22
+    },
+    "end": {
+      "line": 99,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.accountUnavailableInfo",
+    "defaultMessage": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 100,
+      "column": 26
+    },
+    "end": {
+      "line": 103,
      "column": 3
    }
  }
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index 5bf9f0b31..1fdff93b9 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -79,7 +79,7 @@
  },
  {
    "id": "settings.app.lockedPassword",
-    "defaultMessage": "!!!Ferdi Lock Password",
+    "defaultMessage": "!!!Password",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
      "line": 51,
@@ -105,7 +105,7 @@
  },
  {
    "id": "settings.app.lockInfo",
-    "defaultMessage": "!!!Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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.",
+    "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
      "line": 59,
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 411e35dab..d6cdb94c0 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -144,7 +144,7 @@
  },
  {
    "id": "settings.app.form.enableLock",
-    "defaultMessage": "!!!Enable Ferdi password lock",
+    "defaultMessage": "!!!Enable Password Lock",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
      "line": 73,
@@ -157,7 +157,7 @@
  },
  {
    "id": "settings.app.form.lockPassword",
-    "defaultMessage": "!!!Ferdi Lock password",
+    "defaultMessage": "!!!Password",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
      "line": 77,
diff --git a/src/server b/src/internal-server
-Subproject cca6cd984caf729722153e58f44c01319c4bd63
+Subproject cca6cd984caf729722153e58f44c01319c4bd63
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 941107adb..303845e55 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -800,7 +800,7 @@ export default class FranzMenu {
    }, {
      label: intl.formatMessage(menuItems.lockFerdi),
      accelerator: 'CmdOrCtrl+Shift+L',
-      enabled: this.stores.settings.app.lockingFeatureEnabled,
+      enabled: this.stores.user.isLoggedIn && this.stores.settings.app.lockingFeatureEnabled,
      click() {
        // Disable lock first - otherwise the application might not update correctly
        actions.settings.update({
@@ -964,7 +964,7 @@ export default class FranzMenu {
    this.currentTemplate = tpl;
    const menu = Menu.buildFromTemplate(tpl);
    const lockedMenu = Menu.buildFromTemplate([]);
-    Menu.setApplicationMenu(this.stores.settings.app.locked ? lockedMenu : menu);
+    Menu.setApplicationMenu(this.stores.user.isLoggedIn && this.stores.settings.app.locked ? lockedMenu : menu);
  }
  serviceTpl() {
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 780cde3a7..eec4678b9 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -20,7 +20,7 @@ import settingsWS from '../features/settingsWS';
 import serviceLimit from '../features/serviceLimit';
 import communityRecipes from '../features/communityRecipes';
 import todos from '../features/todos';
-import accentColor from '../features/accentColor';
+import appearance from '../features/appearance';
 import planSelection from '../features/planSelection';
 import trialStatusBar from '../features/trialStatusBar';
@@ -90,7 +90,7 @@ export default class FeaturesStore extends Store {
    serviceLimit(this.stores, this.actions);
    communityRecipes(this.stores, this.actions);
    todos(this.stores, this.actions);
-    accentColor(this.stores, this.actions);
+    appearance(this.stores, this.actions);
    planSelection(this.stores, this.actions);
    trialStatusBar(this.stores, this.actions);
  }
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index df0fc77e9..051e86be2 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -68,7 +68,6 @@ export default class SettingsStore extends Store {
      () => 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');
@@ -82,7 +81,8 @@ export default class SettingsStore extends Store {
    // Make sure to lock app on launch if locking feature is enabled
    setTimeout(() => {
-      if (this.all.app.lockingFeatureEnabled) {
+      const isLoggedIn = Boolean(localStorage.getItem('authToken'));
+      if (isLoggedIn && this.all.app.lockingFeatureEnabled) {
        // Disable lock first - otherwise the lock might not get activated corrently
        this.actions.settings.update({
          type: 'app',
diff --git a/src/stores/lib/Request.js b/src/stores/lib/Request.js
index 486de8a49..cfc857c2e 100644
--- a/src/stores/lib/Request.js
+++ b/src/stores/lib/Request.js
@@ -82,7 +82,8 @@ export default class Request {
  }
  reload() {
-    return this.execute(...this._currentApiCall.args);
+    const args = this._currentApiCall ? this._currentApiCall.args : [];
+    return this.execute(...args);
  }
  retry = () => this.reload();
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index 324175d0b..305450fd2 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -92,6 +92,10 @@
        }
      }
+      &.is-disabled {
+        filter: grayscale(100%) opacity(.2);
+      }
      &.is-active {
        background: $dark-theme-gray;
        color: $dark-theme-gray-smoke;
author	Amine Mouafik <amine@mouafik.fr>	2019-12-18 19:23:49 +0100
committer	Amine Mouafik <amine@mouafik.fr>	2019-12-18 19:23:49 +0100
commit	91276bb61df9d6c2ce9b7a3f5433a93454918bc2 (patch)
tree	90199ee67af8ec08f492cf162294a52a917cb2b9
parent	Remove travis_wait for npx lerna bootstrap (diff)
parent	5.4.1-beta.3 (diff)
download	ferdium-app-91276bb61df9d6c2ce9b7a3f5433a93454918bc2.tar.gz ferdium-app-91276bb61df9d6c2ce9b7a3f5433a93454918bc2.tar.zst ferdium-app-91276bb61df9d6c2ce9b7a3f5433a93454918bc2.zip