35 files changed, 595 insertions, 263 deletions
diff --git a/.all-contributorsrc b/.all-contributorsrc
index cd9704edf..832fcd243 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,72 @@
        "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"
+      ]
    }
  ],
  "contributorsPerLine": 6
diff --git a/.gitmodules b/.gitmodules
index 00bc1d26d..d121d6c01 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,8 @@
 [submodule "recipes"]
        path = recipes
-        url = https://github.com/getferdi/recipes.git
+        url = git@github.com:getferdi/recipes.git
        ignore = all
 [submodule "src/server"]
        path = src/server
-        url = https://github.com/getferdi/internal-server.git
+        url = git@github.com:getferdi/internal-server.git
        ignore = all
diff --git a/.travis.yml b/.travis.yml
index ff015b92c..ba8bc86ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,25 @@
 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
+    - os: osx
-    osx_image: xcode11
+      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:
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules; else sed -i '' 's/git@github.com:/https:\/\/github.com\//' .gitmodules; fi
+  - git submodule update --init --recursive
 install:
  - echo do nothing
 before_script:
diff --git a/README.md b/README.md
index 285c80bb0..c2762a498 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)
@@ -53,38 +106,36 @@ 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 // Windows 7
 ```
-#### Clone repository with submodule
+### Clone repository with submodule
 ```bash
 $ git clone https://github.com/getferdi/ferdi.git
@@ -145,34 +196,39 @@ 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>
  </tr>
 </table>
-<!-- markdownlint-enable -->
-<!-- prettier-ignore-end -->
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
@@ -187,4 +243,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..5d2e0c6bd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,6 +4,10 @@ environment:
 version: 5.0.1.{build}
 install:
+  - ps: $fileContent = "-----BEGIN RSA PRIVATE KEY-----`n"
+  - ps: $fileContent += $env:priv_key.Replace(' ', "`n")
+  - ps: $fileContent += "`n-----END RSA PRIVATE KEY-----`n"
+  - ps: Set-Content $env:userprofile\.ssh\id_rsa $fileContent
  - git submodule update --init --recursive
  - ps: Install-Product node 10
  - npx lerna bootstrap
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/next_release.md b/next_release.md
new file mode 100644
index 000000000..0e4bc411b
--- /dev/null
+++ b/next_release.md
@@ -0,0 +1,44 @@
+# 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)
+## 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
+- **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..a5b797e14 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": {
diff --git a/package.json b/package.json
index b26986270..6bafa0f2b 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "ferdi",
  "productName": "Ferdi",
  "appId": "com.kytwb.ferdi",
-  "version": "5.4.0-beta.3",
+  "version": "5.4.0-beta.5",
  "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
  "copyright": "kytwb",
  "main": "index.js",
diff --git a/recipes b/recipes
-Subproject 7aa76feba8bd94368d27bee556480313c636f94
+Subproject f32213ebafaa63bc87202317580abb80d6e0586
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..164bc237b 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;
@@ -466,7 +475,11 @@ export default class ServerApi {
  // 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/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/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/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.js b/src/index.js
index 87aa6357b..3453b46f7 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) {
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index f3fbb0c73..826fe843f 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -678,7 +678,8 @@ const _titleBarTemplateFactory = intl => [
    ],
  },
  {
-    label: '&?',
+    label: '?',
+    accelerator: 'Alt+?',
    submenu: [
      {
        label: intl.formatMessage(menuItems.learnMore),
diff --git a/src/server b/src/server
-Subproject b5973cdc4cdd60e61d2fba25a317bb4d216a0d1
+Subproject 8249d625bbd80498ae18257a52e480d0ebb368c
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 59b100b55..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,6 +229,9 @@ 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,
@@ -238,19 +243,20 @@ export default class AppStore extends Store {
        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 => ({ 
+        services: this.stores.services.all.map(service => ({
-          id: service.id, 
+          id: service.id,
-          recipe: service.recipe.id, 
+          recipe: service.recipe.id,
-          isAttached: service.isAttached, 
+          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: this.stores.settings.app,
+        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;
    }
  }