5.5.0

85 files changed, 2248 insertions, 1651 deletions

diff --git a/.all-contributorsrc b/.all-contributorsrc
index def591b62..e5ae29a91 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -472,7 +472,9 @@
       "avatar_url": "https://avatars1.githubusercontent.com/u/1255523?v=4",
       "profile": "https://github.com/mahadevans87",
       "contributions": [
-        "code"
+        "code",
+        "ideas",
+        "review"
       ]
     },
     {
@@ -490,7 +492,8 @@
       "avatar_url": "https://avatars1.githubusercontent.com/u/17728976?v=4",
       "profile": "https://github.com/sampathBlam",
       "contributions": [
-        "code"
+        "code",
+        "review"
       ]
     },
     {
@@ -499,7 +502,170 @@
       "avatar_url": "https://avatars2.githubusercontent.com/u/41330038?v=4",
       "profile": "https://github.com/saruwman",
       "contributions": [
-        "doc"
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "dorukkarinca",
+      "name": "dorukkarinca",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/9303867?v=4",
+      "profile": "https://github.com/dorukkarinca",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "gautamsi",
+      "name": "Gautam Singh",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/5769869?v=4",
+      "profile": "https://www.linkedin.com/in/gautamsi",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "FeikoJoosten",
+      "name": "Feiko Joosten",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/10920052?v=4",
+      "profile": "https://feikojoosten.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "2bdelghafour",
+      "name": "2bdelghafour",
+      "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14219410/small/31ff20f60d352fb46e314f3c180a77b0.jpeg",
+      "profile": "https://crowdin.com/profile/2bdelghafour",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "abdoutanta",
+      "name": "Abderrahim Tantaoui",
+      "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14213908/small/5b2fc8166f8a0a2b7313fbf49ee5b6b6.jpeg",
+      "profile": "https://crowdin.com/profile/abdoutanta",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "AndiLeni",
+      "name": "AndiLeni",
+      "avatar_url": "https://www.gravatar.com/avatar/4bd0da860de38afa735425ce2d4e10b5",
+      "profile": "https://crowdin.com/profile/AndiLeni",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "brunofalmada",
+      "name": "Bruno Almada",
+      "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14200540/small/f6f1addceeeabc02488f9b08520a902f.jpeg",
+      "profile": "https://crowdin.com/profile/brunofalmada",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "Catarino",
+      "name": "Catarino Gonçalo",
+      "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14208802/small/07287eb2de671257ca3d6bb4ba1cca67.jpeg",
+      "profile": "https://crowdin.com/profile/Catarino",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "Alzemand",
+      "name": "Edilson Alzemand Sigmaringa Junior",
+      "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14184269/small/f5e68247f01988ae7951a282f0fd4d06.jpeg",
+      "profile": "https://crowdin.com/profile/Alzemand",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "MAT-OUT",
+      "name": "MAT-OUT",
+      "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14201550/small/68dd2402bf2879bc3ca312d627710400.png",
+      "profile": "https://crowdin.com/profile/MAT-OUT",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "mazzo98",
+      "name": "mazzo98",
+      "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/12864917/small/69799b5fd7be2f67282715d5cdfd4ae1.png",
+      "profile": "https://crowdin.com/profile/mazzo98",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "paprika-naught-tiffin-flyspeck",
+      "name": "paprika-naught-tiffin-flyspeck",
+      "avatar_url": "https://www.gravatar.com/avatar/8671ebe7a7164dfa7624fbdbff69ed96",
+      "profile": "https://crowdin.com/profile/paprika-naught-tiffin-flyspeck",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "patrickvalle",
+      "name": "Patrick Valle",
+      "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14217484/small/8b73f313ee79fe33625e819cdac86551.jpg",
+      "profile": "https://crowdin.com/profile/patrickvalle",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "peq42",
+      "name": "peq42_",
+      "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14155811/small/b62a94dde7ec29948ec6a6af9fd24b1d.png",
+      "profile": "https://crowdin.com/profile/peq42",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "karlinhos",
+      "name": "Pumbinha",
+      "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14161139/small/96450eb44c22b3141ab4401e547109b8.png",
+      "profile": "https://crowdin.com/profile/karlinhos",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "dies",
+      "name": "Serhiy Dmytryshyn",
+      "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/1/small/e84bcdf6c084ffd52527931f988fb410.png",
+      "profile": "https://crowdin.com/profile/dies",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "SMile61",
+      "name": "SMile61",
+      "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14177585/small/1bb4f6ba39bff3df8f579e61460ce016.png",
+      "profile": "https://crowdin.com/profile/SMile61",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "tinect",
+      "name": "tinect",
+      "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/12521988/small/56c2041645746af9e51dd28782b828c3.jpeg",
+      "profile": "https://crowdin.com/profile/tinect",
+      "contributions": [
+        "translation"
       ]
     }
   ],
diff --git a/.travis.yml b/.travis.yml
index e0fd7b8ae..7579878b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 matrix:
+  fast_finish: true
   include:
     - os: linux
       dist: xenial
@@ -11,27 +12,28 @@ matrix:
             - libxkbfile-dev
             - rpm
     - os: osx
+      if: branch = release
       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
+branches:
+  only:
+    - develop
+    - release
+cache: npm
+
 before_install:
   - git submodule update --init --recursive
 install:
-  - echo do nothing
-before_script:
   - travis_retry npx lerna bootstrap
   - travis_retry npm install node-sass -g
+before_script:
+  - npm run lint && npm run test
 script:
-  - travis_retry travis_wait 100 npm run build
-
-cache: npm
+  - |
+    if [ $TRAVIS_BRANCH == "release" ]; then
+      travis_retry travis_wait 100 npm run build
+    fi
 
