79 files changed, 1004 insertions, 453 deletions
diff --git a/.all-contributorsrc b/.all-contributorsrc
index cd9704edf..487175335 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1,6 +1,6 @@
 {
  "projectName": "ferdi",
-  "projectOwner": "kytwb",
+  "projectOwner": "getferdi",
  "repoType": "github",
  "repoHost": "https://github.com",
  "files": [
@@ -63,7 +63,8 @@
        "projectManagement",
        "review",
        "infra",
-        "fundingFinding"
+        "fundingFinding",
+        "blog"
      ]
    },
    {
@@ -158,7 +159,10 @@
      "contributions": [
        "bug",
        "code",
-        "translation"
+        "translation",
+        "content",
+        "doc",
+        "platform"
      ]
    },
    {
@@ -172,6 +176,81 @@
        "infra",
        "platform"
      ]
+    },
+    {
+      "login": "Gaboris",
+      "name": "Gaboris",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/9462372?v=4",
+      "profile": "https://github.com/Gaboris",
+      "contributions": [
+        "question",
+        "bug"
+      ]
+    },
+    {
+      "login": "incace",
+      "name": "Ce",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/61343?v=4",
+      "profile": "http://www.cu3ed.com/",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "pztrn",
+      "name": "Stanislav N.",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/869402?v=4",
+      "profile": "http://pztrn.name/",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "patrickcurl",
+      "name": "Patrick Curl",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/1470061?v=4",
+      "profile": "http://www.patrickcurl.com",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "Stanzilla",
+      "name": "Benjamin Staneck",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/75278?v=4",
+      "profile": "https://github.com/Stanzilla",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "ammarmalhas",
+      "name": "ammarmalhas",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/57057209?v=4",
+      "profile": "https://github.com/ammarmalhas",
+      "contributions": [
+        "bug",
+        "security"
+      ]
+    },
+    {
+      "login": "steliyan",
+      "name": "Steliyan Stoyanov",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/1850292?v=4",
+      "profile": "https://github.com/steliyan",
+      "contributions": [
+        "code",
+        "ideas"
+      ]
+    },
+    {
+      "login": "brorbw",
+      "name": "Bror Winther",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/5909562?v=4",
+      "profile": "https://github.com/brorbw",
+      "contributions": [
+        "doc"
+      ]
    }
  ],
  "contributorsPerLine": 6
diff --git a/.gitmodules b/.gitmodules
index 00bc1d26d..78e0c5221 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,7 +2,9 @@
        path = recipes
        url = https://github.com/getferdi/recipes.git
        ignore = all
+        branch = master
 [submodule "src/server"]
        path = src/server
        url = https://github.com/getferdi/internal-server.git
        ignore = all
+        branch = master
diff --git a/.nvmrc b/.nvmrc
index 0ca1348de..73bffb039 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-10.14.0
+10.17.0
diff --git a/.travis.yml b/.travis.yml
index ebc96d2cd..d44187e75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,31 @@
 matrix:
  include:
-  - os: linux
+    - os: linux
-    dist: xenial
+      dist: xenial
-    addons:
+      addons:
-      apt:
+        apt:
-        packages:
+          packages:
-        - libx11-dev
+            - libx11-dev
-        - libxext-dev
+            - libxext-dev
-        - libxss-dev
+            - libxss-dev
-        - libxkbfile-dev
+            - libxkbfile-dev
-  - os: osx
+            - rpm
-    osx_image: xcode11
+    - os: osx
+      osx_image: xcode11
 language: node_js
+# Handle git submodules yourself
+git:
+  submodules: false
+# Use sed to replace the SSH URL with the public URL, then initialize submodules
+before_install:
+  - git submodule update --init --recursive
 install:
  - echo do nothing
 before_script:
  - travis_wait 60 npx lerna bootstrap
  - npm install node-sass -g
 script:
-  - npm run test
  - travis_wait 30 npm run build
 cache: npm
diff --git a/README.md b/README.md
index 285c80bb0..662fc37f3 100644
--- a/README.md
+++ b/README.md
@@ -4,14 +4,67 @@
 # Ferdi
