24 files changed, 267 insertions, 89 deletions
diff --git a/.all-contributorsrc b/.all-contributorsrc
index cd9704edf..89c1d6f2a 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,52 @@
        "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"
+      ]
    }
  ],
  "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 90a01b091..44ab84831 100644
--- a/README.md
+++ b/README.md
@@ -196,34 +196,37 @@ 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>
  </tr>
 </table>
-<!-- markdownlint-enable -->
-<!-- prettier-ignore-end -->
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
diff --git a/appveyor.yml b/appveyor.yml
index 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/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/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/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..1db881d35 100644
--- a/src/config.js
+++ b/src/config.js
@@ -112,6 +112,7 @@ 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';
 export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config');
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/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..f65faa5a5 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -585,7 +585,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/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;
    }
  }