-branches:
-  except:
-    - i18n
-    - l10n_master
-    - l10n_develop
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49f6c5b67..0c77abc10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,130 @@
+# [5.5.0](https://github.com/getferdi/ferdi/compare/v5.4.3...v5.5.0) (2020-04-26)
+### Features
+- Merge Franz 5.5.0-beta.2
+- Add dropdown list to choose Todo service (#418, #477), 💖 @yourcontact
+- Add hotkey for darkmode (#530, #537), 💖 @Room4O4 & @mahadevans87
+- Add option to start Ferdi minimized (#490, #534)
+- Add option to show draggable window area on macOS (#304, #532)
+- Add support for Adaptable Dark Mode on Windows (#548), 💖 @Room4O4 & @mahadevans87
+- Add notification & audio toggle action in tray context menu (#542), 💖 @Room4O4 & @mahadevans87
+- Add Dark Reader settings (#531, #568), 💖 @Room4O4 & @mahadevans87
+- Add support for 11 new services and improve existing ones, 💖 @rctneil @JakeSteam @sampathBlam @tpopela @RoiArthurB
+- Add support for unlocking with Touch ID (#367)
+- Add find in page feature (#67) (#432)
+- Add custom dark mode handler support (#445)
+- Add option to disable reload after resume (#442), 💖 @n0emis
+- Add custom JS/CSS to services (#83)
+- Add ability to change the services icons size and sidebar width (#153)
+- Differentiate between indirect and direct notifications (#590), 💖 @Room4O4 @mahadevans87 @FeikoJoosten @sampathBlam
+- Add setting to keep service in hibernation after startup (#577, #584)
+
+### Minor changes
+- Improve user onboarding (#493)
+- Improve "Updates" section in settings (#506), 💖 @yourcontact
+- Improve information about Franz Premium and Teams
+- Hide user lastname on Ferdi servers as it is not stored
+- Improve draggable window area height for macOS (#304, #479)
+- Remove server setting from settings screen (#516), 💖 @mrassili
+- Update Electron to 8.1.1 (#480)
+- Window title now reflects service name (#213), 💖 @gmarec
+- Improve system tray icon behaviour (#307)
+- Improve navigation bar behaviour setting (#270)
+- Ferdi is now available as Flatpak on Flathub (#323), 💖 @lhw
+- Add automatic local recipe updates
+- Add option to start Ferdi in system tray (#331), 💖 @jereksel 
+- Add better support for macOS dark mode
+- Add better seperation in settings
+- Change Sentry telemetry to be opt-in only (#160)
+- Remove excess code from Franz's hibernate feature (#609)
+- Refocus Webview only for active service (#610), 💖 @Room4O4 & @mahadevans87
+- Use GitHub notifications center and direct notifications (getferdi/recipes#133)
+- Switch back to original Telegram, add Telegram React (getferdi/recipes#132)
+- Fix notifications for various services, 💖 @FeikoJoosten
+- Add support for indirect messages for various services, 💖 @FeikoJoosten
+- Use correct Riot icon (getferdi/recipes#125), 💖 @halms
+- Remove incorrectly placed icons (getferdi/recipes#126), 💖 @halms
+- Fix slack draft notifications (getferdi/recipes#127), 💖 @Serubin
+- Remove automatic reloading from WhatsApp
+- Update Microsoft Teams to allow Desktop Sharing (getferdi/recipes#116), 💖 @Gautasmi
+- Organize settings with horizontal tabs (#569), 💖 @yourcontact
+- Improve cache clearing UI feedback (#620), 💖 @saruwman
+
+### Bug fixes
+- Fix cache clearing not working in Windows 10 (#541, #544), 💖 @Room4O4 & @mahadevans87
+- Fix Home button in navigation bar not correctly navigating (#571, #573), 💖 @Room4O4 & @mahadevans87
+- Fix and enhance context menu (#357) (#413) (#452) (#354) (#227)
+- Fix regresssion around muting services (#428), 💖 @dpeukert
+- Fix app unusable without an account on Windows since v5.4.0 (#253)
+- Fix services URL validation/harmonization (#276)
+- Fix app failing to properly lock itself at startup resulting in shortcuts not working (#377) (#362)
+- Fix shortcuts not working when locked (#404)
+- Fix missing Slack services custom icons (#290)
+- Fix app possibly unusable when using faulty translations (#340)
+- Fix Dark Mode setting on Windows (#347)
+- Fix login problems in Google services
+- Fix Dark Reader blocking services from loading (#285)
+- Fix incorrect body closing tag (#330), 💖 @jereksel
+- Fix DarkReader translation problem (#593)
+- Fix system tray icon tooltip text (#648), 💖 @sampathBlam
+- Enable Dark Reader settings to follow the accent color (#646), 💖 @sampathBlam
+
+### Build changes
+- Add retry commands to flaky build steps (#498)
+- Run utility scripts pre-commit instead of pre-push (#515)
+
+# [5.5.0-gm.2](https://github.com/getferdi/ferdi/compare/v5.5.0-gm...v5.5.0-gm.2) (2020-04-23)
+### Features
+- Differentiate between indirect and direct notifications (#590), 💖 @Room4O4 @mahadevans87 @FeikoJoosten @sampathBlam
+- Add setting to keep service in hibernation after startup (#577, #584)
+
+### Minor changes
+- Remove excess code from Franz's hibernate feature (#609)
+- Refocus Webview only for active service (#610), 💖 @Room4O4 & @mahadevans87
+- Use GitHub notifications center and direct notifications (getferdi/recipes#133)
+- Switch back to original Telegram, add Telegram React (getferdi/recipes#132)
+- Fix notifications for various services, 💖 @FeikoJoosten
+- Add support for indirect messages for various services, 💖 @FeikoJoosten
+- Use correct Riot icon (getferdi/recipes#125), 💖 @halms
+- Remove incorrectly placed icons (getferdi/recipes#126), 💖 @halms
+- Fix slack draft notifications (getferdi/recipes#127), 💖 @Serubin
+- Remove automatic reloading from WhatsApp
+- Update Microsoft Teams to allow Desktop Sharing (getferdi/recipes#116), 💖 @Gautasmi
+- Organize settings with horizontal tabs (#569), 💖 @yourcontact
+- Improve cache clearing UI feedback (#620), 💖 @saruwman
+
+### Bug Fixes
+- Fix DarkReader translation problem (#593)
+
+## [5.5.0-gm](https://github.com/getferdi/ferdi/compare/v5.4.4-beta.3...v5.5.0-gm) (2020-04-19)
+### Features
+- Merge Franz 5.5.0-beta.2
+- Add dropdown list to choose Todo service (#418, #477), 💖 @yourcontact
+- Add hotkey for darkmode (#530, #537), 💖 @Room4O4 & @mahadevans87
+- Add option to start Ferdi minimized (#490, #534)
+- Add option to show draggable window area on macOS (#304, #532)
+- Add support for Adaptable Dark Mode on Windows (#548), 💖 @Room4O4 & @mahadevans87
+- Add notification & audio toggle action in tray context menu (#542), 💖 @Room4O4 & @mahadevans87
+- Add Dark Reader settings (#531, #568), 💖 @Room4O4 & @mahadevans87
+- Add support for 11 new services and improve existing ones, 💖 @rctneil @JakeSteam @sampathBlam @tpopela @RoiArthurB
+
+### Minor changes
+- Improve user onboarding (#493)
+- Improve "Updates" section in settings (#506), 💖 @yourcontact
+- Improve information about Franz Premium and Teams
+- Improve user scripts (#559)
+- Hide user lastname on Ferdi servers as it is not stored
+- Improve draggable window area height for macOS (#304, #479)
+- Remove server setting from settings screen (#516), 💖 @mrassili
+- Update Electron to 8.1.1 (#480)
+
+### Bug fixes
+- Fix cache clearing not working in Windows 10 (#541, #544), 💖 @Room4O4 & @mahadevans87
+- Fix Home button in navigation bar not correctly navigating (#571, #573), 💖 @Room4O4 & @mahadevans87
+
+### Build changes
+- Add retry commands to flaky build steps (#498)
+- Run utility scripts pre-commit instead of pre-push (#515)
+
 # [5.4.3](https://github.com/getferdi/ferdi/compare/v5.4.0...v5.4.3)
 ### Features
 - Add inactivity lock #179
@@ -40,7 +167,7 @@
 - Attempt at making "About Ferdi" consistent across platforms #47 (comment)
 - Attempt at fixing "Launch on start" feature on Linux #63
 - Add "Quick Switch" feature
-- Add universal Dark-Mode via the [DarkReader extension](https://github.com/darkreader/darkreader)
+- Add universal Dark-Mode via the [Dark Reader extension](https://github.com/darkreader/darkreader)
 - Add "Scheduled Do-not-Disturb" feature
 
 # [5.3.3](https://github.com/getferdi/ferdi/compare/v5.3.2...v5.3.3) (2019-09-18)
diff --git a/README.md b/README.md
index ad9c85799..bf3f18ea7 100644
--- a/README.md
+++ b/README.md
@@ -13,9 +13,7 @@
 
 <p align="center">
 <img alt="GitHub Releases" src="https://img.shields.io/github/downloads/getferdi/ferdi/latest/total?label=Downloads&logo=iCloud&logoColor=%23FFFFFF">
-<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href='#contributors-'><img src='https://img.shields.io/badge/contributors-49-default.svg?logo=github' alt='Contributors'/></a>
-<!-- ALL-CONTRIBUTORS-BADGE:END --> 
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section --><a href='#contributors-'><img src='https://img.shields.io/badge/contributors-67-default.svg?logo=github' alt='Contributors'/></a><!-- ALL-CONTRIBUTORS-BADGE:END --> 
 <a href="#backers-via-opencollective"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective"></a>
 <a href="#sponsors-via-opencollective"><img alt="Open Collective sponsors" src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective"></a>
 <a href="https://ci.appveyor.com/project/kytwb/ferdi"><img alt="Build Status Windows" src="https://img.shields.io/appveyor/ci/kytwb/ferdi/master?logo=appveyor"></a>
@@ -119,11 +117,14 @@ If you use an AUR Helper e.g. yay, simply install it via `yay -S ferdi`.
 - [x] Adds an option to keep individual workspaces always loaded ([#37](https://github.com/getferdi/ferdi/issues/37))
 - [x] Adds "Quick Switch" feature to help you navigate a long list of services (similar to Rambox's [Quick Switcher](https://rambox.pro/#feature-details/quick_switcher))
 - [x] Adds "Service Hibernation" that will automatically unload services when they are unused to keep your computer running fast
+- [x] Adds a setting to keep service in hibernation after startup ([#577](https://github.com/getferdi/ferdi/issues/577), [#584](https://github.com/getferdi/ferdi/issues/584))
 - [x] [Add `user.css` and `user.js` that allows users to inject custom code into services](https://github.com/getferdi/ferdi/wiki/Using-user.css-and-user.js) ([#83](https://github.com/getferdi/ferdi/issues/83))
 - [x] Adds Process Manager to find services using a lot of resources
 - [x] Adds CTRL+← and CTRL+→ shortcuts and menu options to go back and forward in the service browsing history([#39](https://github.com/getferdi/ferdi/issues/39))
 - [x] Adds "Scheduled Do-not-Disturb" feature in which you won't get notifications (similar to Rambox's [Work Hours](https://rambox.pro/#feature-details/work_hours))
 - [x] Allows you to [use any Todo service inside "Franz Todo" panel](https://github.com/getferdi/ferdi/wiki/Custom-Todo) (e.g. Todoist via https://todoist.com/app) instead of being limited to using Franz Todo
+- [x] Adds a dropdown list to choose your Todo service ([#418](https://github.com/getferdi/ferdi/issues/418), [#477](https://github.com/getferdi/ferdi/issues/477)), 💖 [@yourcontact](https://github.com/yourcontact)
+- [x] Differentiates between indirect and direct notifications ([#590](https://github.com/getferdi/ferdi/issues/590)), 💖 [@Room4O4](https://github.com/Room4O4) [@mahadevans87](https://github.com/mahadevans87) [@FeikoJoosten](https://github.com/FeikoJoosten) [@sampathBlam](https://github.com/sampathBlam)
 
 ### Adds features to improve your privacy
 - [x] [Adds option to change server to a custom](https://github.com/getferdi/ferdi/wiki/Custom-Server) [ferdi-server](https://github.com/getferdi/server)
@@ -137,24 +138,34 @@ If you use an AUR Helper e.g. yay, simply install it via `yay -S ferdi`.
 
 ### Adds features to improve your experience using Ferdi
 - [x] Adds Universal Dark Mode via the [DarkReader extension](https://github.com/darkreader/darkreader) ([#71](https://github.com/getferdi/ferdi/issues/71))
-- [x] Adds adaptable Dark Mode that will respect the system's Dark Mode setting ([#173](https://github.com/getferdi/ferdi/issues/173))
+- [x] Adds Dark Reader settings ([#531](https://github.com/getferdi/ferdi/issues/531), [#568](https://github.com/getferdi/ferdi/issues/568)), 💖 [@Room4O4](https://github.com/Room4O4) & [@mahadevans87](https://github.com/mahadevans87)
+- [x] Adds adaptable Dark Mode that will respect the system's Dark Mode setting ([#173](https://github.com/getferdi/ferdi/issues/173), [#548](https://github.com/getferdi/ferdi/issues/548) (💖 [@Room4O4](https://github.com/Room4O4) & [@mahadevans87](https://github.com/mahadevans87)))
+- [x] Adds a hotkey to quickly toggle darkmode ([#530](https://github.com/getferdi/ferdi/issues/530), [#537](https://github.com/getferdi/ferdi/issues/537)), 💖 [@Room4O4](https://github.com/Room4O4) & [@mahadevans87](https://github.com/mahadevans87)
+- [x] Adds an option to start Ferdi minimized ([#490](https://github.com/getferdi/ferdi/issues/490), [#534](https://github.com/getferdi/ferdi/issues/534))
 - [x] Adds ability to change the services icons size and sidebar width ([#153](https://github.com/getferdi/ferdi/issues/153))
 - [x] Adds an option to auto-hide the menubar ([#7](https://github.com/getferdi/ferdi/issues/7), [franz#833](https://github.com/meetfranz/franz/issues/833))
 - [x] Enhances system tray icon behaviour ([#307](https://github.com/getferdi/ferdi/issues/307))
+- [x] Adds option to show draggable window area on macOS ([#304](https://github.com/getferdi/ferdi/issues/304), [#532](https://github.com/getferdi/ferdi/issues/532))
+- [x] Adds a notification & audio toggle action to the tray context menu ([#542](https://github.com/getferdi/ferdi/issues/542)), 💖 [@Room4O4](https://github.com/Room4O4) & [@mahadevans87](https://github.com/mahadevans87)
 - [x] Adds option to show a browser-like navigation bar on all services
 - [x] Adds option to change accent color
-- [x] Reflects your currently opened service name to the window title to improve support for Password Managers ([#213](https://github.com/getferdi/ferdi/issues/213))
+- [x] Reflects your currently opened service name to the window title to improve support for Password Managers ([#213](https://github.com/getferdi/ferdi/issues/213)), 💖 [@gmarec](https://github.com/gmarec)
 - [x] Allows using SVGs for service custom icon
 - [x] Adds button to open darkmode.css for a service
 - [x] Improves "About Ferdi" screen to better display versions
-- [x] Adds option to start Ferdi in system tray ([#331](https://github.com/getferdi/ferdi/issues/331))
-- [x] Fixes and enhances context menu (#357 #413 #452 #354 #227)
+- [x] Improves user onboarding ([#493](https://github.com/getferdi/ferdi/issues/493))
+- [x] Improves "Updates" section in settings ([#506](https://github.com/getferdi/ferdi/issues/506)), 💖 [@yourcontact](https://github.com/yourcontact)
+- [x] Improves draggable window area height for macOS ([#304](https://github.com/getferdi/ferdi/issues/304), [#479](https://github.com/getferdi/ferdi/issues/479))
+- [x] Adds option to start Ferdi in system tray ([#331](https://github.com/getferdi/ferdi/issues/331)), 💖 [@jereksel](https://github.com/jereksel)
+- [x] Fixes and enhances context menu ([#357](https://github.com/getferdi/ferdi/issues/357) [#413](https://github.com/getferdi/ferdi/issues/413) [#452](https://github.com/getferdi/ferdi/issues/452) [#354](https://github.com/getferdi/ferdi/issues/354) [#227](https://github.com/getferdi/ferdi/issues/227))
 - [x] Adds better support for macOS dark mode
-- [x] Adds option to disable reload of services after resuming Ferdi ([#442](https://github.com/getferdi/ferdi/issues/442))
+- [x] Adds option to disable reload of services after resuming Ferdi ([#442](https://github.com/getferdi/ferdi/issues/442)), 💖 [@n0emis](https://github.com/n0emis)
 - [x] Comes with a custom branding proper to Ferdi
 - [x] Adds better separation in settings
 - [x] Adds various other UI improvements
 - [x] Improves documentation of development so more developers can help making Ferdi even better
+- [x] Updates Microsoft Teams to allow Desktop Sharing ([getferdi/recipes#116](https://github.com/getferdi/recipes/issues/116)), 💖 [@Gautasmi](https://github.com/Gautasmi)
+- [x] Removes automatic reloading from WhatsApp
 
 ### Removed bugs
 - [x] Fixes bug that would incorrectly display unread messages count on some services (more info in [7566ccd](https://github.com/getferdi/ferdi/commit/7566ccd))
@@ -163,19 +174,26 @@ If you use an AUR Helper e.g. yay, simply install it via `yay -S ferdi`.
 - [x] Fixes missing Slack services custom icons ([#290](https://github.com/getferdi/ferdi/issues/290))
 - [x] Fixes bug that marked valid domains as invalid ([#276](https://github.com/getferdi/ferdi/issues/276))
 - [x] Fixes microphone/camera access on some versions of macOS ([#193](https://github.com/getferdi/ferdi/issues/193))
+- [x] Fixes cache clearing not working in Windows 10 ([#541](https://github.com/getferdi/ferdi/issues/541), [#544](https://github.com/getferdi/ferdi/issues/544)), 💖 [@Room4O4](https://github.com/Room4O4) & [@mahadevans87](https://github.com/mahadevans87)
+- [x] Fixes Home button in navigation bar not correctly navigating ([#571](https://github.com/getferdi/ferdi/issues/571), [#573](https://github.com/getferdi/ferdi/issues/573)), 💖 [@Room4O4](https://github.com/Room4O4) & [@mahadevans87](https://github.com/mahadevans87)
+- [x] Fixes notifications for various services, 💖 [@FeikoJoosten](https://github.com/FeikoJoosten)
+- [x] Refocuses Webview only for active service ([#610](https://github.com/getferdi/ferdi/issues/610)), 💖 [@Room4O4](https://github.com/Room4O4) & [@mahadevans87](https://github.com/mahadevans87)
 
 ### Adds new platforms
-- [x] Adds portable version for Windows so you can use Ferdi without even installing it
-- [x] Adds Arch Linux AUR packages
-- [x] Adds Ferdi as a Flatpak on Flathub ([#323](https://github.com/getferdi/ferdi/issues/323))
+- [x] Adds portable version for Windows so you can use Ferdi without even installing it, 💖 [@Makazzz](https://github.com/Makazzz)
+- [x] Adds Arch Linux AUR packages, 💖 [@AGCaesar](https://github.com/AGCaesar)
+- [x] Adds Ferdi as a Flatpak on Flathub ([#323](https://github.com/getferdi/ferdi/issues/323)), 💖 [@lhw](https://github.com/lhw)
 
 ### Adds internal changes
-- [x] Upgrades to Electron 8
+- [x] Upgrades to Electron 8.1.1
 - [x] Switches to [`electron-spellchecker`](https://github.com/electron-userland/electron-spellchecker) to improve application size
 - [x] Minifies build files to improve app size
 - [x] Adds "npm run prepare-code" command for development to lint and beautify code
-- [x] Fixes incorrect body closing tag ([#330](https://github.com/getferdi/ferdi/issues/330))
+- [x] Adds "npm run link-readme" command to automatically add links to issues and users inside README.md
+- [x] Fixes incorrect body closing tag ([#330](https://github.com/getferdi/ferdi/issues/330)), 💖 [@jereksel](https://github.com/jereksel)
 - [x] Uses CrowdIn to improve i18n
+- [x] Adds retry commands to flaky build steps ([#498](https://github.com/getferdi/ferdi/issues/498))
+- [x] Runs utility scripts pre-commit instead of pre-push ([#515](https://github.com/getferdi/ferdi/issues/515))
 
 > Thanks to all our [contributors](#contributors-) who helped realize all these amazing features! 💖 
 
@@ -284,71 +302,95 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <!-- markdownlint-disable -->
 <table>
   <tr>
-    <td align="center"><a href="https://vantezzen.io"><img src="https://avatars2.githubusercontent.com/u/10333196?v=4" width="40px;" alt=""/><br /><sub><b>Bennett</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Code">💻</a> <a href="#design-vantezzen" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Documentation">📖</a> <a href="#ideas-vantezzen" title="Ideas, Planning, & Feedback">🤔</a> <a href="#translation-vantezzen" title="Translation">🌍</a> <a href="#example-vantezzen" title="Examples">💡</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Avantezzen" title="Bug reports">🐛</a> <a href="#content-vantezzen" title="Content">🖋</a> <a href="#infra-vantezzen" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#userTesting-vantezzen" title="User Testing">📓</a> <a href="#question-vantezzen" title="Answering Questions">💬</a> <a href="#projectManagement-vantezzen" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3Avantezzen" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://twitter.com/kytwb"><img src="https://avatars0.githubusercontent.com/u/412895?v=4" width="40px;" alt=""/><br /><sub><b>Amine Mouafik</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=kytwb" title="Code">💻</a> <a href="#design-kytwb" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=kytwb" title="Documentation">📖</a> <a href="#ideas-kytwb" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Akytwb" title="Bug reports">🐛</a> <a href="#content-kytwb" title="Content">🖋</a> <a href="#infra-kytwb" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#userTesting-kytwb" title="User Testing">📓</a> <a href="#question-kytwb" title="Answering Questions">💬</a> <a href="#projectManagement-kytwb" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3Akytwb" title="Reviewed Pull Requests">👀</a> <a href="#maintenance-kytwb" title="Maintenance">🚧</a> <a href="#platform-kytwb" title="Packaging/porting to new platform">📦</a> <a href="#fundingFinding-kytwb" title="Funding Finding">🔍</a> <a href="#blog-kytwb" title="Blogposts">📝</a> <a href="#translation-kytwb" title="Translation">🌍</a></td>
-    <td align="center"><a href="http://www.adlk.io"><img src="https://avatars1.githubusercontent.com/u/3265004?v=4" width="40px;" alt=""/><br /><sub><b>Stefan Malzner</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Code">💻</a> <a href="#content-adlk" title="Content">🖋</a> <a href="#design-adlk" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Documentation">📖</a> <a href="#ideas-adlk" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-adlk" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#projectManagement-adlk" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Tests">⚠️</a> <a href="#translation-adlk" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/Makazzz"><img src="https://avatars2.githubusercontent.com/u/49844464?v=4" width="40px;" alt=""/><br /><sub><b>Makazzz</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3AMakazzz" title="Bug reports">🐛</a> <a href="https://github.com/getferdi/ferdi/commits?author=Makazzz" title="Code">💻</a> <a href="#translation-Makazzz" title="Translation">🌍</a> <a href="#content-Makazzz" title="Content">🖋</a> <a href="https://github.com/getferdi/ferdi/commits?author=Makazzz" title="Documentation">📖</a> <a href="#platform-Makazzz" title="Packaging/porting to new platform">📦</a></td>
-    <td align="center"><a href="http://seriesgt.com"><img src="https://avatars3.githubusercontent.com/u/5977640?v=4" width="40px;" alt=""/><br /><sub><b>ZeroCool</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=ZeroCool940711" title="Code">💻</a> <a href="#ideas-ZeroCool940711" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/rseitbekov"><img src="https://avatars2.githubusercontent.com/u/35684439?v=4" width="40px;" alt=""/><br /><sub><b>rseitbekov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=rseitbekov" title="Code">💻</a></td>
+    <td align="center"><a href="https://vantezzen.io"><img src="https://avatars2.githubusercontent.com/u/10333196?v=4" width="40px;" alt="Bennett"/><br /><sub><b>Bennett</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Code">💻</a> <a href="#design-vantezzen" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Documentation">📖</a> <a href="#ideas-vantezzen" title="Ideas, Planning, & Feedback">🤔</a> <a href="#translation-vantezzen" title="Translation">🌍</a> <a href="#example-vantezzen" title="Examples">💡</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Avantezzen" title="Bug reports">🐛</a> <a href="#content-vantezzen" title="Content">🖋</a> <a href="#infra-vantezzen" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#userTesting-vantezzen" title="User Testing">📓</a> <a href="#question-vantezzen" title="Answering Questions">💬</a> <a href="#projectManagement-vantezzen" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3Avantezzen" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://twitter.com/kytwb"><img src="https://avatars0.githubusercontent.com/u/412895?v=4" width="40px;" alt="Amine Mouafik"/><br /><sub><b>Amine Mouafik</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=kytwb" title="Code">💻</a> <a href="#design-kytwb" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=kytwb" title="Documentation">📖</a> <a href="#ideas-kytwb" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Akytwb" title="Bug reports">🐛</a> <a href="#content-kytwb" title="Content">🖋</a> <a href="#infra-kytwb" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#userTesting-kytwb" title="User Testing">📓</a> <a href="#question-kytwb" title="Answering Questions">💬</a> <a href="#projectManagement-kytwb" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3Akytwb" title="Reviewed Pull Requests">👀</a> <a href="#maintenance-kytwb" title="Maintenance">🚧</a> <a href="#platform-kytwb" title="Packaging/porting to new platform">📦</a> <a href="#fundingFinding-kytwb" title="Funding Finding">🔍</a> <a href="#blog-kytwb" title="Blogposts">📝</a> <a href="#translation-kytwb" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://www.adlk.io"><img src="https://avatars1.githubusercontent.com/u/3265004?v=4" width="40px;" alt="Stefan Malzner"/><br /><sub><b>Stefan Malzner</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Code">💻</a> <a href="#content-adlk" title="Content">🖋</a> <a href="#design-adlk" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Documentation">📖</a> <a href="#ideas-adlk" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-adlk" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#projectManagement-adlk" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Tests">⚠️</a> <a href="#translation-adlk" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/Makazzz"><img src="https://avatars2.githubusercontent.com/u/49844464?v=4" width="40px;" alt="Makazzz"/><br /><sub><b>Makazzz</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3AMakazzz" title="Bug reports">🐛</a> <a href="https://github.com/getferdi/ferdi/commits?author=Makazzz" title="Code">💻</a> <a href="#translation-Makazzz" title="Translation">🌍</a> <a href="#content-Makazzz" title="Content">🖋</a> <a href="https://github.com/getferdi/ferdi/commits?author=Makazzz" title="Documentation">📖</a> <a href="#platform-Makazzz" title="Packaging/porting to new platform">📦</a></td>
+    <td align="center"><a href="http://seriesgt.com"><img src="https://avatars3.githubusercontent.com/u/5977640?v=4" width="40px;" alt="ZeroCool"/><br /><sub><b>ZeroCool</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=ZeroCool940711" title="Code">💻</a> <a href="#ideas-ZeroCool940711" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/rseitbekov"><img src="https://avatars2.githubusercontent.com/u/35684439?v=4" width="40px;" alt="rseitbekov"/><br /><sub><b>rseitbekov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=rseitbekov" title="Code">💻</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://djangogigs.com/developers/peter-bittner/"><img src="https://avatars2.githubusercontent.com/u/665072?v=4" width="40px;" alt=""/><br /><sub><b>Peter Bittner</b></sub></a><br /><a href="#ideas-bittner" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Abittner" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/justus-saul"><img src="https://avatars1.githubusercontent.com/u/5861826?v=4" width="40px;" alt=""/><br /><sub><b>Justus Saul</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Ajustus-saul" title="Bug reports">🐛</a> <a href="#ideas-justus-saul" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/igreil"><img src="https://avatars0.githubusercontent.com/u/17239151?v=4" width="40px;" alt=""/><br /><sub><b>igreil</b></sub></a><br /><a href="#ideas-igreil" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="http://marcolopes.eu"><img src="https://avatars1.githubusercontent.com/u/431889?v=4" width="40px;" alt=""/><br /><sub><b>Marco Lopes</b></sub></a><br /><a href="#ideas-marcolopes" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/dayzlun"><img src="https://avatars3.githubusercontent.com/u/17259690?v=4" width="40px;" alt=""/><br /><sub><b>dayzlun</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Adayzlun" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://twitter.com/tobigue_"><img src="https://avatars2.githubusercontent.com/u/1560152?v=4" width="40px;" alt=""/><br /><sub><b>Tobias Günther</b></sub></a><br /><a href="#ideas-tobigue" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://djangogigs.com/developers/peter-bittner/"><img src="https://avatars2.githubusercontent.com/u/665072?v=4" width="40px;" alt="Peter Bittner"/><br /><sub><b>Peter Bittner</b></sub></a><br /><a href="#ideas-bittner" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Abittner" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/justus-saul"><img src="https://avatars1.githubusercontent.com/u/5861826?v=4" width="40px;" alt="Justus Saul"/><br /><sub><b>Justus Saul</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Ajustus-saul" title="Bug reports">🐛</a> <a href="#ideas-justus-saul" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/igreil"><img src="https://avatars0.githubusercontent.com/u/17239151?v=4" width="40px;" alt="igreil"/><br /><sub><b>igreil</b></sub></a><br /><a href="#ideas-igreil" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="http://marcolopes.eu"><img src="https://avatars1.githubusercontent.com/u/431889?v=4" width="40px;" alt="Marco Lopes"/><br /><sub><b>Marco Lopes</b></sub></a><br /><a href="#ideas-marcolopes" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/dayzlun"><img src="https://avatars3.githubusercontent.com/u/17259690?v=4" width="40px;" alt="dayzlun"/><br /><sub><b>dayzlun</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Adayzlun" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://twitter.com/tobigue_"><img src="https://avatars2.githubusercontent.com/u/1560152?v=4" width="40px;" alt="Tobias Günther"/><br /><sub><b>Tobias Günther</b></sub></a><br /><a href="#ideas-tobigue" title="Ideas, Planning, & Feedback">🤔</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://github.com/AGCaesar"><img src="https://avatars3.githubusercontent.com/u/7844066?v=4" width="40px;" alt=""/><br /><sub><b>AGCaesar</b></sub></a><br /><a href="#platform-AGCaesar" title="Packaging/porting to new platform">📦</a></td>
-    <td align="center"><a href="https://github.com/xthursdayx"><img src="https://avatars0.githubusercontent.com/u/18044308?v=4" width="40px;" alt=""/><br /><sub><b>xthursdayx</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=xthursdayx" title="Code">💻</a> <a href="https://github.com/getferdi/ferdi/commits?author=xthursdayx" title="Documentation">📖</a> <a href="#infra-xthursdayx" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#platform-xthursdayx" title="Packaging/porting to new platform">📦</a></td>
-    <td align="center"><a href="https://github.com/Gaboris"><img src="https://avatars2.githubusercontent.com/u/9462372?v=4" width="40px;" alt=""/><br /><sub><b>Gaboris</b></sub></a><br /><a href="#question-Gaboris" title="Answering Questions">💬</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3AGaboris" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://www.cu3ed.com/"><img src="https://avatars1.githubusercontent.com/u/61343?v=4" width="40px;" alt=""/><br /><sub><b>Ce</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aincace" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://pztrn.name/"><img src="https://avatars1.githubusercontent.com/u/869402?v=4" width="40px;" alt=""/><br /><sub><b>Stanislav N.</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Apztrn" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://www.patrickcurl.com"><img src="https://avatars1.githubusercontent.com/u/1470061?v=4" width="40px;" alt=""/><br /><sub><b>Patrick Curl</b></sub></a><br /><a href="#ideas-patrickcurl" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/AGCaesar"><img src="https://avatars3.githubusercontent.com/u/7844066?v=4" width="40px;" alt="AGCaesar"/><br /><sub><b>AGCaesar</b></sub></a><br /><a href="#platform-AGCaesar" title="Packaging/porting to new platform">📦</a></td>
+    <td align="center"><a href="https://github.com/xthursdayx"><img src="https://avatars0.githubusercontent.com/u/18044308?v=4" width="40px;" alt="xthursdayx"/><br /><sub><b>xthursdayx</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=xthursdayx" title="Code">💻</a> <a href="https://github.com/getferdi/ferdi/commits?author=xthursdayx" title="Documentation">📖</a> <a href="#infra-xthursdayx" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#platform-xthursdayx" title="Packaging/porting to new platform">📦</a></td>
+    <td align="center"><a href="https://github.com/Gaboris"><img src="https://avatars2.githubusercontent.com/u/9462372?v=4" width="40px;" alt="Gaboris"/><br /><sub><b>Gaboris</b></sub></a><br /><a href="#question-Gaboris" title="Answering Questions">💬</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3AGaboris" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="http://www.cu3ed.com/"><img src="https://avatars1.githubusercontent.com/u/61343?v=4" width="40px;" alt="Ce"/><br /><sub><b>Ce</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aincace" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="http://pztrn.name/"><img src="https://avatars1.githubusercontent.com/u/869402?v=4" width="40px;" alt="Stanislav N."/><br /><sub><b>Stanislav N.</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Apztrn" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="http://www.patrickcurl.com"><img src="https://avatars1.githubusercontent.com/u/1470061?v=4" width="40px;" alt="Patrick Curl"/><br /><sub><b>Patrick Curl</b></sub></a><br /><a href="#ideas-patrickcurl" title="Ideas, Planning, & Feedback">🤔</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://github.com/Stanzilla"><img src="https://avatars3.githubusercontent.com/u/75278?v=4" width="40px;" alt=""/><br /><sub><b>Benjamin Staneck</b></sub></a><br /><a href="#design-Stanzilla" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/ammarmalhas"><img src="https://avatars1.githubusercontent.com/u/57057209?v=4" width="40px;" alt=""/><br /><sub><b>ammarmalhas</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aammarmalhas" title="Bug reports">🐛</a> <a href="#security-ammarmalhas" title="Security">🛡️</a></td>
-    <td align="center"><a href="https://github.com/steliyan"><img src="https://avatars1.githubusercontent.com/u/1850292?v=4" width="40px;" alt=""/><br /><sub><b>Steliyan Stoyanov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=steliyan" title="Code">💻</a> <a href="#ideas-steliyan" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/brorbw"><img src="https://avatars2.githubusercontent.com/u/5909562?v=4" width="40px;" alt=""/><br /><sub><b>Bror Winther</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=brorbw" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://fwdekker.com/"><img src="https://avatars0.githubusercontent.com/u/13442533?v=4" width="40px;" alt=""/><br /><sub><b>Felix W. Dekker</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=FWDekker" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/Sauceee"><img src="https://avatars2.githubusercontent.com/u/17987941?v=4" width="40px;" alt=""/><br /><sub><b>Sauceee</b></sub></a><br /><a href="#design-Sauceee" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/Stanzilla"><img src="https://avatars3.githubusercontent.com/u/75278?v=4" width="40px;" alt="Benjamin Staneck"/><br /><sub><b>Benjamin Staneck</b></sub></a><br /><a href="#design-Stanzilla" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/ammarmalhas"><img src="https://avatars1.githubusercontent.com/u/57057209?v=4" width="40px;" alt="ammarmalhas"/><br /><sub><b>ammarmalhas</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aammarmalhas" title="Bug reports">🐛</a> <a href="#security-ammarmalhas" title="Security">🛡️</a></td>
+    <td align="center"><a href="https://github.com/steliyan"><img src="https://avatars1.githubusercontent.com/u/1850292?v=4" width="40px;" alt="Steliyan Stoyanov"/><br /><sub><b>Steliyan Stoyanov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=steliyan" title="Code">💻</a> <a href="#ideas-steliyan" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/brorbw"><img src="https://avatars2.githubusercontent.com/u/5909562?v=4" width="40px;" alt="Bror Winther"/><br /><sub><b>Bror Winther</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=brorbw" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://fwdekker.com/"><img src="https://avatars0.githubusercontent.com/u/13442533?v=4" width="40px;" alt="Felix W. Dekker"/><br /><sub><b>Felix W. Dekker</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=FWDekker" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/Sauceee"><img src="https://avatars2.githubusercontent.com/u/17987941?v=4" width="40px;" alt="Sauceee"/><br /><sub><b>Sauceee</b></sub></a><br /><a href="#design-Sauceee" title="Design">🎨</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="http://lhw.ring0.de"><img src="https://avatars2.githubusercontent.com/u/351875?v=4" width="40px;" alt=""/><br /><sub><b>Lennart Weller</b></sub></a><br /><a href="#platform-lhw" title="Packaging/porting to new platform">📦</a></td>
-    <td align="center"><a href="https://github.com/jereksel"><img src="https://avatars0.githubusercontent.com/u/1307829?v=4" width="40px;" alt=""/><br /><sub><b>Andrzej Ressel</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=jereksel" title="Code">💻</a></td>
-    <td align="center"><a href="https://gitlab.com/dpeukert"><img src="https://avatars2.githubusercontent.com/u/3451904?v=4" width="40px;" alt=""/><br /><sub><b>Daniel Peukert</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=dpeukert" title="Code">💻</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/Ali_Shiple"><img src="https://crowdin-static.downloads.crowdin.com/avatar/12895436/small/00917d09ca1b4b6d8e0ef36af07ecf6b.jpg" width="40px;" alt=""/><br /><sub><b>Ali M. Shiple</b></sub></a><br /><a href="#translation-Ali_Shiple" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/elviseras"><img src="https://www.gravatar.com/avatar/25c2cf0d8cb4a4141e71c3b8a2e9324f" width="40px;" alt=""/><br /><sub><b>elviseras</b></sub></a><br /><a href="#translation-elviseras" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/J370"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14141203/small/7b12b5db419d8796450221c2eaaf6003.png" width="40px;" alt=""/><br /><sub><b>J370</b></sub></a><br /><a href="#translation-J370" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://lhw.ring0.de"><img src="https://avatars2.githubusercontent.com/u/351875?v=4" width="40px;" alt="Lennart Weller"/><br /><sub><b>Lennart Weller</b></sub></a><br /><a href="#platform-lhw" title="Packaging/porting to new platform">📦</a></td>
+    <td align="center"><a href="https://github.com/jereksel"><img src="https://avatars0.githubusercontent.com/u/1307829?v=4" width="40px;" alt="Andrzej Ressel"/><br /><sub><b>Andrzej Ressel</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=jereksel" title="Code">💻</a></td>
+    <td align="center"><a href="https://gitlab.com/dpeukert"><img src="https://avatars2.githubusercontent.com/u/3451904?v=4" width="40px;" alt="Daniel Peukert"/><br /><sub><b>Daniel Peukert</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=dpeukert" title="Code">💻</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/Ali_Shiple"><img src="https://crowdin-static.downloads.crowdin.com/avatar/12895436/small/00917d09ca1b4b6d8e0ef36af07ecf6b.jpg" width="40px;" alt="Ali M. Shiple"/><br /><sub><b>Ali M. Shiple</b></sub></a><br /><a href="#translation-Ali_Shiple" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/elviseras"><img src="https://www.gravatar.com/avatar/25c2cf0d8cb4a4141e71c3b8a2e9324f" width="40px;" alt="elviseras"/><br /><sub><b>elviseras</b></sub></a><br /><a href="#translation-elviseras" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/J370"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14141203/small/7b12b5db419d8796450221c2eaaf6003.png" width="40px;" alt="J370"/><br /><sub><b>J370</b></sub></a><br /><a href="#translation-J370" title="Translation">🌍</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://crowdin.com/profile/keunes"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13018172/small/829115c606347b10218f34c637a2100c.png" width="40px;" alt=""/><br /><sub><b>Koen</b></sub></a><br /><a href="#translation-keunes" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/leandrogehlen"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14099621/small/1d9503523839c310dbce0af3c226e894.jpeg" width="40px;" alt=""/><br /><sub><b>Leandro Gehlen</b></sub></a><br /><a href="#translation-leandrogehlen" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/Matthieu42"><img src="https://www.gravatar.com/avatar/735217ccccf11ba97573deee517ddb19" width="40px;" alt=""/><br /><sub><b>Matthieu42</b></sub></a><br /><a href="#translation-Matthieu42" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/nicky18013"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13468928/small/2b31e7ac19645d950a79b33ffd5721b8.png" width="40px;" alt=""/><br /><sub><b>Nikita Bibanaev</b></sub></a><br /><a href="#translation-nicky18013" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/Tatjana1998"><img src="https://www.gravatar.com/avatar/ade202a04fcbb2c177e4f1d9936af29e" width="40px;" alt=""/><br /><sub><b>Tatjana1998</b></sub></a><br /><a href="#translation-Tatjana1998" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/seayko"><img src="https://www.gravatar.com/avatar/65e2aef738ddf828f822d8463fd04918" width="40px;" alt=""/><br /><sub><b>tinect</b></sub></a><br /><a href="#translation-seayko" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/keunes"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13018172/small/829115c606347b10218f34c637a2100c.png" width="40px;" alt="Koen"/><br /><sub><b>Koen</b></sub></a><br /><a href="#translation-keunes" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/leandrogehlen"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14099621/small/1d9503523839c310dbce0af3c226e894.jpeg" width="40px;" alt="Leandro Gehlen"/><br /><sub><b>Leandro Gehlen</b></sub></a><br /><a href="#translation-leandrogehlen" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/Matthieu42"><img src="https://www.gravatar.com/avatar/735217ccccf11ba97573deee517ddb19" width="40px;" alt="Matthieu42"/><br /><sub><b>Matthieu42</b></sub></a><br /><a href="#translation-Matthieu42" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/nicky18013"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13468928/small/2b31e7ac19645d950a79b33ffd5721b8.png" width="40px;" alt="Nikita Bibanaev"/><br /><sub><b>Nikita Bibanaev</b></sub></a><br /><a href="#translation-nicky18013" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/Tatjana1998"><img src="https://www.gravatar.com/avatar/ade202a04fcbb2c177e4f1d9936af29e" width="40px;" alt="Tatjana1998"/><br /><sub><b>Tatjana1998</b></sub></a><br /><a href="#translation-Tatjana1998" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/seayko"><img src="https://www.gravatar.com/avatar/65e2aef738ddf828f822d8463fd04918" width="40px;" alt="tinect"/><br /><sub><b>tinect</b></sub></a><br /><a href="#translation-seayko" title="Translation">🌍</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://crowdin.com/profile/Pusnow"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13514833/small/65f0b45587cc7e34f2827830cd324b16.jpeg" width="40px;" alt=""/><br /><sub><b>Wonsup Yoon</b></sub></a><br /><a href="#translation-Pusnow" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/zutt"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13320003/small/50fdf9f8c7e54a446925bd79696ea625.JPG" width="40px;" alt=""/><br /><sub><b>zutt</b></sub></a><br /><a href="#translation-zutt" title="Translation">🌍</a></td>
-    <td align="center"><a href="http://twitter.com/noemis_exec"><img src="https://avatars3.githubusercontent.com/u/22817873?v=4" width="40px;" alt=""/><br /><sub><b>n0emis</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=n0emis" title="Code">💻</a> <a href="#translation-n0emis" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://www.monke-agency.com/equipe.html"><img src="https://avatars2.githubusercontent.com/u/3405028?v=4" width="40px;" alt=""/><br /><sub><b>gmarec</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=gmarec" title="Code">💻</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/127oo1"><img src="https://www.gravatar.com/avatar/060c722be11da16ae31902e9c98326b2" width="40px;" alt=""/><br /><sub><b>127oo1</b></sub></a><br /><a href="#translation-127oo1" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/ChTBoner"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13273153/small/a810886febf5199cfa1c98644444dea7.jpeg" width="40px;" alt=""/><br /><sub><b>ChTBoner</b></sub></a><br /><a href="#translation-ChTBoner" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/Pusnow"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13514833/small/65f0b45587cc7e34f2827830cd324b16.jpeg" width="40px;" alt="Wonsup Yoon"/><br /><sub><b>Wonsup Yoon</b></sub></a><br /><a href="#translation-Pusnow" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/zutt"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13320003/small/50fdf9f8c7e54a446925bd79696ea625.JPG" width="40px;" alt="zutt"/><br /><sub><b>zutt</b></sub></a><br /><a href="#translation-zutt" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://twitter.com/noemis_exec"><img src="https://avatars3.githubusercontent.com/u/22817873?v=4" width="40px;" alt="n0emis"/><br /><sub><b>n0emis</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=n0emis" title="Code">💻</a> <a href="#translation-n0emis" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://www.monke-agency.com/equipe.html"><img src="https://avatars2.githubusercontent.com/u/3405028?v=4" width="40px;" alt="gmarec"/><br /><sub><b>gmarec</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=gmarec" title="Code">💻</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/127oo1"><img src="https://www.gravatar.com/avatar/060c722be11da16ae31902e9c98326b2" width="40px;" alt="127oo1"/><br /><sub><b>127oo1</b></sub></a><br /><a href="#translation-127oo1" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/ChTBoner"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13273153/small/a810886febf5199cfa1c98644444dea7.jpeg" width="40px;" alt="ChTBoner"/><br /><sub><b>ChTBoner</b></sub></a><br /><a href="#translation-ChTBoner" title="Translation">🌍</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://crowdin.com/profile/johanengstrand"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14152801/small/fd395f120efca971ca9b34c57fd02cca.png" width="40px;" alt=""/><br /><sub><b>Johan Engstrand</b></sub></a><br /><a href="#translation-johanengstrand" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://mrassili.com"><img src="https://avatars0.githubusercontent.com/u/25288435?v=4" width="40px;" alt=""/><br /><sub><b>Marouane R</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=mrassili" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/yourcontact"><img src="https://avatars2.githubusercontent.com/u/46404814?v=4" width="40px;" alt=""/><br /><sub><b>Roman</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=yourcontact" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/mahadevans87"><img src="https://avatars1.githubusercontent.com/u/1255523?v=4" width="40px;" alt=""/><br /><sub><b>Mahadevan Sreenivasan</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=mahadevans87" title="Code">💻</a></td>
-    <td align="center"><a href="https://jakelee.co.uk"><img src="https://avatars2.githubusercontent.com/u/12380876?v=4" width="40px;" alt=""/><br /><sub><b>Jake Lee</b></sub></a><br /><a href="#content-JakeSteam" title="Content">🖋</a></td>
-    <td align="center"><a href="https://github.com/sampathBlam"><img src="https://avatars1.githubusercontent.com/u/17728976?v=4" width="40px;" alt=""/><br /><sub><b>Sampath Kumar Krishnan</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=sampathBlam" title="Code">💻</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/johanengstrand"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14152801/small/fd395f120efca971ca9b34c57fd02cca.png" width="40px;" alt="Johan Engstrand"/><br /><sub><b>Johan Engstrand</b></sub></a><br /><a href="#translation-johanengstrand" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://mrassili.com"><img src="https://avatars0.githubusercontent.com/u/25288435?v=4" width="40px;" alt="Marouane R"/><br /><sub><b>Marouane R</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=mrassili" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/yourcontact"><img src="https://avatars2.githubusercontent.com/u/46404814?v=4" width="40px;" alt="Roman"/><br /><sub><b>Roman</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=yourcontact" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/mahadevans87"><img src="https://avatars1.githubusercontent.com/u/1255523?v=4" width="40px;" alt="Mahadevan Sreenivasan"/><br /><sub><b>Mahadevan Sreenivasan</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=mahadevans87" title="Code">💻</a> <a href="#ideas-mahadevans87" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3Amahadevans87" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://jakelee.co.uk"><img src="https://avatars2.githubusercontent.com/u/12380876?v=4" width="40px;" alt="Jake Lee"/><br /><sub><b>Jake Lee</b></sub></a><br /><a href="#content-JakeSteam" title="Content">🖋</a></td>
+    <td align="center"><a href="https://github.com/sampathBlam"><img src="https://avatars1.githubusercontent.com/u/17728976?v=4" width="40px;" alt="Sampath Kumar Krishnan"/><br /><sub><b>Sampath Kumar Krishnan</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=sampathBlam" title="Code">💻</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3AsampathBlam" title="Reviewed Pull Requests">👀</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://github.com/saruwman"><img src="https://avatars2.githubusercontent.com/u/41330038?v=4" width="40px;" alt=""/><br /><sub><b>saruwman</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=saruwman" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/saruwman"><img src="https://avatars2.githubusercontent.com/u/41330038?v=4" width="40px;" alt="saruwman"/><br /><sub><b>saruwman</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=saruwman" title="Documentation">📖</a> <a href="https://github.com/getferdi/ferdi/commits?author=saruwman" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/dorukkarinca"><img src="https://avatars0.githubusercontent.com/u/9303867?v=4" width="40px;" alt="dorukkarinca"/><br /><sub><b>dorukkarinca</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Adorukkarinca" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://www.linkedin.com/in/gautamsi"><img src="https://avatars2.githubusercontent.com/u/5769869?v=4" width="40px;" alt="Gautam Singh"/><br /><sub><b>Gautam Singh</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=gautamsi" title="Code">💻</a></td>
+    <td align="center"><a href="https://feikojoosten.com"><img src="https://avatars0.githubusercontent.com/u/10920052?v=4" width="40px;" alt="Feiko Joosten"/><br /><sub><b>Feiko Joosten</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=FeikoJoosten" title="Code">💻</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/2bdelghafour"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14219410/small/31ff20f60d352fb46e314f3c180a77b0.jpeg" width="40px;" alt="2bdelghafour"/><br /><sub><b>2bdelghafour</b></sub></a><br /><a href="#translation-2bdelghafour" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/abdoutanta"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14213908/small/5b2fc8166f8a0a2b7313fbf49ee5b6b6.jpeg" width="40px;" alt="Abderrahim Tantaoui"/><br /><sub><b>Abderrahim Tantaoui</b></sub></a><br /><a href="#translation-abdoutanta" title="Translation">🌍</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://crowdin.com/profile/AndiLeni"><img src="https://www.gravatar.com/avatar/4bd0da860de38afa735425ce2d4e10b5" width="40px;" alt="AndiLeni"/><br /><sub><b>AndiLeni</b></sub></a><br /><a href="#translation-AndiLeni" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/brunofalmada"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14200540/small/f6f1addceeeabc02488f9b08520a902f.jpeg" width="40px;" alt="Bruno Almada"/><br /><sub><b>Bruno Almada</b></sub></a><br /><a href="#translation-brunofalmada" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/Catarino"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14208802/small/07287eb2de671257ca3d6bb4ba1cca67.jpeg" width="40px;" alt="Catarino Gonçalo"/><br /><sub><b>Catarino Gonçalo</b></sub></a><br /><a href="#translation-Catarino" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/Alzemand"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14184269/small/f5e68247f01988ae7951a282f0fd4d06.jpeg" width="40px;" alt="Edilson Alzemand Sigmaringa Junior"/><br /><sub><b>Edilson Alzemand Sigmaringa Junior</b></sub></a><br /><a href="#translation-Alzemand" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/MAT-OUT"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14201550/small/68dd2402bf2879bc3ca312d627710400.png" width="40px;" alt="MAT-OUT"/><br /><sub><b>MAT-OUT</b></sub></a><br /><a href="#translation-MAT-OUT" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/mazzo98"><img src="https://crowdin-static.downloads.crowdin.com/avatar/12864917/small/69799b5fd7be2f67282715d5cdfd4ae1.png" width="40px;" alt="mazzo98"/><br /><sub><b>mazzo98</b></sub></a><br /><a href="#translation-mazzo98" title="Translation">🌍</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://crowdin.com/profile/paprika-naught-tiffin-flyspeck"><img src="https://www.gravatar.com/avatar/8671ebe7a7164dfa7624fbdbff69ed96" width="40px;" alt="paprika-naught-tiffin-flyspeck"/><br /><sub><b>paprika-naught-tiffin-flyspeck</b></sub></a><br /><a href="#translation-paprika-naught-tiffin-flyspeck" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/patrickvalle"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14217484/small/8b73f313ee79fe33625e819cdac86551.jpg" width="40px;" alt="Patrick Valle"/><br /><sub><b>Patrick Valle</b></sub></a><br /><a href="#translation-patrickvalle" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/peq42"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14155811/small/b62a94dde7ec29948ec6a6af9fd24b1d.png" width="40px;" alt="peq42_"/><br /><sub><b>peq42_</b></sub></a><br /><a href="#translation-peq42" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/karlinhos"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14161139/small/96450eb44c22b3141ab4401e547109b8.png" width="40px;" alt="Pumbinha"/><br /><sub><b>Pumbinha</b></sub></a><br /><a href="#translation-karlinhos" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/dies"><img src="https://crowdin-static.downloads.crowdin.com/avatar/1/small/e84bcdf6c084ffd52527931f988fb410.png" width="40px;" alt="Serhiy Dmytryshyn"/><br /><sub><b>Serhiy Dmytryshyn</b></sub></a><br /><a href="#translation-dies" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/SMile61"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14177585/small/1bb4f6ba39bff3df8f579e61460ce016.png" width="40px;" alt="SMile61"/><br /><sub><b>SMile61</b></sub></a><br /><a href="#translation-SMile61" title="Translation">🌍</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://crowdin.com/profile/tinect"><img src="https://crowdin-static.downloads.crowdin.com/avatar/12521988/small/56c2041645746af9e51dd28782b828c3.jpeg" width="40px;" alt="tinect"/><br /><sub><b>tinect</b></sub></a><br /><a href="#translation-tinect" title="Translation">🌍</a></td>
   </tr>
 </table>
 
diff --git a/appveyor.yml b/appveyor.yml
index 1985835ef..acdd94e13 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,29 +1,22 @@
-environment:
-  APPVEYOR_CACHE_SKIP_RESTORE: true
+version: build-{build}
+branches:
+  only:
+    - release
+skip_tags: true
+skip_branch_with_pr: true
 
-version: 5.4.1-beta.4.{build}
+cache:
+  - '%APPDATA%\npm-cache'
+  - node_modules
 
 install:
   - appveyor-retry git submodule update --init --recursive
   - ps: Install-Product node 10
   - appveyor-retry npx lerna bootstrap
 
-cache:
-  - '%APPDATA%\npm-cache'
-
 before_build:
-  - npm run lint
+  - npm run lint && npm test
   - cmd: set NODE_ENV=production
 
 build_script:
   - appveyor-retry npm run build
-
-branches:
-  except:
-    - i18n
-    - l10n_master
-    - l10n_develop
-
-skip_commits:
-  files:
-    - src/i18n/locales/*.json
diff --git a/electron-builder.yml b/electron-builder.yml
index 330fc64e1..86349ba6b 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -37,6 +37,7 @@ win:
       arch: [x64, ia32]
     - target: portable
       arch: [x64, ia32]
+  publisherName: 'Amine Mouafik'
 
 linux:
   icon: ./build-helpers/images/icons
diff --git a/jest.config.js b/jest.config.js
index 8c9b59cf5..cca24440f 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,3 +1,8 @@
 module.exports = {
   roots: ['src'],
+  testPathIgnorePatterns: [
+    'node_modules/',
+    'recipes/',
+    'src/internal-server',
+  ]
 };
diff --git a/package-lock.json b/package-lock.json
index b1aa4e88d..65294a3a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ferdi",
-  "version": "5.4.4-beta.3",
+  "version": "5.5.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2592,9 +2592,9 @@
       }
     },
     "@electron/get": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.9.0.tgz",
-      "integrity": "sha512-OBIKtF6ttIJotDXe4KJMUyTBO4xMii+mFjlA8R4CORuD4HvCUaCK3lPjhdTRCvuEv6gzWNbAvd9DNBv0v780lw==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.10.0.tgz",
+      "integrity": "sha512-hlueNXU51c3CwQjBw/i5fwt+VfQgSQVUTdicpCHkhEjNZaa4CXJ5W1GaxSwtLE2dvRmAHjpIjUMHTqJ53uojfg==",
       "dev": true,
       "requires": {
         "debug": "^4.1.1",
@@ -7106,6 +7106,12 @@
       "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
       "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
     },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true
+    },
     "buffer-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
@@ -9815,9 +9821,9 @@
       "dev": true
     },
     "electron": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-8.1.1.tgz",
-      "integrity": "sha512-t+5zzFo7VOgckJc9YpImHJkpqeWxwpmEjywWbAa4IT5MULS7h1XU52H9gMswK/y8xc5lBNwxLhJSty/15+gi1A==",
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-8.2.3.tgz",
+      "integrity": "sha512-FJUp103c8yJBoAaj/QM/OBde57iJh95u1yGJBytMUXmLFSsx78LmNE03QN4XCODyzi76IEcasvUcK6scogRLbQ==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
@@ -11973,15 +11979,15 @@
       }
     },
     "extract-zip": {
-      "version": "1.6.7",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
-      "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
+      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
       "dev": true,
       "requires": {
-        "concat-stream": "1.6.2",
-        "debug": "2.6.9",
-        "mkdirp": "0.5.1",
-        "yauzl": "2.4.1"
+        "concat-stream": "^1.6.2",
+        "debug": "^2.6.9",
+        "mkdirp": "^0.5.4",
+        "yauzl": "^2.10.0"
       },
       "dependencies": {
         "debug": {
@@ -11993,6 +11999,21 @@
             "ms": "2.0.0"
           }
         },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -12092,9 +12113,9 @@
       }
     },
     "fd-slicer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
       "requires": {
         "pend": "~1.2.0"
@@ -13864,16 +13885,16 @@
       },
       "dependencies": {
         "core-js": {
-          "version": "3.6.4",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-          "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+          "version": "3.6.5",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+          "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
           "dev": true,
           "optional": true
         },
         "semver": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz",
-          "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==",
+          "version": "7.3.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
           "dev": true,
           "optional": true
         }
@@ -23507,9 +23528,9 @@
       "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w="
     },
     "roarr": {
-      "version": "2.15.2",
-      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.2.tgz",
-      "integrity": "sha512-jmaDhK9CO4YbQAV8zzCnq9vjAqeO489MS5ehZ+rXmFiPFFE6B+S9KYO6prjmLJ5A0zY3QxVlQdrIya7E/azz/Q==",
+      "version": "2.15.3",
+      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.3.tgz",
+      "integrity": "sha512-AEjYvmAhlyxOeB9OqPUzQCo3kuAkNfuDk/HqWbZdFsqDFpapkTjiw+p4svNEoRLvuqNTxqfL+s+gtD4eDgZ+CA==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -27910,12 +27931,13 @@
       }
     },
     "yauzl": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
-      "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
       "requires": {
-        "fd-slicer": "~1.0.1"
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
       }
     },
     "yeast": {
diff --git a/package.json b/package.json
index becd0d227..01b902bc0 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "ferdi",
   "productName": "Ferdi",
   "appId": "com.kytwb.ferdi",
-  "version": "5.5.0-gm",
+  "version": "5.5.0",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "kytwb",
   "main": "index.js",
@@ -20,7 +20,7 @@
     "lint": "eslint --quiet --fix src",
     "manage-translations": "node ./src/i18n/manage-translations.js",
     "prebuild": "gulp build",
-    "build": "npx electron-builder --publish onTag",
+    "build": "npx electron-builder",
     "rebuild": "npx electron-rebuild",
     "commit": "git-cz",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
@@ -32,7 +32,8 @@
     "apply-branding": "node ./src/i18n/apply-branding.js",
     "update-submodules": "git submodule update --remote --force && git add .",
     "prepare-code": "npm run update-submodules && npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding",
-    "build-theme-info": "node src/scripts/build-theme-info.js"
+    "build-theme-info": "node src/scripts/build-theme-info.js",
+    "link-readme": "node src/scripts/link-readme.js"
   },
   "keywords": [],
   "author": "Amine Mouafik <amine@mouafik.fr>",
@@ -157,7 +158,7 @@
     "cross-env": "^5.0.5",
     "cz-conventional-changelog": "2.1.0",
     "dotenv": "^4.0.0",
-    "electron": "8.1.1",
+    "electron": "8.2.3",
     "electron-builder": "22.4.1",
     "electron-notarize": "0.2.1",
     "electron-rebuild": "1.10.0",
diff --git a/recipes b/recipes
-Subproject 803c7eb1b65ad793513aaba56df507bc820959a
+Subproject 911d1ded846165a4b420efa2b58668ad27c9f2c
diff --git a/src/assets/images/taskbar/win32/taskbar-alert.ico b/src/assets/images/taskbar/win32/taskbar-alert.ico
index 5b349c2b6..d80333711 100644
--- a/src/assets/images/taskbar/win32/taskbar-alert.ico
+++ b/src/assets/images/taskbar/win32/taskbar-alert.ico
diff --git a/src/assets/images/tray/darwin-dark/tray-indirect-active.png b/src/assets/images/tray/darwin-dark/tray-indirect-active.png
new file mode 100644
index 000000000..b0f68c1ea
--- /dev/null
+++ b/src/assets/images/tray/darwin-dark/tray-indirect-active.png
diff --git a/src/assets/images/tray/darwin-dark/tray-indirect-active@2x.png b/src/assets/images/tray/darwin-dark/tray-indirect-active@2x.png
new file mode 100644
index 000000000..c863fd144
--- /dev/null
+++ b/src/assets/images/tray/darwin-dark/tray-indirect-active@2x.png
diff --git a/src/assets/images/tray/darwin-dark/tray-indirect.png b/src/assets/images/tray/darwin-dark/tray-indirect.png
new file mode 100644
index 000000000..b0f68c1ea
--- /dev/null
+++ b/src/assets/images/tray/darwin-dark/tray-indirect.png
diff --git a/src/assets/images/tray/darwin-dark/tray-indirect@2x.png b/src/assets/images/tray/darwin-dark/tray-indirect@2x.png
new file mode 100644
index 000000000..c863fd144
--- /dev/null
+++ b/src/assets/images/tray/darwin-dark/tray-indirect@2x.png
diff --git a/src/assets/images/tray/darwin/tray-indirect-active.png b/src/assets/images/tray/darwin/tray-indirect-active.png
new file mode 100644
index 000000000..b0f68c1ea
--- /dev/null
+++ b/src/assets/images/tray/darwin/tray-indirect-active.png
diff --git a/src/assets/images/tray/darwin/tray-indirect-active@2x.png b/src/assets/images/tray/darwin/tray-indirect-active@2x.png
new file mode 100644
index 000000000..c863fd144
--- /dev/null
+++ b/src/assets/images/tray/darwin/tray-indirect-active@2x.png
diff --git a/src/assets/images/tray/darwin/tray-indirect.png b/src/assets/images/tray/darwin/tray-indirect.png
new file mode 100644
index 000000000..d7667600b
--- /dev/null
+++ b/src/assets/images/tray/darwin/tray-indirect.png
diff --git a/src/assets/images/tray/darwin/tray-indirect@2x.png b/src/assets/images/tray/darwin/tray-indirect@2x.png
new file mode 100644
index 000000000..bc5910bc7
--- /dev/null
+++ b/src/assets/images/tray/darwin/tray-indirect@2x.png
diff --git a/src/assets/images/tray/linux/tray-indirect.png b/src/assets/images/tray/linux/tray-indirect.png
new file mode 100644
index 000000000..9f5c357eb
--- /dev/null
+++ b/src/assets/images/tray/linux/tray-indirect.png
diff --git a/src/assets/images/tray/linux/tray-indirect@2x.png b/src/assets/images/tray/linux/tray-indirect@2x.png
new file mode 100644
index 000000000..495c7e1cc
--- /dev/null
+++ b/src/assets/images/tray/linux/tray-indirect@2x.png
diff --git a/src/assets/images/tray/win32/tray-indirect.ico b/src/assets/images/tray/win32/tray-indirect.ico
new file mode 100644
index 000000000..bc48a4eef
--- /dev/null
+++ b/src/assets/images/tray/win32/tray-indirect.ico
diff --git a/src/assets/themeInfo.json b/src/assets/themeInfo.json
index eaea65ca7..6be7c4253 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, 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
+{"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, .franz-form .franz-form__slider-wrapper .slider::-webkit-slider-thumb","border-right-color":".settings .settings__header .separator"}
\ No newline at end of file
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 652647470..210a6ab6b 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -41,9 +41,14 @@ class ServiceWebview extends Component {
 
   refocusWebview = () => {
     const { webview } = this;
+    debug('Refocus Webview is called', this.props.service);
     if (!webview) return;
-    webview.view.blur();
-    webview.view.focus();
+    if (this.props.service.isActive) {
+      webview.view.blur();
+      webview.view.focus();
+    } else {
+      debug('Refocus not required - Not active service');
+    }
   };
 
   render() {
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 4fd1f99ef..3dba793b2 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -112,7 +112,7 @@ const messages = defineMessages({
   },
   headlineDarkReaderSettings: {
     id: 'settings.service.form.headlineDarkReaderSettings',
-    defaultMessage: '!!!DarkReader Settings',
+    defaultMessage: '!!!Dark Reader Settings',
   },
   iconDelete: {
     id: 'settings.service.form.iconDelete',
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index e1c2a2d4f..8faea708b 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -99,6 +99,10 @@ const messages = defineMessages({
     id: 'settings.app.cacheInfo',
     defaultMessage: '!!!Ferdi cache is currently using {size} of disk space.',
   },
+  cacheNotCleared: {
+    id: 'settings.app.cacheNotCleared',
+    defaultMessage: '!!!Couldn\'t clear all cache',
+  },
   buttonClearAllCache: {
     id: 'settings.app.buttonClearAllCache',
     defaultMessage: '!!!Clear cache',
@@ -169,6 +173,21 @@ export default @observer class EditSettingsForm extends Component {
     intl: intlShape,
   };
 
+  state = {
+    activeSetttingsTab: 'general',
+    clearCacheButtonClicked: false,
+  }
+
+  setActiveSettingsTab(tab) {
+    this.setState({
+      activeSetttingsTab: tab,
+    });
+  }
+
+  onClearCacheClicked=() => {
+    this.setState({ clearCacheButtonClicked: true });
+  }
+
   submit(e) {
     e.preventDefault();
     this.props.form.submit({
@@ -217,7 +236,7 @@ export default @observer class EditSettingsForm extends Component {
       lockingFeatureEnabled,
       scheduledDNDEnabled,
     } = window.ferdi.stores.settings.all.app;
-
+    const notCleared = this.state.clearCacheButtonClicked && isClearingAllCache === false && cacheSize !== 0;
     return (
       <div className="settings__main">
         <div className="settings__header">
@@ -229,187 +248,203 @@ export default @observer class EditSettingsForm extends Component {
             onChange={e => this.submit(e)}
             id="form"
           >
+            {/* Titles */}
+            <div className="recipes__navigation">
+              <h2
+                id="general"
+                className={this.state.activeSetttingsTab === 'general' ? 'badge badge--primary' : 'badge'}
+                onClick={() => { this.setActiveSettingsTab('general'); }}
+              >
+                {intl.formatMessage(messages.headlineGeneral)}
+              </h2>
+              <h2
+                id="appearance"
+                className={this.state.activeSetttingsTab === 'appearance' ? 'badge badge--primary' : 'badge'}
+                onClick={() => { this.setActiveSettingsTab('appearance'); }}
+              >
+                {intl.formatMessage(messages.headlineAppearance)}
+              </h2>
+              <h2
+                id="language"
+                className={this.state.activeSetttingsTab === 'language' ? 'badge badge--primary' : 'badge'}
+                onClick={() => { this.setActiveSettingsTab('language'); }}
+              >
+                {intl.formatMessage(messages.headlineLanguage)}
+              </h2>
+              <h2
+                id="advanced"
+                className={this.state.activeSetttingsTab === 'advanced' ? 'badge badge--primary' : 'badge'}
+                onClick={() => { this.setActiveSettingsTab('advanced'); }}
+              >
+                {intl.formatMessage(messages.headlineAdvanced)}
+              </h2>
+              <h2
+                id="updates"
+                className={this.state.activeSetttingsTab === 'updates' ? 'badge badge--primary' : 'badge'}
+                onClick={() => { this.setActiveSettingsTab('updates'); }}
+              >
+                {intl.formatMessage(messages.headlineUpdates)}
+              </h2>
+            </div>
+
             {/* General */}
-            <h2 id="general">{intl.formatMessage(messages.headlineGeneral)}</h2>
-            <Toggle field={form.$('autoLaunchOnStart')} />
-            <Toggle field={form.$('runInBackground')} />
-            <Toggle field={form.$('enableSystemTray')} />
-            <Toggle field={form.$('reloadAfterResume')} />
-            <Toggle field={form.$('startMinimized')} />
-            {process.platform === 'win32' && (
-              <Toggle field={form.$('minimizeToSystemTray')} />
-            )}
-            <Toggle field={form.$('privateNotifications')} />
-            <Select field={form.$('navigationBarBehaviour')} />
+            { this.state.activeSetttingsTab === 'general' && (
+              <div>
+                <Toggle field={form.$('autoLaunchOnStart')} />
+                <Toggle field={form.$('runInBackground')} />
+                <Toggle field={form.$('enableSystemTray')} />
+                <Toggle field={form.$('reloadAfterResume')} />
+                <Toggle field={form.$('startMinimized')} />
+                {process.platform === 'win32' && (
+                  <Toggle field={form.$('minimizeToSystemTray')} />
+                )}
+                <Toggle field={form.$('privateNotifications')} />
+                <Select field={form.$('navigationBarBehaviour')} />
 
-            <Hr />
+                <Hr />
 
-            <Toggle field={form.$('sentry')} />
-            <p>{intl.formatMessage(messages.sentryInfo)}</p>
+                <Toggle field={form.$('sentry')} />
+                <p>{intl.formatMessage(messages.sentryInfo)}</p>
 
-            <Hr />
+                <Hr />
 
-            <Toggle field={form.$('hibernate')} />
-            {hibernationEnabled && (
-              <Select field={form.$('hibernationStrategy')} />
-            )}
-            <p
-              className="settings__message"
-              style={{
-                borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
-              }}
-            >
-              <span>
-                { intl.formatMessage(messages.hibernateInfo) }
-              </span>
-            </p>
-
-            <Hr />
-
-            {isWorkspaceEnabled && (
-              <Toggle field={form.$('keepAllWorkspacesLoaded')} />
-            )}
+                <Toggle field={form.$('hibernate')} />
+                {hibernationEnabled && (
+                  <>
+                    <Select field={form.$('hibernationStrategy')} />
+                    <Toggle field={form.$('hibernateOnStartup')} />
+                  </>
+                )}
+                <p
+                  className="settings__message"
+                  style={{
+                    borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
+                  }}
+                >
+                  <span>
+                    { intl.formatMessage(messages.hibernateInfo) }
+                  </span>
+                </p>
 
-            <Hr />
+                <Hr />
 
-            {isTodosEnabled && (
-              <>
-                <Toggle field={form.$('enableTodos')} />
-                {isTodosActivated && (
-                  <div>
-                    <Select field={form.$('predefinedTodoServer')} />
-                    {form.$('predefinedTodoServer').value === 'isUsingCustomTodoService' && (
+                {isWorkspaceEnabled && (
+                  <Toggle field={form.$('keepAllWorkspacesLoaded')} />
+                )}
+
+                <Hr />
+
+                {isTodosEnabled && (
+                  <>
+                    <Toggle field={form.$('enableTodos')} />
+                    {isTodosActivated && (
                       <div>
-                        <Input
-                          placeholder="Todo Server"
-                          onChange={e => this.submit(e)}
-                          field={form.$('customTodoServer')}
-                        />
-                        <p
-                          className="settings__message"
-                          style={{
-                            borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
-                          }}
-                        >
-                          { intl.formatMessage(messages.todoServerInfo) }
-                        </p>
+                        <Select field={form.$('predefinedTodoServer')} />
+                        {form.$('predefinedTodoServer').value === 'isUsingCustomTodoService' && (
+                          <div>
+                            <Input
+                              placeholder="Todo Server"
+                              onChange={e => this.submit(e)}
+                              field={form.$('customTodoServer')}
+                            />
+                            <p
+                              className="settings__message"
+                              style={{
+                                borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
+                              }}
+                            >
+                              { intl.formatMessage(messages.todoServerInfo) }
+                            </p>
+                          </div>
+                        )}
                       </div>
                     )}
-                  </div>
+                  </>
                 )}
-              </>
-            )}
 
+                <Hr />
 
-            <Hr />
-
-            <Toggle field={form.$('lockingFeatureEnabled')} />
-            {lockingFeatureEnabled && (
-              <>
-                {systemPreferences.canPromptTouchID() && (
-                  <Toggle field={form.$('useTouchIdToUnlock')} />
-                )}
-
-                <Input
-                  placeholder={intl.formatMessage(messages.lockedPassword)}
-                  onChange={e => this.submit(e)}
-                  field={form.$('lockedPassword')}
-                  type="password"
-                  scorePassword
-                  showPasswordToggle
-                />
-                <p>
-                  { intl.formatMessage(messages.lockedPasswordInfo) }
-                </p>
+                <Toggle field={form.$('lockingFeatureEnabled')} />
+                {lockingFeatureEnabled && (
+                  <>
+                    {systemPreferences.canPromptTouchID() && (
+                      <Toggle field={form.$('useTouchIdToUnlock')} />
+                    )}
 
-                <Input
-                  placeholder="Lock after inactivity"
-                  onChange={e => this.submit(e)}
-                  field={form.$('inactivityLock')}
-                  autoFocus
-                />
-                <p>
-                  { intl.formatMessage(messages.inactivityLockInfo) }
-                </p>
-              </>
-            )}
-            <p
-              className="settings__message"
-              style={{
-                borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
-              }}
-            >
-              <span>
-                { intl.formatMessage(messages.lockInfo) }
-              </span>
-            </p>
-
-            <Hr />
-
-            <Toggle field={form.$('scheduledDNDEnabled')} />
-            {scheduledDNDEnabled && (
-              <>
-                <div style={{
-                  display: 'flex',
-                  justifyContent: 'center',
-                }}
-                >
-                  <div style={{
-                    padding: '0 1rem',
-                    width: '100%',
-                  }}
-                  >
                     <Input
-                      placeholder="17:00"
+                      placeholder={intl.formatMessage(messages.lockedPassword)}
                       onChange={e => this.submit(e)}
-                      field={form.$('scheduledDNDStart')}
-                      type="time"
+                      field={form.$('lockedPassword')}
+                      type="password"
+                      scorePassword
+                      showPasswordToggle
                     />
-                  </div>
-                  <div style={{
-                    padding: '0 1rem',
-                    width: '100%',
-                  }}
-                  >
+                    <p>
+                      { intl.formatMessage(messages.lockedPasswordInfo) }
+                    </p>
+
                     <Input
-                      placeholder="09:00"
+                      placeholder="Lock after inactivity"
                       onChange={e => this.submit(e)}
-                      field={form.$('scheduledDNDEnd')}
-                      type="time"
+                      field={form.$('inactivityLock')}
+                      autoFocus
                     />
-                  </div>
-                </div>
-                <p>
-                  { intl.formatMessage(messages.scheduledDNDTimeInfo) }
+                    <p>
+                      { intl.formatMessage(messages.inactivityLockInfo) }
+                    </p>
+                  </>
+                )}
+                <p
+                  className="settings__message"
+                  style={{
+                    borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
+                  }}
+                >
+                  <span>
+                    { intl.formatMessage(messages.lockInfo) }
+                  </span>
                 </p>
-              </>
-            )}
-            <p
-              className="settings__message"
-              style={{
-                borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
-              }}
-            >
-              <span>
-                { intl.formatMessage(messages.scheduledDNDInfo) }
-              </span>
-            </p>
-
 
-            {/* Appearance */}
-            <h2 id="apperance">{intl.formatMessage(messages.headlineAppearance)}</h2>
-            <Toggle field={form.$('showDisabledServices')} />
-            <Toggle field={form.$('showMessageBadgeWhenMuted')} />
-
-            {isMac && <Toggle field={form.$('showDragArea')} />}
-
-            <Hr />
-
-            {(isMac || isWindows) && <Toggle field={form.$('adaptableDarkMode')} />}
-            {!((isMac || isWindows) && isAdaptableDarkModeEnabled) && <Toggle field={form.$('darkMode')} />}
-            {(isDarkmodeEnabled || isAdaptableDarkModeEnabled) && (
-              <>
-                <Toggle field={form.$('universalDarkMode')} />
+                <Hr />
+
+                <Toggle field={form.$('scheduledDNDEnabled')} />
+                {scheduledDNDEnabled && (
+                  <>
+                    <div style={{
+                      display: 'flex',
+                      justifyContent: 'center',
+                    }}
+                    >
+                      <div style={{
+                        padding: '0 1rem',
+                        width: '100%',
+                      }}
+                      >
+                        <Input
+                          placeholder="17:00"
+                          onChange={e => this.submit(e)}
+                          field={form.$('scheduledDNDStart')}
+                          type="time"
+                        />
+                      </div>
+                      <div style={{
+                        padding: '0 1rem',
+                        width: '100%',
+                      }}
+                      >
+                        <Input
+                          placeholder="09:00"
+                          onChange={e => this.submit(e)}
+                          field={form.$('scheduledDNDEnd')}
+                          type="time"
+                        />
+                      </div>
+                    </div>
+                    <p>
+                      { intl.formatMessage(messages.scheduledDNDTimeInfo) }
+                    </p>
+                  </>
+                )}
                 <p
                   className="settings__message"
                   style={{
@@ -417,94 +452,138 @@ export default @observer class EditSettingsForm extends Component {
                   }}
                 >
                   <span>
-                    { intl.formatMessage(messages.universalDarkModeInfo) }
+                    { intl.formatMessage(messages.scheduledDNDInfo) }
                   </span>
                 </p>
-              </>
+              </div>
             )}
 
-            <Hr />
+            {/* Appearance */}
+            { this.state.activeSetttingsTab === 'appearance' && (
+              <div>
+                <Toggle field={form.$('showDisabledServices')} />
+                <Toggle field={form.$('showMessageBadgeWhenMuted')} />
+
+                {isMac && <Toggle field={form.$('showDragArea')} />}
+
+                <Hr />
+
+                {(isMac || isWindows) && <Toggle field={form.$('adaptableDarkMode')} />}
+                {!((isMac || isWindows) && isAdaptableDarkModeEnabled) && <Toggle field={form.$('darkMode')} />}
+                {(isDarkmodeEnabled || isAdaptableDarkModeEnabled) && (
+                <>
+                  <Toggle field={form.$('universalDarkMode')} />
+                  <p
+                    className="settings__message"
+                    style={{
+                      borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
+                    }}
+                  >
+                    <span>
+                      { intl.formatMessage(messages.universalDarkModeInfo) }
+                    </span>
+                  </p>
+                </>
+                )}
 
-            <Select field={form.$('serviceRibbonWidth')} />
+                <Hr />
 
-            <Select field={form.$('iconSize')} />
+                <Select field={form.$('serviceRibbonWidth')} />
 
-            <Hr />
+                <Select field={form.$('iconSize')} />
 
-            <Input
-              placeholder="Accent Color"
-              onChange={e => this.submit(e)}
-              field={form.$('accentColor')}
-            />
-            <p>{intl.formatMessage(messages.accentColorInfo)}</p>
+                <Hr />
 
-            {/* Language */}
-            <h2 id="language">{intl.formatMessage(messages.headlineLanguage)}</h2>
-            <Select field={form.$('locale')} showLabel={false} />
-
-            <Hr />
-
-            <PremiumFeatureContainer
-              condition={!isSpellcheckerIncludedInCurrentPlan}
-              gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }}
-            >
-              <Fragment>
-                <Toggle
-                  field={form.$('enableSpellchecking')}
+                <Input
+                  placeholder="Accent Color"
+                  onChange={e => this.submit(e)}
+                  field={form.$('accentColor')}
                 />
-                {form.$('enableSpellchecking').value && (
-                  <Select field={form.$('spellcheckerLanguage')} />
-                )}
-              </Fragment>
-            </PremiumFeatureContainer>
-            <a
-              href={FRANZ_TRANSLATION}
-              target="_blank"
-              className="link"
-            >
-              {intl.formatMessage(messages.translationHelp)}
-              {' '}
-              <i className="mdi mdi-open-in-new" />
-            </a>
+                <p>{intl.formatMessage(messages.accentColorInfo)}</p>
+              </div>
+            )}
+
+            {/* Language */}
+            { this.state.activeSetttingsTab === 'language' && (
+              <div>
+                <Select field={form.$('locale')} showLabel={false} />
+
+                <Hr />
+
+                <PremiumFeatureContainer
+                  condition={!isSpellcheckerIncludedInCurrentPlan}
+                  gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }}
+                >
+                  <Fragment>
+                    <Toggle
+                      field={form.$('enableSpellchecking')}
+                    />
+                    {form.$('enableSpellchecking').value && (
+                    <Select field={form.$('spellcheckerLanguage')} />
+                    )}
+                  </Fragment>
+                </PremiumFeatureContainer>
+                <a
+                  href={FRANZ_TRANSLATION}
+                  target="_blank"
+                  className="link"
+                >
+                  {intl.formatMessage(messages.translationHelp)}
+                  {' '}
+                  <i className="mdi mdi-open-in-new" />
+                </a>
+              </div>
+            )}
 
             {/* Advanced */}
-            <h2 id="advanced">{intl.formatMessage(messages.headlineAdvanced)}</h2>
-            <Toggle field={form.$('enableGPUAcceleration')} />
-            <p className="settings__help">{intl.formatMessage(messages.enableGPUAccelerationInfo)}</p>
-            <div className="settings__settings-group">
-              <h3>
-                {intl.formatMessage(messages.subheadlineCache)}
-              </h3>
-              <p>
-                {intl.formatMessage(messages.cacheInfo, {
-                  size: cacheSize,
-                })}
-              </p>
-              <p>
-                <Button
-                  buttonType="secondary"
-                  label={intl.formatMessage(messages.buttonClearAllCache)}
-                  onClick={onClearAllCache}
-                  disabled={isClearingAllCache}
-                  loaded={!isClearingAllCache}
-                />
-              </p>
-              <div style={{
-                marginTop: 20,
-              }}
-              >
-                <Button
-                  buttonType="secondary"
-                  label="Open Process Manager"
-                  onClick={openProcessManager}
-                />
+            { this.state.activeSetttingsTab === 'advanced' && (
+              <div>
+                <Toggle field={form.$('enableGPUAcceleration')} />
+                <p className="settings__help">{intl.formatMessage(messages.enableGPUAccelerationInfo)}</p>
+                <div className="settings__settings-group">
+                  <h3>
+                    {intl.formatMessage(messages.subheadlineCache)}
+                  </h3>
+                  <p>
+                    {intl.formatMessage(messages.cacheInfo, {
+                      size: cacheSize,
+                    })}
+                  </p>
+                  {
+                    notCleared && (
+                      <p>
+                        {intl.formatMessage(messages.cacheNotCleared)}
+                      </p>
+                    )
+                  }
+                  <p>
+                    <Button
+                      buttonType="secondary"
+                      label={intl.formatMessage(messages.buttonClearAllCache)}
+                      onClick={() => { onClearAllCache(); this.onClearCacheClicked(); }}
+                      disabled={isClearingAllCache}
+                      loaded={!isClearingAllCache}
+                    />
+                  </p>
+                  <div style={{
+                    marginTop: 20,
+                  }}
+                  >
+                    <Button
+                      buttonType="secondary"
+                      label="Open Process Manager"
+                      onClick={openProcessManager}
+                    />
+                  </div>
+                </div>
               </div>
-            </div>
+            )}
 
             {/* Updates */}
-            <h2 id="updates">{intl.formatMessage(messages.headlineUpdates)}</h2>
-            <Toggle field={form.$('automaticUpdates')} />
-            {automaticUpdates && (
+            { this.state.activeSetttingsTab === 'updates' && (
+            <div>
+              <Toggle field={form.$('automaticUpdates')} />
+              {automaticUpdates && (
               <div>
                 <Toggle field={form.$('beta')} />
                 {updateIsReadyToInstall ? (
@@ -523,35 +602,39 @@ export default @observer class EditSettingsForm extends Component {
                 )}
                 <br />
               </div>
-            )}
-            {intl.formatMessage(messages.currentVersion)}
-            {' '}
-            {remote.app.getVersion()}
-            {noUpdateAvailable && (
+              )}
+              {intl.formatMessage(messages.currentVersion)}
+              {' '}
+              {remote.app.getVersion()}
+              {noUpdateAvailable && (
               <>
                 <br />
                 <br />
                 {intl.formatMessage(messages.updateStatusUpToDate)}
               </>
-            )
-            }
-            <p className="settings__message">
-              <span className="mdi mdi-github-face" />
-              <span>
+              )
+              }
+              <p className="settings__message">
+                <span className="mdi mdi-github-face" />
+                <span>
+
 
                 Ferdi is based on
-                {' '}
-                <a href="https://github.com/meetfranz/franz" target="_blank">Franz</a>
+                  {' '}
+                  <a href="https://github.com/meetfranz/franz" target="_blank">Franz</a>
+
 
                 , a project published
                 under the
-                {' '}
-                <a href="https://github.com/meetfranz/franz/blob/master/LICENSE" target="_blank">Apache-2.0 License</a>
-              </span>
-              <br />
-              <span className="mdi mdi-information" />
-              {intl.formatMessage(messages.languageDisclaimer)}
-            </p>
+                  {' '}
+                  <a href="https://github.com/meetfranz/franz/blob/master/LICENSE" target="_blank">Apache-2.0 License</a>
+                </span>
+                <br />
+                <span className="mdi mdi-information" />
+                {intl.formatMessage(messages.languageDisclaimer)}
+              </p>
+            </div>
+            )}
           </form>
         </div>
       </div>
diff --git a/src/config.js b/src/config.js
index 45b840b0a..2467ab706 100644
--- a/src/config.js
+++ b/src/config.js
@@ -118,6 +118,7 @@ export const DEFAULT_APP_SETTINGS = {
   scheduledDNDStart: '17:00',
   scheduledDNDEnd: '09:00',
   hibernate: false,
+  hibernateOnStartup: true,
   hibernationStrategy: 300,
   inactivityLock: 0,
   automaticUpdates: true,
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 14c1ef41e..6aeecaa6d 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -71,15 +71,15 @@ const messages = defineMessages({
   },
   darkReaderBrightness: {
     id: 'settings.service.form.darkReaderBrightness',
-    defaultMessage: '!!!Darkreader Brightness',
+    defaultMessage: '!!!Dark Reader Brightness',
   },
   darkReaderContrast: {
     id: 'settings.service.form.darkReaderContrast',
-    defaultMessage: '!!!Darkreader Contrast',
+    defaultMessage: '!!!Dark Reader Contrast',
   },
   darkReaderSepia: {
     id: 'settings.service.form.darkReaderSepia',
-    defaultMessage: '!!!Darkreader Sepia',
+    defaultMessage: '!!!Dark Reader Sepia',
   },
   enableProxy: {
     id: 'settings.service.form.proxy.isEnabled',
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 74ec1909e..f6c2d4360 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -70,6 +70,10 @@ const messages = defineMessages({
     id: 'settings.app.form.hibernate',
     defaultMessage: '!!!Enable service hibernation',
   },
+  hibernateOnStartup: {
+    id: 'settings.app.form.hibernateOnStartup',
+    defaultMessage: '!!!Keep services in hibernation on startup',
+  },
   hibernationStrategy: {
     id: 'settings.app.form.hibernationStrategy',
     defaultMessage: '!!!Hibernation strategy',
@@ -208,6 +212,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         navigationBarBehaviour: settingsData.navigationBarBehaviour,
         sentry: settingsData.sentry,
         hibernate: settingsData.hibernate,
+        hibernateOnStartup: settingsData.hibernateOnStartup,
         hibernationStrategy: settingsData.hibernationStrategy,
         predefinedTodoServer: settingsData.predefinedTodoServer,
         customTodoServer: settingsData.customTodoServer,
@@ -361,6 +366,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.hibernate,
           default: DEFAULT_APP_SETTINGS.hibernate,
         },
+        hibernateOnStartup: {
+          label: intl.formatMessage(messages.hibernateOnStartup),
+          value: settings.all.app.hibernateOnStartup,
+          default: DEFAULT_APP_SETTINGS.hibernateOnStartup,
+        },
         hibernationStrategy: {
           label: intl.formatMessage(messages.hibernationStrategy),
           value: settings.all.app.hibernationStrategy,
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index 65b0edbfa..9d676c0a9 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "connectionLostBanner.cta": "Reload Service",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Restart & install update",
   "settings.app.buttonSearchForUpdate": "Check for updates",
   "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Current version:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index ebe4419f9..88f970da9 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -1,18 +1,21 @@
 {
   "app.errorHandler.action": "إعادة التحميل",
   "app.errorHandler.headline": "لقد حدث خطب ما",
-  "changeserver.headline": "Change server",
-  "changeserver.label": "Server",
+  "changeserver.headline": "تغيير الخادم",
+  "changeserver.label": "خادم",
   "changeserver.submit": "Submit",
+  "connectionLostBanner.cta": "إعادة تحميل الخدمة",
+  "connectionLostBanner.informationLink": "ماذا حدث؟",
+  "connectionLostBanner.message": "أوه لا! فقد فردي الاتصال بـ.",
   "feature.announcements.changelog.headline": "تغيرات في فريدي {version}",
-  "feature.debugger.title": "Publish debugging information",
+  "feature.debugger.title": "نشر معلومات تصحيح الأخطاء",
   "feature.delayApp.headline": "رجاء قيم بشراء رخصة الدعم لبرنامج فريدي للتخلص من وقت الانتظار",
   "feature.delayApp.text": "فريدي سوف يستكمل خلال {seconds} ثانية.",
   "feature.delayApp.trial.action": "أجل, أريد الحصول على 14 يوم تجريبي مجاني من برنامج فريدي بروفشنال",
   "feature.delayApp.trial.actionShort": "تفعيل الفتره التجريبية لرنامج فريدي بروفشنال",
   "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
+  "feature.delayApp.upgrade.action": "الحصول على ترخيص الدعم لفردي",
+  "feature.delayApp.upgrade.actionShort": "ترقية الحساب",
   "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
   "feature.planSelection.cta.stayOnFree": "Stay on Free",
   "feature.planSelection.cta.trial": "Start my free 14-days Trial",
@@ -29,27 +32,27 @@
   "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
   "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
   "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
-  "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
-  "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
-  "feature.publishDebugInfo.privacy": "Privacy policy",
-  "feature.publishDebugInfo.publish": "Accept and publish",
-  "feature.publishDebugInfo.published": "Your debug log was published and is now availible at",
+  "feature.publishDebugInfo.error": "حدث خطأ أثناء محاولة نشر معلومات التصحيح. الرجاء المحاولة مرة أخرى لاحقاً أو عرض وحدة التحكم لمزيد من المعلومات.",
+  "feature.publishDebugInfo.info": "نشر معلومات التصحيح الخاصة بك يساعدنا على العثور على المشاكل والأخطاء في فردي. بنشر معلومات التصحيح الخاصة بك فإنك تقبل سياسة الخصوصية وشروط خدمة مصحح فيردي",
+  "feature.publishDebugInfo.privacy": "سياسة الخصوصية",
+  "feature.publishDebugInfo.publish": "قبول ونشر",
+  "feature.publishDebugInfo.published": "تم نشر سجل تصحيح الأخطاء الخاص بك وهو متاح الآن في",
   "feature.publishDebugInfo.terms": "Terms of service",
-  "feature.publishDebugInfo.title": "Publish debug information",
-  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
-  "feature.quickSwitch.search": "Search...",
-  "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
-  "feature.shareFranz.action.email": "Send as email",
-  "feature.shareFranz.action.facebook": "Share on Facebook",
-  "feature.shareFranz.action.twitter": "Share on Twitter",
-  "feature.shareFranz.headline": "Ferdi is better together!",
-  "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
-  "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
-  "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
+  "feature.publishDebugInfo.title": "نشر معلومات تصحيح الأخطاء",
+  "feature.quickSwitch.info": "حدد خدمة من خلال زر تاب، ↑ و ↓. افتح الخدمة بالظغط على زر الدخول.",
+  "feature.quickSwitch.search": "بحث...",
+  "feature.quickSwitch.title": "تبديل سريع",
+  "feature.serviceLimit.limitReached": "لقد قمت بإضافة {amount} من {limit} خدمات مدرجة في خطتك. الرجاء ترقية حسابك لإضافة المزيد من الخدمات.",
+  "feature.shareFranz.action.email": "إرسال كبريد إلكتروني",
+  "feature.shareFranz.action.facebook": "شارك على فيسبوك",
+  "feature.shareFranz.action.twitter": "شارِك على تويتر",
+  "feature.shareFranz.headline": "فردي أفضل معًا!",
+  "feature.shareFranz.shareText.email": "لقد أضفت {count} خدمات إلى فردي! احصل على التطبيق المجاني لـ WhatsApp، و Messenger، و Slack، و Skype و co على www.getferdi.com",
+  "feature.shareFranz.shareText.twitter": "لقد أضفت {count} خدمات إلى فردي! احصل على التطبيق المجاني لـ WhatsApp، Messenger, Slack, Skype and co على www.getferdi.com /cc @FerdiMessenger",
+  "feature.shareFranz.text": "أخبر أصدقائك وزملاءك كيف أن فردي رائع وساعدنا على نشر الكلمة.",
+  "feature.todos.premium.info": "فردي للمهام متاح للمستخدمين المتميزين الآن!",
+  "feature.todos.premium.rollout": "سيتعين على كل شخص آخر الانتظار لفترة أطول قليلا.",
+  "feature.todos.premium.upgrade": "ترقية الحساب",
   "feature.trialStatusBar.cta": "Upgrade now",
   "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
   "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
@@ -57,110 +60,110 @@
   "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
   "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
   "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
-  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.franzProRequired": "Ferdi Professional Required",
-  "global.notConnectedToTheInternet": "You are not connected to the internet.",
-  "global.spellchecker.useDefault": "Use System Default ({default})",
-  "global.spellchecking.autodetect": "Detect language automatically",
-  "global.spellchecking.autodetect.short": "Automatic",
-  "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
-  "import.headline": "Import your Ferdi 4 services",
-  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
-  "import.skip.label": "I want to add services manually",
-  "import.submit.label": "Import services",
-  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "What is new?",
-  "infobar.buttonInstallUpdate": "Restart & install update",
-  "infobar.buttonReloadServices": "Reload services",
-  "infobar.requiredRequestsFailed": "Could not load services and user information",
-  "infobar.servicesUpdated": "Your services have been updated.",
+  "global.api.unhealthy": "لا يمكن الإتصال بخدمات فردي عبر الإنترنت",
+  "global.franzProRequired": "الخطة الإحترافية لفردي مطلوبة",
+  "global.notConnectedToTheInternet": "أنت غير متصل بالإنترنت.",
+  "global.spellchecker.useDefault": "إستخدم الإعدادت الافتراضية ({default})",
+  "global.spellchecking.autodetect": "الكشف عن اللغة تلقائياً",
+  "global.spellchecking.autodetect.short": "تلقائي",
+  "global.spellchecking.language": "لغة التدقيق الإملائي",
+  "global.upgradeButton.upgradeToPro": "الترقية إلى الخطة الإحترافية لفردي",
+  "import.headline": "استيراد خدمات فردي الأربع",
+  "import.notSupportedHeadline": "الخدمات غير مدعومة بعد في فردي الإصدار 5",
+  "import.skip.label": "أريد أن أضيف الخدمات يدوياً",
+  "import.submit.label": "خدمات الاستيراد",
+  "infobar.authRequestFailed": "حدثت أخطاء أثناء محاولة تنفيذ طلب المصادقة. الرجاء محاولة تسجيل الخروج والدخول مرة أخرى إذا استمر هذا الخطأ.",
+  "infobar.buttonChangelog": "ما الجديد؟",
+  "infobar.buttonInstallUpdate": "إعادة التشغيل وتثبيت التحديث",
+  "infobar.buttonReloadServices": "إعادة تحميل الخدمات",
+  "infobar.requiredRequestsFailed": "تعذر تحميل الخدمات ومعلومات المستخدم",
+  "infobar.servicesUpdated": "تم تحديث خدماتك.",
   "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
-  "infobar.updateAvailable": "A new update for Ferdi is available.",
-  "invite.email.label": "Email address",
-  "invite.headline.friends": "Invite 3 of your friends or colleagues",
-  "invite.name.label": "Name",
-  "invite.skip.label": "I want to do this later",
-  "invite.submit.label": "Send invites",
-  "invite.successInfo": "Invitations sent successfully",
-  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
-  "locked.invalidCredentials": "Password invalid",
-  "locked.password.label": "Password",
-  "locked.submit.label": "Unlock",
-  "locked.touchId": "Unlock with Touch ID",
-  "locked.touchIdPrompt": "unlock via Touch ID",
-  "locked.unlockWithPassword": "Unlock with Password",
-  "login.changeServer": "Change server",
+  "infobar.updateAvailable": "يتوفر تحديث جديد لفردي.",
+  "invite.email.label": "البريد الإلكتروني",
+  "invite.headline.friends": "قم بدعوة 3 من أصدقائك أو زملائك",
+  "invite.name.label": "الاسم",
+  "invite.skip.label": "أريد أن أفعل هذا لاحقاً",
+  "invite.submit.label": "إرسال الدعوات",
+  "invite.successInfo": "تم إرسال الدعوات بنجاح",
+  "locked.headline": "مقفل",
+  "locked.info": "فردي مقفل حاليا. الرجاء فتح فردي بكلمة المرور الخاصة بك لرؤية رسائلك.",
+  "locked.invalidCredentials": "كلمة المرور غير صالحة",
+  "locked.password.label": "كلمة المرور",
+  "locked.submit.label": "فتح القفل",
+  "locked.touchId": "فتح باستخدام بصمة الإصبع",
+  "locked.touchIdPrompt": "فتح عبر بصمة الإصبع",
+  "locked.unlockWithPassword": "فتح بكلمة المرور",
+  "login.changeServer": "تغيير الخادم",
   "login.customServerQuestion": "Using a custom Ferdi server?",
   "login.customServerSuggestion": "Try importing your Franz account",
-  "login.email.label": "Email address",
-  "login.headline": "Sign in",
-  "login.invalidCredentials": "Email or password not valid",
-  "login.link.password": "Reset password",
-  "login.link.signup": "Create a free account",
-  "login.password.label": "Password",
-  "login.serverLogout": "Your session expired, please login again.",
-  "login.submit.label": "Sign in",
-  "login.tokenExpired": "Your session expired, please login again.",
-  "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
-  "menu.Todoss.openTodosDrawer": "Open Todos drawer",
-  "menu.app.about": "About Ferdi",
-  "menu.app.announcement": "What's new?",
-  "menu.app.autohideMenuBar": "Auto-hide menu bar",
-  "menu.app.checkForUpdates": "Check for updates",
-  "menu.app.hide": "Hide",
-  "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Settings",
-  "menu.app.unhide": "Unhide",
-  "menu.edit": "Edit",
-  "menu.edit.copy": "Copy",
-  "menu.edit.cut": "Cut",
-  "menu.edit.delete": "Delete",
+  "login.email.label": "البريد الإلكتروني",
+  "login.headline": "تسجيل الدخول",
+  "login.invalidCredentials": "البريد الإلكتروني أو كلمة المرور غير صالحة",
+  "login.link.password": "إعادة تعيين كلمة المرور",
+  "login.link.signup": "إنشاء حساب مجاني",
+  "login.password.label": "كلمة المرور",
+  "login.serverLogout": "انتهت صلاحية جلستك، الرجاء تسجيل الدخول مرة أخرى.",
+  "login.submit.label": "تسجيل الدخول",
+  "login.tokenExpired": "انتهت صلاحية جلستك، الرجاء تسجيل الدخول مرة أخرى.",
+  "menu.Todoss.closeTodosDrawer": "إغلاق درج المهام",
+  "menu.Todoss.openTodosDrawer": "فتح درج المهام",
+  "menu.app.about": "حول فردي",
+  "menu.app.announcement": "ما الجديد؟",
+  "menu.app.autohideMenuBar": "إخفاء شريط القوائم تلقائيا",
+  "menu.app.checkForUpdates": "التحقق من وجود تحديثات",
+  "menu.app.hide": "إخفاء",
+  "menu.app.hideOthers": "إخفاء الآخرين",
+  "menu.app.quit": "إغلاق",
+  "menu.app.settings": "الإعدادات",
+  "menu.app.unhide": "إظهار",
+  "menu.edit": "تعديل",
+  "menu.edit.copy": "نسخ",
+  "menu.edit.cut": "قص",
+  "menu.edit.delete": "حذف",
   "menu.edit.emojiSymbols": "Emoji & Symbols",
-  "menu.edit.findInPage": "Find in Page",
-  "menu.edit.paste": "Paste",
-  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
-  "menu.edit.redo": "Redo",
-  "menu.edit.selectAll": "Select All",
-  "menu.edit.speech": "Speech",
-  "menu.edit.startDictation": "Start Dictation",
-  "menu.edit.startSpeaking": "Start Speaking",
-  "menu.edit.stopSpeaking": "Stop Speaking",
-  "menu.edit.undo": "Undo",
-  "menu.file": "File",
-  "menu.help": "Help",
-  "menu.help.changelog": "Changelog",
-  "menu.help.debugInfo": "Copy Debug Information",
-  "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
-  "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
-  "menu.help.learnMore": "Learn More",
-  "menu.help.privacy": "Privacy Statement",
-  "menu.help.publishDebugInfo": "Publish Debug Information",
-  "menu.help.support": "Support",
-  "menu.help.tos": "Terms of Service",
-  "menu.services": "Services",
-  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service...",
-  "menu.services.goHome": "Home",
-  "menu.services.setNextServiceActive": "Activate next service",
-  "menu.todos": "Todos",
-  "menu.todos.enableTodos": "Enable Todos",
-  "menu.view": "View",
-  "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
-  "menu.view.forward": "Forward",
-  "menu.view.lockFerdi": "Lock Ferdi",
-  "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Reload Ferdi",
-  "menu.view.reloadService": "Reload Service",
-  "menu.view.resetZoom": "Actual Size",
-  "menu.view.toggleDarkMode": "Toggle Dark Mode",
-  "menu.view.toggleDevTools": "Toggle Developer Tools",
-  "menu.view.toggleFullScreen": "Toggle Full Screen",
-  "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
+  "menu.edit.findInPage": "البحث في الصفحة",
+  "menu.edit.paste": "لصق",
+  "menu.edit.pasteAndMatchStyle": "لصق ومطابقة النمط",
+  "menu.edit.redo": "إعادة",
+  "menu.edit.selectAll": "تحديد الكل",
+  "menu.edit.speech": "الحديث",
+  "menu.edit.startDictation": "بدء الإملاء",
+  "menu.edit.startSpeaking": "بدء الحديث",
+  "menu.edit.stopSpeaking": "إيقاف الحديث",
+  "menu.edit.undo": "تراجع",
+  "menu.file": "الملف",
+  "menu.help": "مساعدة",
+  "menu.help.changelog": "سِجل التغييرات",
+  "menu.help.debugInfo": "نسخ معلومات تصحيح الأخطاء",
+  "menu.help.debugInfoCopiedBody": "تم نسخ معلومات تصحيح الأخطاء الخاصة بك إلى الحافظة.",
+  "menu.help.debugInfoCopiedHeadline": "معلومات تصحيح الأخطاء لفردي",
+  "menu.help.learnMore": "معرفة المزيد",
+  "menu.help.privacy": "بيان الخصوصية",
+  "menu.help.publishDebugInfo": "نشر معلومات تصحيح الأخطاء",
+  "menu.help.support": "الدعم الفني",
+  "menu.help.tos": "شروط الخدمة",
+  "menu.services": "الخدمات",
+  "menu.services.activatePreviousService": "تفعيل الخدمة السابقة",
+  "menu.services.addNewService": "إضافة خدمة جديدة...",
+  "menu.services.goHome": "الرئيسية",
+  "menu.services.setNextServiceActive": "تفعيل الخدمة التالية",
+  "menu.todos": "المهام",
+  "menu.todos.enableTodos": "تفعيل المهام",
+  "menu.view": "عرض",
+  "menu.view.back": "الرجوع",
+  "menu.view.enterFullScreen": "الدخول إلى وضع ملء الشاشة",
+  "menu.view.exitFullScreen": "الخروج من وضع ملئ للشاشة",
+  "menu.view.forward": "تقدم",
+  "menu.view.lockFerdi": "قفل فردي",
+  "menu.view.openQuickSwitch": "فتح التبديل السريع",
+  "menu.view.reloadFranz": "إعادة تحميل فردي",
+  "menu.view.reloadService": "إعادة تحميل الخدمة",
+  "menu.view.resetZoom": "الحجم الأصلي",
+  "menu.view.toggleDarkMode": "تفعيل الوضع المظلم",
+  "menu.view.toggleDevTools": "فتح أدوات المطور",
+  "menu.view.toggleFullScreen": "تفعيل وضع ملء الشاشة",
+  "menu.view.toggleServiceDevTools": "فتح أدوات المطور للخدمة",
   "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
   "menu.view.zoomIn": "Zoom In",
   "menu.view.zoomOut": "Zoom Out",
@@ -172,17 +175,18 @@
   "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
   "menu.workspaces.defaultWorkspace": "All services",
   "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
-  "password.email.label": "Email address",
-  "password.headline": "Reset password",
+  "password.email.label": "البريد الإلكتروني",
+  "password.headline": "إعادة تعيين كلمة المرور",
   "password.link.login": "Sign in to your account",
-  "password.link.signup": "Create a free account",
+  "password.link.signup": "إنشاء حساب مجاني",
   "password.noUser": "No user with that email address was found",
   "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
+  "premiumFeature.button.upgradeAccount": "ترقية الحساب",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -227,72 +231,74 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
+  "service.restrictedHandler.action": "ترقية الحساب",
   "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading {service}",
-  "services.getStarted": "Get started",
-  "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
-  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Welcome to Ferdi",
-  "settings.account.account.editButton": "Edit account",
-  "settings.account.accountType.basic": "Basic Account",
-  "settings.account.accountType.premium": "Premium Supporter Account",
-  "settings.account.accountUnavailable": "Account is unavailable",
-  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
-  "settings.account.buttonSave": "Update profile",
-  "settings.account.deleteAccount": "Delete account",
-  "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-  "settings.account.deleteInfo": "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
-  "settings.account.headline": "Account",
-  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Change password",
-  "settings.account.headlineProfile": "Update profile",
-  "settings.account.headlineSubscription": "Your subscription",
+  "service.restrictedHandler.serviceLimit.headline": "لقد وصلت إلى حد الخدمة الخاص بك.",
+  "service.restrictedHandler.serviceLimit.text": "الرجاء ترقية حسابك لاستخدام أكثر من {count} خدمة.",
+  "service.webviewLoader.loading": "جاري تحميل {service}",
+  "services.getStarted": "بدأ الإستخدام",
+  "services.login": "الرجاء تسجيل الدخول لاستخدام فردي.",
+  "services.serverInfo": "يمكنك تغيير خادم فردي الخاص بك بالنقر على الكود في أسفل الزاوية اليسار بشكل اختياري.",
+  "services.serverless": "استخدام فردي بدون حساب",
+  "services.welcome": "مرحبا بكم في فردي",
+  "settings.account.account.editButton": "تعديل الحساب",
+  "settings.account.accountType.basic": "الحساب الأساسي",
+  "settings.account.accountType.premium": "حساب الدعم المدفوع",
+  "settings.account.accountUnavailable": "الحساب غير متوفر",
+  "settings.account.accountUnavailableInfo": "أنت تستخدم فردي بدون حساب. إذا كنت ترغب في استخدام فردي مع حساب والحفاظ على مزامنة خدماتك عبر مختلف الحواسيب، الرجاء تحديد خادم في علامة تبويب الإعدادات ثم سجل الدخول.",
+  "settings.account.buttonSave": "تحديث الملف الشخصي",
+  "settings.account.deleteAccount": "حذف الحساب",
+  "settings.account.deleteEmailSent": "لقد تلقيت رسالة بريد إلكتروني مع رابط لتأكيد حذف حسابك. لا يمكن استعادة حسابك وبياناتك!",
+  "settings.account.deleteInfo": "إذا كنت لا تحتاج إلى حساب فردي الخاص بك بعد الآن، يمكنك حذف حسابك وجميع البيانات ذات الصلة من هنا.",
+  "settings.account.headline": "الحساب",
+  "settings.account.headlineAccount": "معلومات الحساب",
+  "settings.account.headlineDangerZone": "منطقة الخطر",
+  "settings.account.headlineInvoices": "الفواتير",
+  "settings.account.headlinePassword": "تغيير كلمة المرور",
+  "settings.account.headlineProfile": "تحديث الملف الشخصي",
+  "settings.account.headlineSubscription": "الإشتراك الخاصة بك",
   "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.manageSubscription.label": "Manage your subscription",
-  "settings.account.successInfo": "Your changes have been saved",
+  "settings.account.headlineUpgradeAccount": "قم بترقية حسابك واحصل على تجربة فردي الكاملة",
+  "settings.account.invoiceDownload": "تنزيل",
+  "settings.account.manageSubscription.label": "إدارة اشتراكك",
+  "settings.account.successInfo": "تم حفظ التغييرات الخاصة بك",
   "settings.account.trial": "Free Trial",
   "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
   "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
-  "settings.account.tryReloadServices": "Try again",
-  "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
-  "settings.account.userInfoRequestFailed": "Could not load user information",
-  "settings.account.yourLicense": "Your Ferdi License",
-  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: #7367f0)",
-  "settings.app.buttonClearAllCache": "Clear cache",
-  "settings.app.buttonInstallUpdate": "Restart & install update",
-  "settings.app.buttonSearchForUpdate": "Check for updates",
-  "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": "Synchronize dark mode with my OS's dark mode setting",
-  "settings.app.form.autoLaunchInBackground": "Open in background",
-  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
-  "settings.app.form.automaticUpdates": "Enable updates",
-  "settings.app.form.beta": "Include beta versions",
-  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
-  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Password Lock",
-  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
-  "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
-  "settings.app.form.hibernationStrategy": "Hibernation strategy",
+  "settings.account.tryReloadServices": "حاول مجددًا",
+  "settings.account.tryReloadUserInfoRequest": "حاول مجددًا",
+  "settings.account.upgradeToPro.label": "الترقية إلى الخطة الإحترافية لفردي",
+  "settings.account.userInfoRequestFailed": "تعذر تحميل معلومات المستخدم",
+  "settings.account.yourLicense": "رخصة فردي الخاصة بك",
+  "settings.app.accentColorInfo": "اكتب لون التمييز الخاص بك بتنسيق متوافق مع CSS. (الافتراضي: #7367f0)",
+  "settings.app.buttonClearAllCache": "مسح ذاكرة التخزين المؤقت",
+  "settings.app.buttonInstallUpdate": "إعادة التشغيل وتثبيت التحديث",
+  "settings.app.buttonSearchForUpdate": "التحقق من وجود تحديثات",
+  "settings.app.cacheInfo": "التخزين المؤقت لفردي يستخدم حاليا {size} من مساحة القرص.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
+  "settings.app.currentVersion": "الإصدار الحالي:",
+  "settings.app.form.accentColor": "لون التمييز",
+  "settings.app.form.adaptableDarkMode": "مزامنة الوضع المظلم مع إعداد الوضع المظلم لنظام التشغيل الخاص بي",
+  "settings.app.form.autoLaunchInBackground": "فتح في الخلفية",
+  "settings.app.form.autoLaunchOnStart": "تشغيل فردي عند البدء",
+  "settings.app.form.automaticUpdates": "تفعيل التحديثات",
+  "settings.app.form.beta": "تضمين الإصدارات التجريبية",
+  "settings.app.form.customTodoServer": "خادم مهام مخصص",
+  "settings.app.form.darkMode": "تفعيل الوضع المظلم",
+  "settings.app.form.enableGPUAcceleration": "تفعيل التسريع بوحدة معالجة الرسومات",
+  "settings.app.form.enableLock": "تفعيل القفل بكلمة المرور",
+  "settings.app.form.enableSpellchecking": "تفعيل التصحيح الإملائي",
+  "settings.app.form.enableSystemTray": "إظهار فردي في شريط النظام",
+  "settings.app.form.enableTodos": "تفعيل فردي للمهام",
+  "settings.app.form.hibernate": "تفعيل وضع النوم للخدمة",
+  "settings.app.form.hibernateOnStartup": "الإبقاء على الخدمات في وضع النوم عند بدء التشغيل",
+  "settings.app.form.hibernationStrategy": "استراتيجية وضع النوم",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Password",
+  "settings.app.form.lockPassword": "كلمة المرور",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
@@ -305,12 +311,12 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
-  "settings.app.headline": "Settings",
+  "settings.app.headline": "الإعدادات",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -320,7 +326,7 @@
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
   "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Password",
+  "settings.app.lockedPassword": "كلمة المرور",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
@@ -334,10 +340,10 @@
   "settings.app.updateStatusSearching": "Is searching for update",
   "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
   "settings.invite.headline": "Invite Friends",
-  "settings.navigation.account": "Account",
+  "settings.navigation.account": "الحساب",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
+  "settings.navigation.settings": "الإعدادات",
   "settings.navigation.supportFerdi": "Support Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -345,47 +351,49 @@
   "settings.recipes.all": "All services",
   "settings.recipes.custom": "Custom Services",
   "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
-  "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes",
-  "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
-  "settings.recipes.customService.openDevDocs": "Developer Documentation",
-  "settings.recipes.customService.openFolder": "Open folder",
+  "settings.recipes.customService.headline.customRecipes": "وصفات طرف ثالث مخصصة",
+  "settings.recipes.customService.headline.devRecipes": "وصفات خدمة التطوير الخاصة بك",
+  "settings.recipes.customService.intro": "لإضافة خدمة مخصصة، انسخ وصفة الخدمة إلى:",
+  "settings.recipes.customService.openDevDocs": "وثائق المطور",
+  "settings.recipes.customService.openFolder": "فتح المجلد",
   "settings.recipes.headline": "Available services",
-  "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "Most popular",
-  "settings.recipes.nothingFound": "Sorry, but no service matched your search term.",
-  "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
-  "settings.searchService": "Search service",
-  "settings.service.error.goBack": "Back to services",
+  "settings.recipes.missingService": "خدمة مفقودة؟",
+  "settings.recipes.mostPopular": "الأكثر شعبية",
+  "settings.recipes.nothingFound": "عذراً، ولكن لا توجد خدمة تطابق مصطلح البحث الخاص بك.",
+  "settings.recipes.servicesSuccessfulAddedInfo": "تمت إضافة الخدمة بنجاح",
+  "settings.searchService": "البحث عن خدمة",
+  "settings.service.error.goBack": "العودة إلى الخدمات",
   "settings.service.error.headline": "Error",
-  "settings.service.error.message": "Could not load service recipe.",
-  "settings.service.form.addServiceHeadline": "Add {name}",
+  "settings.service.error.message": "تعذر تحميل وصفة الخدمة.",
+  "settings.service.form.addServiceHeadline": "إضافة {name}",
   "settings.service.form.availableServices": "Available services",
-  "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
-  "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.customUrl": "خادم مخصص",
+  "settings.service.form.customUrlPremiumInfo": "لإضافة الخدمات المستضافة بنفسك، تحتاج إلى حساب الدعم المدفوع لفردي.",
+  "settings.service.form.customUrlUpgradeAccount": "ترقية حسابك",
+  "settings.service.form.customUrlValidationError": "تعذر التحقق من خادم {name} المخصص.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
-  "settings.service.form.iconDelete": "Delete",
+  "settings.service.form.iconDelete": "حذف",
   "settings.service.form.iconUpload": "Drop your image, or click here",
   "settings.service.form.indirectMessageInfo": "You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
   "settings.service.form.indirectMessages": "Show message badge for all new messages",
   "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
-  "settings.service.form.name": "Name",
+  "settings.service.form.name": "الاسم",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
@@ -412,7 +420,7 @@
   "settings.services.tooltip.isDisabled": "Service is disabled",
   "settings.services.tooltip.isMuted": "All sounds are muted",
   "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
-  "settings.services.updatedInfo": "Your changes have been saved",
+  "settings.services.updatedInfo": "تم حفظ التغييرات الخاصة بك",
   "settings.supportFerdi.github": "Star on GitHub",
   "settings.supportFerdi.headline": "Support Ferdi",
   "settings.supportFerdi.openCollective": "Support our Open Collective",
@@ -435,42 +443,42 @@
   "settings.user.form.firstname": "First Name",
   "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "New password",
-  "settings.workspace.add.form.name": "Name",
+  "settings.workspace.add.form.name": "الاسم",
   "settings.workspace.add.form.submitButton": "Create workspace",
   "settings.workspace.form.buttonDelete": "Delete workspace",
   "settings.workspace.form.buttonSave": "Save workspace",
   "settings.workspace.form.keepLoaded": "Keep this workspace loaded*",
   "settings.workspace.form.keepLoadedInfo": "*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
-  "settings.workspace.form.name": "Name",
+  "settings.workspace.form.name": "الاسم",
   "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace",
   "settings.workspace.form.yourWorkspaces": "Your workspaces",
   "settings.workspaces.deletedInfo": "Workspace has been deleted",
   "settings.workspaces.headline": "Your workspaces",
   "settings.workspaces.noWorkspacesAdded": "You haven't added any workspaces yet.",
-  "settings.workspaces.tryReloadWorkspaces": "Try again",
-  "settings.workspaces.updatedInfo": "Your changes have been saved",
+  "settings.workspaces.tryReloadWorkspaces": "حاول مجددًا",
+  "settings.workspaces.updatedInfo": "تم حفظ التغييرات الخاصة بك",
   "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces",
   "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed": "Could not load your workspaces",
   "sidebar.addNewService": "Add new service",
   "sidebar.closeTodosDrawer": "Close Ferdi Todos",
   "sidebar.closeWorkspaceDrawer": "Close workspace drawer",
-  "sidebar.lockFerdi": "Lock Ferdi",
+  "sidebar.lockFerdi": "قفل فردي",
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
+  "sidebar.settings": "الإعدادات",
   "sidebar.unmuteApp": "Enable notifications & audio",
-  "signup.email.label": "Email address",
+  "signup.email.label": "البريد الإلكتروني",
   "signup.emailDuplicate": "A user with that email address already exists",
   "signup.firstname.label": "First Name",
   "signup.headline": "Sign up",
   "signup.lastname.label": "Last Name",
   "signup.legal.info": "By creating a Ferdi account you accept the",
-  "signup.legal.privacy": "Privacy Statement",
+  "signup.legal.privacy": "بيان الخصوصية",
   "signup.legal.terms": "Terms of service",
   "signup.link.login": "Already have an account, sign in?",
-  "signup.password.label": "Password",
+  "signup.password.label": "كلمة المرور",
   "signup.submit.label": "Create account",
   "subscription.bestValue": "Best value",
   "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
@@ -480,7 +488,7 @@
   "subscription.interval.per": "per {interval}",
   "subscription.interval.perMonth": "per month",
   "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
+  "subscription.planItem.upgradeAccount": "ترقية الحساب",
   "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
   "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
   "subscriptionPopup.buttonCancel": "Cancel",
@@ -489,7 +497,7 @@
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
+  "tabs.item.edit": "تعديل",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
@@ -499,13 +507,13 @@
   "validation.oneRequired": "At least one is required",
   "validation.required": "{field} is required",
   "validation.url": "{field} is not a valid URL",
-  "webControls.back": "Back",
-  "webControls.forward": "Forward",
-  "webControls.goHome": "Home",
+  "webControls.back": "الرجوع",
+  "webControls.forward": "تقدم",
+  "webControls.goHome": "الرئيسية",
   "webControls.openInBrowser": "Open in Browser",
   "webControls.reload": "إعادة التحميل",
   "welcome.loginButton": "Login to your account",
-  "welcome.signupButton": "Create a free account",
+  "welcome.signupButton": "إنشاء حساب مجاني",
   "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
   "workspaceDrawer.allServices": "All services",
   "workspaceDrawer.headline": "Workspaces",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index 65b0edbfa..9d676c0a9 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "connectionLostBanner.cta": "Reload Service",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Restart & install update",
   "settings.app.buttonSearchForUpdate": "Check for updates",
   "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Current version:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 340b5f4cf..b0e8d2ded 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Enviar",
+  "connectionLostBanner.cta": "Torna a carregar el servei",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Canvis en Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Si us plau, compra una llicència de suport per a Ferdi per saltar l'espera",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Reinicia i instal·la l'actualització",
   "settings.app.buttonSearchForUpdate": "Comprova si hi ha actualitzacions",
   "settings.app.cacheInfo": "La memòria cau de Ferdi està utilitzant {size} d'espai al disc",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Versió actual:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Mostra Ferdi a la safata del sistema",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Mostra les pestanyes dels serveis desactivats",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Mostra la insígnia de missatges no llegits quan les notificacions estiguin desactivades",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Mostra la insígnia de missatges no llegits quan les notificacions estiguin desactivades",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Per afegir serveis allotjats per vosaltres mateixos, necessiteu un Compte Ferdi Premium Supporter.",
   "settings.service.form.customUrlUpgradeAccount": "Actualitzeu el vostre compte",
   "settings.service.form.customUrlValidationError": "No s'ha pogut validar el servidor {name} personalitzat.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Suprimeix el servei",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Edita {name}",
   "settings.service.form.enableAudio": "Activa l'àudio",
   "settings.service.form.enableBadge": "Mostra les insígnies als missatges no llegits.",
   "settings.service.form.enableDarkMode": "Activar el Mode Fosc",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Activa les notificacions",
   "settings.service.form.enableService": "Activa el servei",
   "settings.service.form.headlineBadges": "Insígnies de missatges no llegits",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notificacions",
   "settings.service.form.icon": "Icona personalitzada",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index f2d80e845..136602524 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Odeslat",
+  "connectionLostBanner.cta": "Obnovit službu",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Změny ve Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Kup si Ferdi Supporter licenci a nebudeš už muset čekat",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Restartovat a nainstalovat aktualizace",
   "settings.app.buttonSearchForUpdate": "Zkontrolovat aktualizace",
   "settings.app.cacheInfo": "Ferdi momentálně používá {size} místa na disku.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Aktuální verze:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Zobrazit Ferdi v systémové liště",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Zobrazit záložky vypnutých služeb",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Zobrazit odznak pro nepřečtené zprávy když jsou upozornění vypnutá",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Zobrazit odznak pro nepřečtené zprávy když jsou upozornění vypnutá",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Chcete-li přidat vlastní hostované služby, potřebujete účet Ferdi Premium Supporter.",
   "settings.service.form.customUrlUpgradeAccount": "Aktualizujte svůj účet",
   "settings.service.form.customUrlValidationError": "Nepodařilo se ověřit vlastní server {name}.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Odstranit službu",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Upravit {name}",
   "settings.service.form.enableAudio": "Zapnout zvuk",
   "settings.service.form.enableBadge": "Ukázat odznaky nepřečtených zpráv",
   "settings.service.form.enableDarkMode": "Povolit Tmavý vzhled",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Povolit upozornění",
   "settings.service.form.enableService": "Povolit službu",
   "settings.service.form.headlineBadges": "Odznaky nepřečtených zpráv",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Obecné",
   "settings.service.form.headlineNotifications": "Upozornění",
   "settings.service.form.icon": "Vlastní ikona",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index 65b0edbfa..9d676c0a9 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "connectionLostBanner.cta": "Reload Service",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Restart & install update",
   "settings.app.buttonSearchForUpdate": "Check for updates",
   "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Current version:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index a4cff3a32..38772d36a 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Server wechseln",
   "changeserver.label": "Server",
   "changeserver.submit": "Absenden",
+  "connectionLostBanner.cta": "Dienst neu laden",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Was ist neu in Ferdi {version}",
   "feature.debugger.title": "Debug-Informationen veröffentlichen",
   "feature.delayApp.headline": "Bitte kaufe eine Ferdi Supporter Lizenz, um das Warten zu überspringen",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Konto-Synchronisierung",
   "pricing.features.adFree": "Keine Werbung",
   "pricing.features.appDelays": "Keine unnötigen Unterbrechungen",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Hinzufügen von eigenen Websites",
   "pricing.features.desktopNotifications": "Desktop Benachrichtigungen",
   "pricing.features.onPremise": "On-premise & andere Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Neu starten & Update installieren",
   "settings.app.buttonSearchForUpdate": "Nach Updates suchen",
   "settings.app.cacheInfo": "Der Ferdi Cache belegt derzeit {size}.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Aktuelle Version:",
   "settings.app.form.accentColor": "Akzentfarbe",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Ferdi im Infobereich anzeigen",
   "settings.app.form.enableTodos": "Ferdi Todos aktivieren",
   "settings.app.form.hibernate": "\"Service Hibernation\" aktivieren",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "\"Service Hibernation\"-Strategie",
   "settings.app.form.iconSize": "Service Symbolgröße",
   "settings.app.form.inactivityLock": "Nach Inaktivität sperren",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Telemetrie-Daten senden",
   "settings.app.form.serviceRibbonWidth": "Größe der Sidebar",
   "settings.app.form.showDisabledServices": "Deaktivierte Services-Tabs anzeigen",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Ungelesene Nachrichten zeigen, wenn die Benachrichtigungen deaktiviert sind",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Ungelesene Nachrichten zeigen, wenn die Benachrichtigungen deaktiviert sind",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Universellen Dark Mode aktivieren",
   "settings.app.form.useTouchIdToUnlock": "Verwenden von Touch ID zum Entsperren von Ferdi erlauben",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Um einen selbst gehosteten Dienst hinzuzufügen, brauchst Du ein Ferdi Premium Konto.",
   "settings.service.form.customUrlUpgradeAccount": "Dein Konto upgraden",
   "settings.service.form.customUrlValidationError": "Dein {name}-Server konnte nicht verifiziert werden.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Dienst löschen",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "{name} bearbeiten",
   "settings.service.form.enableAudio": "Audio aktivieren",
   "settings.service.form.enableBadge": "Nachrichten-Badge anzeigen",
   "settings.service.form.enableDarkMode": "Dark Mode aktivieren",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Benachrichtigungen aktivieren",
   "settings.service.form.enableService": "Dienst aktivieren",
   "settings.service.form.headlineBadges": "Nachrichten-Badge",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Allgemeines",
   "settings.service.form.headlineNotifications": "Benachrichtigungen",
   "settings.service.form.icon": "Icon",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index f3ff7caf3..c80574aa8 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -2444,351 +2444,364 @@
         "defaultMessage": "!!!Save service",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 28
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.saveButton",
         "start": {
           "column": 15,
-          "line": 24
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Delete Service",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 32
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.deleteButton",
         "start": {
           "column": 17,
-          "line": 28
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Open darkmode.css",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 36
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.openDarkmodeCss",
         "start": {
           "column": 19,
-          "line": 32
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Open user.css",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 40
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.openUserCss",
         "start": {
           "column": 15,
-          "line": 36
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Open user.js",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 44
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.openUserJs",
         "start": {
           "column": 14,
-          "line": 40
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 48
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.recipeFileInfo",
         "start": {
           "column": 18,
-          "line": 44
+          "line": 45
         }
       },
       {
         "defaultMessage": "!!!Available services",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 52
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.availableServices",
         "start": {
           "column": 21,
-          "line": 48
+          "line": 49
         }
       },
       {
         "defaultMessage": "!!!Your services",
         "end": {
           "column": 3,
-          "line": 55
+          "line": 56
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.yourServices",
         "start": {
           "column": 16,
-          "line": 52
+          "line": 53
         }
       },
       {
         "defaultMessage": "!!!Add {name}",
         "end": {
           "column": 3,
-          "line": 59
+          "line": 60
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.addServiceHeadline",
         "start": {
           "column": 22,
-          "line": 56
+          "line": 57
         }
       },
       {
         "defaultMessage": "!!!Edit {name}",
         "end": {
           "column": 3,
-          "line": 63
+          "line": 64
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.editServiceHeadline",
         "start": {
           "column": 23,
-          "line": 60
+          "line": 61
         }
       },
       {
         "defaultMessage": "!!!Hosted",
         "end": {
           "column": 3,
-          "line": 67
+          "line": 68
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.tabHosted",
         "start": {
           "column": 13,
-          "line": 64
+          "line": 65
         }
       },
       {
         "defaultMessage": "!!!Self hosted ⭐️",
         "end": {
           "column": 3,
-          "line": 71
+          "line": 72
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.tabOnPremise",
         "start": {
           "column": 16,
-          "line": 68
+          "line": 69
         }
       },
       {
         "defaultMessage": "!!!Use the hosted {name} service.",
         "end": {
           "column": 3,
-          "line": 75
+          "line": 76
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.useHostedService",
         "start": {
           "column": 20,
-          "line": 72
+          "line": 73
         }
       },
       {
         "defaultMessage": "!!!Could not validate custom {name} server.",
         "end": {
           "column": 3,
-          "line": 79
+          "line": 80
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.customUrlValidationError",
         "start": {
           "column": 28,
-          "line": 76
+          "line": 77
         }
       },
       {
         "defaultMessage": "!!!To add self hosted services, you need a Ferdi Premium Supporter Account.",
         "end": {
           "column": 3,
-          "line": 83
+          "line": 84
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.customUrlPremiumInfo",
         "start": {
           "column": 24,
-          "line": 80
+          "line": 81
         }
       },
       {
         "defaultMessage": "!!!Upgrade your account",
         "end": {
           "column": 3,
-          "line": 87
+          "line": 88
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.customUrlUpgradeAccount",
         "start": {
           "column": 27,
-          "line": 84
+          "line": 85
         }
       },
       {
         "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
         "end": {
           "column": 3,
-          "line": 91
+          "line": 92
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.indirectMessageInfo",
         "start": {
           "column": 23,
-          "line": 88
+          "line": 89
         }
       },
       {
         "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
         "end": {
           "column": 3,
-          "line": 95
+          "line": 96
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.isMutedInfo",
         "start": {
           "column": 15,
-          "line": 92
+          "line": 93
         }
       },
       {
         "defaultMessage": "!!!You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
         "end": {
           "column": 3,
-          "line": 99
+          "line": 100
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.disableHibernationInfo",
         "start": {
           "column": 26,
-          "line": 96
+          "line": 97
         }
       },
       {
         "defaultMessage": "!!!Notifications",
         "end": {
           "column": 3,
-          "line": 103
+          "line": 104
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.headlineNotifications",
         "start": {
           "column": 25,
-          "line": 100
+          "line": 101
         }
       },
       {
         "defaultMessage": "!!!Unread message badges",
         "end": {
           "column": 3,
-          "line": 107
+          "line": 108
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.headlineBadges",
         "start": {
           "column": 18,
-          "line": 104
+          "line": 105
         }
       },
       {
         "defaultMessage": "!!!General",
         "end": {
           "column": 3,
-          "line": 111
+          "line": 112
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.headlineGeneral",
         "start": {
           "column": 19,
-          "line": 108
+          "line": 109
+        }
+      },
+      {
+        "defaultMessage": "!!!Dark Reader Settings",
+        "end": {
+          "column": 3,
+          "line": 116
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.headlineDarkReaderSettings",
+        "start": {
+          "column": 30,
+          "line": 113
         }
       },
       {
         "defaultMessage": "!!!Delete",
         "end": {
           "column": 3,
-          "line": 115
+          "line": 120
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.iconDelete",
         "start": {
           "column": 14,
-          "line": 112
+          "line": 117
         }
       },
       {
         "defaultMessage": "!!!Drop your image, or click here",
         "end": {
           "column": 3,
-          "line": 119
+          "line": 124
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.iconUpload",
         "start": {
           "column": 14,
-          "line": 116
+          "line": 121
         }
       },
       {
         "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
         "end": {
           "column": 3,
-          "line": 123
+          "line": 128
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.proxy.headline",
         "start": {
           "column": 17,
-          "line": 120
+          "line": 125
         }
       },
       {
         "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
         "end": {
           "column": 3,
-          "line": 127
+          "line": 132
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.proxy.restartInfo",
         "start": {
           "column": 20,
-          "line": 124
+          "line": 129
         }
       },
       {
         "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
         "end": {
           "column": 3,
-          "line": 131
+          "line": 136
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.proxy.info",
         "start": {
           "column": 13,
-          "line": 128
+          "line": 133
         }
       }
     ],
@@ -3280,120 +3293,133 @@
         }
       },
       {
-        "defaultMessage": "!!!Clear cache",
+        "defaultMessage": "!!!Couldn't clear all cache",
         "end": {
           "column": 3,
           "line": 105
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.cacheNotCleared",
+        "start": {
+          "column": 19,
+          "line": 102
+        }
+      },
+      {
+        "defaultMessage": "!!!Clear cache",
+        "end": {
+          "column": 3,
+          "line": 109
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonClearAllCache",
         "start": {
           "column": 23,
-          "line": 102
+          "line": 106
         }
       },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 109
+          "line": 113
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonSearchForUpdate",
         "start": {
           "column": 25,
-          "line": 106
+          "line": 110
         }
       },
       {
         "defaultMessage": "!!!Restart & install update",
         "end": {
           "column": 3,
-          "line": 113
+          "line": 117
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonInstallUpdate",
         "start": {
           "column": 23,
-          "line": 110
+          "line": 114
         }
       },
       {
         "defaultMessage": "!!!Is searching for update",
         "end": {
           "column": 3,
-          "line": 117
+          "line": 121
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusSearching",
         "start": {
           "column": 25,
-          "line": 114
+          "line": 118
         }
       },
       {
         "defaultMessage": "!!!Update available, downloading...",
         "end": {
           "column": 3,
-          "line": 121
+          "line": 125
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusAvailable",
         "start": {
           "column": 25,
-          "line": 118
+          "line": 122
         }
       },
       {
         "defaultMessage": "!!!You are using the latest version of Ferdi",
         "end": {
           "column": 3,
-          "line": 125
+          "line": 129
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusUpToDate",
         "start": {
           "column": 24,
-          "line": 122
+          "line": 126
         }
       },
       {
         "defaultMessage": "!!!Current version:",
         "end": {
           "column": 3,
-          "line": 129
+          "line": 133
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.currentVersion",
         "start": {
           "column": 18,
-          "line": 126
+          "line": 130
         }
       },
       {
         "defaultMessage": "!!!Changes require restart",
         "end": {
           "column": 3,
-          "line": 133
+          "line": 137
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.restartRequired",
         "start": {
           "column": 29,
-          "line": 130
+          "line": 134
         }
       },
       {
         "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
         "end": {
           "column": 3,
-          "line": 137
+          "line": 141
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.languageDisclaimer",
         "start": {
           "column": 22,
-          "line": 134
+          "line": 138
         }
       }
     ],
@@ -4403,68 +4429,107 @@
         }
       },
       {
-        "defaultMessage": "!!!Use Proxy",
+        "defaultMessage": "!!!Dark Reader Brightness",
         "end": {
           "column": 3,
           "line": 75
         },
         "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.darkReaderBrightness",
+        "start": {
+          "column": 24,
+          "line": 72
+        }
+      },
+      {
+        "defaultMessage": "!!!Dark Reader Contrast",
+        "end": {
+          "column": 3,
+          "line": 79
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.darkReaderContrast",
+        "start": {
+          "column": 22,
+          "line": 76
+        }
+      },
+      {
+        "defaultMessage": "!!!Dark Reader Sepia",
+        "end": {
+          "column": 3,
+          "line": 83
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.darkReaderSepia",
+        "start": {
+          "column": 19,
+          "line": 80
+        }
+      },
+      {
+        "defaultMessage": "!!!Use Proxy",
+        "end": {
+          "column": 3,
+          "line": 87
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.isEnabled",
         "start": {
           "column": 15,
-          "line": 72
+          "line": 84
         }
       },
       {
         "defaultMessage": "!!!Proxy Host/IP",
         "end": {
           "column": 3,
-          "line": 79
+          "line": 91
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.host",
         "start": {
           "column": 13,
-          "line": 76
+          "line": 88
         }
       },
       {
         "defaultMessage": "!!!Port",
         "end": {
           "column": 3,
-          "line": 83
+          "line": 95
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.port",
         "start": {
           "column": 13,
-          "line": 80
+          "line": 92
         }
       },
       {
         "defaultMessage": "!!!User",
         "end": {
           "column": 3,
-          "line": 87
+          "line": 99
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.user",
         "start": {
           "column": 13,
-          "line": 84
+          "line": 96
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 91
+          "line": 103
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.password",
         "start": {
           "column": 17,
-          "line": 88
+          "line": 100
         }
       }
     ],
@@ -4616,341 +4681,354 @@
         }
       },
       {
-        "defaultMessage": "!!!Hibernation strategy",
+        "defaultMessage": "!!!Keep services in hibernation on startup",
         "end": {
           "column": 3,
           "line": 76
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.hibernateOnStartup",
+        "start": {
+          "column": 22,
+          "line": 73
+        }
+      },
+      {
+        "defaultMessage": "!!!Hibernation strategy",
+        "end": {
+          "column": 3,
+          "line": 80
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.hibernationStrategy",
         "start": {
           "column": 23,
-          "line": 73
+          "line": 77
         }
       },
       {
         "defaultMessage": "!!!Todo Server",
         "end": {
           "column": 3,
-          "line": 80
+          "line": 84
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.predefinedTodoServer",
         "start": {
           "column": 24,
-          "line": 77
+          "line": 81
         }
       },
       {
         "defaultMessage": "!!!Custom TodoServer",
         "end": {
           "column": 3,
-          "line": 84
+          "line": 88
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.customTodoServer",
         "start": {
           "column": 20,
-          "line": 81
+          "line": 85
         }
       },
       {
         "defaultMessage": "!!!Enable Password Lock",
         "end": {
           "column": 3,
-          "line": 88
+          "line": 92
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableLock",
         "start": {
           "column": 14,
-          "line": 85
+          "line": 89
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 92
+          "line": 96
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.lockPassword",
         "start": {
           "column": 16,
-          "line": 89
+          "line": 93
         }
       },
       {
         "defaultMessage": "!!!Allow using Touch ID to unlock",
         "end": {
           "column": 3,
-          "line": 96
+          "line": 100
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.useTouchIdToUnlock",
         "start": {
           "column": 22,
-          "line": 93
+          "line": 97
         }
       },
       {
         "defaultMessage": "!!!Lock after inactivity",
         "end": {
           "column": 3,
-          "line": 100
+          "line": 104
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.inactivityLock",
         "start": {
           "column": 18,
-          "line": 97
+          "line": 101
         }
       },
       {
         "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
         "end": {
           "column": 3,
-          "line": 104
+          "line": 108
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDEnabled",
         "start": {
           "column": 23,
-          "line": 101
+          "line": 105
         }
       },
       {
         "defaultMessage": "!!!From",
         "end": {
           "column": 3,
-          "line": 108
+          "line": 112
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDStart",
         "start": {
           "column": 21,
-          "line": 105
+          "line": 109
         }
       },
       {
         "defaultMessage": "!!!To",
         "end": {
           "column": 3,
-          "line": 112
+          "line": 116
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDEnd",
         "start": {
           "column": 19,
-          "line": 109
+          "line": 113
         }
       },
       {
         "defaultMessage": "!!!Language",
         "end": {
           "column": 3,
-          "line": 116
+          "line": 120
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.language",
         "start": {
           "column": 12,
-          "line": 113
+          "line": 117
         }
       },
       {
         "defaultMessage": "!!!Dark Mode",
         "end": {
           "column": 3,
-          "line": 120
+          "line": 124
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.darkMode",
         "start": {
           "column": 12,
-          "line": 117
+          "line": 121
         }
       },
       {
         "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
         "end": {
           "column": 3,
-          "line": 124
+          "line": 128
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.adaptableDarkMode",
         "start": {
           "column": 21,
-          "line": 121
+          "line": 125
         }
       },
       {
         "defaultMessage": "!!!Enable universal Dark Mode",
         "end": {
           "column": 3,
-          "line": 128
+          "line": 132
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.universalDarkMode",
         "start": {
           "column": 21,
-          "line": 125
+          "line": 129
         }
       },
       {
         "defaultMessage": "!!!Sidebar width",
         "end": {
           "column": 3,
-          "line": 132
+          "line": 136
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.serviceRibbonWidth",
         "start": {
           "column": 22,
-          "line": 129
+          "line": 133
         }
       },
       {
         "defaultMessage": "!!!Service icon size",
         "end": {
           "column": 3,
-          "line": 136
+          "line": 140
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.iconSize",
         "start": {
           "column": 12,
-          "line": 133
+          "line": 137
         }
       },
       {
         "defaultMessage": "!!!Accent color",
         "end": {
           "column": 3,
-          "line": 140
+          "line": 144
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.accentColor",
         "start": {
           "column": 15,
-          "line": 137
+          "line": 141
         }
       },
       {
         "defaultMessage": "!!!Display disabled services tabs",
         "end": {
           "column": 3,
-          "line": 144
+          "line": 148
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDisabledServices",
         "start": {
           "column": 24,
-          "line": 141
+          "line": 145
         }
       },
       {
         "defaultMessage": "!!!Show unread message badge when notifications are disabled",
         "end": {
           "column": 3,
-          "line": 148
+          "line": 152
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showMessagesBadgesWhenMuted",
         "start": {
           "column": 29,
-          "line": 145
+          "line": 149
         }
       },
       {
         "defaultMessage": "!!!Show draggable area on window",
         "end": {
           "column": 3,
-          "line": 152
+          "line": 156
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDragArea",
         "start": {
           "column": 16,
-          "line": 149
+          "line": 153
         }
       },
       {
         "defaultMessage": "!!!Enable spell checking",
         "end": {
           "column": 3,
-          "line": 156
+          "line": 160
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSpellchecking",
         "start": {
           "column": 23,
-          "line": 153
+          "line": 157
         }
       },
       {
         "defaultMessage": "!!!Enable GPU Acceleration",
         "end": {
           "column": 3,
-          "line": 160
+          "line": 164
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableGPUAcceleration",
         "start": {
           "column": 25,
-          "line": 157
+          "line": 161
         }
       },
       {
         "defaultMessage": "!!!Include beta versions",
         "end": {
           "column": 3,
-          "line": 164
+          "line": 168
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.beta",
         "start": {
           "column": 8,
-          "line": 161
+          "line": 165
         }
       },
       {
         "defaultMessage": "!!!Enable updates",
         "end": {
           "column": 3,
-          "line": 168
+          "line": 172
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.automaticUpdates",
         "start": {
           "column": 20,
-          "line": 165
+          "line": 169
         }
       },
       {
         "defaultMessage": "!!!Enable Franz Todos",
         "end": {
           "column": 3,
-          "line": 172
+          "line": 176
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableTodos",
         "start": {
           "column": 15,
-          "line": 169
+          "line": 173
         }
       },
       {
         "defaultMessage": "!!!Keep all workspaces loaded",
         "end": {
           "column": 3,
-          "line": 176
+          "line": 180
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.keepAllWorkspacesLoaded",
         "start": {
           "column": 27,
-          "line": 173
+          "line": 177
         }
       }
     ],
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index a5d95e7f8..88fe5a81d 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Υποβολή",
+  "connectionLostBanner.cta": "Ανανέωση Υπηρεσίας",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Επανεκκίνηση & εγκατάσταση ενημερώσεων",
   "settings.app.buttonSearchForUpdate": "Έλεγχος για ενημερώσεις",
   "settings.app.cacheInfo": "Το Ferdi χρησιμοποιεί αυτήν τη στιγμή {size} χώρου στο δίσκο.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Τρέχουσα έκδοση:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Εμφάνιση του Ferdi στη γραμμή ειδοποιήσεων",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Προβολή καρτελών των απενεργοποιημένων υπηρεσιών",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Προβολή του εικονιδίου μη αναγνωσμένου μηνύματος όταν οι ειδοποιήσεις είναι απενεργοποιημένες",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Προβολή του εικονιδίου μη αναγνωσμένου μηνύματος όταν οι ειδοποιήσεις είναι απενεργοποιημένες",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Για να προσθέσετε υπηρεσίες που φιλοξενούνται μόνος σας, χρειάζεστε έναν λογαριασμό υποστήριξης Premium Ferdi.",
   "settings.service.form.customUrlUpgradeAccount": "Αναβάθμιση του λογαριασμού σας",
   "settings.service.form.customUrlValidationError": "Δεν ήταν δυνατή η επικύρωση του προσαρμοσμένου διακομιστή {name}.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Διαγραφή υπηρεσίας",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Επεξεργασία {name}",
   "settings.service.form.enableAudio": "Ενεργοποίηση ήχου",
   "settings.service.form.enableBadge": "Εμφάνιση εικονιδίων μη αναγνωσμένου μηνύματος",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Ενεργοποίηση ειδοποιήσεων",
   "settings.service.form.enableService": "Ενεργοποίηση υπηρεσίας",
   "settings.service.form.headlineBadges": "Εικονίδια μη αναγνωσμένου μηνύματος",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Γενικά",
   "settings.service.form.headlineNotifications": "Ειδοποιήσεις",
   "settings.service.form.icon": "Προσαρμοσμένο εικονίδιο",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index d1b01f884..5c33daf86 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -276,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Restart & install update",
   "settings.app.buttonSearchForUpdate": "Check for updates",
   "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Current version:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -291,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -369,6 +371,9 @@
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.disableHibernation": "Disable hibernation",
   "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
@@ -379,6 +384,7 @@
   "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
deleted file mode 100644
index 544ad997d..000000000
--- a/src/i18n/locales/en.json
+++ /dev/null
@@ -1,434 +0,0 @@
-{
-  "app.errorHandler.action": "Athlódáil",
-  "app.errorHandler.headline": "Something went wrong",
-  "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
-  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
-  "feature.quickSwitch.search": "Search...",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
-  "feature.shareFranz.action.email": "Send as email",
-  "feature.shareFranz.action.facebook": "Share on Facebook",
-  "feature.shareFranz.action.twitter": "Share on Twitter",
-  "feature.shareFranz.headline": "Ferdi is better together!",
-  "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
-  "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
-  "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "global.api.unhealthy": "Ní féidir nascadh le seirbhísí Ferdi ar líne",
-  "global.franzProRequired": "Ferdi Professional Required",
-  "global.notConnectedToTheInternet": "Níl tú nasctha leis an Idirlíon.",
-  "global.spellchecker.useDefault": "Use System Default ({default})",
-  "global.spellchecking.autodetect": "Detect language automatically",
-  "global.spellchecking.autodetect.short": "Automatic",
-  "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
-  "import.headline": "Iompórtáil do sheirbhísí Ferdi 4",
-  "import.notSupportedHeadline": "Níl na seirbhísí seo taca ag Ferdi 5 go fóill",
-  "import.skip.label": "Ba mhaith liom seirbhísí a chur de láimh",
-  "import.submit.label": "Iompórtáil seirbhísí",
-  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "Cad atá nua?",
-  "infobar.buttonInstallUpdate": "Atosaigh ⁊ suiteáil nuashonrú",
-  "infobar.buttonReloadServices": "Athlódáil seirbhísí",
-  "infobar.requiredRequestsFailed": "Ní féidir seirbhísí agus eolas úsáideora a lódáil",
-  "infobar.servicesUpdated": "Nuashonraíodh do sheirbhísí.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
-  "infobar.updateAvailable": "Tá nuashonrú nua do Ferdi ar fáil.",
-  "invite.email.label": "Seoladh ríomhphoist",
-  "invite.headline.friends": "Tabhair cuireadh do thriúr chara nó chomhghleacaí",
-  "invite.name.label": "Ainm",
-  "invite.skip.label": "Ba mhaith liom é seo a dhéanamh níos deireanaí",
-  "invite.submit.label": "Seol cuirí",
-  "invite.successInfo": "Cuirí seolta go rathúil",
-  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
-  "locked.invalidCredentials": "Password invalid",
-  "locked.password.label": "Password",
-  "locked.submit.label": "Unlock",
-  "login.customServerQuestion": "Using a custom Ferdi server?",
-  "login.customServerSuggestion": "Try importing your Franz account",
-  "login.email.label": "Seoladh ríomhphoist",
-  "login.headline": "Logáil isteach",
-  "login.invalidCredentials": "Seoladh ríomhphoist nó pasfhocal neamhbhailí",
-  "login.link.password": "Athshocraigh pasfhocal",
-  "login.link.signup": "Cruthaigh cuntas saor in aisce",
-  "login.password.label": "Password",
-  "login.serverLogout": "D'éag do sheisiún, logáil isteach arís le do thoil.",
-  "login.submit.label": "Logáil isteach",
-  "login.tokenExpired": "D'éag do sheisiún, logáil isteach arís le do thoil.",
-  "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
-  "menu.Todoss.openTodosDrawer": "Open Todos drawer",
-  "menu.app.about": "Faoi Ferdi",
-  "menu.app.announcement": "What's new?",
-  "menu.app.autohideMenuBar": "Auto-hide menu bar",
-  "menu.app.checkForUpdates": "Cuardaigh le nuashonruithe",
-  "menu.app.hide": "Cuir Ferdi i bhfolach",
-  "menu.app.hideOthers": "Folaigh feidhmchláir eile",
-  "menu.app.quit": "Scoir",
-  "menu.app.settings": "Socruithe",
-  "menu.app.unhide": "Taispeáin",
-  "menu.edit": "Cuir in eagar",
-  "menu.edit.copy": "Cóipeáil",
-  "menu.edit.cut": "Gearr",
-  "menu.edit.delete": "Scrios",
-  "menu.edit.emojiSymbols": "Straoiseoga ⁊ siombailí",
-  "menu.edit.paste": "Greamaigh",
-  "menu.edit.pasteAndMatchStyle": "Greamaigh agus cuir stíl in oiriúint",
-  "menu.edit.redo": "Athdhéan",
-  "menu.edit.selectAll": "Roghnaigh gach rud",
-  "menu.edit.speech": "Caint",
-  "menu.edit.startDictation": "Tosaigh deachtú",
-  "menu.edit.startSpeaking": "Tosaigh ag caint",
-  "menu.edit.stopSpeaking": "Stad ag caint",
-  "menu.edit.undo": "Cealaigh",
-  "menu.file": "Comhad",
-  "menu.help": "Cabhair",
-  "menu.help.changelog": "Athruithe",
-  "menu.help.debugInfo": "Copy Debug Information",
-  "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
-  "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
-  "menu.help.learnMore": "Tuilleadh eolais",
-  "menu.help.privacy": "Ráiteas phríobháideachais",
-  "menu.help.support": "Tacaíocht",
-  "menu.help.tos": "Téarmaí tagartha",
-  "menu.services": "Seirbhísí",
-  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Cuir seirbhís nua leis",
-  "menu.services.setNextServiceActive": "Activate next service",
-  "menu.todos": "Todos",
-  "menu.todos.enableTodos": "Enable Todos",
-  "menu.view": "Amharc",
-  "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Cuir isteach mód lánscáileáin",
-  "menu.view.exitFullScreen": "Scoir mód lánscáileáin",
-  "menu.view.forward": "Forward",
-  "menu.view.lockFerdi": "Lock Ferdi",
-  "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Athlódáil Ferdi",
-  "menu.view.reloadService": "Athlódáil seirbhís",
-  "menu.view.resetZoom": "Fíormhéid",
-  "menu.view.toggleDevTools": "Scoránaigh uirlis forbróra",
-  "menu.view.toggleDarkMode": "Toggle Dark Mode",
-  "menu.view.toggleFullScreen": "Scoránaigh mód lánscáileáin",
-  "menu.view.toggleServiceDevTools": "Scoránaigh uirlis forbróra seirbhíse",
-  "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
-  "menu.view.zoomIn": "Zúmáil isteach",
-  "menu.view.zoomOut": "Zúmáil amach",
-  "menu.window": "Fuinneog",
-  "menu.window.close": "Dún",
-  "menu.window.minimize": "Íoslaghdaigh",
-  "menu.workspaces": "Workspaces",
-  "menu.workspaces.addNewWorkspace": "Add New Workspace...",
-  "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
-  "menu.workspaces.defaultWorkspace": "Gach seirbhís",
-  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
-  "password.email.label": "Seoladh ríomhphoist",
-  "password.headline": "Athshocraigh pasfhocal",
-  "password.link.login": "Logáil isteach i do chuntas",
-  "password.link.signup": "Cruthaigh cuntas saor in aisce",
-  "password.noUser": "Níor aimsíodh úsáideoir leis an seoladh ríomhphoist seo",
-  "password.submit.label": "Cuir isteach",
-  "password.successInfo": "Seiceáil do chuid ríomhphoist le do thoil",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline": "Ferdi Professional",
-  "pricing.trial.subheadline": "Your personal welcome offer:",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "service.crashHandler.action": "Athlódáil {name}",
-  "service.crashHandler.autoReload": "Ag iarraidh {name} a thabhairt ar ais go huathoibríoch i gceann {seconds} shoicind",
-  "service.crashHandler.headline": "Oró, ní hea!",
-  "service.crashHandler.text": "Tá {name} tar éis earráid a dhéanamh.",
-  "service.disabledHandler.action": "Cumasaigh {name}",
-  "service.disabledHandler.headline": "Tá {name} díchumasaithe",
-  "service.errorHandler.action": "Athlódáil {name}",
-  "service.errorHandler.editAction": "Cuir {name} in eagar",
-  "service.errorHandler.headline": "Oró, ní hea!",
-  "service.errorHandler.message": "Earráid",
-  "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
-  "services.getStarted": "Cuir tús",
-  "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
-  "services.welcome": "Fáilte go Ferdi",
-  "settings.account.account.editButton": "Cuir cuntas in eagar",
-  "settings.account.accountType.basic": "Bunchuntas",
-  "settings.account.accountType.premium": "Cuntas Phŕeimhthacadóra Ferdi",
-  "settings.account.buttonSave": "Nuashonraigh próifíl",
-  "settings.account.deleteAccount": "Scrios cuntas",
-  "settings.account.deleteEmailSent": "Fuair tú ríomhphost chun scriosadh do chuntais a dheimhniú. Ní féidir do chuntas agus do chuid sonraí a thabhairt ar ais!",
-  "settings.account.deleteInfo": "Más rud é nár ghá cuntas Ferdi a bheith agat a thuilleadh, is féidir do chuntas agus gach sonraí riachtanach a scriosadh anseo.",
-  "settings.account.headline": "Cuntas",
-  "settings.account.headlineAccount": "Eolas faoin gcuntas",
-  "settings.account.headlineDangerZone": "Scrios cuntas",
-  "settings.account.headlineInvoices": "Sonraisc",
-  "settings.account.headlinePassword": "Athraigh pasfhocal",
-  "settings.account.headlineProfile": "Nuashonraigh próifíl",
-  "settings.account.headlineSubscription": "Do shíntiús",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Íoslódáil",
-  "settings.account.manageSubscription.label": "Bainistigh do shíntiús",
-  "settings.account.successInfo": "Sábháladh do chuid athruithe",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
-  "settings.account.tryReloadServices": "Atriail",
-  "settings.account.tryReloadUserInfoRequest": "Atriail",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
-  "settings.account.userInfoRequestFailed": "Ní féidir eolas úsáideora a lódáil",
-  "settings.account.yourLicense": "Your Ferdi License",
-  "settings.app.buttonClearAllCache": "Glan taisce",
-  "settings.app.buttonInstallUpdate": "Atosaigh ⁊ suiteáil nuashonrú",
-  "settings.app.buttonSearchForUpdate": "Cuardaigh le nuashonruithe",
-  "settings.app.cacheInfo": "Tá taisce Ferdi ag baint úsáid as {size} den spás diosca.",
-  "settings.app.currentVersion": "Leagan reatha:",
-  "settings.app.form.autoLaunchInBackground": "Oscail sa chúlra",
-  "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
-  "settings.app.form.autoLaunchOnStart": "Láinseáil Ferdi ón tús",
-  "settings.app.form.beta": "Cuir leagain béite san áireamh",
-  "settings.app.form.darkMode": "Join the Dark Side",
-  "settings.app.form.enableGPUAcceleration": "Cumasaigh luasghéarú APG",
-  "settings.app.form.enableLock": "Enable Password Lock",
-  "settings.app.form.enableSpellchecking": "Cumasaigh seiceáil litrithe",
-  "settings.app.form.enableSystemTray": "Taispeáin Ferdi i dtráidire an chórais",
-  "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
-  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
-  "settings.app.form.language": "Teanga",
-  "settings.app.form.lockPassword": "Password",
-  "settings.app.form.minimizeToSystemTray": "Íoslaghdaigh Ferdi chuig tráidire an chórais",
-  "settings.app.form.privateNotifications": "Don't show message content in notifications",
-  "settings.app.form.runInBackground": "Coimeád Ferdi sa chúlra nuair a dhúntar an fhuinneog",
-  "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
-  "settings.app.form.scheduledDNDEnd": "To",
-  "settings.app.form.scheduledDNDStart": "From",
-  "settings.app.form.server": "Server",
-  "settings.app.form.showDisabledServices": "Taispeáin tabanna do sheirbhísí dhíchumasaithe",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Taispeáin teachtaireachtaí neamhléite, nuair a dhíchumasaítear fógraí",
-  "settings.app.form.todoServer": "Todo Server",
-  "settings.app.headline": "Socruithe",
-  "settings.app.headlineAdvanced": "Casta",
-  "settings.app.headlineAppearance": "Dealramh",
-  "settings.app.headlineGeneral": "Ginearálta",
-  "settings.app.headlineLanguage": "Teanga",
-  "settings.app.headlineUpdates": "Nuashonruithe",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Password",
-  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
-  "settings.app.restartRequired": "Ní gá atosú chun athruithe a chur i bhfeidhm.",
-  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
-  "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi 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 Ferdi's recipe store, server resources and its development.",
-  "settings.app.subheadlineCache": "Taisce",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
-  "settings.app.translationHelp": "Cabhraigh linn Ferdi a aistriú i do theanga.",
-  "settings.app.updateStatusAvailable": "Nuashonrú le fáil, ag íoslódáil...",
-  "settings.app.updateStatusSearching": "Ag cuardach le nuashonruithe",
-  "settings.app.updateStatusUpToDate": "Tá tú ag baint úsáid as an leagan is deireanaí de Ferdi",
-  "settings.invite.headline": "Tabhair cuireadh do thriúr chara",
-  "settings.navigation.account": "Cuntas",
-  "settings.navigation.availableServices": "Seirbhísí le fáil",
-  "settings.navigation.logout": "Logáil amach",
-  "settings.navigation.settings": "Socruithe",
-  "settings.navigation.supportFerdi": "Support Ferdi",
-  "settings.navigation.team": "Manage Team",
-  "settings.navigation.yourServices": "Do sheirbhísí",
-  "settings.navigation.yourWorkspaces": "Your workspaces",
-  "settings.recipes.all": "Gach seirbhís",
-  "settings.recipes.custom": "Custom Services",
-  "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
-  "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes",
-  "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
-  "settings.recipes.customService.openDevDocs": "Developer Documentation",
-  "settings.recipes.customService.openFolder": "Open folder",
-  "settings.recipes.headline": "Seirbhísí le fáil",
-  "settings.recipes.missingService": "Seirbhís ar iarraidh?",
-  "settings.recipes.mostPopular": "Is coitianta",
-  "settings.recipes.nothingFound": "Tá brón orm, ach níl seirbhís ar bith ag teacht le do théarma chuardach.",
-  "settings.recipes.servicesSuccessfulAddedInfo": "Seirbhís curtha go rathúil",
-  "settings.searchService": "Cuardaigh seirbhís",
-  "settings.service.error.goBack": "Ar ais chuig seirbhísí",
-  "settings.service.error.headline": "Earráid",
-  "settings.service.error.message": "Ní féidir an oideas seirbhíse a lódáil.",
-  "settings.service.form.addServiceHeadline": "Cuir {name} leis",
-  "settings.service.form.availableServices": "Seirbhísí le fáil",
-  "settings.service.form.customUrl": "Freastalaí saincheaptha",
-  "settings.service.form.customUrlPremiumInfo": "Chun seirbhísí féinóstáilte a chur le Ferdi, ní gá Cuntas Phŕeimhthacadóra Ferdi a bheith agat.",
-  "settings.service.form.customUrlUpgradeAccount": "Uasghrádaigh do chuntas",
-  "settings.service.form.customUrlValidationError": "Ní féidir seirbhís {name} saincheaptha a dheimhniú",
-  "settings.service.form.deleteButton": "Scrios seirbhís",
-  "settings.service.form.editServiceHeadline": "Cuir {name} in eagar",
-  "settings.service.form.enableAudio": "Cumasaigh fuaim",
-  "settings.service.form.enableBadge": "Taispeáin comhartha do theachtaireachtaí neamhléite",
-  "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Darkreader Brightness",
-  "settings.service.form.darkReaderContrast": "Darkreader Contrast",
-  "settings.service.form.darkReaderSepia": "Darkreader Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
-  "settings.service.form.enableNotification": "Cumasaigh fógraí",
-  "settings.service.form.enableService": "Cumasaigh seirbhís",
-  "settings.service.form.headlineBadges": "Comhartha do theachtaireachtaí neamhléite",
-  "settings.service.form.headlineGeneral": "Ginearálta",
-  "settings.service.form.headlineNotifications": "Fógraí",
-  "settings.service.form.icon": "Deilbhín saincheaptha",
-  "settings.service.form.iconDelete": "Scrios",
-  "settings.service.form.iconUpload": "Scaoil d'íomhá nó cliceáil anseo",
-  "settings.service.form.indirectMessageInfo": "Gheobhaidh tú fógraí faoi gach teachtaireacht nua i mbealach, ní amháin @username, @channel, @here, ...",
-  "settings.service.form.indirectMessages": "Taispeáin comhartha theachtaireachta do gach teachtaireacht nua",
-  "settings.service.form.isMutedInfo": "Tachtar gach fuaim fógraí agus athchasadh fuaime",
-  "settings.service.form.name": "Ainm",
-  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
-  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
-  "settings.service.form.proxy.isEnabled": "Use Proxy",
-  "settings.service.form.proxy.password": "Password (optional)",
-  "settings.service.form.proxy.port": "Port",
-  "settings.service.form.proxy.restartInfo": "Please restart Ferdi after changing proxy Settings.",
-  "settings.service.form.proxy.user": "User (optional)",
-  "settings.service.form.saveButton": "Sábháil seirbhís",
-  "settings.service.form.tabHosted": "Óstáilte",
-  "settings.service.form.tabOnPremise": "Féinóstáilte ⭐️",
-  "settings.service.form.team": "Foireann",
-  "settings.service.form.useHostedService": "Bain úsáid as an seirbhís óstáilte {name}.",
-  "settings.service.form.yourServices": "Do sheirbhísí",
-  "settings.services.deletedInfo": "Seirbhís scriosta",
-  "settings.services.discoverServices": "Aimsigh seirbhísí",
-  "settings.services.headline": "Do sheirbhísí",
-  "settings.services.noServicesAdded": "Níl aon seirbhís curtha agat go fóill.",
-  "settings.services.servicesRequestFailed": "Could not load your services",
-  "settings.services.tooltip.isDisabled": "Seirbhís díchumasaithe",
-  "settings.services.tooltip.isMuted": "Tachtar gach fuaim",
-  "settings.services.tooltip.notificationsDisabled": "Fógraí dhíchumasaithe",
-  "settings.services.updatedInfo": "Sábháladh do chuid athruithe",
-  "settings.supportFerdi.github": "Star on GitHub",
-  "settings.supportFerdi.headline": "Support Ferdi",
-  "settings.supportFerdi.openCollective": "Support our Open Collective",
-  "settings.supportFerdi.share": "Tell your Friends",
-  "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
-  "settings.team.headline": "Foireann",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.upgradeAction": "Upgrade your Account",
-  "settings.user.form.accountType.company": "Comhlacht",
-  "settings.user.form.accountType.individual": "Ar leith",
-  "settings.user.form.accountType.label": "Cineál chuntais",
-  "settings.user.form.accountType.non-profit": "Neamhbhrabúis",
-  "settings.user.form.currentPassword": "Pasfhocal reatha",
-  "settings.user.form.email": "Ríomhphost",
-  "settings.user.form.firstname": "Céadainm",
-  "settings.user.form.lastname": "Sloinne",
-  "settings.user.form.newPassword": "Pasfhocal nua",
-  "settings.workspace.add.form.name": "Ainm",
-  "settings.workspace.add.form.submitButton": "Create workspace",
-  "settings.workspace.form.buttonDelete": "Delete workspace",
-  "settings.workspace.form.buttonSave": "Save workspace",
-  "settings.workspace.form.keepLoaded": "Keep this workspace loaded*",
-  "settings.workspace.form.keepLoadedInfo": "*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
-  "settings.workspace.form.name": "Ainm",
-  "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace",
-  "settings.workspace.form.yourWorkspaces": "Your workspaces",
-  "settings.workspaces.deletedInfo": "Workspace has been deleted",
-  "settings.workspaces.headline": "Your workspaces",
-  "settings.workspaces.noWorkspacesAdded": "You haven't added any workspaces yet.",
-  "settings.workspaces.tryReloadWorkspaces": "Atriail",
-  "settings.workspaces.updatedInfo": "Sábháladh do chuid athruithe",
-  "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
-  "settings.workspaces.workspacesRequestFailed": "Could not load your workspaces",
-  "sidebar.addNewService": "Cuir seirbhís nua leis",
-  "sidebar.closeTodosDrawer": "Close Ferdi Todos",
-  "sidebar.closeWorkspaceDrawer": "Close workspace drawer",
-  "sidebar.lockFerdi": "Lock Ferdi",
-  "sidebar.muteApp": "Díchumasaigh fógraí ⁊ fuaim",
-  "sidebar.openTodosDrawer": "Open Ferdi Todos",
-  "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Socruithe",
-  "sidebar.unmuteApp": "Cumasaigh fógraí ⁊ fuaim",
-  "signup.email.label": "Seoladh ríomhphoist",
-  "signup.emailDuplicate": "Tá úsáideoir leis an seoladh ríomhphoist sin cheana féin",
-  "signup.firstname.label": "Céadainm",
-  "signup.headline": "Cláraigh",
-  "signup.lastname.label": "Sloinne",
-  "signup.legal.info": "Agus tú ag cruthú cuntas Ferdi glacann tú le",
-  "signup.legal.privacy": "Ráiteas phríobháideachais",
-  "signup.legal.terms": "Tearmaí seirbhíse",
-  "signup.link.login": "Cuntas agat cheana féin, logáil isteach?",
-  "signup.password.label": "Password",
-  "signup.submit.label": "Cruthaigh cuntas",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cealaigh",
-  "subscriptionPopup.buttonDone": "Déanta",
-  "tabs.item.deleteService": "Scrios seirbhís",
-  "tabs.item.disableAudio": "Díchumasaigh fuaim",
-  "tabs.item.disableNotifications": "Díchumasaigh fógraí",
-  "tabs.item.disableService": "Díchumasaigh seirbhís",
-  "tabs.item.edit": "Cuir in eagar",
-  "tabs.item.enableAudio": "Cumasaigh fuaim",
-  "tabs.item.enableNotification": "Cumasaigh fógraí",
-  "tabs.item.enableService": "Cumasaigh seirbhís",
-  "tabs.item.reload": "Athlódáil",
-  "validation.email": "Níl {field} neamhbhailí",
-  "validation.minLength": "Ba cheart go mbeadh {field} ar a laghad {length} charactar fada",
-  "validation.oneRequired": "At least one is required",
-  "validation.required": "Tá {field} de dhíth",
-  "validation.url": "Ní AAA bhailí é {field}",
-  "welcome.loginButton": "Logáil isteach i do chuntas",
-  "welcome.signupButton": "Cruthaigh cuntas saor in aisce",
-  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
-  "workspaceDrawer.allServices": "Gach seirbhís",
-  "workspaceDrawer.headline": "Workspaces",
-  "workspaceDrawer.item.contextMenuEdit": "edit",
-  "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
-  "workspaces.switchingIndicator.switchingTo": "Switching to"
-}
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index ba72a7a8e..a8518b5e3 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -4,8 +4,11 @@
   "changeserver.headline": "Cambiar servidor",
   "changeserver.label": "Servidor",
   "changeserver.submit": "Enviar",
+  "connectionLostBanner.cta": "Recargar Servicio",
+  "connectionLostBanner.informationLink": "¿Qué ocurrió?",
+  "connectionLostBanner.message": "¡Oh no! Ferdi perdió la conexión con {name}.",
   "feature.announcements.changelog.headline": "Cambios en Ferdi {version}",
-  "feature.debugger.title": "Publish debugging information",
+  "feature.debugger.title": "Escribir información de depuración",
   "feature.delayApp.headline": "Por favor compra una Licencia de Soporte de Ferdi para omitir la espera",
   "feature.delayApp.text": "Ferdi continuará en {seconds} segundos.",
   "feature.delayApp.trial.action": "Si! Quiero probar Ferdi Profesional por 14 días, gratis!",
@@ -29,13 +32,13 @@
   "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
   "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
   "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
-  "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
-  "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
+  "feature.publishDebugInfo.error": "Hubo un error al intentar publicar la información de depuración. Por favor, inténtalo de nuevo más tarde o ve la consola para más información.",
+  "feature.publishDebugInfo.info": "Publicar su información de depuración nos ayuda a encontrar problemas y errores en Ferdi. Al publicar tu información de depuración aceptas la política de privacidad y las condiciones de servicio de Ferdi Debuggger",
   "feature.publishDebugInfo.privacy": "Política de Privacidad",
   "feature.publishDebugInfo.publish": "Aceptar y publicar",
-  "feature.publishDebugInfo.published": "Your debug log was published and is now availible at",
+  "feature.publishDebugInfo.published": "Su registro de depuración fue publicado y ahora está disponible en",
   "feature.publishDebugInfo.terms": "Términos de servicio",
-  "feature.publishDebugInfo.title": "Publish debug information",
+  "feature.publishDebugInfo.title": "Escribir información de depuración",
   "feature.quickSwitch.info": "Seleccionar servicio con TAB y ↑ ↓. Abrir servicio con ENTER.",
   "feature.quickSwitch.search": "Buscar...",
   "feature.quickSwitch.title": "Cambio rápido",
@@ -137,7 +140,7 @@
   "menu.help.debugInfoCopiedHeadline": "Información de depurador de Ferdi",
   "menu.help.learnMore": "Conocer más",
   "menu.help.privacy": "Declaración de privacidad",
-  "menu.help.publishDebugInfo": "Publish Debug Information",
+  "menu.help.publishDebugInfo": "Escribir información de depuración",
   "menu.help.support": "Soporte",
   "menu.help.tos": "Términos del Servicio",
   "menu.services": "Servicios",
@@ -157,7 +160,7 @@
   "menu.view.reloadFranz": "Recargar Ferdi",
   "menu.view.reloadService": "Recargar Servicio",
   "menu.view.resetZoom": "Tamaño Actual",
-  "menu.view.toggleDarkMode": "Toggle Dark Mode",
+  "menu.view.toggleDarkMode": "Cambiar a modo oscuro",
   "menu.view.toggleDevTools": "Activar las Herramientas para Desarrolladores",
   "menu.view.toggleFullScreen": "Cambiar a Pantalla Completa",
   "menu.view.toggleServiceDevTools": "Mostrar Herramientas de Servicios para Desarrolladores",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Sincronización de cuenta",
   "pricing.features.adFree": "Sin anuncios para siempre!",
   "pricing.features.appDelays": "Sin pantallas de espera",
+  "pricing.features.appDelaysEnabled": "Pantallas Ocasionales de Espera",
   "pricing.features.customWebsites": "Agregue sitios personalizados",
   "pricing.features.desktopNotifications": "Notificaciones de escritorio",
   "pricing.features.onPremise": "En sitio y otros servicios alojados",
@@ -272,14 +276,15 @@
   "settings.app.buttonInstallUpdate": "Reiniciar e instalar actualización",
   "settings.app.buttonSearchForUpdate": "Comprobar actualizaciones",
   "settings.app.cacheInfo": "El cache de Ferdi actualmente usa {size} de espacio en disco.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Versión actual:",
   "settings.app.form.accentColor": "Color de realce",
-  "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
+  "settings.app.form.adaptableDarkMode": "Sincroniza el modo oscuro con el ajuste del modo oscuro de mi Sistema Operativo",
   "settings.app.form.autoLaunchInBackground": "Abrir en segundo plano",
   "settings.app.form.autoLaunchOnStart": "Iniciar Ferdi al iniciar",
-  "settings.app.form.automaticUpdates": "Enable updates",
+  "settings.app.form.automaticUpdates": "Activar actualizaciones",
   "settings.app.form.beta": "Incluir versiones beta",
-  "settings.app.form.customTodoServer": "Custom Todo Server",
+  "settings.app.form.customTodoServer": "Servidor de Todo personalizado",
   "settings.app.form.darkMode": "Activar tema oscuro",
   "settings.app.form.enableGPUAcceleration": "Habilitar aceleración de GPU",
   "settings.app.form.enableLock": "Activar bloqueo por contraseña",
@@ -287,29 +292,30 @@
   "settings.app.form.enableSystemTray": "Mostrar Ferdi en la bandeja del sistema",
   "settings.app.form.enableTodos": "Activar Ferdi Todos",
   "settings.app.form.hibernate": "Habilitar hibernación del servicio",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Estrategia de hibernación",
-  "settings.app.form.iconSize": "Service icon size",
+  "settings.app.form.iconSize": "Tamaño del icono del servicio",
   "settings.app.form.inactivityLock": "Bloquear tras inactividad",
   "settings.app.form.keepAllWorkspacesLoaded": "Mantener todas las Áreas de trabajo cargadas",
   "settings.app.form.language": "Idioma",
   "settings.app.form.lockPassword": "Contraseña",
   "settings.app.form.minimizeToSystemTray": "Minimizar Ferdi a la bandeja del sistema",
-  "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.predefinedTodoServer": "Todo Server",
+  "settings.app.form.navigationBarBehaviour": "Comportamiento de la barra de navegación",
+  "settings.app.form.predefinedTodoServer": "Servidor de tareas",
   "settings.app.form.privateNotifications": "No mostrar contenido de mensajes en notificaciones",
-  "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
+  "settings.app.form.reloadAfterResume": "Recargar Ferdi después de reanudar el sistema",
   "settings.app.form.runInBackground": "Mantener Ferdi en segundo plano al cerrar la ventana",
   "settings.app.form.scheduledDNDEnabled": "Activar programación \"No molestar\"",
   "settings.app.form.scheduledDNDEnd": "A",
   "settings.app.form.scheduledDNDStart": "De",
   "settings.app.form.sentry": "Enviar datos de telemetría",
-  "settings.app.form.serviceRibbonWidth": "Sidebar width",
+  "settings.app.form.serviceRibbonWidth": "Ancho de Barra Lateral",
   "settings.app.form.showDisabledServices": "Mostrar pestañas de servicios desactivados",
+  "settings.app.form.showDragArea": "Mostrar área arrastrable en la ventana",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas",
-  "settings.app.form.showDragArea": "Show draggable area on window",
-  "settings.app.form.startMinimized": "Start minimized",
+  "settings.app.form.startMinimized": "Iniciar minimizado",
   "settings.app.form.universalDarkMode": "Activar modo oscuro universal",
-  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
+  "settings.app.form.useTouchIdToUnlock": "Permitir usar TouchID para desbloquear Ferdi",
   "settings.app.headline": "Configuración",
   "settings.app.headlineAdvanced": "Avanzado",
   "settings.app.headlineAppearance": "Apariencia",
@@ -317,19 +323,19 @@
   "settings.app.headlineLanguage": "Idioma",
   "settings.app.headlineUpdates": "Actualizaciones",
   "settings.app.hibernateInfo": "Por defecto, Ferdi mantendrá todos sus servicios abiertos y cargados en segundo plano para que estén listos cuando los necesite. La hibernación del servicio desactivará los mismos tras el tiempo especificado. Esto es útil para ahorrar RAM y evitar que los servicios ralentizen su sistema.",
-  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
+  "settings.app.inactivityLockInfo": "Minutos de inactividad, tras los cuales Ferdi debe bloquear automáticamente. Utilice 0 para desactivar",
   "settings.app.languageDisclaimer": "Las traducciones oficiales son en inglés y alemán. Todos los demás idiomas son traducciones basadas en la comunidad.",
   "settings.app.lockInfo": "El bloqueo de contraseña le permite mantener los mensajes protegidos.\nSi activa el bloqueo de contraseña, se le pedirá introducirla cada vez que inicie o bloquee Ferdi usando el símbolo de la esquina inferior izquierda o bien el acceso directo CMD/CTRL+Shift+L.",
   "settings.app.lockedPassword": "Contraseña",
   "settings.app.lockedPasswordInfo": "Por favor, asegúrese de recordar la contraseña que establezca.\nSi la perdiera u olvidara, tendría que reinstalar Ferdi.",
   "settings.app.restartRequired": "Los cambios requieren reiniciar",
   "settings.app.scheduledDNDInfo": "El \"No molestar\" programado permite definir un período de tiempo en el que no recibir notificaciones de Ferdi.",
-  "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.scheduledDNDTimeInfo": "Horas en formato 24 horas. La hora de finalización puede ser anterior a la hora de inicio (por ejemplo, inicio 17:00, final 09:00) para habilitar No molestar la noche.",
+  "settings.app.sentryInfo": "El envío de datos de telemetría nos permite encontrar errores en Ferdi - no enviaremos ninguna información personal como sus datos de mensaje! Cambiar esta opción requiere reiniciar Ferdi.",
   "settings.app.subheadlineCache": "Caché",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
+  "settings.app.todoServerInfo": "Este servidor se utilizará para la función \"Ferdi Todo\".",
   "settings.app.translationHelp": "Ayúdanos a traducir Ferdi a tu idioma.",
-  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
+  "settings.app.universalDarkModeInfo": "El Modo Oscuro Universal intenta generar dinámicamente estilos de modo oscuro para servicios que de otro modo no están soportados actualmente.",
   "settings.app.updateStatusAvailable": "Actualización disponible, descargando...",
   "settings.app.updateStatusSearching": "Buscando actualizaciones",
   "settings.app.updateStatusUpToDate": "Estás utilizando la última versión de Ferdi",
@@ -338,18 +344,18 @@
   "settings.navigation.availableServices": "Servicios disponibles",
   "settings.navigation.logout": "Cerrar sesión",
   "settings.navigation.settings": "Configuración",
-  "settings.navigation.supportFerdi": "Support Ferdi",
+  "settings.navigation.supportFerdi": "Ayuda a Ferdi",
   "settings.navigation.team": "Gestionar equipo",
   "settings.navigation.yourServices": "Tus servicios",
   "settings.navigation.yourWorkspaces": "Tus espacios de trabajo",
   "settings.recipes.all": "Todos los servicios",
   "settings.recipes.custom": "Servicios Personalizados",
-  "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
-  "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes",
-  "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
+  "settings.recipes.customService.headline.communityRecipes": "Recetas de terceros comunitarios",
+  "settings.recipes.customService.headline.customRecipes": "Recetas de terceros comunitarios",
+  "settings.recipes.customService.headline.devRecipes": "Sus recetas de Servicio de Desarrollo",
+  "settings.recipes.customService.intro": "Para añadir un servicio personalizado, copia la receta de servicio a:",
   "settings.recipes.customService.openDevDocs": "Documentación para desarrolladores",
-  "settings.recipes.customService.openFolder": "Open folder",
+  "settings.recipes.customService.openFolder": "Abrir carpeta",
   "settings.recipes.headline": "Servicios disponibles",
   "settings.recipes.missingService": "¿Echas de menos algún servicio?",
   "settings.recipes.mostPopular": "Más populares",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Para añadir tus propios servicios, necesitas una Cuenta Colaborador Premium de Ferdi.",
   "settings.service.form.customUrlUpgradeAccount": "Mejora tu cuenta",
   "settings.service.form.customUrlValidationError": "No se pudo validar el servidor personalizado {name}.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Eliminar servicio",
+  "settings.service.form.disableHibernation": "Desactivar hibernación",
+  "settings.service.form.disableHibernationInfo": "Actualmente tienes la hibernación habilitada, pero puedes desactivar la hibernación para servicios individuales usando esta opción.",
   "settings.service.form.editServiceHeadline": "Editar {name}",
   "settings.service.form.enableAudio": "Habilitar audio",
   "settings.service.form.enableBadge": "Mostrar señal de mensajes no leídos",
   "settings.service.form.enableDarkMode": "Habilitar modo oscuro",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Activar notificaciones",
   "settings.service.form.enableService": "Activar servicio",
   "settings.service.form.headlineBadges": "Insignias de mensaje no leídos",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notificaciones",
   "settings.service.form.icon": "Icono Personalizado",
@@ -386,18 +394,18 @@
   "settings.service.form.indirectMessages": "Mostrar señal de notificación para todos los mensajes nuevos",
   "settings.service.form.isMutedInfo": "Cuando estén desactivados, todos los sonidos de notificación y la reproducción de audio serán silenciados",
   "settings.service.form.name": "Nombre",
-  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
-  "settings.service.form.openUserCss": "Open user.css",
-  "settings.service.form.openUserJs": "Open user.js",
+  "settings.service.form.openDarkmodeCss": "Abrir darkmode.css (modo oscuro)",
+  "settings.service.form.openUserCss": "Abrir user.css",
+  "settings.service.form.openUserJs": "Abrir user.js",
   "settings.service.form.proxy.headline": "Ajustes Proxy HTTP/HTTPS",
-  "settings.service.form.proxy.host": "Proxy Host/IP",
+  "settings.service.form.proxy.host": "Servidor/IP Proxy",
   "settings.service.form.proxy.info": "Las configuraciones de Proxy no se sincronizarán con los servidores de Ferdi.",
-  "settings.service.form.proxy.isEnabled": "Use Proxy",
+  "settings.service.form.proxy.isEnabled": "Utilizar Proxy",
   "settings.service.form.proxy.password": "Contraseña (opcional)",
   "settings.service.form.proxy.port": "Puerto",
   "settings.service.form.proxy.restartInfo": "Por favor reinicie Ferdi despues de modificar los ajustes proxy.",
   "settings.service.form.proxy.user": "Usuario (opcional)",
-  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
+  "settings.service.form.recipeFileInfo": "Sus archivos de usuario se insertarán en la página web para que pueda personalizar los servicios de la forma que desee. Los archivos de usuario sólo se almacenan localmente y no se transfieren a otros equipos usando la misma cuenta.",
   "settings.service.form.saveButton": "Guardar servicio",
   "settings.service.form.tabHosted": "Alojado",
   "settings.service.form.tabOnPremise": "Auto alojado ⭐️",
@@ -413,18 +421,18 @@
   "settings.services.tooltip.isMuted": "Todos los sonidos están silenciados",
   "settings.services.tooltip.notificationsDisabled": "Las notificaciones están desactivadas",
   "settings.services.updatedInfo": "Tus cambios han sido guardados",
-  "settings.supportFerdi.github": "Star on GitHub",
-  "settings.supportFerdi.headline": "Support Ferdi",
-  "settings.supportFerdi.openCollective": "Support our Open Collective",
-  "settings.supportFerdi.share": "Tell your Friends",
-  "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Franz Team Management",
-  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
+  "settings.supportFerdi.github": "Estrella en GitHub",
+  "settings.supportFerdi.headline": "Ayuda a Ferdi",
+  "settings.supportFerdi.openCollective": "Apoyar nuestro Colectivo Abierto",
+  "settings.supportFerdi.share": "Cuénteles a sus amigos",
+  "settings.supportFerdi.title": "Te agrada Ferdi? Comparte el amor!",
+  "settings.team.contentHeadline": "Administración de Equipo",
+  "settings.team.copy": "La gestión de equipos de Franz's te permite administrar suscripciones de Franz para múltiples usuarios. Por favor, ten en cuenta que tener una suscripción a Franz Premium no te dará ninguna ventaja en el uso de Ferdi: la única razón por la que todavía tienes acceso a la Gestión de Equipos es para que puedas gestionar tus equipos de Franz y para que no pierdas ninguna funcionalidad en la gestión de tu cuenta.",
   "settings.team.headline": "Equipo",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
-  "settings.team.manageAction": "Manage your Team on meetfranz.com",
-  "settings.team.teamsUnavailable": "Teams are unavailable",
-  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.intro": "Actualmente estás usando Franz Servers, por lo que tienes acceso a la Gestión de Equipos.",
+  "settings.team.manageAction": "Administra tu equipo en meetfranz.com",
+  "settings.team.teamsUnavailable": "Los equipos no están disponibles",
+  "settings.team.teamsUnavailableInfo": "Los equipos están disponibles actualmente sólo cuando se utiliza el servidor Franz y después de pagar por Franz Professional. Por favor, cambie su servidor a https://api.franz)[video] .com para usar equipos.",
   "settings.team.upgradeAction": "Actualiza tu cuenta",
   "settings.user.form.accountType.company": "Empresa",
   "settings.user.form.accountType.individual": "Individual",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index 65b0edbfa..9d676c0a9 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "connectionLostBanner.cta": "Reload Service",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Restart & install update",
   "settings.app.buttonSearchForUpdate": "Check for updates",
   "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Current version:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 9cc26b990..c898f47f2 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Changer de serveur",
   "changeserver.label": "Serveur",
   "changeserver.submit": "Soumettre",
+  "connectionLostBanner.cta": "Redémarrer le service",
+  "connectionLostBanner.informationLink": "Que s'est-il passé?",
+  "connectionLostBanner.message": "Oh non ! Ferdi a perdu la connexion avec {name}.",
   "feature.announcements.changelog.headline": "Les nouveaux changements dans Ferdi {version}",
   "feature.debugger.title": "Publier les informations de débogage",
   "feature.delayApp.headline": "Achetez la licence Ferdi pour ne plus avoir de temps d'attente",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Synchronisation de compte",
   "pricing.features.adFree": "Sans pub, pour toujours",
   "pricing.features.appDelays": "Plus d'écrans d'attente",
+  "pricing.features.appDelaysEnabled": "Écrans d'attente occasionnels",
   "pricing.features.customWebsites": "Ajouter des sites web modifiés",
   "pricing.features.desktopNotifications": "Notifications de bureau",
   "pricing.features.onPremise": "Services hébergés sur place et autres",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Redémarrer et installer la mise à jour",
   "settings.app.buttonSearchForUpdate": "Vérifier les mises à jour",
   "settings.app.cacheInfo": "Le cache de Ferdi occupe actuellement {size} en espace disque.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Version actuelle :",
   "settings.app.form.accentColor": "Couleur d'accentuation",
   "settings.app.form.adaptableDarkMode": "Synchroniser le mode sombre avec l'option mode sombre du système",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Afficher Ferdi dans la barre d'état système",
   "settings.app.form.enableTodos": "Activer Ferdi Todos",
   "settings.app.form.hibernate": "Activer le service d'hibernation",
+  "settings.app.form.hibernateOnStartup": "Garder les services en veille prolongée au démarrage",
   "settings.app.form.hibernationStrategy": "Stratégie d'hibernation",
   "settings.app.form.iconSize": "Taille de l'icône du service",
   "settings.app.form.inactivityLock": "Verrouiller après inactivité",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Envoyer des données de télémétrie",
   "settings.app.form.serviceRibbonWidth": "Largeur du menu",
   "settings.app.form.showDisabledServices": "Afficher les onglets des services désactivés",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Afficher les badges de messages non lus quand les notifications sont désactivées",
   "settings.app.form.showDragArea": "Afficher les zones de glisser-déposer dans la fenêtre",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Afficher les badges de messages non lus quand les notifications sont désactivées",
   "settings.app.form.startMinimized": "Démarrage minimisé",
   "settings.app.form.universalDarkMode": "Activer le mode sombre universel",
   "settings.app.form.useTouchIdToUnlock": "Autoriser l'utilisation de TouchID pour déverrouiller Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Pour ajouter des services auto-hébergés, vous avez besoin d'un compte Ferdi Premium Supporter.",
   "settings.service.form.customUrlUpgradeAccount": "Améliorez votre compte",
   "settings.service.form.customUrlValidationError": "Impossible de valider le serveur modifié {name}.",
+  "settings.service.form.darkReaderBrightness": "Luminosité de Dark Reader",
+  "settings.service.form.darkReaderContrast": "Contraste de Dark Reader",
+  "settings.service.form.darkReaderSepia": "Sepia de Dark Reader",
   "settings.service.form.deleteButton": "Supprimer le service",
+  "settings.service.form.disableHibernation": "Désactiver l'hibernation",
+  "settings.service.form.disableHibernationInfo": "Vous avez actuellement activé l'hibernation mais vous pouvez désactiver l'hibernation pour les services individuels en utilisant cette option.",
   "settings.service.form.editServiceHeadline": "Modifier {name}",
   "settings.service.form.enableAudio": "Activer l'audio",
   "settings.service.form.enableBadge": "Afficher le badge des messages non lus",
   "settings.service.form.enableDarkMode": "Activer le mode sombre",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Activer les notifications",
   "settings.service.form.enableService": "Activer le service",
   "settings.service.form.headlineBadges": "Badge des messages non lus",
+  "settings.service.form.headlineDarkReaderSettings": "Paramètre de Dark Reader",
   "settings.service.form.headlineGeneral": "Général",
   "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Icône personnalisée",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 5da8219c0..d930ab415 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Cuir isteach",
+  "connectionLostBanner.cta": "Athlódáil seirbhís",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Atosaigh ⁊ suiteáil nuashonrú",
   "settings.app.buttonSearchForUpdate": "Cuardaigh le nuashonruithe",
   "settings.app.cacheInfo": "Tá taisce Ferdi ag baint úsáid as {size} den spás diosca.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Leagan reatha:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Taispeáin Ferdi i dtráidire an chórais",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Taispeáin tabanna do sheirbhísí dhíchumasaithe",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Taispeáin teachtaireachtaí neamhléite, nuair a dhíchumasaítear fógraí",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Taispeáin teachtaireachtaí neamhléite, nuair a dhíchumasaítear fógraí",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Chun seirbhísí féinóstáilte a chur le Ferdi, ní gá Cuntas Phŕeimhthacadóra Ferdi a bheith agat.",
   "settings.service.form.customUrlUpgradeAccount": "Uasghrádaigh do chuntas",
   "settings.service.form.customUrlValidationError": "Ní féidir seirbhís {name} saincheaptha a dheimhniú",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Scrios seirbhís",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Cuir {name} in eagar",
   "settings.service.form.enableAudio": "Cumasaigh fuaim",
   "settings.service.form.enableBadge": "Taispeáin comhartha do theachtaireachtaí neamhléite",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Cumasaigh fógraí",
   "settings.service.form.enableService": "Cumasaigh seirbhís",
   "settings.service.form.headlineBadges": "Comhartha do theachtaireachtaí neamhléite",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Ginearálta",
   "settings.service.form.headlineNotifications": "Fógraí",
   "settings.service.form.icon": "Deilbhín saincheaptha",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 65b0edbfa..9d676c0a9 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "connectionLostBanner.cta": "Reload Service",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Restart & install update",
   "settings.app.buttonSearchForUpdate": "Check for updates",
   "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Current version:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 879328576..79616f9f5 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Pošalji",
+  "connectionLostBanner.cta": "Reload Service",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Ponovo pokreni i instaliraj ažuriranje",
   "settings.app.buttonSearchForUpdate": "Potraži ažuriranja",
   "settings.app.cacheInfo": "Ferdi predmemorija trenutno koristi {size} prostora na disku",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Trenutna verzija:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Prikaži aplikaciju u sustavskoj traci",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Prikaži ploče s onemogućenim servisima",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Pokaži nepročitane značke poruka kad se obavještenja onemoguće",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Pokaži nepročitane značke poruka kad se obavještenja onemoguće",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Da bi ste dodali samo-hostovane usluge, potreban vam je Premium račun.",
   "settings.service.form.customUrlUpgradeAccount": "Nadogradite Vaš račun",
   "settings.service.form.customUrlValidationError": "Nije moguće odobriti prilagođeno {name} servera.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Izbriši uslugu",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Uredite {name}",
   "settings.service.form.enableAudio": "Omogućite zvuk",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Omogućite obavijesti",
   "settings.service.form.enableService": "Omogućite usluge",
   "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Općenito",
   "settings.service.form.headlineNotifications": "Obavijesti",
   "settings.service.form.icon": "Prilagođena ikona",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index cc699a6fb..07603df52 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Küldés",
+  "connectionLostBanner.cta": "Szolgáltatás újraindítása",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Ferdi {version} változásai",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Kérjük vásárolj egy Franc Támogatói Liszencet a várakozás átugrásához",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Hirdetésmentesség, örökre!",
   "pricing.features.appDelays": "Nincsenek töltőképernyők",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Egyéni weboldalak megadása",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "Helyi és egyéb távoli szolgáltatások",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Újraindítás és frissítés telepítése",
   "settings.app.buttonSearchForUpdate": "Frissítések keresése",
   "settings.app.cacheInfo": "A Ferdi gyorsítótár jelenleg {size} lemezterületet használ.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Aktuális verzió:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Ferdi mutatása a tálcán",
   "settings.app.form.enableTodos": "Ferdi Tennivalók bekapcsolása",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Letiltott szolgáltatások megjelenítése",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Mutassa az 'olvasatlan üzenet' jelzést, amikor az értesítések le vannak tiltva",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Mutassa az 'olvasatlan üzenet' jelzést, amikor az értesítések le vannak tiltva",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Egyénileg üzemeltetett szolgáltatások hozzáadásához Ferdi Prémium Támogató Fiók szükséges.",
   "settings.service.form.customUrlUpgradeAccount": "Frissítsd fiókodat",
   "settings.service.form.customUrlValidationError": "Nem sikerült érvényesíteni az egyéni {name} kiszolgálót.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Szolgáltatás törlése",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "{name} szerkesztése",
   "settings.service.form.enableAudio": "Hang engedélyezése",
   "settings.service.form.enableBadge": "Mutasd az olvasatlan jelzéseket",
   "settings.service.form.enableDarkMode": "Sötét mód engedélyezése",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Értesítések engedélyezése",
   "settings.service.form.enableService": "Szolgáltatás engedélyezése",
   "settings.service.form.headlineBadges": "Olvasatlan üzenet jelzések",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Általános",
   "settings.service.form.headlineNotifications": "Értesítések",
   "settings.service.form.icon": "Egyedi ikon",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 47039a827..433fde229 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Kirim",
+  "connectionLostBanner.cta": "Muat ulang Layanan",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Perubahan dalam Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Beli Lisensi Pendukung Ferdi agar tidak perlu menunggu",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Mulai ulang & instal pembaruan",
   "settings.app.buttonSearchForUpdate": "Periksa versi baru",
   "settings.app.cacheInfo": "Singgahan Ferdi sedang menggunakan ruang disk {size}.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Versi saat ini:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Tampilkan Ferdi di baki sistem",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Tampilkan tab layanan yang dinonaktifkan",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Tampilkan lencana pesan belum dibaca saat pemberitahuan dinonaktifkan",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Tampilkan lencana pesan belum dibaca saat pemberitahuan dinonaktifkan",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Untuk menambahkan layanan hosted yang dijalankan mandiri, Anda membutuhkan Ferdi Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Tingkatkan akun Anda",
   "settings.service.form.customUrlValidationError": "Gagal memvalidasi server {name} khusus.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Hapus layanan",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Aktifkan audio",
   "settings.service.form.enableBadge": "Tampilkan lencana pesan belum dibaca",
   "settings.service.form.enableDarkMode": "Aktifkan Mode Gelap",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Aktifkan pemberitahuan",
   "settings.service.form.enableService": "Aktifkan layanan",
   "settings.service.form.headlineBadges": "Lencana pesan belum dibaca",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Umum",
   "settings.service.form.headlineNotifications": "Notifikasi",
   "settings.service.form.icon": "Ikon khusus",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 815f5bcb4..78474b496 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Invia",
+  "connectionLostBanner.cta": "Ricarica Servizio",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Modifiche in Ferdi {Version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Per favore, compra una Licenza Supporter di Ferdi per saltare l'attesa",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Senza pubblicità per sempre",
   "pricing.features.appDelays": "Nessuna schermata di attesa",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Aggiungi siti web personalizzati",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "Servizi ospitati & on-premise",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Riavvia e installa l'aggiornamento",
   "settings.app.buttonSearchForUpdate": "Controlla aggiornamenti",
   "settings.app.cacheInfo": "Ferdi sta utilizzando {size} di spazio su disco.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Versione attuale:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Mostra Ferdi nell'area di notifica",
   "settings.app.form.enableTodos": "Abilità le Attività Ferdi",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Mostra schede servizi disattivati",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Mostra l'etichetta dei messaggi non letti quando le notifiche sono disattivate",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Mostra l'etichetta dei messaggi non letti quando le notifiche sono disattivate",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Per aggiungere servizi personalizzati, devi avere un account Ferdi Premium Supporter.",
   "settings.service.form.customUrlUpgradeAccount": "Aggiorna il tuo account",
   "settings.service.form.customUrlValidationError": "Impossibile validare il server personalizzato {name}.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Elimina servizio",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Modifica {name}",
   "settings.service.form.enableAudio": "Attiva audio",
   "settings.service.form.enableBadge": "Mostra l'etichetta dei messaggi non letti",
   "settings.service.form.enableDarkMode": "Attiva la modalità scura.",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Attiva le notifiche",
   "settings.service.form.enableService": "Attiva il servizio",
   "settings.service.form.headlineBadges": "Etichetta dei messaggi non letti",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Generale",
   "settings.service.form.headlineNotifications": "Notifiche",
   "settings.service.form.icon": "Icona personalizzata",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index b7a7bbc7b..3c8f938aa 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "送信",
+  "connectionLostBanner.cta": "サービスをリロードする",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Ferdiをすぐに起動するには、Ferdi サポーターライセンスを購入してください。",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "再起動して更新をインストールする",
   "settings.app.buttonSearchForUpdate": "更新の確認",
   "settings.app.cacheInfo": "現在、Ferdiのキャッシュはディスクの{size}分を使用しています。",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "現在のバージョン:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Ferdiをシステムトレイに表示する",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "無効化されたサービスのタブを表示する",
-  "settings.app.form.showMessagesBadgesWhenMuted": "通知の無効時に未読メッセージ件数を表示する",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "通知の無効時に未読メッセージ件数を表示する",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "独自サービスを追加するためには、Ferdi Premium Supporterアカウントが必要です。",
   "settings.service.form.customUrlUpgradeAccount": "アカウントをアップグレードする",
   "settings.service.form.customUrlValidationError": "独自サーバー{name}を検証できませんでした。",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "サービスの削除",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "{name}を編集",
   "settings.service.form.enableAudio": "オーディオを有効にする",
   "settings.service.form.enableBadge": "未読件数の通知バッジを表示する",
   "settings.service.form.enableDarkMode": "ダークモードを有効にする",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "通知を有効にする",
   "settings.service.form.enableService": "サービスを有効にする",
   "settings.service.form.headlineBadges": "未読件数の通知バッジ",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "一般",
   "settings.service.form.headlineNotifications": "通知メッセージ",
   "settings.service.form.icon": "カスタム アイコン",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 2161bbc97..3768274ff 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "დადასტურება",
+  "connectionLostBanner.cta": "Reload Service",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "გადატვირთეთ და დააყენეთ განახლება",
   "settings.app.buttonSearchForUpdate": "განახლებების შემოწმება",
   "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "ამჟამინდელი ვერსია:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "აჩვენეთ Ferdi სისტემის უჯრაში",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "თვით დაჰოსტილი სერვისების დასამატებლად საჭიროა Ferdi-ის პრემიუმ მხარდამჭერის ანგარიში.",
   "settings.service.form.customUrlUpgradeAccount": "განაახლეთ თქვენი ანგარიში",
   "settings.service.form.customUrlValidationError": "ვერ დადასტურდა {name} კერძო სერვერი.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "სერვისის წაშლა",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "შეასწორე {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "შეტყობინებების ჩართვა",
   "settings.service.form.enableService": "სერვისის ჩართვა",
   "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "მთავარი",
   "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index fb02761b6..462990547 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "connectionLostBanner.cta": "Reload Service",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Ferdi {version} 변경점",
   "feature.debugger.title": "디버깅 정보 공개",
   "feature.delayApp.headline": "Ferdi Supporter License를 구매하여 대기시간을 스킵하세요.",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Restart & install update",
   "settings.app.buttonSearchForUpdate": "Check for updates",
   "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Current version:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 46619f3e0..f166fd1c9 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Verzenden",
+  "connectionLostBanner.cta": "Service Herladen",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Wijzigingen in Ferdi {versie}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Neem een Ferdi Supporter Licentie om niet meer te hoeven wachten",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Opnieuw opstarten & update installeren",
   "settings.app.buttonSearchForUpdate": "Controleer op updates",
   "settings.app.cacheInfo": "Ferdi cache gebruikt momenteel {size} schijfruimte.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Huidige versie:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Toon Ferdi in de systeembalk",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Toon uitgeschakelde services",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Om intern gehoste services toe te voegen heb je een Ferdi Premium Supporter Account nodig.",
   "settings.service.form.customUrlUpgradeAccount": "Je account upgraden",
   "settings.service.form.customUrlValidationError": "Kon de custom {name} server niet valideren.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Service verwijderen",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Bewerk {name}",
   "settings.service.form.enableAudio": "Audio inschakelen",
   "settings.service.form.enableBadge": "Toon badges met ongelezen berichten",
   "settings.service.form.enableDarkMode": "Dark Mode aanzetten",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Notificaties aanzetten",
   "settings.service.form.enableService": "Service aanzetten",
   "settings.service.form.headlineBadges": "Ongelezen berichten badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Algemeen",
   "settings.service.form.headlineNotifications": "Meldingen",
   "settings.service.form.icon": "Aangepast icoon",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 3995f56f8..3ac8186bd 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Server wijzigen",
   "changeserver.label": "Server",
   "changeserver.submit": "Verzenden",
+  "connectionLostBanner.cta": "Een service opnieuw laden",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Wijzigingen in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Sponsor Ferdi om wachten over te slaan",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Voor altijd reclamevrij",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Opnieuw opstarten & update installeren",
   "settings.app.buttonSearchForUpdate": "Controleer op updates",
   "settings.app.cacheInfo": "Ferdi gebruikt op dit moment {size} schijfruimte aan tijdelijke bestanden.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Huidige versie:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Pictogram voor Ferdi in systeemvak tonen",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Toon uitgeschakelde services",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Om zelf-gehoste services toe te kunnen voegen, heb je een Ferdi Premium Supporter Account nodig.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade je account",
   "settings.service.form.customUrlValidationError": "Kon aangepaste server {name} niet valideren.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Verwijder service",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Bewerk {name}",
   "settings.service.form.enableAudio": "Audio inschakelen",
   "settings.service.form.enableBadge": "Toon badges met ongelezen berichten",
   "settings.service.form.enableDarkMode": "Dark mode aanzetten",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Meldingen inschakelen",
   "settings.service.form.enableService": "Service inschakelen",
   "settings.service.form.headlineBadges": "Ongelezen berichten badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Algemeen",
   "settings.service.form.headlineNotifications": "Meldingen",
   "settings.service.form.icon": "Aangepast icoon",
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index 65b0edbfa..9d676c0a9 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "connectionLostBanner.cta": "Reload Service",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Restart & install update",
   "settings.app.buttonSearchForUpdate": "Check for updates",
   "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Current version:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 65ce1c1db..f6193a1fd 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Wyślij",
+  "connectionLostBanner.cta": "Przeładuj usługę",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Zmiany we Ferdiie {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Aby nie czekać, kup licencję Ferdi Supporter",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Na zawsze bez reklam",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Dodawanie dowolnych stron internetowych",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Uruchom ponownie i zainstaluj aktualizację",
   "settings.app.buttonSearchForUpdate": "Sprawdź aktualizacje",
   "settings.app.cacheInfo": "Pamięć podręczna zajmuje obecnie {size} przestrzeni dyskowej",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Aktualna wersja:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Pokaż Ferdia w obszarze powiadomień",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Wyłącz wyświetlanie zakładek z usługami",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Aby dodać usługi hostowane lokalnie, musisz posiadać konto Premium.",
   "settings.service.form.customUrlUpgradeAccount": "Ulepsz swoje konto",
   "settings.service.form.customUrlValidationError": "Nie można zweryfikować spersonalizowanego {name} serwera.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Usuń usługę",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Edytuj {name}",
   "settings.service.form.enableAudio": "Włącz dźwięk",
   "settings.service.form.enableBadge": "Pokaż znacznik nieprzeczytanych wiadomości",
   "settings.service.form.enableDarkMode": "Włącz Ciemny motyw",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Aktywuj powiadomienia",
   "settings.service.form.enableService": "Aktywuj usługę",
   "settings.service.form.headlineBadges": "Znaczniki nieprzeczytanych wiadomości",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Ogólne",
   "settings.service.form.headlineNotifications": "Powiadomienia",
   "settings.service.form.icon": "Własna ikona",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index cae5fa457..190ef31de 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Alterar servidor",
   "changeserver.label": "Servidor",
   "changeserver.submit": "Submeter",
+  "connectionLostBanner.cta": "Recarregar serviço",
+  "connectionLostBanner.informationLink": "O que aconteceu?",
+  "connectionLostBanner.message": "Ah não! Ferdi perdeu a conexão com {name}.",
   "feature.announcements.changelog.headline": "Alterações no Ferdi {version}",
   "feature.debugger.title": "Publicar informações de depuração",
   "feature.delayApp.headline": "Por favor compre uma licença Ferdi Supporter para saltar a fila de espera",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Sincronização Automática",
   "pricing.features.adFree": "Sem publicidade para sempre",
   "pricing.features.appDelays": "Sem Telas de Espera",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Adicionar Websites Personalizados",
   "pricing.features.desktopNotifications": "Notificações no ambiente de trabalho",
   "pricing.features.onPremise": "On-Premise & Outros serviços hospedados",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Reiniciar e instalar atualizações",
   "settings.app.buttonSearchForUpdate": "Procurar atualizações",
   "settings.app.cacheInfo": "A cache do Ferdi está a usar {size} de espaço em disco.",
+  "settings.app.cacheNotCleared": "Não foi possível limpar o cache",
   "settings.app.currentVersion": "Versão atual",
   "settings.app.form.accentColor": "Cor de destaque",
   "settings.app.form.adaptableDarkMode": "Sincronizar o modo escuro com a configuração de modo escuro do meu SO",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Mostrar o Ferdi na barra do sistema",
   "settings.app.form.enableTodos": "Ativar Tarefas",
   "settings.app.form.hibernate": "Ativar hibernação de serviço",
+  "settings.app.form.hibernateOnStartup": "Manter os serviços em hibernação ao inicializar",
   "settings.app.form.hibernationStrategy": "Estratégia de Hibernação",
   "settings.app.form.iconSize": "Tamanho do ícone",
   "settings.app.form.inactivityLock": "Bloquear após",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Enviar dados de telemetria",
   "settings.app.form.serviceRibbonWidth": "Largura da barra lateral",
   "settings.app.form.showDisabledServices": "Apresentar separadores de serviços desativados",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Apresentar emblema com o número de mensagens não lidas quando as notificações estão desativadas",
   "settings.app.form.showDragArea": "Mostrar área arrastável na janela",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Apresentar emblema com o número de mensagens não lidas quando as notificações estão desativadas",
   "settings.app.form.startMinimized": "Iniciar minimizado",
   "settings.app.form.universalDarkMode": "Habilitar modo noturno universal",
   "settings.app.form.useTouchIdToUnlock": "Permitir usar TouchID para desbloquear Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Para adicionar serviços com domínio próprio, é necessário uma Conta Premium no Ferdi.",
   "settings.service.form.customUrlUpgradeAccount": "Atualizar a conta",
   "settings.service.form.customUrlValidationError": "Não foi possível validar o servidor {name}.",
+  "settings.service.form.darkReaderBrightness": "Brilho do Dark Reader",
+  "settings.service.form.darkReaderContrast": "Contraste do Dark Reader",
+  "settings.service.form.darkReaderSepia": "Sépia do Dark Reader",
   "settings.service.form.deleteButton": "Apagar serviço",
+  "settings.service.form.disableHibernation": "Desabilitar hibernação",
+  "settings.service.form.disableHibernationInfo": "Atualmente, a hibernação está habilitada, mas é possível desativar este recurso para serviços individuais utilizando esta opção.",
   "settings.service.form.editServiceHeadline": "Editar {name}",
   "settings.service.form.enableAudio": "Ativar áudio",
   "settings.service.form.enableBadge": "Mostrar emblemas de mensagens não lidas",
   "settings.service.form.enableDarkMode": "Ativar o Tema Escuro",
-  "settings.service.form.darkReaderBrightness": "Brilho",
-  "settings.service.form.darkReaderContrast": "Contraste",
-  "settings.service.form.darkReaderSepia": "Sépia",
-  "settings.service.form.headlineDarkReaderSettings": "Configurações do Leitor Escuro",
   "settings.service.form.enableNotification": "Ativar notificações",
   "settings.service.form.enableService": "Ativar serviço",
   "settings.service.form.headlineBadges": "Emblema de mensagem não lida",
+  "settings.service.form.headlineDarkReaderSettings": "Configurações do Dark Reader",
   "settings.service.form.headlineGeneral": "Geral",
   "settings.service.form.headlineNotifications": "Notificações",
   "settings.service.form.icon": "Ícone personalizado",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index ff2eb8889..7a6ed77cc 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Alterar servidor",
   "changeserver.label": "Servidor",
   "changeserver.submit": "Enviar",
+  "connectionLostBanner.cta": "Reiniciar serviço",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Mudanças no Ferdi {version}",
   "feature.debugger.title": "Publicar informações de debug",
   "feature.delayApp.headline": "Por favor, adquira uma licença de apoiante Ferdi para não ficar à espera",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Sincronização de conta",
   "pricing.features.adFree": "Sem anúncios para sempre",
   "pricing.features.appDelays": "Sem Ecrãs de Espera",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Adicionar Websites Personalizados",
   "pricing.features.desktopNotifications": "Notificações no ambiente de trabalho",
   "pricing.features.onPremise": "En sitio y otros servicios alojados",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Reiniciar e instalar atualizações",
   "settings.app.buttonSearchForUpdate": "Procurar atualizações",
   "settings.app.cacheInfo": "De momento, a cache de Ferdi está a usar {size} de espaço de disco.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Versão atual:",
   "settings.app.form.accentColor": "Cor de destaque",
   "settings.app.form.adaptableDarkMode": "Sincronizar modo noturno com a configuração modo noturno do sistema operativo",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Mostrar Ferdi na barra de sistema",
   "settings.app.form.enableTodos": "Ativar Tarefas Ferdi",
   "settings.app.form.hibernate": "Ativar hibernação do serviço",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Estratégia de hibernação",
   "settings.app.form.iconSize": "Tamanho de ícone de serviço",
   "settings.app.form.inactivityLock": "Bloquear após inatividade",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Enviar dados de telemetria",
   "settings.app.form.serviceRibbonWidth": "Largura da barra lateral",
   "settings.app.form.showDisabledServices": "Mostrar separadores de serviços desativados",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar ícone de mensagem não lida quando as notificações estiverem desativadas",
   "settings.app.form.showDragArea": "Mostrar área arrastável na janela",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar ícone de mensagem não lida quando as notificações estiverem desativadas",
   "settings.app.form.startMinimized": "Iniciar minimizado",
   "settings.app.form.universalDarkMode": "Ativar o Modo Noturno Universal",
   "settings.app.form.useTouchIdToUnlock": "Permite usar o TouchID para desbloquear Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Para adicionar serviços auto-hospedados, você precisa de uma conta Apoiador Ferdi Premium.",
   "settings.service.form.customUrlUpgradeAccount": "Faça upgrade à sua conta",
   "settings.service.form.customUrlValidationError": "Não foi possível validar servidor personalizado {name}.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Apagar serviço",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Editar {name}",
   "settings.service.form.enableAudio": "Ativar áudio",
   "settings.service.form.enableBadge": "Mostrar aviso de mensagens não lidas",
   "settings.service.form.enableDarkMode": "Ativar modo noturno",
-  "settings.service.form.darkReaderBrightness": "Luminosidade",
-  "settings.service.form.darkReaderContrast": "Contraste",
-  "settings.service.form.darkReaderSepia": "Sépia",
-  "settings.service.form.headlineDarkReaderSettings": "Configurações do leitor noturno",
   "settings.service.form.enableNotification": "Ativar notificações",
   "settings.service.form.enableService": "Ativar serviço",
   "settings.service.form.headlineBadges": "Notificações de Mensagens não lidas",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Geral",
   "settings.service.form.headlineNotifications": "Notificações",
   "settings.service.form.icon": "Ícone personalizado",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index 65b0edbfa..9d676c0a9 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "connectionLostBanner.cta": "Reload Service",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Restart & install update",
   "settings.app.buttonSearchForUpdate": "Check for updates",
   "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Current version:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 63eee53b5..a16bde739 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Изменить сервер",
   "changeserver.label": "Server",
   "changeserver.submit": "Принять",
+  "connectionLostBanner.cta": "Перезапустить сервис",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Изменения в версии Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Пожалуйста приобретите лицензию Ferdi Supporter чтобы убрать ожидание",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Всегда бесплатен с рекламой",
   "pricing.features.appDelays": "Без экранов ожидания",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Добавить пользовательские веб-сайты",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Перезапустить и установить обновления",
   "settings.app.buttonSearchForUpdate": "Проверить обновления",
   "settings.app.cacheInfo": "Кэш занимает {size} на диске.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Текущая версия:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Показывать Ferdi в системном трее",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Показывать вкладки отключённых служб",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Показывать значок непрочитанного сообщения при отключённых уведомлениях",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Показывать значок непрочитанного сообщения при отключённых уведомлениях",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Для добавления сервиса на своем хостинге необходим премиум аккаунт Ferdi.",
   "settings.service.form.customUrlUpgradeAccount": "Улучшить ваш аккаунт",
   "settings.service.form.customUrlValidationError": "Невозможно проверить сервер {name}.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Удалить сервис",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Редактирование {name}",
   "settings.service.form.enableAudio": "Включить звук",
   "settings.service.form.enableBadge": "Показывать иконку непрочитанных сообщений",
   "settings.service.form.enableDarkMode": "Включить Тёмный режим",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Включить уведомления",
   "settings.service.form.enableService": "Включить сервис",
   "settings.service.form.headlineBadges": "Значки непрочитанных сообщений",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Общие",
   "settings.service.form.headlineNotifications": "Уведомления",
   "settings.service.form.icon": "Пользовательская иконка",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index eff949a7a..fd73bc773 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -1,9 +1,12 @@
 {
   "app.errorHandler.action": "Obnoviť",
   "app.errorHandler.headline": "Niečo sa pokazilo",
-  "changeserver.headline": "Change server",
+  "changeserver.headline": "Zmeniť server",
   "changeserver.label": "Server",
   "changeserver.submit": "Odoslať",
+  "connectionLostBanner.cta": "Obnoviť službu",
+  "connectionLostBanner.informationLink": "Čo sa stalo?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Zmeny vo Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Prosím, kúp si licenciu Ferdi Supporter a nebudeš musieť čakať",
@@ -32,12 +35,12 @@
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
-  "feature.publishDebugInfo.publish": "Accept and publish",
+  "feature.publishDebugInfo.publish": "Prijať a publikovať",
   "feature.publishDebugInfo.published": "Your debug log was published and is now availible at",
   "feature.publishDebugInfo.terms": "Podmienky služby",
   "feature.publishDebugInfo.title": "Publish debug information",
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
-  "feature.quickSwitch.search": "Search...",
+  "feature.quickSwitch.search": "Hľadať...",
   "feature.quickSwitch.title": "QuickSwitch",
   "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Odoslať ako e-mail",
@@ -49,7 +52,7 @@
   "feature.shareFranz.text": "Povedzte vašim priateľom a známym aký je Ferdi skvelý a pomôžte nám rozšíriť sa do sveta.",
   "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
   "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
+  "feature.todos.premium.upgrade": "Vylepšite svoj účet",
   "feature.trialStatusBar.cta": "Upgrade now",
   "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
   "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
@@ -83,15 +86,15 @@
   "invite.skip.label": "Chcem to urobiť neskôr",
   "invite.submit.label": "Poslať pozvánky",
   "invite.successInfo": "Pozvánky boli úspešne odoslané",
-  "locked.headline": "Locked",
+  "locked.headline": "Zamknuté",
   "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
   "locked.invalidCredentials": "Password invalid",
-  "locked.password.label": "Password",
-  "locked.submit.label": "Unlock",
+  "locked.password.label": "Heslo",
+  "locked.submit.label": "Odomknúť",
   "locked.touchId": "Unlock with Touch ID",
   "locked.touchIdPrompt": "unlock via Touch ID",
   "locked.unlockWithPassword": "Unlock with Password",
-  "login.changeServer": "Change server",
+  "login.changeServer": "Zmeniť server",
   "login.customServerQuestion": "Using a custom Ferdi server?",
   "login.customServerSuggestion": "Try importing your Franz account",
   "login.email.label": "E-mailová adresa",
@@ -99,7 +102,7 @@
   "login.invalidCredentials": "E-mail alebo heslo nesúhlasia",
   "login.link.password": "Obnoviť heslo",
   "login.link.signup": "Vytvoriť používateľský účet zdarma",
-  "login.password.label": "Password",
+  "login.password.label": "Heslo",
   "login.serverLogout": "Vaša relácia vypršala, prihláste sa prosím znovu.",
   "login.submit.label": "Prihlásiť sa",
   "login.tokenExpired": "Vaša relácia vypršala, prihláste sa prosím znovu.",
@@ -143,12 +146,12 @@
   "menu.services": "Služby",
   "menu.services.activatePreviousService": "Aktivovať predchádzajúcu službu",
   "menu.services.addNewService": "Pridať novú službu...",
-  "menu.services.goHome": "Home",
+  "menu.services.goHome": "Úvod",
   "menu.services.setNextServiceActive": "Aktivujte ďalšiu službu",
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Zobraziť",
-  "menu.view.back": "Back",
+  "menu.view.back": "Naspäť",
   "menu.view.enterFullScreen": "Na celú obrazovku",
   "menu.view.exitFullScreen": "Ukončiť režim na celú obrazovku",
   "menu.view.forward": "Forward",
@@ -157,7 +160,7 @@
   "menu.view.reloadFranz": "Obnoviť Ferdi",
   "menu.view.reloadService": "Obnoviť službu",
   "menu.view.resetZoom": "Pôvodná veľkosť",
-  "menu.view.toggleDarkMode": "Toggle Dark Mode",
+  "menu.view.toggleDarkMode": "Zapnúť Tmavý Mód",
   "menu.view.toggleDevTools": "Prepnúť vývojárske nástroje",
   "menu.view.toggleFullScreen": "Prepnúť na celú obrazovku",
   "menu.view.toggleServiceDevTools": "Prepnúť vývojárske nástroje služby",
@@ -181,8 +184,9 @@
   "password.successInfo": "Skontrolujte prosím váš e-mail",
   "premiumFeature.button.upgradeAccount": "Upgradovať účet",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
+  "pricing.features.adFree": "Navždy bez reklám",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -227,7 +231,7 @@
   "service.errorHandler.headline": "Ale nie!",
   "service.errorHandler.message": "Chyba",
   "service.errorHandler.text": "{name} sa nepodarilo načítať.",
-  "service.restrictedHandler.action": "Upgrade Account",
+  "service.restrictedHandler.action": "Vylepšite svoj účet",
   "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
@@ -272,8 +276,9 @@
   "settings.app.buttonInstallUpdate": "Reštartovať a nainštalovať aktualizáciu",
   "settings.app.buttonSearchForUpdate": "Skontrolovať aktualizácie",
   "settings.app.cacheInfo": "Vyrovnávacia pamäť Ferdi momentálne používa {size} miesta na disku.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Súčasná verzia:",
-  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.accentColor": "Odtieň farby",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Otvoriť na pozadí",
   "settings.app.form.autoLaunchOnStart": "Spustiť Ferdi pri štarte",
@@ -287,12 +292,13 @@
   "settings.app.form.enableSystemTray": "Zobrazovať Ferdi v systémovej lište",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Jazyk",
-  "settings.app.form.lockPassword": "Password",
+  "settings.app.form.lockPassword": "Heslo",
   "settings.app.form.minimizeToSystemTray": "Minimalizovať Ferdi do systémovej lišty",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
@@ -300,13 +306,13 @@
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Po zatvorení okna ponechať Ferdi spustený na pozadí",
   "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
-  "settings.app.form.scheduledDNDEnd": "To",
-  "settings.app.form.scheduledDNDStart": "From",
+  "settings.app.form.scheduledDNDEnd": "Do",
+  "settings.app.form.scheduledDNDStart": "Od",
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Zobraziť záložky vypnutých služieb",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Zobraziť symbol pre neprečítané správy, keď sú vypnuté upozornenia",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Zobraziť symbol pre neprečítané správy, keď sú vypnuté upozornenia",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -320,7 +326,7 @@
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Oficiálne preklady sú angličtina a nemčina. Všetky ostatné jazyky sú preklady založené na komunite.",
   "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Password",
+  "settings.app.lockedPassword": "Heslo",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Zmeny vyžadujú reštart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
@@ -349,7 +355,7 @@
   "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
   "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
   "settings.recipes.customService.openDevDocs": "Developer Documentation",
-  "settings.recipes.customService.openFolder": "Open folder",
+  "settings.recipes.customService.openFolder": "Otvoriť priečinok",
   "settings.recipes.headline": "Dostupné služby",
   "settings.recipes.missingService": "Chýba vám služba?",
   "settings.recipes.mostPopular": "Najpopulárnejšie",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Ak chcete pridať vlastné hostované služby, potrebujete účet Ferdi Premium Supporter.",
   "settings.service.form.customUrlUpgradeAccount": "Povýšte váš účet",
   "settings.service.form.customUrlValidationError": "Nebolo možné overiť vlastný server: {name}.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Odstrániť službu",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Upraviť {name}",
   "settings.service.form.enableAudio": "Zapnúť zvuk",
   "settings.service.form.enableBadge": "Zobraziť symboly neprečítaných správ",
   "settings.service.form.enableDarkMode": "Zapnúť Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Povoliť oznámenia",
   "settings.service.form.enableService": "Povoliť službu",
   "settings.service.form.headlineBadges": "Symboly neprečítaných správ",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Všeobecné",
   "settings.service.form.headlineNotifications": "Oznámenia",
   "settings.service.form.icon": "Vlastná ikona",
@@ -416,7 +424,7 @@
   "settings.supportFerdi.github": "Star on GitHub",
   "settings.supportFerdi.headline": "Support Ferdi",
   "settings.supportFerdi.openCollective": "Support our Open Collective",
-  "settings.supportFerdi.share": "Tell your Friends",
+  "settings.supportFerdi.share": "Povedať svojim priateľom",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
@@ -470,17 +478,17 @@
   "signup.legal.privacy": "Vyhlásenie o ochrane súkromia",
   "signup.legal.terms": "Podmienky služby",
   "signup.link.login": "Už máte účet, chcete sa prihlásiť?",
-  "signup.password.label": "Password",
+  "signup.password.label": "Heslo",
   "signup.submit.label": "Vytvoriť účet",
   "subscription.bestValue": "Best value",
   "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
+  "subscription.cta.allOptions": "Pozrieť všetky nastavenia",
+  "subscription.cta.choosePlan": "Vyberte váš plán",
   "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
+  "subscription.interval.per": "za { interval}",
+  "subscription.interval.perMonth": "za mesiac",
   "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
+  "subscription.planItem.upgradeAccount": "Vylepšite svoj účet",
   "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
   "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
   "subscriptionPopup.buttonCancel": "Zrušiť",
@@ -499,10 +507,10 @@
   "validation.oneRequired": "Je nutné zadať aspoň jeden",
   "validation.required": "{field} je povinné",
   "validation.url": "{field} nie je platné URL",
-  "webControls.back": "Back",
+  "webControls.back": "Naspäť",
   "webControls.forward": "Forward",
-  "webControls.goHome": "Home",
-  "webControls.openInBrowser": "Open in Browser",
+  "webControls.goHome": "Úvod",
+  "webControls.openInBrowser": "Otvoriť v prehliadači",
   "webControls.reload": "Obnoviť",
   "welcome.loginButton": "Prihlásiť sa do vášho účtu",
   "welcome.signupButton": "Vytvoriť používateľský účet zdarma",
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index 65b0edbfa..9d676c0a9 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "connectionLostBanner.cta": "Reload Service",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Restart & install update",
   "settings.app.buttonSearchForUpdate": "Check for updates",
   "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Current version:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index f2e268058..33cde814c 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Pošalji",
+  "connectionLostBanner.cta": "Поново учирај услугу",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Ponovo pokreni i instaliraj ažuriranje ",
   "settings.app.buttonSearchForUpdate": "Potraži ažuriranja",
   "settings.app.cacheInfo": "Франз кеш тренутно користи {size} простора на диску.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Trenutna verzija:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Prikaži aplikaciju u sustavskoj traci",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Prikaži ploče s onemogućenim servisima",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Покажи беџ за непрочитане поруке када су обавештења онемогућена",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Покажи беџ за непрочитане поруке када су обавештења онемогућена",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Da bi ste dodali samo-hostovane usluge, potreban vam je Premium račun.",
   "settings.service.form.customUrlUpgradeAccount": "Nadogradite Vaš račun",
   "settings.service.form.customUrlValidationError": "Nije moguće odobriti prilagođeno {name} servera.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Izbriši uslugu",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Uredite {name}",
   "settings.service.form.enableAudio": "Omogućite zvuk",
   "settings.service.form.enableBadge": "Покажи беџеве за непрочитане поруке",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Omogućite obavijesti",
   "settings.service.form.enableService": "Omogućite usluge",
   "settings.service.form.headlineBadges": "Беџеви за непрочитане поруке",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Općenito",
   "settings.service.form.headlineNotifications": "Обавештења",
   "settings.service.form.icon": "Посебна иконица",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index 0d3e18a27..418624a66 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Byt server",
   "changeserver.label": "Server",
   "changeserver.submit": "Skicka",
+  "connectionLostBanner.cta": "Ladda om tjänst",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Ändringar i Ferdi {version}",
   "feature.debugger.title": "Skicka felsökningsinformation",
   "feature.delayApp.headline": "Vänligen köp en Ferdi Supporter-licens för att slippa vänta",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Synkronisering av konto",
   "pricing.features.adFree": "Reklamfritt för alltid",
   "pricing.features.appDelays": "Inga vänteskärmar",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Lägg till egna webbplatser",
   "pricing.features.desktopNotifications": "Skrivbordsaviseringar",
   "pricing.features.onPremise": "Lokala tjänster och andra värdtjänster",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Starta om & installera uppdatering",
   "settings.app.buttonSearchForUpdate": "Sök efter uppdateringar",
   "settings.app.cacheInfo": "Ferdis cache använder för närvarande {size} diskutrymme.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Nuvarande version:",
   "settings.app.form.accentColor": "Accentfärg",
   "settings.app.form.adaptableDarkMode": "Synkronisera det mörka läget med operativsystemets inställning för mörkt läge",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Visa Ferdi i systemfältet",
   "settings.app.form.enableTodos": "Aktivera Ferdi Todos",
   "settings.app.form.hibernate": "Sätt tjänst i vila",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Strategi för vila",
   "settings.app.form.iconSize": "Ikonstorlek för tjänster",
   "settings.app.form.inactivityLock": "Lås efter inaktivitet",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Skicka telemetridata",
   "settings.app.form.serviceRibbonWidth": "Sidofältets bredd",
   "settings.app.form.showDisabledServices": "Visa flikar för inaktiverade tjänster",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Visa antal olästa meddelanden när aviseringar är inaktiverade",
   "settings.app.form.showDragArea": "Visa dragbart område i fönstret",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Visa antal olästa meddelanden när aviseringar är inaktiverade",
   "settings.app.form.startMinimized": "Starta i minimerat läge",
   "settings.app.form.universalDarkMode": "Aktivera globalt mörkt läge",
   "settings.app.form.useTouchIdToUnlock": "Tillåt att TouchID används för att låsa upp Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "För att lägga till egna tjänster behöver du ett Ferdi Premium supporter-konto.",
   "settings.service.form.customUrlUpgradeAccount": "Uppgradera ditt konto",
   "settings.service.form.customUrlValidationError": "Kunde inte validera anpassad {name} -server.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Ta bort tjänst",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Redigera {name}",
   "settings.service.form.enableAudio": "Aktivera ljud",
   "settings.service.form.enableBadge": "Visa olästa meddelandemärken",
   "settings.service.form.enableDarkMode": "Aktivera mörkt läge",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Aktivera aviseringar",
   "settings.service.form.enableService": "Aktivera tjänst",
   "settings.service.form.headlineBadges": "Olästa meddelandemärken",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Allmänt",
   "settings.service.form.headlineNotifications": "Aviseringar",
   "settings.service.form.icon": "Anpassad ikon",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 54515f6fe..428d9f18f 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Sunucuyu değiştir",
   "changeserver.label": "Sunucu",
   "changeserver.submit": "Gönder",
+  "connectionLostBanner.cta": "Servisi Tekrar Yükle",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Ferdi {version} Sürümündeki Değişiklikler",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Beklememek için Ferdi Destek Lisansı'nı satın alın",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Sonsuza dek reklamsız",
   "pricing.features.appDelays": "Yükleme Ekranları Yok",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Özel Siteler Ekle",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Yeniden Başlat ve Güncelleştirmeleri Kur",
   "settings.app.buttonSearchForUpdate": "Güncellemeleri kontrol et",
   "settings.app.cacheInfo": "Ferdi önbelleği şu anda {size} disk alanı kullanıyor.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Geçerli sürüm:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Ferdi'ı sistem tepsisinde göster",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Devre dışı bırakılan servis sekmelerini göster",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Bildirimler kapalı iken okunmamış mesaj sayısını göster",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Bildirimler kapalı iken okunmamış mesaj sayısını göster",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Kendi barındırdığın servisi ekleyebilmek için Ferdi Premium Destek Hesabına ihtiyacın var.",
   "settings.service.form.customUrlUpgradeAccount": "Hesabını yükselt",
   "settings.service.form.customUrlValidationError": "{name} özel sunucu doğrulanamadı.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Servisi sil",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "{name} düzenle",
   "settings.service.form.enableAudio": "Sesi etkinleştirin",
   "settings.service.form.enableBadge": "Okunmamış mesajları göster",
   "settings.service.form.enableDarkMode": "Karanlık modu aç",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Bildirimleri etkinleştir",
   "settings.service.form.enableService": "Servisi etkinleştir",
   "settings.service.form.headlineBadges": "Okunmamış mesajlar",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Genel",
   "settings.service.form.headlineNotifications": "Bildirimler",
   "settings.service.form.icon": "Özel simge",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index c6acfb4e9..25e09ea49 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -1,11 +1,14 @@
 {
   "app.errorHandler.action": "Перезавантажити",
   "app.errorHandler.headline": "Щось пішло не так",
-  "changeserver.headline": "Change server",
-  "changeserver.label": "Server",
+  "changeserver.headline": "Змінити сервер",
+  "changeserver.label": "Сервер",
   "changeserver.submit": "Подати",
+  "connectionLostBanner.cta": "Перезавантажити сервіс",
+  "connectionLostBanner.informationLink": "Що трапилось?",
+  "connectionLostBanner.message": "О ні! Ферді втратив з'єднання з {name}.",
   "feature.announcements.changelog.headline": "Зміни у Ferdi {version}",
-  "feature.debugger.title": "Publish debugging information",
+  "feature.debugger.title": "Опублікувати інформацію для налагодження",
   "feature.delayApp.headline": "Будь ласка, придбайте ліцензію Ferdi Supporter аби пропустити очікування",
   "feature.delayApp.text": "Ferdi відновить роботу за {seconds} секунд",
   "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
@@ -29,20 +32,20 @@
   "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
   "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
   "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
-  "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
-  "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
-  "feature.publishDebugInfo.privacy": "Privacy policy",
-  "feature.publishDebugInfo.publish": "Accept and publish",
-  "feature.publishDebugInfo.published": "Your debug log was published and is now availible at",
+  "feature.publishDebugInfo.error": "Сталася помилка під час спроби опублікувати інформацію для налагодження. Будь ласка, спробуйте ще раз пізніше або перегляньте консоль для отримання додаткової інформації.",
+  "feature.publishDebugInfo.info": "Публікація інформації для налагодження допоможе нам знайти проблеми та помилки у Fredi. Публікуючи вашу зневаджувальну інформацію, ви приймаєте політику конфіденційності Ferdi Debugger та умови використання",
+  "feature.publishDebugInfo.privacy": "Політика конфіденційності",
+  "feature.publishDebugInfo.publish": "Прийняти і опублікувати",
+  "feature.publishDebugInfo.published": "Ваш журнал налагодження був опублікований та доступний тут",
   "feature.publishDebugInfo.terms": "Умови використання",
-  "feature.publishDebugInfo.title": "Publish debug information",
-  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
-  "feature.quickSwitch.search": "Search...",
+  "feature.publishDebugInfo.title": "Опублікувати інформацію для налагодження",
+  "feature.quickSwitch.info": "Виберіть сервіс за допомогою TAB, стрілок ↑ та ↓. Натисніть ENTER, щоб відкрити.",
+  "feature.quickSwitch.search": "Пошук...",
   "feature.quickSwitch.title": "QuickSwitch",
   "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
-  "feature.shareFranz.action.email": "Send as email",
-  "feature.shareFranz.action.facebook": "Share on Facebook",
-  "feature.shareFranz.action.twitter": "Share on Twitter",
+  "feature.shareFranz.action.email": "Надіслати електронною поштою",
+  "feature.shareFranz.action.facebook": "Поділитися на Facebook",
+  "feature.shareFranz.action.twitter": "Поділитись у Twitter",
   "feature.shareFranz.headline": "Ferdi is better together!",
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
@@ -64,7 +67,7 @@
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Мова перевірки правопису",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
+  "global.upgradeButton.upgradeToPro": "Підвищити до Fredi Professional",
   "import.headline": "Імпортувати ваші сервіси з Ferdi 4",
   "import.notSupportedHeadline": "Наразі сервіси не підтримуються у Ferdi 5",
   "import.skip.label": "Я бажаю додати сервіс вручну",
@@ -83,15 +86,15 @@
   "invite.skip.label": "Я зроблю це пізніше",
   "invite.submit.label": "Надіслати запрошення",
   "invite.successInfo": "Запрошення успішно надіслані",
-  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
-  "locked.invalidCredentials": "Password invalid",
+  "locked.headline": "Заблоковано",
+  "locked.info": "Fredi зараз заблокований. Розблокуйте Fredi з вашим паролем, щоб побачити повідомлення.",
+  "locked.invalidCredentials": "Пароль не є дійсним",
   "locked.password.label": "Пароль",
-  "locked.submit.label": "Unlock",
-  "locked.touchId": "Unlock with Touch ID",
-  "locked.touchIdPrompt": "unlock via Touch ID",
-  "locked.unlockWithPassword": "Unlock with Password",
-  "login.changeServer": "Change server",
+  "locked.submit.label": "Розблокувати",
+  "locked.touchId": "Розблокувати за допомогою Touch ID",
+  "locked.touchIdPrompt": "розблокувати за допомогою Touch ID",
+  "locked.unlockWithPassword": "Розблокування паролем",
+  "login.changeServer": "Змінити сервер",
   "login.customServerQuestion": "Using a custom Ferdi server?",
   "login.customServerSuggestion": "Try importing your Franz account",
   "login.email.label": "Email адреса",
@@ -106,8 +109,8 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "Про Ferdi",
-  "menu.app.announcement": "What's new?",
-  "menu.app.autohideMenuBar": "Auto-hide menu bar",
+  "menu.app.announcement": "Що нового?",
+  "menu.app.autohideMenuBar": "Автоматично приховувати меню",
   "menu.app.checkForUpdates": "Перевірити наявність оновлень",
   "menu.app.hide": "Приховати",
   "menu.app.hideOthers": "Приховати інші",
@@ -119,7 +122,7 @@
   "menu.edit.cut": "Вирізати",
   "menu.edit.delete": "Видалити",
   "menu.edit.emojiSymbols": "Емодзі та символи",
-  "menu.edit.findInPage": "Find in Page",
+  "menu.edit.findInPage": "Знайти на сторінці",
   "menu.edit.paste": "Вставити",
   "menu.edit.pasteAndMatchStyle": "Вставити з дотриманням стилю",
   "menu.edit.redo": "Повернути",
@@ -132,7 +135,7 @@
   "menu.file": "Файл",
   "menu.help": "Довідка",
   "menu.help.changelog": "Журнал змін",
-  "menu.help.debugInfo": "Copy Debug Information",
+  "menu.help.debugInfo": "Копіювати інформацію для налагодження",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
   "menu.help.learnMore": "Докладніше",
@@ -143,15 +146,15 @@
   "menu.services": "Служби",
   "menu.services.activatePreviousService": "Activate previous service",
   "menu.services.addNewService": "Додати сервіс",
-  "menu.services.goHome": "Home",
-  "menu.services.setNextServiceActive": "Activate next service",
+  "menu.services.goHome": "Головна",
+  "menu.services.setNextServiceActive": "Активувати наступний сервіс",
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Вигляд",
-  "menu.view.back": "Back",
+  "menu.view.back": "Назад",
   "menu.view.enterFullScreen": "Вікно на повний екран",
   "menu.view.exitFullScreen": "Вийти з повного екрану",
-  "menu.view.forward": "Forward",
+  "menu.view.forward": "Вперед",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
   "menu.view.reloadFranz": "Перезавантажити Ferdi",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -232,7 +236,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading {service}",
+  "service.webviewLoader.loading": "Завантаження {service}",
   "services.getStarted": "Почати",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -241,7 +245,7 @@
   "settings.account.account.editButton": "Редагувати акаунт",
   "settings.account.accountType.basic": "Базовий акаунт",
   "settings.account.accountType.premium": "Преміум Акаунт Прихильника",
-  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailable": "Обліковий запис недоступний",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Оновити профіль",
   "settings.account.deleteAccount": "Видалити обліковий запис",
@@ -264,7 +268,7 @@
   "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Спробуйте ще раз",
   "settings.account.tryReloadUserInfoRequest": "Спробуйте ще раз",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
+  "settings.account.upgradeToPro.label": "Підвищити до Fredi Professional",
   "settings.account.userInfoRequestFailed": "Не вдалося завантажити інформацію користувача",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: #7367f0)",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Перезавантажити і встановити оновлення",
   "settings.app.buttonSearchForUpdate": "Перевірити наявність оновлень",
   "settings.app.cacheInfo": "Кеш, який використовує Ferdi, займає {size} дискового простору.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Поточна версія:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Показувати Ferdi у системному лотку",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -300,16 +306,16 @@
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Тримати Ferdi в фоні при закритті вікна",
   "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
-  "settings.app.form.scheduledDNDEnd": "To",
-  "settings.app.form.scheduledDNDStart": "From",
+  "settings.app.form.scheduledDNDEnd": "До",
+  "settings.app.form.scheduledDNDStart": "Від",
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Показати вкладку вимкнених сервісів",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Показувати значок непрочитаних повідомлень коли сповіщення вимкнені",
   "settings.app.form.showDragArea": "Show draggable area on window",
-  "settings.app.form.startMinimized": "Start minimized",
-  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
-  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Показувати значок непрочитаних повідомлень коли сповіщення вимкнені",
+  "settings.app.form.startMinimized": "Запускати згорнутим",
+  "settings.app.form.universalDarkMode": "Увімкнути універсальний темний режим",
+  "settings.app.form.useTouchIdToUnlock": "Дозволити використання TouchID для розблокування Ferdi",
   "settings.app.headline": "Налаштування",
   "settings.app.headlineAdvanced": "Додаткові налаштування",
   "settings.app.headlineAppearance": "Вигляд",
@@ -348,7 +354,7 @@
   "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes",
   "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
   "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
-  "settings.recipes.customService.openDevDocs": "Developer Documentation",
+  "settings.recipes.customService.openDevDocs": "Документація розробника",
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Доступні сервіси",
   "settings.recipes.missingService": "Не знайшли сервісу?",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "Щоб додати самостійно розміщені сервіси, вам потріьно мати Преміумним Акаунт Прихильника Ferdi.",
   "settings.service.form.customUrlUpgradeAccount": "Оновити ваш обліковий запис",
   "settings.service.form.customUrlValidationError": "Не вдалось підтвердити власний {name} сервер.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Видалити сервіс",
+  "settings.service.form.disableHibernation": "Вимкнути режим глибокого сну",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Редагувати {name}",
   "settings.service.form.enableAudio": "Увімкнути звук",
   "settings.service.form.enableBadge": "Показувати непрочитані повідомлення",
   "settings.service.form.enableDarkMode": "Переходь на Темну Сторону",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Увімкнути сповіщення",
   "settings.service.form.enableService": "Увімкнути сервіс",
   "settings.service.form.headlineBadges": "Значки непрочитаних повідомлень",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "Загальні",
   "settings.service.form.headlineNotifications": "Сповіщення",
   "settings.service.form.icon": "Своя іконка",
@@ -387,8 +395,8 @@
   "settings.service.form.isMutedInfo": "Коли вимкнено, всі сповищення та відтворення ігноруються",
   "settings.service.form.name": "Ім'я",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
-  "settings.service.form.openUserCss": "Open user.css",
-  "settings.service.form.openUserJs": "Open user.js",
+  "settings.service.form.openUserCss": "Відкрити user.css",
+  "settings.service.form.openUserJs": "Відкрити user.js",
   "settings.service.form.proxy.headline": "Налаштування HTTP/HTTPS проксі ",
   "settings.service.form.proxy.host": "Проксі Host/IP",
   "settings.service.form.proxy.info": "Налаштування проксі не будуть синхронізовані із серверами Ferdi",
@@ -413,11 +421,11 @@
   "settings.services.tooltip.isMuted": "Всі звуки вимкнено",
   "settings.services.tooltip.notificationsDisabled": "Сповіщення відключені",
   "settings.services.updatedInfo": "Ваші зміни були збережені",
-  "settings.supportFerdi.github": "Star on GitHub",
+  "settings.supportFerdi.github": "Поставити зірочку на GitHub",
   "settings.supportFerdi.headline": "Support Ferdi",
-  "settings.supportFerdi.openCollective": "Support our Open Collective",
-  "settings.supportFerdi.share": "Tell your Friends",
-  "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
+  "settings.supportFerdi.openCollective": "Підтримати на Open Collective",
+  "settings.supportFerdi.share": "Розповісти друзям",
+  "settings.supportFerdi.title": "Подобається Fredi? Розкажи про це!",
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Команда",
@@ -499,9 +507,9 @@
   "validation.oneRequired": "At least one is required",
   "validation.required": "{field} обов'язвоке",
   "validation.url": "{field} не валідний URL",
-  "webControls.back": "Back",
-  "webControls.forward": "Forward",
-  "webControls.goHome": "Home",
+  "webControls.back": "Назад",
+  "webControls.forward": "Вперед",
+  "webControls.goHome": "Головна",
   "webControls.openInBrowser": "Open in Browser",
   "webControls.reload": "Перезавантажити",
   "welcome.loginButton": "Увійдіть до свого акаунту",
@@ -510,7 +518,7 @@
   "workspaceDrawer.allServices": "Усі сервіси",
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
-  "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
+  "workspaceDrawer.item.noServicesAddedYet": "Немає доданих сервісів",
   "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
   "workspaceDrawer.proFeatureBadge": "Premium feature",
   "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index 65b0edbfa..9d676c0a9 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "connectionLostBanner.cta": "Reload Service",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Restart & install update",
   "settings.app.buttonSearchForUpdate": "Check for updates",
   "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Current version:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index 026df56c3..3bba232fd 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "切換服務器",
   "changeserver.label": "伺服器",
   "changeserver.submit": "送出",
+  "connectionLostBanner.cta": "重新載入",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Ferdi 有了更新 {version}",
   "feature.debugger.title": "發布除錯訊息",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "帳號同步",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "添加自訂網站",
   "pricing.features.desktopNotifications": "桌面通知",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "重新啟動並且更新",
   "settings.app.buttonSearchForUpdate": "檢查更新",
   "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "當前版本：",
   "settings.app.form.accentColor": "強調顏色",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "在系統匣上顯示",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "服務圖示大小",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "升級帳戶",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "刪除",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "編輯 {name}",
   "settings.service.form.enableAudio": "啟用音效",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "啟用夜間模式",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "啟用通知",
   "settings.service.form.enableService": "啟用服務",
   "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "一般",
   "settings.service.form.headlineNotifications": "提示信息",
   "settings.service.form.icon": "自訂圖示",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index f70b2c837..2c7b75e42 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "服务器：",
   "changeserver.submit": "Submit",
+  "connectionLostBanner.cta": "重新加载服务",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Ferdi的变化",
   "feature.debugger.title": "发布调试信息",
   "feature.delayApp.headline": "请购买Ferdi 支持者许可证来跳过等待",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -272,6 +276,7 @@
   "settings.app.buttonInstallUpdate": "Restart & install update",
   "settings.app.buttonSearchForUpdate": "Check for updates",
   "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
+  "settings.app.cacheNotCleared": "Couldn't clear all cache",
   "settings.app.currentVersion": "Current version:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
@@ -287,6 +292,7 @@
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -305,8 +311,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -365,18 +371,20 @@
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
+  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
+  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
   "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.darkReaderBrightness": "Brightness",
-  "settings.service.form.darkReaderContrast": "Contrast",
-  "settings.service.form.darkReaderSepia": "Sepia",
-  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
diff --git a/src/i18n/messages/src/components/settings/services/EditServiceForm.json b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
index 811c49498..987004199 100644
--- a/src/i18n/messages/src/components/settings/services/EditServiceForm.json
+++ b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Save service",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 24,
+      "line": 25,
       "column": 15
     },
     "end": {
-      "line": 27,
+      "line": 28,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Delete Service",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 28,
+      "line": 29,
       "column": 17
     },
     "end": {
-      "line": 31,
+      "line": 32,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Open darkmode.css",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 32,
+      "line": 33,
       "column": 19
     },
     "end": {
-      "line": 35,
+      "line": 36,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Open user.css",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 36,
+      "line": 37,
       "column": 15
     },
     "end": {
-      "line": 39,
+      "line": 40,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Open user.js",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 40,
+      "line": 41,
       "column": 14
     },
     "end": {
-      "line": 43,
+      "line": 44,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 44,
+      "line": 45,
       "column": 18
     },
     "end": {
-      "line": 47,
+      "line": 48,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Available services",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 48,
+      "line": 49,
       "column": 21
     },
     "end": {
-      "line": 51,
+      "line": 52,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Your services",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 52,
+      "line": 53,
       "column": 16
     },
     "end": {
-      "line": 55,
+      "line": 56,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Add {name}",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 56,
+      "line": 57,
       "column": 22
     },
     "end": {
-      "line": 59,
+      "line": 60,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Edit {name}",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 60,
+      "line": 61,
       "column": 23
     },
     "end": {
-      "line": 63,
+      "line": 64,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Hosted",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 64,
+      "line": 65,
       "column": 13
     },
     "end": {
-      "line": 67,
+      "line": 68,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Self hosted ⭐️",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 68,
+      "line": 69,
       "column": 16
     },
     "end": {
-      "line": 71,
+      "line": 72,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Use the hosted {name} service.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 72,
+      "line": 73,
       "column": 20
     },
     "end": {
-      "line": 75,
+      "line": 76,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Could not validate custom {name} server.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 76,
+      "line": 77,
       "column": 28
     },
     "end": {
-      "line": 79,
+      "line": 80,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!To add self hosted services, you need a Ferdi Premium Supporter Account.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 80,
+      "line": 81,
       "column": 24
     },
     "end": {
-      "line": 83,
+      "line": 84,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Upgrade your account",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 84,
+      "line": 85,
       "column": 27
     },
     "end": {
-      "line": 87,
+      "line": 88,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 88,
+      "line": 89,
       "column": 23
     },
     "end": {
-      "line": 91,
+      "line": 92,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 92,
+      "line": 93,
       "column": 15
     },
     "end": {
-      "line": 95,
+      "line": 96,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 96,
+      "line": 97,
       "column": 26
     },
     "end": {
-      "line": 99,
+      "line": 100,
       "column": 3
     }
   },
@@ -251,11 +251,11 @@
     "defaultMessage": "!!!Notifications",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 100,
+      "line": 101,
       "column": 25
     },
     "end": {
-      "line": 103,
+      "line": 104,
       "column": 3
     }
   },
@@ -264,11 +264,11 @@
     "defaultMessage": "!!!Unread message badges",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 104,
+      "line": 105,
       "column": 18
     },
     "end": {
-      "line": 107,
+      "line": 108,
       "column": 3
     }
   },
@@ -277,11 +277,24 @@
     "defaultMessage": "!!!General",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 108,
+      "line": 109,
       "column": 19
     },
     "end": {
-      "line": 111,
+      "line": 112,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.headlineDarkReaderSettings",
+    "defaultMessage": "!!!Dark Reader Settings",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 113,
+      "column": 30
+    },
+    "end": {
+      "line": 116,
       "column": 3
     }
   },
@@ -290,11 +303,11 @@
     "defaultMessage": "!!!Delete",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 112,
+      "line": 117,
       "column": 14
     },
     "end": {
-      "line": 115,
+      "line": 120,
       "column": 3
     }
   },
@@ -303,11 +316,11 @@
     "defaultMessage": "!!!Drop your image, or click here",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 116,
+      "line": 121,
       "column": 14
     },
     "end": {
-      "line": 119,
+      "line": 124,
       "column": 3
     }
   },
@@ -316,11 +329,11 @@
     "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 120,
+      "line": 125,
       "column": 17
     },
     "end": {
-      "line": 123,
+      "line": 128,
       "column": 3
     }
   },
@@ -329,11 +342,11 @@
     "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 124,
+      "line": 129,
       "column": 20
     },
     "end": {
-      "line": 127,
+      "line": 132,
       "column": 3
     }
   },
@@ -342,11 +355,11 @@
     "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 128,
+      "line": 133,
       "column": 13
     },
     "end": {
-      "line": 131,
+      "line": 136,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index cdc6ded7e..97360b78e 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -260,15 +260,28 @@
     }
   },
   {
+    "id": "settings.app.cacheNotCleared",
+    "defaultMessage": "!!!Couldn't clear all cache",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 102,
+      "column": 19
+    },
+    "end": {
+      "line": 105,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.app.buttonClearAllCache",
     "defaultMessage": "!!!Clear cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 102,
+      "line": 106,
       "column": 23
     },
     "end": {
-      "line": 105,
+      "line": 109,
       "column": 3
     }
   },
@@ -277,11 +290,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 106,
+      "line": 110,
       "column": 25
     },
     "end": {
-      "line": 109,
+      "line": 113,
       "column": 3
     }
   },
@@ -290,11 +303,11 @@
     "defaultMessage": "!!!Restart & install update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 110,
+      "line": 114,
       "column": 23
     },
     "end": {
-      "line": 113,
+      "line": 117,
       "column": 3
     }
   },
@@ -303,11 +316,11 @@
     "defaultMessage": "!!!Is searching for update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 114,
+      "line": 118,
       "column": 25
     },
     "end": {
-      "line": 117,
+      "line": 121,
       "column": 3
     }
   },
@@ -316,11 +329,11 @@
     "defaultMessage": "!!!Update available, downloading...",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 118,
+      "line": 122,
       "column": 25
     },
     "end": {
-      "line": 121,
+      "line": 125,
       "column": 3
     }
   },
@@ -329,11 +342,11 @@
     "defaultMessage": "!!!You are using the latest version of Ferdi",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 122,
+      "line": 126,
       "column": 24
     },
     "end": {
-      "line": 125,
+      "line": 129,
       "column": 3
     }
   },
@@ -342,11 +355,11 @@
     "defaultMessage": "!!!Current version:",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 126,
+      "line": 130,
       "column": 18
     },
     "end": {
-      "line": 129,
+      "line": 133,
       "column": 3
     }
   },
@@ -355,11 +368,11 @@
     "defaultMessage": "!!!Changes require restart",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 130,
+      "line": 134,
       "column": 29
     },
     "end": {
-      "line": 133,
+      "line": 137,
       "column": 3
     }
   },
@@ -368,11 +381,11 @@
     "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 134,
+      "line": 138,
       "column": 22
     },
     "end": {
-      "line": 137,
+      "line": 141,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/containers/settings/EditServiceScreen.json b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
index 36937ebf8..5c83085f2 100644
--- a/src/i18n/messages/src/containers/settings/EditServiceScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
@@ -143,15 +143,54 @@
     }
   },
   {
+    "id": "settings.service.form.darkReaderBrightness",
+    "defaultMessage": "!!!Dark Reader Brightness",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 72,
+      "column": 24
+    },
+    "end": {
+      "line": 75,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.darkReaderContrast",
+    "defaultMessage": "!!!Dark Reader Contrast",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 76,
+      "column": 22
+    },
+    "end": {
+      "line": 79,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.darkReaderSepia",
+    "defaultMessage": "!!!Dark Reader Sepia",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 80,
+      "column": 19
+    },
+    "end": {
+      "line": 83,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.service.form.proxy.isEnabled",
     "defaultMessage": "!!!Use Proxy",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 72,
+      "line": 84,
       "column": 15
     },
     "end": {
-      "line": 75,
+      "line": 87,
       "column": 3
     }
   },
@@ -160,11 +199,11 @@
     "defaultMessage": "!!!Proxy Host/IP",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 76,
+      "line": 88,
       "column": 13
     },
     "end": {
-      "line": 79,
+      "line": 91,
       "column": 3
     }
   },
@@ -173,11 +212,11 @@
     "defaultMessage": "!!!Port",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 80,
+      "line": 92,
       "column": 13
     },
     "end": {
-      "line": 83,
+      "line": 95,
       "column": 3
     }
   },
@@ -186,11 +225,11 @@
     "defaultMessage": "!!!User",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 84,
+      "line": 96,
       "column": 13
     },
     "end": {
-      "line": 87,
+      "line": 99,
       "column": 3
     }
   },
@@ -199,11 +238,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 88,
+      "line": 100,
       "column": 17
     },
     "end": {
-      "line": 91,
+      "line": 103,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 42199503b..f6afe5246 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -143,15 +143,28 @@
     }
   },
   {
+    "id": "settings.app.form.hibernateOnStartup",
+    "defaultMessage": "!!!Keep services in hibernation on startup",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 73,
+      "column": 22
+    },
+    "end": {
+      "line": 76,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.app.form.hibernationStrategy",
     "defaultMessage": "!!!Hibernation strategy",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 73,
+      "line": 77,
       "column": 23
     },
     "end": {
-      "line": 76,
+      "line": 80,
       "column": 3
     }
   },
@@ -160,11 +173,11 @@
     "defaultMessage": "!!!Todo Server",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 77,
+      "line": 81,
       "column": 24
     },
     "end": {
-      "line": 80,
+      "line": 84,
       "column": 3
     }
   },
@@ -173,11 +186,11 @@
     "defaultMessage": "!!!Custom TodoServer",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 81,
+      "line": 85,
       "column": 20
     },
     "end": {
-      "line": 84,
+      "line": 88,
       "column": 3
     }
   },
@@ -186,11 +199,11 @@
     "defaultMessage": "!!!Enable Password Lock",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 85,
+      "line": 89,
       "column": 14
     },
     "end": {
-      "line": 88,
+      "line": 92,
       "column": 3
     }
   },
@@ -199,11 +212,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 89,
+      "line": 93,
       "column": 16
     },
     "end": {
-      "line": 92,
+      "line": 96,
       "column": 3
     }
   },
@@ -212,11 +225,11 @@
     "defaultMessage": "!!!Allow using Touch ID to unlock",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 93,
+      "line": 97,
       "column": 22
     },
     "end": {
-      "line": 96,
+      "line": 100,
       "column": 3
     }
   },
@@ -225,11 +238,11 @@
     "defaultMessage": "!!!Lock after inactivity",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 97,
+      "line": 101,
       "column": 18
     },
     "end": {
-      "line": 100,
+      "line": 104,
       "column": 3
     }
   },
@@ -238,11 +251,11 @@
     "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 101,
+      "line": 105,
       "column": 23
     },
     "end": {
-      "line": 104,
+      "line": 108,
       "column": 3
     }
   },
@@ -251,11 +264,11 @@
     "defaultMessage": "!!!From",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 105,
+      "line": 109,
       "column": 21
     },
     "end": {
-      "line": 108,
+      "line": 112,
       "column": 3
     }
   },
@@ -264,11 +277,11 @@
     "defaultMessage": "!!!To",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 109,
+      "line": 113,
       "column": 19
     },
     "end": {
-      "line": 112,
+      "line": 116,
       "column": 3
     }
   },
@@ -277,11 +290,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 113,
+      "line": 117,
       "column": 12
     },
     "end": {
-      "line": 116,
+      "line": 120,
       "column": 3
     }
   },
@@ -290,11 +303,11 @@
     "defaultMessage": "!!!Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 117,
+      "line": 121,
       "column": 12
     },
     "end": {
-      "line": 120,
+      "line": 124,
       "column": 3
     }
   },
@@ -303,11 +316,11 @@
     "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 121,
+      "line": 125,
       "column": 21
     },
     "end": {
-      "line": 124,
+      "line": 128,
       "column": 3
     }
   },
@@ -316,11 +329,11 @@
     "defaultMessage": "!!!Enable universal Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 125,
+      "line": 129,
       "column": 21
     },
     "end": {
-      "line": 128,
+      "line": 132,
       "column": 3
     }
   },
@@ -329,11 +342,11 @@
     "defaultMessage": "!!!Sidebar width",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 129,
+      "line": 133,
       "column": 22
     },
     "end": {
-      "line": 132,
+      "line": 136,
       "column": 3
     }
   },
@@ -342,11 +355,11 @@
     "defaultMessage": "!!!Service icon size",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 133,
+      "line": 137,
       "column": 12
     },
     "end": {
-      "line": 136,
+      "line": 140,
       "column": 3
     }
   },
@@ -355,11 +368,11 @@
     "defaultMessage": "!!!Accent color",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 137,
+      "line": 141,
       "column": 15
     },
     "end": {
-      "line": 140,
+      "line": 144,
       "column": 3
     }
   },
@@ -368,11 +381,11 @@
     "defaultMessage": "!!!Display disabled services tabs",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 141,
+      "line": 145,
       "column": 24
     },
     "end": {
-      "line": 144,
+      "line": 148,
       "column": 3
     }
   },
@@ -381,11 +394,11 @@
     "defaultMessage": "!!!Show unread message badge when notifications are disabled",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 145,
+      "line": 149,
       "column": 29
     },
     "end": {
-      "line": 148,
+      "line": 152,
       "column": 3
     }
   },
@@ -394,11 +407,11 @@
     "defaultMessage": "!!!Show draggable area on window",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 149,
+      "line": 153,
       "column": 16
     },
     "end": {
-      "line": 152,
+      "line": 156,
       "column": 3
     }
   },
@@ -407,11 +420,11 @@
     "defaultMessage": "!!!Enable spell checking",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 153,
+      "line": 157,
       "column": 23
     },
     "end": {
-      "line": 156,
+      "line": 160,
       "column": 3
     }
   },
@@ -420,11 +433,11 @@
     "defaultMessage": "!!!Enable GPU Acceleration",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 157,
+      "line": 161,
       "column": 25
     },
     "end": {
-      "line": 160,
+      "line": 164,
       "column": 3
     }
   },
@@ -433,11 +446,11 @@
     "defaultMessage": "!!!Include beta versions",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 161,
+      "line": 165,
       "column": 8
     },
     "end": {
-      "line": 164,
+      "line": 168,
       "column": 3
     }
   },
@@ -446,11 +459,11 @@
     "defaultMessage": "!!!Enable updates",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 165,
+      "line": 169,
       "column": 20
     },
     "end": {
-      "line": 168,
+      "line": 172,
       "column": 3
     }
   },
@@ -459,11 +472,11 @@
     "defaultMessage": "!!!Enable Franz Todos",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 169,
+      "line": 173,
       "column": 15
     },
     "end": {
-      "line": 172,
+      "line": 176,
       "column": 3
     }
   },
@@ -472,11 +485,11 @@
     "defaultMessage": "!!!Keep all workspaces loaded",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 173,
+      "line": 177,
       "column": 27
     },
     "end": {
-      "line": 176,
+      "line": 180,
       "column": 3
     }
   }
diff --git a/src/index.js b/src/index.js
index e5f678759..027884826 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,6 +3,7 @@ import {
   BrowserWindow,
   shell,
   ipcMain,
+  session,
 } from 'electron';
 import isDevMode from 'electron-is-dev';
 import fs from 'fs-extra';
@@ -394,6 +395,23 @@ ipcMain.on('feature-basic-auth-credentials', (e, { user, password }) => {
   authCallback = noop;
 });
 
+
+ipcMain.on('modifyRequestHeaders', (e, { modifiedRequestHeaders, serviceId }) => {
+  debug('Received modifyRequestHeaders', modifiedRequestHeaders, serviceId);
+  modifiedRequestHeaders.forEach((headerFilterSet) => {
+    const { headers, requestFilters } = headerFilterSet;
+    session.fromPartition(`persist:service-${serviceId}`).webRequest.onBeforeSendHeaders(requestFilters, (details, callback) => {
+      for (const key in headers) {
+        if (Object.prototype.hasOwnProperty.call(headers, key)) {
+          const value = headers[key];
+          details.requestHeaders[key] = value;
+        }
+      }
+      callback({ requestHeaders: details.requestHeaders });
+    });
+  });
+});
+
 ipcMain.on('feature-basic-auth-cancel', () => {
   debug('Cancel basic auth');
 
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 3700cca27..d6d49b0c8 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -6,6 +6,7 @@ import path from 'path';
 const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png';
 const INDICATOR_TRAY_PLAIN = 'tray';
 const INDICATOR_TRAY_UNREAD = 'tray-unread';
+const INDICATOR_TRAY_INDIRECT = 'tray-indirect';
 
 export default class TrayIcon {
   trayIcon = null;
@@ -54,6 +55,8 @@ export default class TrayIcon {
 
     this.trayIcon = new Tray(this._getAsset('tray', INDICATOR_TRAY_PLAIN));
 
+    this.trayIcon.setToolTip('Ferdi');
+
     this.trayMenu = Menu.buildFromTemplate(this.trayMenuTemplate);
 
     ipcMain.on('initialAppSettings', (event, appSettings) => {
@@ -103,14 +106,23 @@ export default class TrayIcon {
     this._refreshIcon();
   }
 
+  _getAssetFromIndicator(indicator) {
+    if (indicator === '•') {
+      return INDICATOR_TRAY_INDIRECT;
+    } if (indicator !== 0) {
+      return INDICATOR_TRAY_UNREAD;
+    }
+    return INDICATOR_TRAY_PLAIN;
+  }
+
   _refreshIcon() {
     if (!this.trayIcon) return;
 
-    this.trayIcon.setImage(this._getAsset('tray', this.indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN));
+    this.trayIcon.setImage(this._getAsset('tray', this._getAssetFromIndicator(this.indicator)));
 
     if (process.platform === 'darwin') {
       this.trayIcon.setPressedImage(
-        this._getAsset('tray', `${this.indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN}-active`),
+        this._getAsset('tray', `${this._getAssetFromIndicator(this.indicator)}-active`),
       );
     }
   }
diff --git a/src/models/Service.js b/src/models/Service.js
index dc8febe0b..5b3ad7bd8 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -1,4 +1,5 @@
 import { autorun, computed, observable } from 'mobx';
+import { ipcRenderer } from 'electron';
 import normalizeUrl from 'normalize-url';
 import path from 'path';
 
@@ -139,6 +140,17 @@ export default class Service {
 
     this.recipe = recipe;
 
+    // Check if "Hibernate on Startup" is enabled and hibernate all services except active one
+    const {
+      hibernate,
+      hibernateOnStartup,
+    } = window.ferdi.stores.settings.app;
+    // The service store is probably not loaded yet so we need to use localStorage data to get active service
+    const isActive = window.localStorage.service && JSON.parse(window.localStorage.service).activeService === this.id;
+    if (hibernate && hibernateOnStartup && !isActive) {
+      this.isHibernating = true;
+    }
+
     autorun(() => {
       if (!this.isEnabled) {
         this.webview = null;
@@ -213,9 +225,23 @@ export default class Service {
     return ua;
   }
 
+
   initializeWebViewEvents({ handleIPCMessage, openWindow, stores }) {
     const webContents = this.webview.getWebContents();
 
+    // If the recipe has implemented modifyRequestHeaders,
+    // Send those headers to ipcMain so that it can be set in session
+    if (typeof this.recipe.modifyRequestHeaders === 'function') {
+      const modifiedRequestHeaders = this.recipe.modifyRequestHeaders();
+      debug(this.name, 'modifiedRequestHeaders', modifiedRequestHeaders);
+      ipcRenderer.send('modifyRequestHeaders', {
+        modifiedRequestHeaders,
+        serviceId: this.id,
+      });
+    } else {
+      debug(this.name, 'modifyRequestHeaders is not defined in the recipe');
+    }
+
     const handleUserAgent = (url, forwardingHack = false) => {
       if (url.startsWith('https://accounts.google.com')) {
         if (!this.chromelessUserAgent) {
diff --git a/src/scripts/link-readme.js b/src/scripts/link-readme.js
new file mode 100644
index 000000000..694b89700
--- /dev/null
+++ b/src/scripts/link-readme.js
@@ -0,0 +1,63 @@
+/**
+ * Script that automatically creates links to issues and users inside README.md
+ *
+ * e.g. "#123" => "[#123](https://github.com/getferdi/ferdi/issues/123)"
+ * and  "franz/#123" => "[franz#123](https://github.com/meetfranz/franz/issues/123)"
+ * and "@abc" => "[@abc](https://github.com/abc)"
+ */
+
+const fs = require('fs-extra');
+const path = require('path');
+
+console.log('Linking issues and PRs in README.md');
+
+const readmepath = path.join(__dirname, '../../', 'README.md');
+
+// Read README.md
+let readme = fs.readFileSync(readmepath, 'utf-8');
+
+let replacements = 0;
+
+// Replace Franz issues
+// Regex matches strings that don't begin with a "[", i.e. are not already linked
+// followed by a "franz#" and digits to indicate
+// a GitHub issue, and not ending with a "]"
+readme = readme.replace(/(?<!\[)franz#\d{1,}(?![\]\d])/gi, (match) => {
+  const issueNr = match.replace('franz#', '');
+  replacements += 1;
+  return `[franz#${issueNr}](https://github.com/meetfranz/franz/issues/${issueNr})`;
+});
+
+// Replace external issues
+// Regex matches strings that don't begin with a "[", followed a repo name in the format "user/repo"
+// followed by a "#" and digits to indicate a GitHub issue, and not ending with a "]"
+readme = readme.replace(/(?<!\[)\w+\/\w+#\d{1,}(?![\]\d])/gi, (match) => {
+  const issueNr = match.replace(/\D/g, '');
+  const repo = match.replace(/#\d+/g, '');
+  replacements += 1;
+  return `[${repo}#${issueNr}](https://github.com/${repo}/issues/${issueNr})`;
+});
+
+// Replace Ferdi issues
+// Regex matches strings that don't begin with a "[", i.e. are not already linked and
+// don't begin with "franz", i.e. are not Franz issues, followed by a "#" and digits to indicate
+// a GitHub issue, and not ending with a "]"
+readme = readme.replace(/(?<!\[|franz)#\d{1,}(?![\]\d])/gi, (match) => {
+  const issueNr = match.replace('#', '');
+  replacements += 1;
+  return `[#${issueNr}](https://github.com/getferdi/ferdi/issues/${issueNr})`;
+});
+
+// Link GitHub users
+// Regex matches strings that don't begin with a "[", i.e. are not already linked
+// followed by a "@" and at least one word character and not ending with a "]"
+readme = readme.replace(/(?<!\[)@\w+(?!\])/gi, (match) => {
+  const username = match.replace('@', '');
+  replacements += 1;
+  return `[@${username}](https://github.com/${username})`;
+});
+
+// Write to file
+fs.writeFileSync(readmepath, readme);
+
+console.log(`Added ${replacements} strings`);
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index da6055e5f..96142787e 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -222,7 +222,7 @@ export default class AppStore extends Store {
       if (!localStorage.getItem(CATALINA_NOTIFICATION_HACK_KEY)) {
         debug('Triggering macOS Catalina notification permission trigger');
         // eslint-disable-next-line no-new
-        new window.Notification('Welcome to Franz 5', {
+        new window.Notification('Welcome to Ferdi 5', {
           body: 'Have a wonderful day & happy messaging.',
         });
 
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 80c7d7e81..0ad523374 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -155,12 +155,6 @@ export default class ServicesStore extends Store {
    */
   _serviceMaintenance() {
     this.all.forEach((service) => {
-      // Defines which services should be hibernated.
-      if (!service.isActive && (Date.now() - service.lastUsed > ms('5m'))) {
-        // If service is stale for 5 min, hibernate it.
-        this._hibernate({ serviceId: service.id });
-      }
-
       if (service.lastPoll && (service.lastPoll) - service.lastPollAnswer > ms('30s')) {
         // If service did not reply for more than 30s try to reload.
         if (!service.isActive) {
@@ -501,9 +495,7 @@ export default class ServicesStore extends Store {
     const service = this.one(serviceId);
 
     if (service.webview) {
-      if (document.activeElement) {
-        document.activeElement.blur();
-      }
+      service.webview.blur();
       service.webview.focus();
     }
   }
diff --git a/src/styles/badge.scss b/src/styles/badge.scss
index 69879de31..728200d03 100644
--- a/src/styles/badge.scss
+++ b/src/styles/badge.scss
@@ -4,6 +4,7 @@
   background: $dark-theme-gray;
   border-radius: $theme-border-radius-small;
   color: $dark-theme-gray-lightest;
+  margin-right: 10px;
 
   &.badge--primary,
   &.badge--premium {
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index 14cc91f87..dab48ef0b 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -187,12 +187,18 @@
     .mdi { color: $theme-gray-light; }
   }
 
+  .settings_titles {
+    display:inline-block;
+  }
+
   .settings__body {
     flex: 1;
     margin: 15px;
     overflow-y: scroll;
     padding: 25px 15px 15px 25px;
 
+    .badge { margin-right: 10px; }
+
     &::-webkit-scrollbar { width: 8px; }
 
     /* Track */
diff --git a/src/styles/slider.scss b/src/styles/slider.scss
index 36e0638c4..8bb771586 100644
--- a/src/styles/slider.scss
+++ b/src/styles/slider.scss
@@ -41,14 +41,5 @@
       box-shadow: 0 1px 4px rgba(0, 0, 0, .3);
       cursor: pointer;
     }
-    
-    .slider::-moz-range-thumb {
-      width: 14px;
-      height: 14px;
-      border-radius: 50%;
-      background: $theme-brand-primary;
-      box-shadow: 0 1px 4px rgba(0, 0, 0, .3);
-      cursor: pointer;
-    }
     }
 }
diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss
index 5bd0555d2..d09353e38 100644
--- a/src/styles/tabs.scss
+++ b/src/styles/tabs.scss
@@ -65,7 +65,10 @@
     position: absolute;
     right: 8px;
 
-    &.is-indirect { padding-top: 0; }
+    &.is-indirect { 
+      padding-top: 0;
+      background: #0088cc;
+        }
     &.hibernating { 
       padding-top: 0; 
       background: $theme-gray; 
@@ -92,7 +95,10 @@
     right: 8px;
     width: 17px;
 
-    &.is-indirect { padding-top: 0; }
+    &.is-indirect { 
+      padding-top: 0;
+      background: #0088cc;
+        }
   }
 
   &.is-reordering { z-index: 99999; }
diff --git a/src/styles/type.scss b/src/styles/type.scss
index 636b8fd36..5b1160d0b 100644
--- a/src/styles/type.scss
+++ b/src/styles/type.scss
@@ -19,7 +19,7 @@ h2 {
   font-weight: 500;
   letter-spacing: -1px;
   margin-bottom: 25px;
-  margin-top: 55px;
+  margin-top: 5px;
 
   &:first-of-type { margin-top: 0; }
 }
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 8125ec064..b0aefd9c1 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -231,9 +231,9 @@ class RecipeController {
         disableDarkMode();
         this.universalDarkModeInjected = false;
       } else if (this.settings.app.universalDarkMode && !ignoreList.includes(window.location.host)) {
-        console.log('Injecting DarkReader');
+        console.log('Injecting Dark Reader');
 
-        // Use darkreader instead
+        // Use Dark Reader instead
         const { brightness, contrast, sepia } = this.settings.service.darkReaderSettings;
         enableDarkMode({ brightness, contrast, sepia }, {
           css: customDarkModeCss[window.location.host] || '',
@@ -257,7 +257,7 @@ class RecipeController {
         console.log('Removing injected darkmode.css');
         removeDarkModeStyle();
       } else {
-        console.log('Removing DarkReader');
+        console.log('Removing Dark Reader');
 
         disableDarkMode();
         this.universalDarkModeInjected = false;