-[![Backers on Open Collective](https://opencollective.com/getferdi/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/getferdi/sponsors/badge.svg)](#sponsors) [![Build Status Windows](https://ci.appveyor.com/api/projects/status/2ckfbmoxp36fye5b?svg=true)](https://ci.appveyor.com/project/kytwb/ferdi)
+<p align="center">
-[![Build Status Mac & Linux](https://travis-ci.org/getferdi/ferdi.svg?branch=master)](https://travis-ci.org/getferdi/ferdi)
+<a href="#backers-via-opencollective"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective"></a>
+<a href="#sponsors-via-opencollective"><img alt="Open Collective sponsors" src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective"></a>
+<a href="https://ci.appveyor.com/project/kytwb/ferdi"><img alt="Build Status Windows" src="https://img.shields.io/appveyor/ci/kytwb/ferdi/master?logo=appveyor"></a>
+<a href="https://travis-ci.org/getferdi/ferdi"><img alt="Build Status Mac & Linux" src="https://img.shields.io/travis/getferdi/ferdi/master?logo=travis"></a>
+</p>
 🤴🏽 Hard-fork of [Franz](https://github.com/meetfranz/franz), adding awesome features and removing unwanted ones.
+### Table of contents
+<details>
+<summary>Ferdi</summary>
+<ul>
+<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="#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="#development">Development</a></li>
+<ul>
+<li><a href="#install-os-dependencies">Install OS dependencies</a></li>
+<li><a href="#clone-repository-with-submodule">Clone repository with submodule</a></li>
+<li><a href="#install-dependencies">Install dependencies</a></li>
+<li><a href="#fix-native-modules-to-match-current-electron-node-version">Fix native modules to match current electron node version</a></li>
+<li><a href="#start-development-app">Start development app</a></li>
+<li><a href="#packaging">Packaging</a></li>
+<li><a href="#release">Release</a></li>
+</ul>
+<li><a href="#contributors-">Contributors ✨</a></li>
+<li><a href="#backers-via-opencollective">Backers via OpenCollective</a></li>
+<li><a href="#sponsors-via-opencollective">Sponsors via OpenCollective</a></li>
+</ul>
+</details>
+### 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 ?
+<details>
+<summary>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>
+<img alt="Order your services with Ferdi Workspaces." src="./branding/screenshots/workspaces.png">
+<em>"Order your services with Ferdi Workspaces."</em>
+<img alt="Always keep your Todo list open with Ferdi Todos." src="./branding/screenshots/todos.png">
+<em>"Always keep your Todo list open with Ferdi Todos."</em>
+<img alt="Supporting all your services." src="./branding/screenshots/service-store.png">
+<em>"Supporting all your services."</em>
+</p>
+</details>
 ## Download Ferdi
-You can find the installers in the [latest release](https://github.com/getferdi/ferdi/releases) assets.
+You can find the installers in the [latest stable release](https://github.com/getferdi/ferdi/releases/latest) assets and [all the other release here](https://github.com/getferdi/ferdi/releases).
 ### Or use homebrew (macOS only)
@@ -19,6 +72,16 @@ You can find the installers in the [latest release](https://github.com/getferdi/
 (Don't know homebrew? [brew.sh](https://brew.sh/))
+### 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-git**: Uses system electron version
+If you use a 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.
 ## Ferdi-specific Features
 - [x] Removes the counter-productive fullscreen app delay inviting users to upgrade
@@ -33,6 +96,7 @@ You can find the installers in the [latest release](https://github.com/getferdi/
 - [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 adaptable Dark Mode that will respect the system's darkmode 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
@@ -44,7 +108,7 @@ You can find the installers in the [latest release](https://github.com/getferdi/
 - [x] Add Process Manager to find services using a lot of resources
 - [x] Add "npm run prepare-code" command for development to lint and beautify code
 - [x] Add button to open darkmode.css for a service
- [x] Switch to [`electron-spellchecker`](https://github.com/electron-userland/electron-spellchecker) ti improve application size
+- [x] Switch to [`electron-spellchecker`](https://github.com/electron-userland/electron-spellchecker) to improve application size
 - [x] Improve "About Ferdi" screen to better display versions
 - [x] Minifying build files to improve app size
 - [x] [Makes it possible to edit the "Franz Todo" server](https://github.com/getferdi/ferdi/wiki/Custom-Todo)
@@ -53,38 +117,35 @@ You can find the installers in the [latest release](https://github.com/getferdi/
 ## Development
-### Preparations
+### Install OS dependencies
-#### Install OS dependencies
-##### Node.js
+#### Node.js
 Please make sure you are running NodeJS v10 ([v10.16.3](https://nodejs.org/dist/v10.16.3/) suggested). Versions above will throw an errow when trying to install due to an [old fsevent dependency](https://github.com/fsevents/fsevents/issues/278).
-##### Git
+#### Git
 The version [2.23.0](https://github.com/git-for-windows/git/releases/tag/v2.23.0.windows.1) for Git is working fine for development. You can then use the console from Git to do the development procedure.
-##### Debian/Ubuntu
+#### Debian/Ubuntu
 ```bash
 $ apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev
 ```
-##### Fedora
+#### Fedora
 ```bash
 $ dnf install libX11-devel libXext-devel libXScrnSaver-devel libxkbfile-devel
 ```
-##### Windows
+#### Windows
 ```bash
-$ npm install --global windows-build-tools // Windows 10
+$ npm install --global windows-build-tools --vs2015
-$ npm install --global windows-build-tools --vs2015 // Windows 7
 ```
-#### Clone repository with submodule
+### Clone repository with submodule
 ```bash
 $ git clone https://github.com/getferdi/ferdi.git
@@ -145,34 +206,40 @@ 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-start -->
+<!-- prettier-ignore -->
-<!-- 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/kytwb/ferdi/commits?author=vantezzen" title="Code">💻</a> <a href="#design-vantezzen" title="Design">🎨</a> <a href="https://github.com/kytwb/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/kytwb/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="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="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/kytwb/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/kytwb/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/kytwb/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="Stefan Malzner"/><br /><sub><b>Stefan Malzner</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Code">💻</a> <a href="#content-adlk" title="Content">🖋</a> <a href="#design-adlk" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Documentation">📖</a> <a href="#ideas-adlk" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-adlk" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#projectManagement-adlk" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Tests">⚠️</a> <a href="#translation-adlk" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://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/kytwb/ferdi/commits?author=kytwb" title="Code">💻</a> <a href="https://github.com/kytwb/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></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="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/kytwb/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="ZeroCool"/><br /><sub><b>ZeroCool</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=ZeroCool940711" title="Code">💻</a> <a href="#ideas-ZeroCool940711" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/rseitbekov"><img src="https://avatars2.githubusercontent.com/u/35684439?v=4" width="40px;" alt="rseitbekov"/><br /><sub><b>rseitbekov</b></sub></a><br /><a href="https://github.com/kytwb/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="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://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/kytwb/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="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>
  </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/kytwb/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="Justus Saul"/><br /><sub><b>Justus Saul</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Ajustus-saul" title="Bug reports">🐛</a> <a href="#ideas-justus-saul" title="Ideas, Planning, & Feedback">🤔</a></td>
    <td align="center"><a href="https://github.com/igreil"><img src="https://avatars0.githubusercontent.com/u/17239151?v=4" width="40px;" alt="igreil"/><br /><sub><b>igreil</b></sub></a><br /><a href="#ideas-igreil" title="Ideas, Planning, & Feedback">🤔</a></td>
    <td align="center"><a href="http://marcolopes.eu"><img src="https://avatars1.githubusercontent.com/u/431889?v=4" width="40px;" alt="Marco Lopes"/><br /><sub><b>Marco Lopes</b></sub></a><br /><a href="#ideas-marcolopes" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/dayzlun"><img src="https://avatars3.githubusercontent.com/u/17259690?v=4" width="40px;" alt="dayzlun"/><br /><sub><b>dayzlun</b></sub></a><br /><a href="https://github.com/kytwb/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="dayzlun"/><br /><sub><b>dayzlun</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Adayzlun" title="Bug reports">🐛</a></td>
    <td align="center"><a href="https://twitter.com/tobigue_"><img src="https://avatars2.githubusercontent.com/u/1560152?v=4" width="40px;" alt="Tobias Günther"/><br /><sub><b>Tobias Günther</b></sub></a><br /><a href="#ideas-tobigue" title="Ideas, Planning, & Feedback">🤔</a></td>
    <td align="center"><a href="https://github.com/AGCaesar"><img src="https://avatars3.githubusercontent.com/u/7844066?v=4" width="40px;" alt="AGCaesar"/><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/kytwb/ferdi/issues?q=author%3AMakazzz" title="Bug reports">🐛</a> <a href="https://github.com/kytwb/ferdi/commits?author=Makazzz" title="Code">💻</a> <a href="#translation-Makazzz" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/Makazzz"><img src="https://avatars2.githubusercontent.com/u/49844464?v=4" width="40px;" alt="Makazzz"/><br /><sub><b>Makazzz</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3AMakazzz" title="Bug reports">🐛</a> <a href="https://github.com/getferdi/ferdi/commits?author=Makazzz" title="Code">💻</a> <a href="#translation-Makazzz" title="Translation">🌍</a> <a href="#content-Makazzz" title="Content">🖋</a> <a href="https://github.com/getferdi/ferdi/commits?author=Makazzz" title="Documentation">📖</a> <a href="#platform-Makazzz" title="Packaging/porting to new platform">📦</a></td>
-    <td align="center"><a href="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/kytwb/ferdi/commits?author=xthursdayx" title="Code">💻</a> <a href="https://github.com/kytwb/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="xthursdayx"/><br /><sub><b>xthursdayx</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=xthursdayx" title="Code">💻</a> <a href="https://github.com/getferdi/ferdi/commits?author=xthursdayx" title="Documentation">📖</a> <a href="#infra-xthursdayx" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#platform-xthursdayx" title="Packaging/porting to new platform">📦</a></td>
+    <td align="center"><a href="https://github.com/Gaboris"><img src="https://avatars2.githubusercontent.com/u/9462372?v=4" width="40px;" alt="Gaboris"/><br /><sub><b>Gaboris</b></sub></a><br /><a href="#question-Gaboris" title="Answering Questions">💬</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3AGaboris" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="http://www.cu3ed.com/"><img src="https://avatars1.githubusercontent.com/u/61343?v=4" width="40px;" alt="Ce"/><br /><sub><b>Ce</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aincace" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="http://pztrn.name/"><img src="https://avatars1.githubusercontent.com/u/869402?v=4" width="40px;" alt="Stanislav N."/><br /><sub><b>Stanislav N.</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Apztrn" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="http://www.patrickcurl.com"><img src="https://avatars1.githubusercontent.com/u/1470061?v=4" width="40px;" alt="Patrick Curl"/><br /><sub><b>Patrick Curl</b></sub></a><br /><a href="#ideas-patrickcurl" title="Ideas, Planning, & Feedback">🤔</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/Stanzilla"><img src="https://avatars3.githubusercontent.com/u/75278?v=4" width="40px;" alt="Benjamin Staneck"/><br /><sub><b>Benjamin Staneck</b></sub></a><br /><a href="#design-Stanzilla" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/ammarmalhas"><img src="https://avatars1.githubusercontent.com/u/57057209?v=4" width="40px;" alt="ammarmalhas"/><br /><sub><b>ammarmalhas</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aammarmalhas" title="Bug reports">🐛</a> <a href="#security-ammarmalhas" title="Security">🛡️</a></td>
+    <td align="center"><a href="https://github.com/steliyan"><img src="https://avatars1.githubusercontent.com/u/1850292?v=4" width="40px;" alt="Steliyan Stoyanov"/><br /><sub><b>Steliyan Stoyanov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=steliyan" title="Code">💻</a> <a href="#ideas-steliyan" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/brorbw"><img src="https://avatars2.githubusercontent.com/u/5909562?v=4" width="40px;" alt="Bror Winther"/><br /><sub><b>Bror Winther</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=brorbw" title="Documentation">📖</a></td>
  </tr>
 </table>
-<!-- markdownlint-enable -->
-<!-- prettier-ignore-end -->
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
@@ -187,4 +254,8 @@ This project follows the [all-contributors](https://github.com/all-contributors/
 ## Backers via OpenCollective
-<a href="https://opencollective.com/getferdi#backers" target="_blank"><img src="https://opencollective.com/getferdi/backers.svg?width=890"></a>
+<a href="https://opencollective.com/getferdi#section-contribute" target="_blank"><img src="https://opencollective.com/getferdi/backers.svg?width=890"></a>
+## Sponsors via OpenCollective
+<a href="https://opencollective.com/getferdi#section-contribute" target="_blank"><img src="https://opencollective.com/getferdi/sponsors.svg?width=890"></a>
diff --git a/appveyor.yml b/appveyor.yml
index 1034565ed..c367baeb3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
 environment:
  APPVEYOR_CACHE_SKIP_RESTORE: true
-version: 5.0.1.{build}
+version: 5.4.0.{build}
 install:
  - git submodule update --init --recursive
@@ -13,7 +13,7 @@ cache:
 before_build:
  - npm run lint
-  - npm run test
+  - cmd: set NODE_ENV=production
 build_script:
  - npm run build
diff --git a/branding/screenshots/hero.png b/branding/screenshots/hero.png
index f21e2abb6..09f509ca7 100644
--- a/branding/screenshots/hero.png
+++ b/branding/screenshots/hero.png
Binary files differ
diff --git a/build-helpers/images/win-app-ico.ico b/build-helpers/images/win-app-ico.ico
index 658826324..3731f6425 100644
--- a/build-helpers/images/win-app-ico.ico
+++ b/build-helpers/images/win-app-ico.ico
Binary files differ
diff --git a/electron-builder.yml b/electron-builder.yml
index f6dceabce..4fa6c0b15 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -43,6 +43,7 @@ linux:
    - target: AppImage
    - target: deb
    - target: tar.gz
+    - target: rpm
 nsis:
  perMachine: false
diff --git a/next_release.md b/next_release.md
new file mode 100644
index 000000000..ae472bce9
--- /dev/null
+++ b/next_release.md
@@ -0,0 +1,47 @@
+# Next release
+Infos about the next release:
+## Beta
+v5.4.0-beta.5:
+- Updated translations
+- Remove "&" sign from window menu bar (#65)
+- Extend debug information
+- Use SSH for submodules
+- Move hibernation indicator to bottom left (#129 (comment))
+- Add fix for 1.1.1.1 hack (#146)
+- Fix darkmode not loading correctly (#158)
+- Add adaptable Dark Mode that will respect the system's darkmode setting ([#173](https://github.com/getferdi/ferdi/issues/173))
+## Minor
+v5.4.0
+### Features
+- **Merge Franz 5.4.0**
+- **Use Ferdi without an Account**: Simply choose "Use Ferdi without an Account" on the login screen
+- **Accent color**: Change Ferdi's accent color
+- **Darkmode**: 
+  - Easily open and edit any service's `darkmode.css` through the new "Open darkmode.css" button
+  - Add adaptable Dark Mode that will respect the system's darkmode setting ([#173](https://github.com/getferdi/ferdi/issues/173) - @steliyan)
+- **Hibernation**: Activate service hibernation to save battery
+- **Smaller file size**: Ferdi is now 17% smaller
+- **Annoucements**: Always get notified about the latest features of Ferdi
+- **Navigation bar**: Add option to always show a service navigation bar
+### Minor changes
+- Sorting applications in QuickSwitch by last used
+- Add info about teams only being available on Franz servers
+- Add toggle to disable dark mode on per-service basis
+- Add toggle to disable universal Dark Mode
+- Improve switching between accounts
+- Extend debug information
+- Add fix for 1.1.1.1 hack (#146)
+### Bug fixes
+- Fix universal darkmode for WhatsApp and Threema QR Codes
+- Fix darkmode not activating on reload
+- Fix disabling/enabling service not correctly reloading webview (#116)
+- Remove "&" sign from window menu bar (#65)
+### Changes in building Ferdi
+- Update Building Node Version
+- Use SSH for submodules
+\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 2cbbe8939..c84c1afbc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "ferdi",
-  "version": "5.4.0-beta.2",
+  "version": "5.4.0-beta.5",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -3071,14 +3071,6 @@
          "version": "3.9.97",
          "resolved": "https://registry.npmjs.org/@mdi/js/-/js-3.9.97.tgz",
          "integrity": "sha512-JzX6rDlUcNZHaoUg9sAzdg5Js287tvgRbNmMIyKoJK2ZCP9JupeWTYlpbX4oNJ9Zg9v8YH76WuWLALKOospQgw=="
-        },
-        "@meetfranz/theme": {
-          "version": "1.0.14",
-          "resolved": "https://registry.npmjs.org/@meetfranz/theme/-/theme-1.0.14.tgz",
-          "integrity": "sha512-iWP+3ifiNum98sHKiNdUJK+R0p4Z7TT8OenA1N2BnSC6CFob+dLhzAK+o5lxcyEcKZKYDwd7JKRZj93wqpBPpg==",
-          "requires": {
-            "color": "^3.1.0"
-          }
        }
      }
    },
@@ -3101,14 +3093,6 @@
          "version": "3.9.97",
          "resolved": "https://registry.npmjs.org/@mdi/js/-/js-3.9.97.tgz",
          "integrity": "sha512-JzX6rDlUcNZHaoUg9sAzdg5Js287tvgRbNmMIyKoJK2ZCP9JupeWTYlpbX4oNJ9Zg9v8YH76WuWLALKOospQgw=="
-        },
-        "@meetfranz/theme": {
-          "version": "1.0.14",
-          "resolved": "https://registry.npmjs.org/@meetfranz/theme/-/theme-1.0.14.tgz",
-          "integrity": "sha512-iWP+3ifiNum98sHKiNdUJK+R0p4Z7TT8OenA1N2BnSC6CFob+dLhzAK+o5lxcyEcKZKYDwd7JKRZj93wqpBPpg==",
-          "requires": {
-            "color": "^3.1.0"
-          }
        }
      }
    },
@@ -3229,6 +3213,136 @@
        "universal-user-agent": "^4.0.0"
      }
    },
+    "@sentry/browser": {
+      "version": "4.6.6",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-4.6.6.tgz",
+      "integrity": "sha512-+9VsQ+oQYU+PYlLJG2ex7JCMSVQbnUvWPI2uZOofWdI9sWIPUub3boWItMzRQNQ1T4S3FZd4FqAWNFd3azdnBw==",
+      "requires": {
+        "@sentry/core": "4.6.6",
+        "@sentry/types": "4.5.3",
+        "@sentry/utils": "4.6.5",
+        "tslib": "^1.9.3"
+      }
+    },
+    "@sentry/core": {
+      "version": "4.6.6",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-4.6.6.tgz",
+      "integrity": "sha512-7z9HKLTNr3zVBR3tBRheTxkkkuK2IqISUc5Iyo3crN2OecOLtpptT96f5XjLndBEL2ab39eCBPpA5OFjbpzrIA==",
+      "requires": {
+        "@sentry/hub": "4.6.5",
+        "@sentry/minimal": "4.6.5",
+        "@sentry/types": "4.5.3",
+        "@sentry/utils": "4.6.5",
+        "tslib": "^1.9.3"
+      }
+    },
+    "@sentry/electron": {
+      "version": "0.17.4",
+      "resolved": "https://registry.npmjs.org/@sentry/electron/-/electron-0.17.4.tgz",
+      "integrity": "sha512-1IU0o+E8eY5Lrthj6Pqf+Dh8MptddHsFFmcOwKlft/bbZ+6RTKEefLtFOclKUMLR64C7GTqa80Yddq0ssjOv5w==",
+      "requires": {
+        "@sentry/browser": "4.6.2 || ~4.6.4",
+        "@sentry/core": "4.6.2 || ~4.6.4",
+        "@sentry/minimal": "^4.5.0",
+        "@sentry/node": "4.6.2 || ~4.6.4",
+        "@sentry/types": "^4.5.0",
+        "@sentry/utils": "4.6.2 || ~4.6.4",
+        "electron-fetch": "1.3.0",
+        "form-data": "2.3.2",
+        "util.promisify": "1.0.0"
+      },
+      "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"
+          }
+        },
+        "form-data": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+          "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        }
+      }
+    },
+    "@sentry/hub": {
+      "version": "4.6.5",
+      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-4.6.5.tgz",
+      "integrity": "sha512-v9vee8s8C1fK/DPtNOzv6r+AMbPDOWfnasouNcBUkbQUSN5wUNyCDvt51QbWaw5kMMY5TSqjdVqY6gXQZI0APQ==",
+      "requires": {
+        "@sentry/types": "4.5.3",
+        "@sentry/utils": "4.6.5",
+        "tslib": "^1.9.3"
+      }
+    },
+    "@sentry/minimal": {
+      "version": "4.6.5",
+      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-4.6.5.tgz",
+      "integrity": "sha512-tf+J+uUNmSgzC7d9JSN8Ekw1HeBAX87Efa/jyFbzLvaw80oibvTiLSLqDjQ9PgvyIzBUuuPImkS2NpvPQGWFtg==",
+      "requires": {
+        "@sentry/hub": "4.6.5",
+        "@sentry/types": "4.5.3",
+        "tslib": "^1.9.3"
+      }
+    },
+    "@sentry/node": {
+      "version": "4.6.6",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-4.6.6.tgz",
+      "integrity": "sha512-+zZHE2uOwQTgypP6N9oBd0Io6BKXaJh6mdmZBauF0G46/8V28sBQ/dXBtJJNZ8tW7eVlLGpLSGuJb9Ai7c/rNw==",
+      "requires": {
+        "@sentry/core": "4.6.6",
+        "@sentry/hub": "4.6.5",
+        "@sentry/types": "4.5.3",
+        "@sentry/utils": "4.6.5",
+        "@types/stack-trace": "0.0.29",
+        "cookie": "0.3.1",
+        "https-proxy-agent": "2.2.1",
+        "lru_map": "0.3.3",
+        "lsmod": "1.0.0",
+        "stack-trace": "0.0.10",
+        "tslib": "^1.9.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
+          "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==",
+          "requires": {
+            "agent-base": "^4.1.0",
+            "debug": "^3.1.0"
+          }
+        }
+      }
+    },
+    "@sentry/types": {
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-4.5.3.tgz",
+      "integrity": "sha512-7ll1PAFNjrBNX9rzy3P2qAQrpQwHaDO3uKj735qsnGw34OtAS8Xr8WYrjI14f9fMPa/XIeWvMPb4GMic28V/ag=="
+    },
+    "@sentry/utils": {
+      "version": "4.6.5",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-4.6.5.tgz",
+      "integrity": "sha512-rTISJtRRbWsd3UE+TkA3QG1C0VzPKPW8w74tieBwYhtTCGmOHNwz2nDC/MZGbGj4OgDmNKKl4CCyQr88EX08hA==",
+      "requires": {
+        "@sentry/types": "4.5.3",
+        "tslib": "^1.9.3"
+      }
+    },
    "@sindresorhus/is": {
      "version": "0.14.0",
      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
@@ -3456,6 +3570,11 @@
      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-6.0.2.tgz",
      "integrity": "sha512-G1Ggy7/9Nsa1Jt2yiBR2riEuyK2DFNnqow6R7cromXPMNynackRY1vqFTLz/gwnef1LHokbXThcPhqMRjUbkpQ=="
    },
+    "@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",
@@ -3820,7 +3939,6 @@
      "version": "4.3.0",
      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
-      "dev": true,
      "requires": {
        "es6-promisify": "^5.0.0"
      }
@@ -7529,7 +7647,6 @@
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
      "requires": {
        "object-keys": "^1.0.12"
      }
@@ -8946,7 +9063,6 @@
      "version": "1.14.2",
      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz",
      "integrity": "sha512-DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg==",
-      "dev": true,
      "requires": {
        "es-to-primitive": "^1.2.0",
        "function-bind": "^1.1.1",
@@ -8964,7 +9080,6 @@
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
      "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
-      "dev": true,
      "requires": {
        "is-callable": "^1.1.4",
        "is-date-object": "^1.0.1",
@@ -8994,14 +9109,12 @@
    "es6-promise": {
      "version": "4.2.8",
      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
-      "dev": true
    },
    "es6-promisify": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-      "dev": true,
      "requires": {
        "es6-promise": "^4.0.3"
      }
@@ -11224,8 +11337,7 @@
    "function-bind": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-      "dev": true
    },
    "functional-red-black-tree": {
      "version": "1.0.1",
@@ -13397,7 +13509,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
      "requires": {
        "function-bind": "^1.1.1"
      }
@@ -13458,8 +13569,7 @@
    "has-symbols": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
-      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
-      "dev": true
    },
    "has-unicode": {
      "version": "2.0.1",
@@ -14331,8 +14441,7 @@
    "is-date-object": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
-      "dev": true
    },
    "is-descriptor": {
      "version": "0.1.6",
@@ -14525,7 +14634,6 @@
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-      "dev": true,
      "requires": {
        "has": "^1.0.1"
      }
@@ -14556,7 +14664,6 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
-      "dev": true,
      "requires": {
        "has-symbols": "^1.0.0"
      }
@@ -16513,6 +16620,16 @@
        "es5-ext": "~0.10.2"
      }
    },
+    "lru_map": {
+      "version": "0.3.3",
+      "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",
@@ -18555,8 +18672,7 @@
    "object-inspect": {
      "version": "1.6.0",
      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
-      "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",
+      "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="
-      "dev": true
    },
    "object-is": {
      "version": "1.0.1",
@@ -18567,8 +18683,7 @@
    "object-keys": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-      "dev": true
    },
    "object-visit": {
      "version": "1.0.1",
@@ -18617,7 +18732,6 @@
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
-      "dev": true,
      "requires": {
        "define-properties": "^1.1.2",
        "es-abstract": "^1.5.1"
@@ -23134,7 +23248,6 @@
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
      "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
-      "dev": true,
      "requires": {
        "define-properties": "^1.1.3",
        "function-bind": "^1.1.1"
@@ -23144,7 +23257,6 @@
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
      "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
-      "dev": true,
      "requires": {
        "define-properties": "^1.1.3",
        "function-bind": "^1.1.1"
@@ -24738,7 +24850,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-      "dev": true,
      "requires": {
        "define-properties": "^1.1.2",
        "object.getownpropertydescriptors": "^2.0.3"
diff --git a/package.json b/package.json
index 1198da4f6..fe4950776 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "ferdi",
  "productName": "Ferdi",
  "appId": "com.kytwb.ferdi",
-  "version": "5.4.0-beta.4",
+  "version": "5.4.0",
  "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
  "copyright": "kytwb",
  "main": "index.js",
@@ -56,6 +56,7 @@
    "@meetfranz/forms": "file:packages/forms",
    "@meetfranz/theme": "file:packages/theme",
    "@meetfranz/ui": "file:packages/ui",
+    "@sentry/electron": "0.17.4",
    "address-rfc2822": "^2.0.1",
    "atob": "2.1.2",
    "auto-launch": "5.0.5",
diff --git a/recipes b/recipes
-Subproject 7aa76feba8bd94368d27bee556480313c636f94
+Subproject 922b980f941dfbae0181595d35fa4618d1714e7
diff --git a/src/api/apiBase.js b/src/api/apiBase.js
index 561b025f0..85dd0f3df 100644
--- a/src/api/apiBase.js
+++ b/src/api/apiBase.js
@@ -6,25 +6,19 @@ import {
 } from '../environment';
 import {
  LOCAL_SERVER,
+  SERVER_NOT_LOADED,
 } from '../config';
-const apiBase = () => {
+const apiBase = (withVersion = true) => {
  let url;
  if (!window.ferdi
    || !window.ferdi.stores.settings
    || !window.ferdi.stores.settings.all
    || !window.ferdi.stores.settings.all.app.server) {
-    // Stores have not yet been loaded - send invalid URL to force a retry when stores are loaded
+    // Stores have not yet been loaded - return SERVER_NOT_LOADED to force a retry when stores are loaded
-    //  "Why 1.1.1.1 as the default, invalid URL?"
+    return SERVER_NOT_LOADED;
-    //    1.1.1.1 is the server for Cloudflare's DNS service and will be the same across most networks.
+  } if (window.ferdi.stores.settings.all.app.server === LOCAL_SERVER) {
-    //    Using a random IP could result in unwanted connections, using localhost could unwantedly
-    //    connect to local develoment servers.
-    //    1.1.1.1 also sends a status 400 response for invalid routes. Other servers may return status 401
-    //    on some routes. This would result in Ferdi deleting its current authToken as it thinks it
-    //    has gone invalid.
-    url = 'https://1.1.1.1';
-  } else if (window.ferdi.stores.settings.all.app.server === LOCAL_SERVER) {
    // Use URL for local server
    url = `http://127.0.0.1:${window.ferdi.stores.requests.localServerPort}`;
  } else {
@@ -32,7 +26,10 @@ const apiBase = () => {
    url = window.ferdi.stores.settings.all.app.server;
  }
-  return `${url}/${API_VERSION}`;
+  if (withVersion) {
+    return `${url}/${API_VERSION}`;
+  }
+  return url;
 };
 export default apiBase;
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index a5d636b4e..627425948 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -14,8 +14,7 @@ import OrderModel from '../../models/Order';
 import { sleep } from '../../helpers/async-helpers';
-import { API } from '../../environment';
+import { RECIPES_PATH, SERVER_NOT_LOADED } from '../../config';
-import { RECIPES_PATH } from '../../config';
 import apiBase from '../apiBase';
 import { prepareAuthRequest, sendAuthRequest } from '../utils/auth';
@@ -39,8 +38,6 @@ module.paths.unshift(
 const { app } = remote;
 const { default: fetch } = remote.require('electron-fetch');
-const SERVER_URL = API;
 export default class ServerApi {
  recipePreviews = [];
@@ -121,6 +118,10 @@ export default class ServerApi {
  }
  async userInfo() {
+    if (apiBase() === SERVER_NOT_LOADED) {
+      throw new Error('Server not loaded');
+    }
    const request = await sendAuthRequest(`${apiBase()}/me`);
    if (!request.ok) {
      throw request;
@@ -163,6 +164,10 @@ export default class ServerApi {
  // Services
  async getServices() {
+    if (apiBase() === SERVER_NOT_LOADED) {
+      throw new Error('Server not loaded');
+    }
    const request = await sendAuthRequest(`${apiBase()}/me/services`);
    if (!request.ok) {
      throw request;
@@ -287,6 +292,10 @@ export default class ServerApi {
  }
  async getFeatures() {
+    if (apiBase() === SERVER_NOT_LOADED) {
+      throw new Error('Server not loaded');
+    }
    const request = await sendAuthRequest(`${apiBase()}/features`);
    if (!request.ok) {
      throw request;
@@ -449,7 +458,7 @@ export default class ServerApi {
  // News
  async getLatestNews() {
-    const url = `${apiBase()}/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`;
+    const url = `https://api.getferdi.com/v1/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`;
    const request = await sendAuthRequest(url);
    if (!request.ok) throw request;
    const data = await request.json();
@@ -459,14 +468,18 @@ export default class ServerApi {
  }
  async hideNews(id) {
-    const request = await sendAuthRequest(`${apiBase()}/news/${id}/read`);
+    const request = await sendAuthRequest(`https://api.getferdi.com/v1/news/${id}/read`);
    if (!request.ok) throw request;
    debug('ServerApi::hideNews resolves', id);
  }
  // Health Check
  async healthCheck() {
-    const request = await sendAuthRequest(`${SERVER_URL}/health`, {
+    if (apiBase() === SERVER_NOT_LOADED) {
+      throw new Error('Server not loaded');
+    }
+    const request = await sendAuthRequest(`${apiBase(false)}/health`, {
      method: 'GET',
    }, false);
    if (!request.ok) {
diff --git a/src/assets/themeInfo.json b/src/assets/themeInfo.json
index d6017de23..eaea65ca7 100644
--- a/src/assets/themeInfo.json
+++ b/src/assets/themeInfo.json
@@ -1 +1 @@
-{"color":".theme__dark .app .sidebar .sidebar__button.is-muted, .theme__dark .app .sidebar .sidebar__button.is-active, .sidebar .sidebar__button.is-muted, .sidebar .sidebar__button.is-active, .settings .account .invoices .invoices__action button, .settings-navigation .settings-navigation__link.is-active .badge, a.button, a.link, .auth .welcome .button:hover, .auth .welcome .button__inverted, .franz-form .franz-form__radio.is-selected, .theme__dark .franz-form__button.franz-form__button--inverted, .franz-form__button.franz-form__button--inverted","border-left-color":".tab-item.is-active","border-color":".theme__dark .settings .premium-info, a.button, .franz-form .franz-form__radio.is-selected","background":".settings .settings__header, .settings .settings__close, .settings .settings__close:hover, .settings-navigation .settings-navigation__link.is-active, a.button:hover, .info-bar, .info-bar.info-bar--primary, .infobox.infobox--primary, .theme__dark .badge.badge--primary, .theme__dark .badge.badge--premium, .badge.badge--primary, .badge.badge--premium, .content-tabs .content-tabs__tabs .content-tabs__item.is-active, #electron-app-title-bar .toolbar-dropdown:not(.open) > .toolbar-button > button:hover, #electron-app-title-bar .list-item.selected .menu-item, #electron-app-title-bar .list-item.selected:focus .menu-item, .theme__dark .quick-switch .active, .franz-form .franz-form__toggle-wrapper .franz-form__toggle.is-active .franz-form__toggle-button, .theme__dark .franz-form__button, .theme__dark .franz-form__button:hover, .theme__dark .franz-form__button.franz-form__button--inverted:hover, .franz-form__button, .franz-form__button:hover, .franz-form__button.franz-form__button--inverted:hover","border-right-color":".settings .settings__header .separator"}
-\ No newline at end of file
+{"color":".theme__dark .app .sidebar .sidebar__button.is-muted, .theme__dark .app .sidebar .sidebar__button.is-active, .sidebar .sidebar__button.is-muted, .sidebar .sidebar__button.is-active, .settings .account .invoices .invoices__action button, .settings-navigation .settings-navigation__link.is-active .badge, a.button, button.button, a.link, button.link, .auth .welcome .button:hover, .auth .welcome .button__inverted, .franz-form .franz-form__radio.is-selected, .theme__dark .franz-form__button.franz-form__button--inverted, .franz-form__button.franz-form__button--inverted","border-left-color":".tab-item.is-active","border-color":".theme__dark .settings .premium-info, a.button, button.button, .franz-form .franz-form__radio.is-selected","background":".settings .settings__header, .settings .settings__close, .settings .settings__close:hover, .settings-navigation .settings-navigation__link.is-active, a.button:hover, button.button:hover, .info-bar, .info-bar.info-bar--primary, .infobox.infobox--primary, .theme__dark .badge.badge--primary, .theme__dark .badge.badge--premium, .badge.badge--primary, .badge.badge--premium, .content-tabs .content-tabs__tabs .content-tabs__item.is-active, #electron-app-title-bar .toolbar-dropdown:not(.open) > .toolbar-button > button:hover, #electron-app-title-bar .list-item.selected .menu-item, #electron-app-title-bar .list-item.selected:focus .menu-item, .theme__dark .quick-switch .active, .franz-form .franz-form__toggle-wrapper .franz-form__toggle.is-active .franz-form__toggle-button, .theme__dark .franz-form__button, .theme__dark .franz-form__button:hover, .theme__dark .franz-form__button.franz-form__button--inverted:hover, .franz-form__button, .franz-form__button:hover, .franz-form__button.franz-form__button--inverted:hover","border-right-color":".settings .settings__header .separator"}
+\ No newline at end of file
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index 49ee24361..1fff5ef7a 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -42,10 +42,10 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
    forceRepaint: false,
    targetUrl: '',
    statusBarVisible: false,
-    hibernate: false,
-    hibernationTimer: null,
  };
+  hibernationTimer = null;
  autorunDisposer = null;
  forceRepaintTimeout = null;
@@ -73,15 +73,12 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
          // Service is inactive - start hibernation countdown
          this.startHibernationTimer();
        } else {
-          if (this.state.hibernationTimer) {
+          if (this.hibernationTimer) {
            // Service is active but we have an active hibernation timer: Clear timeout
-            clearTimeout(this.state.hibernationTimer);
+            clearTimeout(this.hibernationTimer);
          }
          // Service is active, wake up service from hibernation
-          this.setState({
-            hibernate: false,
-          });
          this.props.actions.service.setHibernation({
            serviceId: this.props.service.id,
            hibernating: false,
@@ -90,16 +87,6 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
      },
    );
-    // Store hibernation status to state, otherwise the webview won't get unloaded correctly
-    reaction(
-      () => this.props.service.isHibernating,
-      () => {
-        this.setState({
-          hibernate: this.props.service.isHibernating,
-        });
-      },
-    );
    // Start hibernation counter if we are in background
    if (!this.props.service.isActive && this.props.stores.settings.all.app.hibernate) {
      this.startHibernationTimer();
@@ -126,18 +113,13 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
    const timerDuration = (Number(this.props.stores.settings.all.app.hibernationStrategy) || 300) * 1000;
    const hibernationTimer = setTimeout(() => {
-      this.setState({
-        hibernate: true,
-      });
      this.props.actions.service.setHibernation({
        serviceId: this.props.service.id,
        hibernating: true,
      });
    }, timerDuration);
-    this.setState({
+    this.hibernationTimer = hibernationTimer;
-      hibernationTimer,
-    });
  }
  render() {
@@ -208,7 +190,7 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
          </Fragment>
        ) : (
          <>
-            {!this.state.hibernate ? (
+            {!service.isHibernating ? (
              <>
                {(service.recipe.id === CUSTOM_WEBSITE_ID || showServiceNavigationBar) && (
                  <WebControlsScreen service={service} />
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index e6ebb6afb..652647470 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { observable, reaction } from 'mobx';
 import ElectronWebView from 'react-electron-web-view';
+import path from 'path';
 import ServiceModel from '../../../models/Service';
@@ -51,6 +52,8 @@ class ServiceWebview extends Component {
      setWebviewReference,
    } = this.props;
+    const preloadScript = path.join(__dirname, '../../../', 'webview', 'recipe.js');
    return (
      <ElectronWebView
        ref={(webview) => {
@@ -61,7 +64,7 @@ class ServiceWebview extends Component {
        }}
        autosize
        src={service.url}
-        preload="./webview/recipe.js"
+        preload={preloadScript}
        partition={`persist:service-${service.id}`}
        onDidAttach={() => {
          setWebviewReference({
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 2be5c4ed7..d567a47d1 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -12,6 +12,7 @@ import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
 import Input from '../../ui/Input';
 import { FRANZ_TRANSLATION } from '../../../config';
+import { isMac } from '../../../environment';
 function escapeHtml(unsafe) {
  return unsafe
@@ -383,8 +384,10 @@ export default @observer class EditSettingsForm extends Component {
            <Toggle field={form.$('showDisabledServices')} />
            <Toggle field={form.$('showMessageBadgeWhenMuted')} />
            <Toggle field={form.$('darkMode')} />
+            {isMac && <Toggle field={form.$('adaptableDarkMode')} disabled={isDarkmodeEnabled} />}
            {isDarkmodeEnabled && (
              <>
+                <Toggle field={form.$('adaptableDarkMode')} />
                <Toggle field={form.$('universalDarkMode')} />
                <p
                  className="settings__message"
diff --git a/src/components/ui/FeatureList.js b/src/components/ui/FeatureList.js
index 7ba8b54d7..f1039709c 100644
--- a/src/components/ui/FeatureList.js
+++ b/src/components/ui/FeatureList.js
@@ -72,7 +72,7 @@ export class FeatureList extends Component {
  static propTypes = {
    className: PropTypes.string,
    featureClassName: PropTypes.string,
-    plan: PropTypes.oneOf(PLANS),
+    plan: PropTypes.oneOf(Object.values(PLANS)),
  };
  static defaultProps = {
diff --git a/src/config.js b/src/config.js
index 761d26eea..bd67aee6b 100644
--- a/src/config.js
+++ b/src/config.js
@@ -112,6 +112,19 @@ export const FILE_SYSTEM_SETTINGS_TYPES = [
 ];
 export const LOCAL_SERVER = 'You are using Ferdi without a server';
+export const SERVER_NOT_LOADED = 'Ferdi::SERVER_NOT_LOADED';
+// Set app directory before loading user modules
+if (process.env.FERDI_APPDATA_DIR != null) {
+  app.setPath('appData', process.env.FERDI_APPDATA_DIR);
+  app.setPath('userData', path.join(app.getPath('appData')));
+} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
+  app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.getName()}AppData`);
+  app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}AppData`));
+} else if (process.platform === 'win32') {
+  app.setPath('appData', process.env.APPDATA);
+  app.setPath('userData', path.join(app.getPath('appData'), app.getName()));
+}
 export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config');
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index ddee82e45..07efbb881 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -98,6 +98,10 @@ const messages = defineMessages({
    id: 'settings.app.form.darkMode',
    defaultMessage: '!!!Dark Mode',
  },
+  adaptableDarkMode: {
+    id: 'settings.app.form.adaptableDarkMode',
+    defaultMessage: '!!!Enable adaptable Dark Mode',
+  },
  universalDarkMode: {
    id: 'settings.app.form.universalDarkMode',
    defaultMessage: '!!!Enable universal Dark Mode',
@@ -180,6 +184,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
        enableGPUAcceleration: settingsData.enableGPUAcceleration,
        showDisabledServices: settingsData.showDisabledServices,
        darkMode: settingsData.darkMode,
+        adaptableDarkMode: settingsData.adaptableDarkMode,
        universalDarkMode: settingsData.universalDarkMode,
        accentColor: settingsData.accentColor,
        showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted,
@@ -350,6 +355,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
          value: settings.all.app.darkMode,
          default: DEFAULT_APP_SETTINGS.darkMode,
        },
+        adaptableDarkMode: {
+          label: intl.formatMessage(messages.adaptableDarkMode),
+          value: settings.all.app.adaptableDarkMode,
+          default: DEFAULT_APP_SETTINGS.adaptableDarkMode,
+        },
        universalDarkMode: {
          label: intl.formatMessage(messages.universalDarkMode),
          value: settings.all.app.universalDarkMode,
diff --git a/src/features/accentColor/index.js b/src/features/accentColor/index.js
index a0f57a2fa..90fbcab43 100644
--- a/src/features/accentColor/index.js
+++ b/src/features/accentColor/index.js
@@ -4,6 +4,15 @@ 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;
@@ -13,6 +22,7 @@ function createAccentStyleElement() {
 function setAccentStyle(style) {
  const styleElement = document.getElementById(STYLE_ELEMENT_ID);
  styleElement.innerHTML = style;
 }
@@ -27,6 +37,8 @@ function generateAccentStyle(color) {
    `;
  });
+  style += ADDITIONAL_STYLES.replace(/\[ACCENT\]/g, color);
  return style;
 }
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
index e9a01b156..e78607667 100644
--- a/src/features/serviceProxy/index.js
+++ b/src/features/serviceProxy/index.js
@@ -22,7 +22,6 @@ export default function init(stores) {
    config.isIncludedInCurrentPlan = true;
    const services = stores.services.enabled;
-    const isPremiumUser = stores.user.data.isPremium;
    const proxySettings = stores.settings.proxy;
    debug('Service Proxy autorun');
@@ -30,7 +29,7 @@ export default function init(stores) {
    services.forEach((service) => {
      const s = session.fromPartition(`persist:service-${service.id}`);
-      if (config.isEnabled && (isPremiumUser || !config.isIncludedInCurrentPlan)) {
+      if (config.isEnabled) {
        const serviceProxyConfig = proxySettings[service.id];
        if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) {
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index edcc67771..8eb2053bc 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
  "settings.app.currentVersion": "Current version:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Open in background",
  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
  "settings.app.form.beta": "Include beta versions",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index edcc67771..8eb2053bc 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
  "settings.app.currentVersion": "Current version:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Open in background",
  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
  "settings.app.form.beta": "Include beta versions",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index edcc67771..8eb2053bc 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
  "settings.app.currentVersion": "Current version:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Open in background",
  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
  "settings.app.form.beta": "Include beta versions",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 5f55f804a..f7de90243 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "La memòria cau de Ferdi està utilitzant {size} d'espai al disc",
  "settings.app.currentVersion": "Versió actual:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Obrir en segon plà",
  "settings.app.form.autoLaunchOnStart": "Iniciar Ferdi a l'inici",
  "settings.app.form.beta": "Inclou versions beta",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index e8d3827dd..7ec1ce369 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi momentálně používá {size} místa na disku.",
  "settings.app.currentVersion": "Aktuální verze:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Spustit na pozadí",
  "settings.app.form.autoLaunchOnStart": "Spustit Ferdi při startu",
  "settings.app.form.beta": "Zahrnout beta verze",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index edcc67771..8eb2053bc 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
  "settings.app.currentVersion": "Current version:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Open in background",
  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
  "settings.app.form.beta": "Include beta versions",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 02e9b2a8e..2709f7788 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -9,17 +9,17 @@
  "feature.delayApp.trial.headline": "Hol dir die kostenlose Ferdi Professional Testlizenz und es geht ohne Warten weiter",
  "feature.delayApp.upgrade.action": "Hol dir Ferdi Premium",
  "feature.delayApp.upgrade.actionShort": "Account erweitern",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
+  "feature.planSelection.cta.ctaDowngradeFree": "Auf kostenlosen Plan herunterstufen",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
+  "feature.planSelection.cta.stayOnFree": "Auf kostenlosem Plan bleiben",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
+  "feature.planSelection.cta.trial": "Starte meine 14-Tage Testversion",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
+  "feature.planSelection.cta.upgradePersonal": "Personal Plan wählen",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
+  "feature.planSelection.cta.upgradePro": "Professional Plan wählen",
-  "feature.planSelection.free.text": "Basic functionality",
+  "feature.planSelection.free.text": "Einfache Funktionalität",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
+  "feature.planSelection.fullFeatureList": "Kompletter Vergleich aller Pläne",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
+  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Auf kostenlosen Plan herunterstufen",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
+  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Personal Plan wählen",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
+  "feature.planSelection.fullscreen.dialog.message": "Du bist dabei, auf ein kostenloses Konto herunterzustufen. Bist du sicher? Klicke stattdessen hier, um mehr Dienste und Funktionen für nur {currency}{price} pro Monat zu erhalten.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
+  "feature.planSelection.fullscreen.dialog.title": "Deinen Ferdi Plan herunterstufen",
  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
@@ -41,10 +41,10 @@
  "feature.todos.premium.upgrade": "Account Upgrade",
  "feature.trialStatusBar.cta": "Upgrade now",
  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
+  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Auf kostenlosen Plan herunterstufen",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
+  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Personal Plan wählen",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
+  "feature.trialStatusBar.fullscreen.dialog.message": "Du bist dabei, auf ein kostenloses Konto herunterzustufen. Bist du sicher? Klicke stattdessen hier, um mehr Dienste und Funktionen für nur {currency}{price} pro Monat zu erhalten.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
+  "feature.trialStatusBar.fullscreen.dialog.title": "Deinen Ferdi Plan herunterstufen",
  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
  "global.api.unhealthy": "Verbindung zu den Ferdi Online Services fehlgeschlagen",
  "global.franzProRequired": "Ferdi Professional benötigt",
@@ -188,11 +188,11 @@
  "pricing.plan.pro-yearly": "Ferdi Professional jährlich",
  "pricing.trial.cta.accept": "Ja, Upgrade zu Ferdi Professional durchführen",
  "pricing.trial.cta.skip": "Weiter zu Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
+  "pricing.trial.cta.start": "Ferdi verwenden",
  "pricing.trial.error": "Tut uns leid, wir konnten deine kostenlose Testlizenz nicht aktivieren!",
  "pricing.trial.features.headline": "Ferdi Professional beinhaltet:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
+  "pricing.trial.headline.pro": "Hi {name}, willkommen bei Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
+  "pricing.trial.intro.happyMessaging": "Viel Spaß beim Nachrichten schreiben",
  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
  "pricing.trial.terms.automaticTrialEnd": "Deine kostenlose Testlizenz endet automatisch nach 14 Tagen",
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Der Ferdi Cache belegt derzeit {size}.",
  "settings.app.currentVersion": "Aktuelle Version:",
  "settings.app.form.accentColor": "Akzentfarbe",
+  "settings.app.form.adaptableDarkMode": "Angepassten DarkMode aktivieren",
  "settings.app.form.autoLaunchInBackground": "Im Hintergrund öffnen",
  "settings.app.form.autoLaunchOnStart": "Ferdi beim Systemstart ausführen",
  "settings.app.form.beta": "Beta-Versionen einbeziehen",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index bb65ccdf2..10092cd9e 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -2608,377 +2608,377 @@
        "defaultMessage": "!!!Settings",
        "end": {
          "column": 3,
-          "line": 29
+          "line": 30
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.headline",
        "start": {
          "column": 12,
-          "line": 26
+          "line": 27
        }
      },
      {
        "defaultMessage": "!!!General",
        "end": {
          "column": 3,
-          "line": 33
+          "line": 34
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.headlineGeneral",
        "start": {
          "column": 19,
-          "line": 30
+          "line": 31
        }
      },
      {
        "defaultMessage": "!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
        "end": {
          "column": 3,
-          "line": 37
+          "line": 38
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.hibernateInfo",
        "start": {
          "column": 17,
-          "line": 34
+          "line": 35
        }
      },
      {
        "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.",
        "end": {
          "column": 3,
-          "line": 41
+          "line": 42
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.serverInfo",
        "start": {
          "column": 14,
-          "line": 38
+          "line": 39
        }
      },
      {
        "defaultMessage": "!!!You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
        "end": {
          "column": 3,
-          "line": 45
+          "line": 46
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.serverMoneyInfo",
        "start": {
          "column": 19,
-          "line": 42
+          "line": 43
        }
      },
      {
        "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
        "end": {
          "column": 3,
-          "line": 49
+          "line": 50
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.todoServerInfo",
        "start": {
          "column": 18,
-          "line": 46
+          "line": 47
        }
      },
      {
        "defaultMessage": "!!!Ferdi Lock Password",
        "end": {
          "column": 3,
-          "line": 53
+          "line": 54
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.lockedPassword",
        "start": {
          "column": 18,
-          "line": 50
+          "line": 51
        }
      },
      {
        "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
        "end": {
          "column": 3,
-          "line": 57
+          "line": 58
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.lockedPasswordInfo",
        "start": {
          "column": 22,
-          "line": 54
+          "line": 55
        }
      },
      {
        "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.",
        "end": {
          "column": 3,
-          "line": 61
+          "line": 62
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.lockInfo",
        "start": {
          "column": 12,
-          "line": 58
+          "line": 59
        }
      },
      {
        "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
        "end": {
          "column": 3,
-          "line": 65
+          "line": 66
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.scheduledDNDTimeInfo",
        "start": {
          "column": 24,
-          "line": 62
+          "line": 63
        }
      },
      {
        "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
        "end": {
          "column": 3,
-          "line": 69
+          "line": 70
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.scheduledDNDInfo",
        "start": {
          "column": 20,
-          "line": 66
+          "line": 67
        }
      },
      {
        "defaultMessage": "!!!Language",
        "end": {
          "column": 3,
-          "line": 73
+          "line": 74
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.headlineLanguage",
        "start": {
          "column": 20,
-          "line": 70
+          "line": 71
        }
      },
      {
        "defaultMessage": "!!!Updates",
        "end": {
          "column": 3,
-          "line": 77
+          "line": 78
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.headlineUpdates",
        "start": {
          "column": 19,
-          "line": 74
+          "line": 75
        }
      },
      {
        "defaultMessage": "!!!Appearance",
        "end": {
          "column": 3,
-          "line": 81
+          "line": 82
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.headlineAppearance",
        "start": {
          "column": 22,
-          "line": 78
+          "line": 79
        }
      },
      {
        "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
        "end": {
          "column": 3,
-          "line": 85
+          "line": 86
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.universalDarkModeInfo",
        "start": {
          "column": 25,
-          "line": 82
+          "line": 83
        }
      },
      {
        "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: #7367f0)",
        "end": {
          "column": 3,
-          "line": 89
+          "line": 90
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.accentColorInfo",
        "start": {
          "column": 19,
-          "line": 86
+          "line": 87
        }
      },
      {
        "defaultMessage": "!!!Advanced",
        "end": {
          "column": 3,
-          "line": 93
+          "line": 94
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.headlineAdvanced",
        "start": {
          "column": 20,
-          "line": 90
+          "line": 91
        }
      },
      {
        "defaultMessage": "!!!Help us to translate Ferdi into your language.",
        "end": {
          "column": 3,
-          "line": 97
+          "line": 98
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.translationHelp",
        "start": {
          "column": 19,
-          "line": 94
+          "line": 95
        }
      },
      {
        "defaultMessage": "!!!Cache",
        "end": {
          "column": 3,
-          "line": 101
+          "line": 102
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.subheadlineCache",
        "start": {
          "column": 20,
-          "line": 98
+          "line": 99
        }
      },
      {
        "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
        "end": {
          "column": 3,
-          "line": 105
+          "line": 106
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.cacheInfo",
        "start": {
          "column": 13,
-          "line": 102
+          "line": 103
        }
      },
      {
        "defaultMessage": "!!!Clear cache",
        "end": {
          "column": 3,
-          "line": 109
+          "line": 110
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.buttonClearAllCache",
        "start": {
          "column": 23,
-          "line": 106
+          "line": 107
        }
      },
      {
        "defaultMessage": "!!!Check for updates",
        "end": {
          "column": 3,
-          "line": 113
+          "line": 114
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.buttonSearchForUpdate",
        "start": {
          "column": 25,
-          "line": 110
+          "line": 111
        }
      },
      {
        "defaultMessage": "!!!Restart & install update",
        "end": {
          "column": 3,
-          "line": 117
+          "line": 118
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.buttonInstallUpdate",
        "start": {
          "column": 23,
-          "line": 114
+          "line": 115
        }
      },
      {
        "defaultMessage": "!!!Is searching for update",
        "end": {
          "column": 3,
-          "line": 121
+          "line": 122
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.updateStatusSearching",
        "start": {
          "column": 25,
-          "line": 118
+          "line": 119
        }
      },
      {
        "defaultMessage": "!!!Update available, downloading...",
        "end": {
          "column": 3,
-          "line": 125
+          "line": 126
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.updateStatusAvailable",
        "start": {
          "column": 25,
-          "line": 122
+          "line": 123
        }
      },
      {
        "defaultMessage": "!!!You are using the latest version of Ferdi",
        "end": {
          "column": 3,
-          "line": 129
+          "line": 130
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.updateStatusUpToDate",
        "start": {
          "column": 24,
-          "line": 126
+          "line": 127
        }
      },
      {
        "defaultMessage": "!!!Current version:",
        "end": {
          "column": 3,
-          "line": 133
+          "line": 134
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.currentVersion",
        "start": {
          "column": 18,
-          "line": 130
+          "line": 131
        }
      },
      {
        "defaultMessage": "!!!Changes require restart",
        "end": {
          "column": 3,
-          "line": 137
+          "line": 138
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.restartRequired",
        "start": {
          "column": 29,
-          "line": 134
+          "line": 135
        }
      },
      {
        "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
        "end": {
          "column": 3,
-          "line": 141
+          "line": 142
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.languageDisclaimer",
        "start": {
          "column": 22,
-          "line": 138
+          "line": 139
        }
      }
    ],
@@ -4266,133 +4266,146 @@
        }
      },
      {
-        "defaultMessage": "!!!Enable universal Dark Mode",
+        "defaultMessage": "!!!Enable adaptable Dark Mode",
        "end": {
          "column": 3,
          "line": 104
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.universalDarkMode",
+        "id": "settings.app.form.adaptableDarkMode",
        "start": {
          "column": 21,
          "line": 101
        }
      },
      {
-        "defaultMessage": "!!!Accent color",
+        "defaultMessage": "!!!Enable universal Dark Mode",
        "end": {
          "column": 3,
          "line": 108
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.universalDarkMode",
+        "start": {
+          "column": 21,
+          "line": 105
+        }
+      },
+      {
+        "defaultMessage": "!!!Accent color",
+        "end": {
+          "column": 3,
+          "line": 112
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.accentColor",
        "start": {
          "column": 15,
-          "line": 105
+          "line": 109
        }
      },
      {
        "defaultMessage": "!!!Display disabled services tabs",
        "end": {
          "column": 3,
-          "line": 112
+          "line": 116
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.showDisabledServices",
        "start": {
          "column": 24,
-          "line": 109
+          "line": 113
        }
      },
      {
        "defaultMessage": "!!!Show unread message badge when notifications are disabled",
        "end": {
          "column": 3,
-          "line": 116
+          "line": 120
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.showMessagesBadgesWhenMuted",
        "start": {
          "column": 29,
-          "line": 113
+          "line": 117
        }
      },
      {
        "defaultMessage": "!!!Enable spell checking",
        "end": {
          "column": 3,
-          "line": 120
+          "line": 124
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.enableSpellchecking",
        "start": {
          "column": 23,
-          "line": 117
+          "line": 121
        }
      },
      {
        "defaultMessage": "!!!Enable GPU Acceleration",
        "end": {
          "column": 3,
-          "line": 124
+          "line": 128
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.enableGPUAcceleration",
        "start": {
          "column": 25,
-          "line": 121
+          "line": 125
        }
      },
      {
        "defaultMessage": "!!!Include beta versions",
        "end": {
          "column": 3,
-          "line": 128
+          "line": 132
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.beta",
        "start": {
          "column": 8,
-          "line": 125
+          "line": 129
        }
      },
      {
        "defaultMessage": "!!!Disable updates",
        "end": {
          "column": 3,
-          "line": 132
+          "line": 136
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.noUpdates",
        "start": {
          "column": 13,
-          "line": 129
+          "line": 133
        }
      },
      {
        "defaultMessage": "!!!Enable Franz Todos",
        "end": {
          "column": 3,
-          "line": 136
+          "line": 140
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.enableTodos",
        "start": {
          "column": 15,
-          "line": 133
+          "line": 137
        }
      },
      {
        "defaultMessage": "!!!Keep all workspaces loaded",
        "end": {
          "column": 3,
-          "line": 140
+          "line": 144
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.keepAllWorkspacesLoaded",
        "start": {
          "column": 27,
-          "line": 137
+          "line": 141
        }
      }
    ],
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 89c0d62b6..c383a18fb 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Το Ferdi χρησιμοποιεί αυτήν τη στιγμή {size} χώρου στο δίσκο.",
  "settings.app.currentVersion": "Τρέχουσα έκδοση:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Άνοιγμα στο παρασκήνιο",
  "settings.app.form.autoLaunchOnStart": "Εκκίνηση του Ferdi κατά την εκκίνηση του συστήματος",
  "settings.app.form.beta": "Συμπεριλάβετε εκδόσεις beta",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index a34da1848..b7d81356e 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
  "settings.app.currentVersion": "Current version:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Open in background",
  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
  "settings.app.form.beta": "Include beta versions",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index e3aad888f..462d74d39 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "El cache de Ferdi actualmente usa {size} de espacio en disco.",
  "settings.app.currentVersion": "Versión actual:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Abrir en segundo plano",
  "settings.app.form.autoLaunchOnStart": "Iniciar Ferdi al iniciar",
  "settings.app.form.beta": "Incluir versiones beta",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index edcc67771..8eb2053bc 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
  "settings.app.currentVersion": "Current version:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Open in background",
  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
  "settings.app.form.beta": "Include beta versions",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 1ae8d6164..2edf358f5 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -9,22 +9,22 @@
  "feature.delayApp.trial.headline": "Prendre l'essai gratuit de 14 jours de Ferdi Professionnel et esquiver la ligne",
  "feature.delayApp.upgrade.action": "Acheter une license Ferdi",
  "feature.delayApp.upgrade.actionShort": "Augmenter le niveau de mon compte",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
+  "feature.planSelection.cta.ctaDowngradeFree": "Rétrograder à la version gratuite",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
+  "feature.planSelection.cta.stayOnFree": "Rester en version gratuite",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
+  "feature.planSelection.cta.trial": "Commencez mon essai gratuit de 14 jours",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
+  "feature.planSelection.cta.upgradePersonal": "Choisir Personnel",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
+  "feature.planSelection.cta.upgradePro": "Choisir Professionnel",
-  "feature.planSelection.free.text": "Basic functionality",
+  "feature.planSelection.free.text": "Fonctionnalité basique",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
+  "feature.planSelection.fullFeatureList": "Comparaison complète de tous les plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
+  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Rétrograder à la version gratuite",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
+  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choisir Personnel",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
+  "feature.planSelection.fullscreen.dialog.message": "Vous êtes sur le point de rétrograder vers notre compte gratuit. Êtes-vous sûr ? Cliquez ici pour obtenir plus de services et de fonctionnalités pour seulement {currency}{price} par mois.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
+  "feature.planSelection.fullscreen.dialog.title": "Rétrograder votre plan Ferdi",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
+  "feature.planSelection.fullscreen.subheadline": "Il est temps de faire un choix. Ferdi fonctionne mieux sur nos plans Personnels et Professionnels. Veuillez consulter et choisir le meilleur pour vous.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
+  "feature.planSelection.fullscreen.welcome": "Êtes-vous prêt à choisir, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
+  "feature.planSelection.personal.text": "Plus de services, pas d'attente - idéal pour un usage personnel.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
+  "feature.planSelection.pricesBasedOnAnnualPayment": "Tous les prix basés sur un paiement annuel",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
+  "feature.planSelection.pro.text": "Des services illimités et des fonctionnalités professionnelles pour vous - et votre équipe.",
  "feature.quickSwitch.info": "Sélectionner un service avec TAB, ↑ et ↓. Ouvrir un service avec ENTER.",
  "feature.quickSwitch.search": "Rechercher...",
  "feature.quickSwitch.title": "Changement rapide",
@@ -39,13 +39,13 @@
  "feature.todos.premium.info": "Ferdi Todos est disponible aux utilisateurs premium maintenant!",
  "feature.todos.premium.rollout": "Tous le monde devra attendre un peux plus longtemps.",
  "feature.todos.premium.upgrade": "Améliorez votre compte",
-  "feature.trialStatusBar.cta": "Upgrade now",
+  "feature.trialStatusBar.cta": "Améliorer maintenant",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
+  "feature.trialStatusBar.expired": "Votre essai gratuit Ferdi {plan} a expiré, veuillez mettre à jour votre compte.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
+  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Rétrograder à la version gratuite",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
+  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choisir Personnel",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
+  "feature.trialStatusBar.fullscreen.dialog.message": "Vous êtes sur le point de rétrograder vers notre compte gratuit. Êtes-vous sûr ? Cliquez ici pour obtenir plus de services et de fonctionnalités pour seulement {currency}{price} par mois.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
+  "feature.trialStatusBar.fullscreen.dialog.title": "Rétrograder votre plan Ferdi",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
+  "feature.trialStatusBar.restTime": "Votre essai gratuit de Ferdi {plan} se termine dans {time}.",
  "global.api.unhealthy": "Impossible de se connecter aux services en ligne de Ferdi",
  "global.franzProRequired": "Ferdi Professionnel Requis",
  "global.notConnectedToTheInternet": "Vous n'êtes pas connecté à Internet.",
@@ -163,20 +163,20 @@
  "password.submit.label": "Soumettre",
  "password.successInfo": "Merci de consulter vos emails",
  "premiumFeature.button.upgradeAccount": "Augmenter le niveau de mon compte",
-  "pricing.features.accountSync": "Account Synchronisation",
+  "pricing.features.accountSync": "Synchronisation de compte",
  "pricing.features.adFree": "Toujours sans pub",
  "pricing.features.appDelays": "Plus d'écrans d'attente",
  "pricing.features.customWebsites": "Ajouter des sites web modifiés",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
+  "pricing.features.desktopNotifications": "Notifications de bureau",
  "pricing.features.onPremise": "Services hébergés sur place et autre",
-  "pricing.features.recipes": "Choose from more than 70 Services",
+  "pricing.features.recipes": "Choisissez parmi de plus de 70 services",
  "pricing.features.serviceProxies": "Service Proxy",
  "pricing.features.spellchecker": "Support du correcteur orthographique",
  "pricing.features.teamManagement": "Gestion d'équipe",
  "pricing.features.thirdPartyServices": "Installer des services tiers",
  "pricing.features.unlimitedServices": "Ajouter des services illimités",
-  "pricing.features.upToSixServices": "Add up to 6 services",
+  "pricing.features.upToSixServices": "Ajouter jusqu'à 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
+  "pricing.features.upToThreeServices": "Ajouter jusqu'à 3 services",
  "pricing.features.workspaces": "Espace de travail",
  "pricing.plan.free": "Ferdi Gratuit",
  "pricing.plan.legacy": "Ferdi Premium",
@@ -188,17 +188,17 @@
  "pricing.plan.pro-yearly": "Ferdi Professionnel à l'année",
  "pricing.trial.cta.accept": "Oui, améliorer mon compte à Ferdi Professionnel",
  "pricing.trial.cta.skip": "Continuer à Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
+  "pricing.trial.cta.start": "Commencez à utiliser Ferdi",
  "pricing.trial.error": "Désoler, nous ne pouvons pas activé votre essai!",
  "pricing.trial.features.headline": "Ferdi Professionnel inclus:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
+  "pricing.trial.headline.pro": "Bonjour {name}, bienvenue dans Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
+  "pricing.trial.intro.happyMessaging": "Bonne messagerie,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
+  "pricing.trial.intro.specialTreat": "Nous avons une offre spéciale pour vous.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
+  "pricing.trial.intro.tryPro": "Profitez de l'expérience complète de Ferdi Professional pendant 14 jours.",
  "pricing.trial.terms.automaticTrialEnd": "Votre essai gratuit se finis automatiquement après 14 jours",
  "pricing.trial.terms.headline": "Sans condition",
  "pricing.trial.terms.noCreditCard": "Pas de carte de crédit requis",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
+  "pricing.trial.terms.trialWorth": "Essai gratuit (normalement {currency}{price} par mois)",
  "service.crashHandler.action": "Recharger {name}",
  "service.crashHandler.autoReload": "Tentative de restauration automatique de {name} dans {seconds} secondes",
  "service.crashHandler.headline": "Oh non!",
@@ -255,10 +255,11 @@
  "settings.app.cacheInfo": "Le cache de Ferdi occupe actuellement {size} en espace disque.",
  "settings.app.currentVersion": "Version actuelle :",
  "settings.app.form.accentColor": "Accent de couleur",
+  "settings.app.form.adaptableDarkMode": "Activer le mode sombre adaptable",
  "settings.app.form.autoLaunchInBackground": "Ouvrir en arrière-plan",
  "settings.app.form.autoLaunchOnStart": "Lancer Ferdi au démarrage",
  "settings.app.form.beta": "Accepter les versions bêta",
-  "settings.app.form.darkMode": "Activer le th��me sombre",
+  "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.enableSpellchecking": "Activer la vérification orthographique",
@@ -437,14 +438,14 @@
  "signup.link.login": "Vous avez déjà un compte? Connectez-vous",
  "signup.password.label": "Mot de passe",
  "signup.submit.label": "Créer un compte",
-  "subscription.bestValue": "Best value",
+  "subscription.bestValue": "Le meilleur prix",
  "subscription.cta.activateTrial": "Oui, commencer l'essai gratuit de Ferdi Professionnel",
  "subscription.cta.allOptions": "Voir toutes les options",
  "subscription.cta.choosePlan": "Choisissez votre plan",
  "subscription.includedProFeatures": "Le plan Ferdi Professionnel inclus:",
-  "subscription.interval.per": "per {interval}",
+  "subscription.interval.per": "par {interval}",
-  "subscription.interval.perMonth": "per month",
+  "subscription.interval.perMonth": "par mois",
-  "subscription.interval.perMonthPerUser": "per month & user",
+  "subscription.interval.perMonthPerUser": "par mois et utilisateur",
  "subscription.planItem.upgradeAccount": "Améliorez votre compte",
  "subscription.teaser.includedFeatures": "Les plans de Ferdi payés inclus:",
  "subscription.teaser.intro": "Ferdi 5 viens avec une large plage de nouvelles fonctionnalités pour renforcer votre communication quotidienne - batteries inclus. Aller voir nos nouveaux plans et trouver celui qui vous satisfait le mieux!",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index e96d9e14f..ebc7b1dbe 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Tá taisce Ferdi ag baint úsáid as {size} den spás diosca.",
  "settings.app.currentVersion": "Leagan reatha:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Oscail sa chúlra",
  "settings.app.form.autoLaunchOnStart": "Láinseáil Ferdi ón tús",
  "settings.app.form.beta": "Cuir leagain béite san áireamh",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index edcc67771..8eb2053bc 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
  "settings.app.currentVersion": "Current version:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Open in background",
  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
  "settings.app.form.beta": "Include beta versions",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 5ad85cc1a..5d6f353f0 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi predmemorija trenutno koristi {size} prostora na disku",
  "settings.app.currentVersion": "Trenutna verzija:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Otvori u pozadini",
  "settings.app.form.autoLaunchOnStart": "Pokreni Ferdi sa sistemom",
  "settings.app.form.beta": "Obuhvati i beta verzije",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 940db5dff..7695f5fc4 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "A Ferdi gyorsítótár jelenleg {size} lemezterületet használ.",
  "settings.app.currentVersion": "Aktuális verzió:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Megnyitás háttérben",
  "settings.app.form.autoLaunchOnStart": "Ferdi betöltése indításkor",
  "settings.app.form.beta": "Béta verziók keresése",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 2378bfbad..e48458d07 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Singgahan Ferdi sedang menggunakan ruang disk {size}.",
  "settings.app.currentVersion": "Versi saat ini:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Buka di latar belakang",
  "settings.app.form.autoLaunchOnStart": "Jalankan Ferdi saat komputer dimulai",
  "settings.app.form.beta": "Sertakan versi beta",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index f3ed42e3a..07a4dc98d 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi sta utilizzando {size} di spazio su disco.",
  "settings.app.currentVersion": "Versione attuale:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Apri in background",
  "settings.app.form.autoLaunchOnStart": "Esegui Ferdi all'avvio",
  "settings.app.form.beta": "Includi versioni beta",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index b9b6da6c3..0f5a14be1 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "現在、Ferdiのキャッシュはディスクの{size}分を使用しています。",
  "settings.app.currentVersion": "現在のバージョン:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "バックグラウンドで開く",
  "settings.app.form.autoLaunchOnStart": "システム起動時にFerdiを開く",
  "settings.app.form.beta": "Betaバージョンを含める",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 2f0aaa5ae..302b513d2 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
  "settings.app.currentVersion": "ამჟამინდელი ვერსია:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "გახსენით ფონზე",
  "settings.app.form.autoLaunchOnStart": "გაეშვას Ferdi სისტემის ჩატვირთვისას",
  "settings.app.form.beta": "ჩართეთ ბეტა ვერსიები",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index edcc67771..8eb2053bc 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
  "settings.app.currentVersion": "Current version:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Open in background",
  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
  "settings.app.form.beta": "Include beta versions",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index ce8a35ce8..80f33d583 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi cache gebruikt momenteel {size} schijfruimte.",
  "settings.app.currentVersion": "Huidige versie:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Open op de achtergrond",
  "settings.app.form.autoLaunchOnStart": "Lanceer Ferdi bij opstarten",
  "settings.app.form.beta": "Inclusief beta versies",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index e5467c877..c71954427 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi gebruikt op dit moment {size} schijfruimte aan tijdelijke bestanden.",
  "settings.app.currentVersion": "Huidige versie:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Open op de achtergrond",
  "settings.app.form.autoLaunchOnStart": "Open Ferdi bij opstarten",
  "settings.app.form.beta": "Inclusief bètaversies",
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index edcc67771..8eb2053bc 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
  "settings.app.currentVersion": "Current version:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Open in background",
  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
  "settings.app.form.beta": "Include beta versions",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 6cc75eaf3..e29e80e9f 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Pamięć podręczna zajmuje obecnie {size} przestrzeni dyskowej",
  "settings.app.currentVersion": "Aktualna wersja:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Otwórz w tle",
  "settings.app.form.autoLaunchOnStart": "Uruchom Ferdi na początku",
  "settings.app.form.beta": "Uwzględnij wersje beta",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 9dec7e7a3..591b35610 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,33 +1,33 @@
 {
-  "app.errorHandler.action": "Recarregar",
+  "app.errorHandler.action": "Actualizar",
-  "app.errorHandler.headline": "Opa! Algo deu errado.",
+  "app.errorHandler.headline": "Uoops! Algo correu mal",
-  "feature.announcements.changelog.headline": "Mudanças no Ferdi {version}",
+  "feature.announcements.changelog.headline": "Alterações no Ferdi {version}",
-  "feature.delayApp.headline": "Por favor, adquira uma licença para pular o tempo de espera",
+  "feature.delayApp.headline": "Por favor, adquira uma licença Ferdi para não ter tempo de espera",
  "feature.delayApp.text": "Ferdi continuará em {seconds} segundos.",
  "feature.delayApp.trial.action": "Sim, eu quero o período de testes gratuito de 14 dias do Ferdi Professional",
  "feature.delayApp.trial.actionShort": "Ativar período de testes gratuito do Ferdi Professional",
  "feature.delayApp.trial.headline": "Empieza el periodo de prueba de Ferdi Profesional por 14 días y cruza la linea.",
  "feature.delayApp.upgrade.action": "Adquira uma licença de suporte Ferdi",
  "feature.delayApp.upgrade.actionShort": "Atualizar conta",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
+  "feature.planSelection.cta.ctaDowngradeFree": "Despromover para Gratuito",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
+  "feature.planSelection.cta.stayOnFree": "Continuar em Gratuito",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
+  "feature.planSelection.cta.trial": "Iniciar meu teste grátis de 14 dias",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
+  "feature.planSelection.cta.upgradePersonal": "Escolha Pessoal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
+  "feature.planSelection.cta.upgradePro": "Escolha Profissional",
-  "feature.planSelection.free.text": "Basic functionality",
+  "feature.planSelection.free.text": "Funcionalidade básica",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
+  "feature.planSelection.fullFeatureList": "Comparação completa de todos os planos",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
+  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Despromover para Gratuito",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
+  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Escolha Pessoal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
+  "feature.planSelection.fullscreen.dialog.message": "Você está prestes a fazer a despromoção para nossa conta gratuita. Você tem certeza? Clique aqui para obter mais serviços e funcionalidade por apenas {currency}{price} por mês.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
+  "feature.planSelection.fullscreen.dialog.title": "Despromover o seu Plano Ferdi",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
+  "feature.planSelection.fullscreen.subheadline": "Agora tem de fazer uma escolha. O Ferdi trabalha melhor em nossos planos pessoais e profissionais. Por favor, compare estes planos e escolha o que melhor se adapta a si.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
+  "feature.planSelection.fullscreen.welcome": "Está prestes a escolher, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
+  "feature.planSelection.personal.text": "Mais serviços, sem espera - ideal para uso pessoal.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
+  "feature.planSelection.pricesBasedOnAnnualPayment": "Todos os preços são baseados no pagamento anual",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
+  "feature.planSelection.pro.text": "Serviços ilimitados e recursos profissionais para si - e para a sua equipa.",
-  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
+  "feature.quickSwitch.info": "Seleccione um serviço com TAB, ↑ e ↓. Abra um serviço com ENTER.",
-  "feature.quickSwitch.search": "Search...",
+  "feature.quickSwitch.search": "A procurar...",
-  "feature.quickSwitch.title": "QuickSwitch",
+  "feature.quickSwitch.title": "Troca Rápida",
  "feature.serviceLimit.limitReached": "Você adicionou {amount} serviços de um total de {limit} que estão inclusos no seu plano. Por favor, atualize sua conta para adicionar mais serviços.",
  "feature.shareFranz.action.email": "Enviar por e-mail",
  "feature.shareFranz.action.facebook": "Compartilhar no Facebook",
@@ -39,13 +39,13 @@
  "feature.todos.premium.info": "As Listas de Tarefa do Ferdi estão disponíveis para usuários premium!",
  "feature.todos.premium.rollout": "As outras pessoas terão que esperar um pouquinho mais.",
  "feature.todos.premium.upgrade": "Actualizar cuenta",
-  "feature.trialStatusBar.cta": "Upgrade now",
+  "feature.trialStatusBar.cta": "Promover agora",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
+  "feature.trialStatusBar.expired": "Seu teste grátis Ferdi {plan} expirou, por favor actualize sua conta.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
+  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Despromover para Gratuito",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
+  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Escolha Pessoal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
+  "feature.trialStatusBar.fullscreen.dialog.message": "Você está prestes a fazer a despromoção para nossa conta gratuita. Você tem certeza? Clique aqui para obter mais serviços e funcionalidade por apenas {currency}{price} por mês.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
+  "feature.trialStatusBar.fullscreen.dialog.title": "Despromover o seu Plano Ferdi",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
+  "feature.trialStatusBar.restTime": "Seu teste grátis Ferdi {plan} termina em {time}.",
  "global.api.unhealthy": "Não foi possível conectar-se aos serviços on-line do Ferdi.",
  "global.franzProRequired": "Se requiere una cuenta Ferdi Profesional",
  "global.notConnectedToTheInternet": "Você não está conectado à internet",
@@ -58,7 +58,7 @@
  "import.notSupportedHeadline": "Serviços ainda não suportados pelo Ferdi 5 ",
  "import.skip.label": "Quero adicionar serviços manualmente",
  "import.submit.label": "Importar serviços",
-  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
+  "infobar.authRequestFailed": "Houve erros ao tentar autenticar. Por favor, tente desconectar e autenticar novamente se o erro persistir.",
  "infobar.buttonChangelog": "O que há de novo?",
  "infobar.buttonInstallUpdate": "Reiniciar e instalar atualizações ",
  "infobar.buttonReloadServices": "Recarregar serviços",
@@ -72,12 +72,12 @@
  "invite.skip.label": "Quero fazer isso depois",
  "invite.submit.label": "Enviar convites",
  "invite.successInfo": "Convites enviados com sucesso",
-  "locked.headline": "Locked",
+  "locked.headline": "Bloqueado",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
+  "locked.info": "Ferdi está bloqueado no momento. Por favor, desbloqueie Ferdi com sua senha para ver suas mensagens.",
-  "locked.invalidCredentials": "Password invalid",
+  "locked.invalidCredentials": "Senha inválida",
-  "locked.password.label": "Password",
+  "locked.password.label": "Senha",
-  "locked.submit.label": "Unlock",
+  "locked.submit.label": "Desbloquear",
-  "login.changeServer": "Change server",
+  "login.changeServer": "Alterar servidor",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
  "login.email.label": "Endereço de E-mail",
@@ -85,7 +85,7 @@
  "login.invalidCredentials": "E-mail ou senha inválida",
  "login.link.password": "Trocar a senha",
  "login.link.signup": "Criar uma conta gratuita",
-  "login.password.label": "Password",
+  "login.password.label": "Senha",
  "login.serverLogout": "Sua sessão expirou, faça o login novamente.",
  "login.submit.label": "Entrar",
  "login.tokenExpired": "Sua sessão expirou, faça o login novamente.",
@@ -93,7 +93,7 @@
  "menu.Todoss.openTodosDrawer": "Abrir a gaveta de Listas de Tarefa",
  "menu.app.about": "Sobre Ferdi",
  "menu.app.announcement": "Quais as novidades?",
-  "menu.app.autohideMenuBar": "Auto-hide menu bar",
+  "menu.app.autohideMenuBar": "Auto-ocultar barra de menu",
  "menu.app.checkForUpdates": "Verificar se há atualizações",
  "menu.app.hide": "Ocultar",
  "menu.app.hideOthers": "Ocultar Outros",
@@ -127,17 +127,17 @@
  "menu.services": "Serviços",
  "menu.services.activatePreviousService": "Pular para serviço anterior",
  "menu.services.addNewService": "Adicionar Novo Serviço",
-  "menu.services.goHome": "Home",
+  "menu.services.goHome": "Início",
  "menu.services.setNextServiceActive": "Pular para próximo serviço",
  "menu.todos": "Tareas pendientes",
  "menu.todos.enableTodos": "Habilitar Tareas pendientes",
  "menu.view": "Visualizar ",
-  "menu.view.back": "Back",
+  "menu.view.back": "Anterior",
  "menu.view.enterFullScreen": "Modo Tela Cheia",
  "menu.view.exitFullScreen": "Sair da Tela Cheia",
-  "menu.view.forward": "Forward",
+  "menu.view.forward": "Seguinte",
-  "menu.view.lockFerdi": "Lock Ferdi",
+  "menu.view.lockFerdi": "Bloquear Ferdi",
-  "menu.view.openQuickSwitch": "Open Quick Switch",
+  "menu.view.openQuickSwitch": "Abrir Troca Rápida",
  "menu.view.reloadFranz": "Recarregar Ferdi",
  "menu.view.reloadService": "Reiniciar o Serviço",
  "menu.view.resetZoom": "Tamanho real",
@@ -163,20 +163,20 @@
  "password.submit.label": "Enviar",
  "password.successInfo": "Por favor, verifique o seu e-mail",
  "premiumFeature.button.upgradeAccount": "Atualizar conta",
-  "pricing.features.accountSync": "Account Synchronisation",
+  "pricing.features.accountSync": "Sincronização Automática",
  "pricing.features.adFree": "Sin anuncios para siempre!",
  "pricing.features.appDelays": "Sem Telas de Espera",
  "pricing.features.customWebsites": "Adicionar Websites Personalizados",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
+  "pricing.features.desktopNotifications": "Notificações no ambiente de trabalho",
  "pricing.features.onPremise": "En sitio y otros servicios alojados",
-  "pricing.features.recipes": "Choose from more than 70 Services",
+  "pricing.features.recipes": "Escolha entre mais de 70 serviços",
  "pricing.features.serviceProxies": "Apoderados de Servicio",
  "pricing.features.spellchecker": "Soporte de corrector ortográfico",
  "pricing.features.teamManagement": "Gestão de Time",
  "pricing.features.thirdPartyServices": "Instalar servicios de terceros",
  "pricing.features.unlimitedServices": "Agregar servicios ilimitados",
-  "pricing.features.upToSixServices": "Add up to 6 services",
+  "pricing.features.upToSixServices": "Adicionar até 6 serviços",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
+  "pricing.features.upToThreeServices": "Adicionar até 3 serviços",
  "pricing.features.workspaces": "Áreas de trabalho",
  "pricing.plan.free": "Ferdi Gratuito",
  "pricing.plan.legacy": "Ferdi Premium",
@@ -188,17 +188,17 @@
  "pricing.plan.pro-yearly": "Ferdi Profissional Anual",
  "pricing.trial.cta.accept": "Sim, atualizar minha conta para o Ferdi Profissional",
  "pricing.trial.cta.skip": "Continuar para o Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
+  "pricing.trial.cta.start": "Começar a usar Ferdi",
  "pricing.trial.error": "Desculpe, não conseguimos ativar o seu período de testes",
  "pricing.trial.features.headline": "Incluso no Ferdi Profissional:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
+  "pricing.trial.headline.pro": "Olá {name}, bem-vindo/a ao Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
+  "pricing.trial.intro.happyMessaging": "Mensagens felizes,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
+  "pricing.trial.intro.specialTreat": "Temos uma oferta especial para si.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
+  "pricing.trial.intro.tryPro": "Aproveite a experiência completa de Ferdi Profissional completamente gratuita durante 14 dias.",
  "pricing.trial.terms.automaticTrialEnd": "Seu período de testes encerra automaticamente em 14 dias",
  "pricing.trial.terms.headline": "Sem vínculos",
  "pricing.trial.terms.noCreditCard": "No necesita tarjeta de crédito",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
+  "pricing.trial.terms.trialWorth": "Teste gratuito (normalmente {currency}{price} por mês)",
  "service.crashHandler.action": "Recarregar {name}",
  "service.crashHandler.autoReload": "Tentando reestabelecer {name} automaticamente em {seconds} segundos",
  "service.crashHandler.headline": "Ah, não!",
@@ -217,9 +217,9 @@
  "service.restrictedHandler.serviceLimit.text": "Por favor mejore su cuenta para poder utilizar más de {count} servicios.",
  "service.webviewLoader.loading": "Carregando",
  "services.getStarted": "Iniciar",
-  "services.login": "Please login to use Ferdi.",
+  "services.login": "Por favor, inicie sua sessão para usar Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Opcionalmente, você pode mudar seu servidor Ferdi clicando no icon de roda dentada no canto inferior esquerdo.",
-  "services.serverless": "Use Ferdi without an Account",
+  "services.serverless": "Use Ferdi sem uma conta",
  "services.welcome": "Bem-vindo ao Ferdi!",
  "settings.account.account.editButton": "Editar conta",
  "settings.account.accountType.basic": "Conta Básica",
@@ -248,39 +248,40 @@
  "settings.account.upgradeToPro.label": "Atualizar para o Ferdi Profissional",
  "settings.account.userInfoRequestFailed": "Não foi possível carregar as informações do usuário",
  "settings.account.yourLicense": "Su Licencia Ferdi",
-  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: #7367f0)",
+  "settings.app.accentColorInfo": "Escreva sua cor de destaque em um formato compatível com CSS. (Padrão: #7367f0)",
  "settings.app.buttonClearAllCache": "Limpar cache",
  "settings.app.buttonInstallUpdate": "Reiniciar e instalar atualizações ",
  "settings.app.buttonSearchForUpdate": "Verificar se há atualizações",
  "settings.app.cacheInfo": "O cache do Ferdi está usando {size} de espaço em disco atualmente.",
  "settings.app.currentVersion": "Versão atual:",
-  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.accentColor": "Cor de destaque",
+  "settings.app.form.adaptableDarkMode": "Activar modo de escuridão adaptável",
  "settings.app.form.autoLaunchInBackground": "Abrir em segundo plano",
  "settings.app.form.autoLaunchOnStart": "Abrir o Ferdi ao iniciar o sistema",
  "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": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Activar o bloqueio com palavra-passe do Ferdi",
  "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",
-  "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernate": "Activar hibernação do serviço",
-  "settings.app.form.hibernationStrategy": "Hibernation strategy",
+  "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": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Palavra-passe para bloqueio do Ferdi",
  "settings.app.form.minimizeToSystemTray": "Minimizar o Ferdi para a área de sistema",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.noUpdates": "Desactivar actualizações",
-  "settings.app.form.privateNotifications": "Don't show message content in notifications",
+  "settings.app.form.privateNotifications": "Não mostrar o conteúdo das mensagens nas notificações",
  "settings.app.form.runInBackground": "Manter o Ferdi no fundo quando fechar a janela",
-  "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
+  "settings.app.form.scheduledDNDEnabled": "Activar Não-Perturbar agendado",
-  "settings.app.form.scheduledDNDEnd": "To",
+  "settings.app.form.scheduledDNDEnd": "Até",
-  "settings.app.form.scheduledDNDStart": "From",
+  "settings.app.form.scheduledDNDStart": "Desde",
-  "settings.app.form.server": "Server",
+  "settings.app.form.server": "Servidor",
  "settings.app.form.showDisabledServices": "Mostrar abas de serviços desativados",
  "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar ícone de mensagem não lida quando as notificações estiverem desativadas",
-  "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
+  "settings.app.form.showServiceNavigationBar": "Sempre mostrar a barra de navegação do serviço",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.todoServer": "Tarefa do Servidor",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.headline": "Configurações",
  "settings.app.headlineAdvanced": "Avançado",
@@ -420,7 +421,7 @@
  "sidebar.addNewService": "Adicionar novo serviço",
  "sidebar.closeTodosDrawer": "Close Ferdi Todos",
  "sidebar.closeWorkspaceDrawer": "Fechar menu da área de trabalho",
-  "sidebar.lockFerdi": "Lock Ferdi",
+  "sidebar.lockFerdi": "Bloquear Ferdi",
  "sidebar.muteApp": "Desativar notificações e áudio",
  "sidebar.openTodosDrawer": "Open Ferdi Todos",
  "sidebar.openWorkspaceDrawer": "Abrir o menu da área de trabalho",
@@ -435,7 +436,7 @@
  "signup.legal.privacy": "Declaração de Privacidade ",
  "signup.legal.terms": "Termos de serviço",
  "signup.link.login": "Já tem uma conta?",
-  "signup.password.label": "Password",
+  "signup.password.label": "Senha",
  "signup.submit.label": "Criar uma conta",
  "subscription.bestValue": "Best value",
  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
@@ -444,9 +445,9 @@
  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
  "subscription.interval.per": "per {interval}",
  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
+  "subscription.interval.perMonthPerUser": "por mês e por utilizador",
  "subscription.planItem.upgradeAccount": "Actualizar cuenta",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
+  "subscription.teaser.includedFeatures": "Planos pagos Ferdi incluem:",
  "subscription.teaser.intro": "O Ferdi 5 vem com uma variedade de novas funcionalidades para melhorar a sua comunicação diária - pilhas inclusas. Confira os nossos novos planos e encontre aquele que melhor serve para você!",
  "subscriptionPopup.buttonCancel": "Cancelar",
  "subscriptionPopup.buttonDone": "Feito",
@@ -458,17 +459,17 @@
  "tabs.item.enableAudio": "Ativar áudio",
  "tabs.item.enableNotification": "Ativar notificações",
  "tabs.item.enableService": "Ativar serviço",
-  "tabs.item.reload": "Recarregar",
+  "tabs.item.reload": "Actualizar",
  "validation.email": "inválido",
  "validation.minLength": "{campo} deve ter pelo menos {comprimento} mais caracteres ",
  "validation.oneRequired": "Necessário pelo menos um",
  "validation.required": "{campo} obrigatório",
  "validation.url": "{campo} essa URL não é válida",
-  "webControls.back": "Back",
+  "webControls.back": "Anterior",
-  "webControls.forward": "Forward",
+  "webControls.forward": "Seguinte",
-  "webControls.goHome": "Home",
+  "webControls.goHome": "Início",
-  "webControls.openInBrowser": "Open in Browser",
+  "webControls.openInBrowser": "Abrir no navegador",
-  "webControls.reload": "Recarregar",
+  "webControls.reload": "Actualizar",
  "welcome.loginButton": "Entrar na sua conta",
  "welcome.signupButton": "Criar uma conta gratuita",
  "workspaceDrawer.addNewWorkspaceLabel": "Adicionar uma nova área de trabalho",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index f5beac6b3..3d14d5414 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "A cache do Ferdi está a usar {size} de espaço em disco.",
  "settings.app.currentVersion": "Versão atual",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Abrir em segundo plano",
  "settings.app.form.autoLaunchOnStart": "Iniciar o Ferdi após iniciar o computador",
  "settings.app.form.beta": "Incluir versões instáveis (beta)",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index edcc67771..8eb2053bc 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
  "settings.app.currentVersion": "Current version:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Open in background",
  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
  "settings.app.form.beta": "Include beta versions",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index b329522f4..5d3636d9e 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Кэш занимает {size} на диске.",
  "settings.app.currentVersion": "Текущая версия:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Открывать в фоне",
  "settings.app.form.autoLaunchOnStart": "Запускать Ferdi при старте",
  "settings.app.form.beta": "Включая бета версии",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 0b4c0d3fa..b9805e2a6 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Vyrovnávacia pamäť Ferdi momentálne používa {size} miesta na disku.",
  "settings.app.currentVersion": "Súčasná verzia:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Otvoriť na pozadí",
  "settings.app.form.autoLaunchOnStart": "Spustiť Ferdi pri štarte",
  "settings.app.form.beta": "Vrátane beta verzií",
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index edcc67771..8eb2053bc 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
  "settings.app.currentVersion": "Current version:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Open in background",
  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
  "settings.app.form.beta": "Include beta versions",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 1190fee0a..f1257ac1e 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Франз кеш тренутно користи {величина} простора на диску.",
  "settings.app.currentVersion": "Trenutna verzija:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Otvori u pozadini",
  "settings.app.form.autoLaunchOnStart": "Pokreni Ferdi sa sistemom",
  "settings.app.form.beta": "Obuhvati i beta verzije",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index edcc67771..8eb2053bc 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
  "settings.app.currentVersion": "Current version:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Open in background",
  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
  "settings.app.form.beta": "Include beta versions",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 8e55a66f9..34c406981 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi önbelleği şu anda {size} disk alanı kullanıyor.",
  "settings.app.currentVersion": "Geçerli sürüm:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Arka planda aç",
  "settings.app.form.autoLaunchOnStart": "Ferdi'ı başlangıçta aç",
  "settings.app.form.beta": "Beta versiyonları dahil et",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 1deed25fe..c1657b2c0 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Кеш, який використовує Ferdi, займає {size} дискового простору.",
  "settings.app.currentVersion": "Поточна версія:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Відкрити у фоновому режимі",
  "settings.app.form.autoLaunchOnStart": "Запускати Ferdi на початку",
  "settings.app.form.beta": "Включити бета-версії",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index edcc67771..8eb2053bc 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
  "settings.app.currentVersion": "Current version:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Open in background",
  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
  "settings.app.form.beta": "Include beta versions",
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index 872bfd9d7..fd1ea9977 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
  "settings.app.currentVersion": "當前版本：",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "背景啟動",
  "settings.app.form.autoLaunchOnStart": "開機時啟動",
  "settings.app.form.beta": "包含開發中版本",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index edcc67771..8eb2053bc 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -255,6 +255,7 @@
  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
  "settings.app.currentVersion": "Current version:",
  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
  "settings.app.form.autoLaunchInBackground": "Open in background",
  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
  "settings.app.form.beta": "Include beta versions",
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index 70c4fb87f..5bf9f0b31 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -4,11 +4,11 @@
    "defaultMessage": "!!!Settings",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 26,
+      "line": 27,
      "column": 12
    },
    "end": {
-      "line": 29,
+      "line": 30,
      "column": 3
    }
  },
@@ -17,11 +17,11 @@
    "defaultMessage": "!!!General",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 30,
+      "line": 31,
      "column": 19
    },
    "end": {
-      "line": 33,
+      "line": 34,
      "column": 3
    }
  },
@@ -30,11 +30,11 @@
    "defaultMessage": "!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 34,
+      "line": 35,
      "column": 17
    },
    "end": {
-      "line": 37,
+      "line": 38,
      "column": 3
    }
  },
@@ -43,11 +43,11 @@
    "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 38,
+      "line": 39,
      "column": 14
    },
    "end": {
-      "line": 41,
+      "line": 42,
      "column": 3
    }
  },
@@ -56,11 +56,11 @@
    "defaultMessage": "!!!You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 42,
+      "line": 43,
      "column": 19
    },
    "end": {
-      "line": 45,
+      "line": 46,
      "column": 3
    }
  },
@@ -69,11 +69,11 @@
    "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 46,
+      "line": 47,
      "column": 18
    },
    "end": {
-      "line": 49,
+      "line": 50,
      "column": 3
    }
  },
@@ -82,11 +82,11 @@
    "defaultMessage": "!!!Ferdi Lock Password",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 50,
+      "line": 51,
      "column": 18
    },
    "end": {
-      "line": 53,
+      "line": 54,
      "column": 3
    }
  },
@@ -95,11 +95,11 @@
    "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 54,
+      "line": 55,
      "column": 22
    },
    "end": {
-      "line": 57,
+      "line": 58,
      "column": 3
    }
  },
@@ -108,11 +108,11 @@
    "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.",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 58,
+      "line": 59,
      "column": 12
    },
    "end": {
-      "line": 61,
+      "line": 62,
      "column": 3
    }
  },
@@ -121,11 +121,11 @@
    "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 62,
+      "line": 63,
      "column": 24
    },
    "end": {
-      "line": 65,
+      "line": 66,
      "column": 3
    }
  },
@@ -134,11 +134,11 @@
    "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 66,
+      "line": 67,
      "column": 20
    },
    "end": {
-      "line": 69,
+      "line": 70,
      "column": 3
    }
  },
@@ -147,11 +147,11 @@
    "defaultMessage": "!!!Language",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 70,
+      "line": 71,
      "column": 20
    },
    "end": {
-      "line": 73,
+      "line": 74,
      "column": 3
    }
  },
@@ -160,11 +160,11 @@
    "defaultMessage": "!!!Updates",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 74,
+      "line": 75,
      "column": 19
    },
    "end": {
-      "line": 77,
+      "line": 78,
      "column": 3
    }
  },
@@ -173,11 +173,11 @@
    "defaultMessage": "!!!Appearance",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 78,
+      "line": 79,
      "column": 22
    },
    "end": {
-      "line": 81,
+      "line": 82,
      "column": 3
    }
  },
@@ -186,11 +186,11 @@
    "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 82,
+      "line": 83,
      "column": 25
    },
    "end": {
-      "line": 85,
+      "line": 86,
      "column": 3
    }
  },
@@ -199,11 +199,11 @@
    "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: #7367f0)",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 86,
+      "line": 87,
      "column": 19
    },
    "end": {
-      "line": 89,
+      "line": 90,
      "column": 3
    }
  },
@@ -212,11 +212,11 @@
    "defaultMessage": "!!!Advanced",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 90,
+      "line": 91,
      "column": 20
    },
    "end": {
-      "line": 93,
+      "line": 94,
      "column": 3
    }
  },
@@ -225,11 +225,11 @@
    "defaultMessage": "!!!Help us to translate Ferdi into your language.",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 94,
+      "line": 95,
      "column": 19
    },
    "end": {
-      "line": 97,
+      "line": 98,
      "column": 3
    }
  },
@@ -238,11 +238,11 @@
    "defaultMessage": "!!!Cache",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 98,
+      "line": 99,
      "column": 20
    },
    "end": {
-      "line": 101,
+      "line": 102,
      "column": 3
    }
  },
@@ -251,11 +251,11 @@
    "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 102,
+      "line": 103,
      "column": 13
    },
    "end": {
-      "line": 105,
+      "line": 106,
      "column": 3
    }
  },
@@ -264,11 +264,11 @@
    "defaultMessage": "!!!Clear cache",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 106,
+      "line": 107,
      "column": 23
    },
    "end": {
-      "line": 109,
+      "line": 110,
      "column": 3
    }
  },
@@ -277,11 +277,11 @@
    "defaultMessage": "!!!Check for updates",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 110,
+      "line": 111,
      "column": 25
    },
    "end": {
-      "line": 113,
+      "line": 114,
      "column": 3
    }
  },
@@ -290,11 +290,11 @@
    "defaultMessage": "!!!Restart & install update",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 114,
+      "line": 115,
      "column": 23
    },
    "end": {
-      "line": 117,
+      "line": 118,
      "column": 3
    }
  },
@@ -303,11 +303,11 @@
    "defaultMessage": "!!!Is searching for update",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 118,
+      "line": 119,
      "column": 25
    },
    "end": {
-      "line": 121,
+      "line": 122,
      "column": 3
    }
  },
@@ -316,11 +316,11 @@
    "defaultMessage": "!!!Update available, downloading...",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 122,
+      "line": 123,
      "column": 25
    },
    "end": {
-      "line": 125,
+      "line": 126,
      "column": 3
    }
  },
@@ -329,11 +329,11 @@
    "defaultMessage": "!!!You are using the latest version of Ferdi",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 126,
+      "line": 127,
      "column": 24
    },
    "end": {
-      "line": 129,
+      "line": 130,
      "column": 3
    }
  },
@@ -342,11 +342,11 @@
    "defaultMessage": "!!!Current version:",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 130,
+      "line": 131,
      "column": 18
    },
    "end": {
-      "line": 133,
+      "line": 134,
      "column": 3
    }
  },
@@ -355,11 +355,11 @@
    "defaultMessage": "!!!Changes require restart",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 134,
+      "line": 135,
      "column": 29
    },
    "end": {
-      "line": 137,
+      "line": 138,
      "column": 3
    }
  },
@@ -368,11 +368,11 @@
    "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
    "file": "src/components/settings/settings/EditSettingsForm.js",
    "start": {
-      "line": 138,
+      "line": 139,
      "column": 22
    },
    "end": {
-      "line": 141,
+      "line": 142,
      "column": 3
    }
  }
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 5ec8fdba7..411e35dab 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -234,8 +234,8 @@
    }
  },
  {
-    "id": "settings.app.form.universalDarkMode",
+    "id": "settings.app.form.adaptableDarkMode",
-    "defaultMessage": "!!!Enable universal Dark Mode",
+    "defaultMessage": "!!!Enable adaptable Dark Mode",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
      "line": 101,
@@ -247,15 +247,28 @@
    }
  },
  {
+    "id": "settings.app.form.universalDarkMode",
+    "defaultMessage": "!!!Enable universal Dark Mode",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 105,
+      "column": 21
+    },
+    "end": {
+      "line": 108,
+      "column": 3
+    }
+  },
+  {
    "id": "settings.app.form.accentColor",
    "defaultMessage": "!!!Accent color",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 105,
+      "line": 109,
      "column": 15
    },
    "end": {
-      "line": 108,
+      "line": 112,
      "column": 3
    }
  },
@@ -264,11 +277,11 @@
    "defaultMessage": "!!!Display disabled services tabs",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 109,
+      "line": 113,
      "column": 24
    },
    "end": {
-      "line": 112,
+      "line": 116,
      "column": 3
    }
  },
@@ -277,11 +290,11 @@
    "defaultMessage": "!!!Show unread message badge when notifications are disabled",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 113,
+      "line": 117,
      "column": 29
    },
    "end": {
-      "line": 116,
+      "line": 120,
      "column": 3
    }
  },
@@ -290,11 +303,11 @@
    "defaultMessage": "!!!Enable spell checking",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 117,
+      "line": 121,
      "column": 23
    },
    "end": {
-      "line": 120,
+      "line": 124,
      "column": 3
    }
  },
@@ -303,11 +316,11 @@
    "defaultMessage": "!!!Enable GPU Acceleration",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 121,
+      "line": 125,
      "column": 25
    },
    "end": {
-      "line": 124,
+      "line": 128,
      "column": 3
    }
  },
@@ -316,11 +329,11 @@
    "defaultMessage": "!!!Include beta versions",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 125,
+      "line": 129,
      "column": 8
    },
    "end": {
-      "line": 128,
+      "line": 132,
      "column": 3
    }
  },
@@ -329,11 +342,11 @@
    "defaultMessage": "!!!Disable updates",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 129,
+      "line": 133,
      "column": 13
    },
    "end": {
-      "line": 132,
+      "line": 136,
      "column": 3
    }
  },
@@ -342,11 +355,11 @@
    "defaultMessage": "!!!Enable Franz Todos",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 133,
+      "line": 137,
      "column": 15
    },
    "end": {
-      "line": 136,
+      "line": 140,
      "column": 3
    }
  },
@@ -355,11 +368,11 @@
    "defaultMessage": "!!!Keep all workspaces loaded",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 137,
+      "line": 141,
      "column": 27
    },
    "end": {
-      "line": 140,
+      "line": 144,
      "column": 3
    }
  }
diff --git a/src/index.html b/src/index.html
index 7f223b662..31e8aa553 100644
--- a/src/index.html
+++ b/src/index.html
@@ -14,6 +14,7 @@
  <script>
    document.querySelector('body').classList.add(process.env.OS_PLATFORM ? process.env.OS_PLATFORM : process.platform);
+    require('./sentry')
    const { isDevMode } = require('./environment');
    if (isDevMode) {
      const debugging = require('debug');
diff --git a/src/index.js b/src/index.js
index 87aa6357b..12ea7f646 100644
--- a/src/index.js
+++ b/src/index.js
@@ -9,9 +9,16 @@ import fs from 'fs-extra';
 import path from 'path';
 import windowStateKeeper from 'electron-window-state';
-if (process.platform === 'win32') {
+// Set app directory before loading user modules
-  app.setPath('appData', process.env.LOCALAPPDATA);
+if (process.env.FERDI_APPDATA_DIR != null) {
-  app.setPath('userData', path.join(process.env.LOCALAPPDATA, app.getName()));
+  app.setPath('appData', process.env.FERDI_APPDATA_DIR);
+  app.setPath('userData', path.join(app.getPath('appData')));
+} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
+  app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.getName()}AppData`);
+  app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}AppData`));
+} else if (process.platform === 'win32') {
+  app.setPath('appData', process.env.APPDATA);
+  app.setPath('userData', path.join(app.getPath('appData'), app.getName()));
 }
 if (isDevMode) {
@@ -32,6 +39,7 @@ import handleDeepLink from './electron/deepLinking';
 import { isPositionValid } from './electron/windowUtils';
 import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
 import './electron/exception';
+import './sentry';
 import {
  DEFAULT_APP_SETTINGS,
@@ -166,6 +174,7 @@ const createWindow = () => {
    webPreferences: {
      nodeIntegration: true,
      webviewTag: true,
+      preload: path.join(__dirname, 'sentry.js'),
    },
  });
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index d7398a126..826fe843f 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -487,7 +487,8 @@ const _templateFactory = intl => [
 const _titleBarTemplateFactory = intl => [
  {
-    label: `&${intl.formatMessage(menuItems.edit)}`,
+    label: intl.formatMessage(menuItems.edit),
+    accelerator: 'Alt+E',
    submenu: [
      {
        label: intl.formatMessage(menuItems.undo),
@@ -550,7 +551,8 @@ const _titleBarTemplateFactory = intl => [
    ],
  },
  {
-    label: `&${intl.formatMessage(menuItems.view)}`,
+    label: intl.formatMessage(menuItems.view),
+    accelerator: 'Alt+V',
    submenu: [
      {
        type: 'separator',
@@ -641,11 +643,13 @@ const _titleBarTemplateFactory = intl => [
    ],
  },
  {
-    label: `&${intl.formatMessage(menuItems.services)}`,
+    label: intl.formatMessage(menuItems.services),
+    accelerator: 'Alt+S',
    submenu: [],
  },
  {
-    label: `&${intl.formatMessage(menuItems.workspaces)}`,
+    label: intl.formatMessage(menuItems.workspaces),
+    accelerator: 'Alt+W',
    submenu: [],
    visible: workspaceStore.isFeatureEnabled,
  },
@@ -674,7 +678,8 @@ const _titleBarTemplateFactory = intl => [
    ],
  },
  {
-    label: '&?',
+    label: '?',
+    accelerator: 'Alt+?',
    submenu: [
      {
        label: intl.formatMessage(menuItems.learnMore),
@@ -816,7 +821,8 @@ export default class FranzMenu {
    });
    tpl.unshift({
-      label: isMac ? app.getName() : `&${intl.formatMessage(menuItems.file)}`,
+      label: isMac ? app.getName() : intl.formatMessage(menuItems.file),
+      accelerator: 'Alt+F',
      submenu: [
        {
          label: intl.formatMessage(menuItems.about),
diff --git a/src/sentry.js b/src/sentry.js
new file mode 100644
index 000000000..4f6d7205d
--- /dev/null
+++ b/src/sentry.js
@@ -0,0 +1,5 @@
+import * as Sentry from '@sentry/electron';
+Sentry.init({
+  dsn: 'https://f3d022fbcf6243a68a58d681c2122ee4@sentry.io/1803053',
+});
diff --git a/src/server b/src/server
-Subproject b5973cdc4cdd60e61d2fba25a317bb4d216a0d1
+Subproject cca6cd984caf729722153e58f44c01319c4bd63
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index c6724c20f..0756a05eb 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -181,7 +181,9 @@ export default class AppStore extends Store {
    this.locale = this._getDefaultLocale();
-    this._healthCheck();
+    setTimeout(() => {
+      this._healthCheck();
+    }, 1000);
    this.isSystemDarkModeEnabled = systemPreferences.isDarkMode();
@@ -227,20 +229,35 @@ export default class AppStore extends Store {
  }
  @computed get debugInfo() {
+    const settings = JSON.parse(JSON.stringify(this.stores.settings.app));
+    settings.lockedPassword = '******';
    return {
      host: {
        platform: process.platform,
        release: os.release(),
        screens: screen.getAllDisplays(),
      },
-      franz: {
+      ferdi: {
        version: app.getVersion(),
        electron: process.versions.electron,
        installedRecipes: this.stores.recipes.all.map(recipe => ({ id: recipe.id, version: recipe.version })),
        devRecipes: this.stores.recipePreviews.dev.map(recipe => ({ id: recipe.id, version: recipe.version })),
-        services: this.stores.services.all.map(service => ({ id: service.id, recipe: service.recipe.id })),
+        services: this.stores.services.all.map(service => ({
+          id: service.id,
+          recipe: service.recipe.id,
+          isAttached: service.isAttached,
+          isActive: service.isActive,
+          isEnabled: service.isEnabled,
+          isHibernating: service.isHibernating,
+          hasCrashed: service.hasCrashed,
+          isDarkModeEnabled: service.isDarkModeEnabled,
+        })),
+        messages: this.stores.globalError.messages,
        workspaces: this.stores.workspaces.workspaces.map(workspace => ({ id: workspace.id, services: workspace.services })),
        windowSettings: readJsonSync(path.join(app.getPath('userData'), 'window-state.json')),
+        settings,
+        features: this.stores.features.features,
        user: this.stores.user.data.id,
      },
    };
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index ab5d762c7..780cde3a7 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -57,7 +57,10 @@ export default class FeaturesStore extends Store {
  _updateFeatures = () => {
    const features = Object.assign({}, DEFAULT_FEATURES_CONFIG);
    if (this.stores.user.isLoggedIn) {
-      const requestResult = this.featuresRequest.execute().result;
+      let requestResult = {};
+      try {
+        requestResult = this.featuresRequest.execute().result;
+      } catch (e) {} // eslint-disable-line no-empty
      Object.assign(features, requestResult);
    }
    runInAction('FeaturesStore::_updateFeatures', () => {
diff --git a/src/stores/GlobalErrorStore.js b/src/stores/GlobalErrorStore.js
index 8bdafb68c..aacaa247f 100644
--- a/src/stores/GlobalErrorStore.js
+++ b/src/stores/GlobalErrorStore.js
@@ -5,14 +5,54 @@ import Request from './lib/Request';
 export default class GlobalErrorStore extends Store {
  @observable error = null;
+  @observable messages = [];
  @observable response = {};
  constructor(...args) {
    super(...args);
+    window.onerror = (...errorArgs) => {
+      this._handleConsoleError.call(this, ['error', ...errorArgs]);
+    };
+    const origConsoleError = console.error;
+    window.console.error = (...errorArgs) => {
+      this._handleConsoleError.call(this, ['error', ...errorArgs]);
+      origConsoleError.apply(this, errorArgs);
+    };
+    const origConsoleLog = console.log;
+    window.console.log = (...logArgs) => {
+      this._handleConsoleError.call(this, ['log', ...logArgs]);
+      origConsoleLog.apply(this, logArgs);
+    };
+    const origConsoleInfo = console.info;
+    window.console.info = (...infoArgs) => {
+      this._handleConsoleError.call(this, ['info', ...infoArgs]);
+      origConsoleInfo.apply(this, infoArgs);
+    };
    Request.registerHook(this._handleRequests);
  }
+  _handleConsoleError(type, error, url, line) {
+    if (typeof type === 'object' && type.length && type.length >= 1) {
+      this.messages.push({
+        type: type[0],
+        info: type,
+      });
+    } else {
+      this.messages.push({
+        type,
+        error,
+        url,
+        line,
+      });
+    }
+  }
  _handleRequests = action(async (request) => {
    if (request.isError) {
      this.error = request.error;
@@ -28,6 +68,18 @@ export default class GlobalErrorStore extends Store {
          // this.actions.user.logout({ serverLogout: true });
        }
      }
+      this.messages.push({
+        type: 'error',
+        request: {
+          result: request.result,
+          wasExecuted: request.wasExecuted,
+          method: request._method,
+        },
+        error: this.error,
+        response: this.response,
+        server: window.ferdi.stores.settings.app.server,
+      });
    } else {
      window.ferdi.stores.app.authRequestFailed = false;
    }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 934a8a6e0..3dd601bc3 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -116,6 +116,11 @@ export default class ServicesStore extends Store {
    );
    reaction(
+      () => this.stores.settings.app.adaptableDarkMode,
+      () => this._shareSettingsWithServiceProcess(),
+    );
+    reaction(
      () => this.stores.settings.app.universalDarkMode,
      () => this._shareSettingsWithServiceProcess(),
    );
@@ -585,7 +590,8 @@ export default class ServicesStore extends Store {
    service.resetMessageCount();
-    service.webview.loadURL(service.url);
+    // service.webview.loadURL(service.url);
+    service.webview.reload();
  }
  @action _reloadActive() {
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index 9680c5bcc..44bc7c974 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -5,12 +5,18 @@ import {
  reaction,
 } from 'mobx';
 import { theme } from '@meetfranz/theme';
+import { remote } from 'electron';
 import Store from './lib/Store';
+import { isMac } from '../environment';
+const { systemPreferences } = remote;
 export default class UIStore extends Store {
  @observable showServicesUpdatedInfoBar = false;
+  @observable isOsDarkThemeActive = isMac ? systemPreferences.isDarkMode() : false;
  constructor(...args) {
    super(...args);
@@ -18,6 +24,13 @@ export default class UIStore extends Store {
    this.actions.ui.openSettings.listen(this._openSettings.bind(this));
    this.actions.ui.closeSettings.listen(this._closeSettings.bind(this));
    this.actions.ui.toggleServiceUpdatedInfoBar.listen(this._toggleServiceUpdatedInfoBar.bind(this));
+    // Listen for theme change on MacOS
+    if (isMac) {
+      systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
+        this.isOsDarkThemeActive = systemPreferences.isDarkMode();
+      });
+    }
  }
  setup() {
@@ -35,7 +48,7 @@ export default class UIStore extends Store {
  }
  @computed get isDarkThemeActive() {
-    return this.stores.settings.all.app.darkMode;
+    return this.stores.settings.all.app.darkMode || (this.stores.settings.all.app.adaptableDarkMode && this.isOsDarkThemeActive);
  }
  @computed get theme() {
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index d6a2e5fde..ec0b0cf8d 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -348,7 +348,12 @@ export default class UserStore extends Store {
  // Reactions
  async _getUserData() {
    if (this.isLoggedIn) {
-      const data = await this.getUserInfoRequest.execute()._promise;
+      let data;
+      try {
+        data = await this.getUserInfoRequest.execute()._promise;
+      } catch (e) {
+        return false;
+      }
      // We need to set the beta flag for the SettingsStore
      this.actions.settings.update({
@@ -408,7 +413,11 @@ export default class UserStore extends Store {
  }
  async _migrateUserLocale() {
-    await this.getUserInfoRequest._promise;
+    try {
+      await this.getUserInfoRequest._promise;
+    } catch (e) {
+      return false;
+    }
    if (!this.data.locale) {
      debug('Migrate "locale" to user data');
diff --git a/src/stores/lib/CachedRequest.js b/src/stores/lib/CachedRequest.js
index ac8b2bd81..31c7ce241 100644
--- a/src/stores/lib/CachedRequest.js
+++ b/src/stores/lib/CachedRequest.js
@@ -39,7 +39,7 @@ export default class CachedRequest extends Request {
    }), 0);
    // Issue api call & save it as promise that is handled to update the results of the operation
-    this._promise = new Promise((resolve, reject) => {
+    this._promise = new Promise((resolve) => {
      this._api[this._method](...callArgs)
        .then((result) => {
          setTimeout(action(() => {
@@ -63,7 +63,7 @@ export default class CachedRequest extends Request {
            this.wasExecuted = true;
            this._isWaitingForResponse = false;
            this._triggerHooks();
-            reject(error);
+            // reject(error);
          }), 1);
        }));
    });
diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss
index e500830ed..5bd0555d2 100644
--- a/src/styles/tabs.scss
+++ b/src/styles/tabs.scss
@@ -72,6 +72,8 @@
      font-size: 0px;
      min-height: 10px;
      min-width: 10px;
+      right: auto;
+      left: 8px;
    }
  }
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 2bf8f757a..1e290f8be 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -120,6 +120,7 @@ class RecipeController {
      }
    }
+    console.log('Set theme to: ', this.settings.service.isDarkModeEnabled ? 'Dark' : 'Light');
    if (this.settings.service.isDarkModeEnabled) {
      debug('Enable dark mode');
@@ -127,9 +128,18 @@ class RecipeController {
      const darkModeStyle = path.join(this.settings.service.recipe.path, 'darkmode.css');
      const darkModeExists = fs.pathExistsSync(darkModeStyle);
+      console.log('darkmode.css exists? ', darkModeExists ? 'Yes' : 'No');
      if (darkModeExists) {
+        console.log('Injecting darkmode.css');
        injectDarkModeStyle(this.settings.service.recipe.path);
+        // Make sure universal dark mode is disabled
+        disableDarkMode();
+        this.universalDarkModeInjected = false;
      } else if (this.settings.app.universalDarkMode && !ignoreList.includes(window.location.host)) {
+        console.log('Injecting DarkReader');
        // Use darkreader instead
        enableDarkMode({}, {
          css: customDarkModeCss[window.location.host] || '',
@@ -138,10 +148,14 @@ class RecipeController {
      }
    } else {
      debug('Remove dark mode');
+      console.log('DarkMode disabled - removing remaining styles');
      if (isDarkModeStyleInjected()) {
+        console.log('Removing injected darkmode.css');
        removeDarkModeStyle();
      } else {
+        console.log('Removing DarkReader');
        disableDarkMode();
        this.universalDarkModeInjected = false;
      }