From 4d26ffd4805c234e4b0592ae5aa9254e8c3206fd Mon Sep 17 00:00:00 2001
From: Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com>
Date: Wed, 23 Jun 2021 20:39:18 +0530
Subject: Upgraded eslint and fixed all the reported errors. (#1549)

---
 src/I18n.js                                        |   2 +
 src/components/layout/Sidebar.js                   |   9 +
 .../settings/navigation/SettingsNavigation.js      |   4 +-
 src/components/subscription/SubscriptionPopup.js   |   1 -
 src/components/ui/ActivateTrialButton/index.js     |   5 +-
 src/components/ui/FAB.js                           |  14 +-
 src/components/ui/FullscreenLoader/index.js        |   3 +
 src/components/ui/PremiumFeatureContainer/index.js |   5 +-
 src/components/ui/Tabs/Tabs.js                     |   4 +-
 src/components/ui/ToggleRaw.js                     |   1 +
 src/components/ui/UpgradeButton/index.js           |   5 +-
 src/containers/auth/AuthLayoutContainer.js         |  10 +-
 src/containers/auth/ChangeServerScreen.js          |   4 +-
 src/containers/auth/ImportScreen.js                |   6 +-
 src/containers/auth/LockedScreen.js                |   6 +-
 src/containers/auth/LoginScreen.js                 |   4 +-
 src/containers/auth/PasswordScreen.js              |   4 +-
 src/containers/auth/PricingScreen.js               |   6 +-
 src/containers/auth/SetupAssistantScreen.js        |  14 +-
 src/containers/auth/SignupScreen.js                |   4 +-
 src/containers/layout/AppLayoutContainer.js        |  33 +-
 src/containers/settings/AccountScreen.js           |  14 +-
 src/containers/settings/EditServiceScreen.js       |  17 +-
 src/containers/settings/EditSettingsScreen.js      |  23 +-
 src/containers/settings/EditUserScreen.js          |   5 +-
 src/containers/settings/InviteScreen.js            |   9 +-
 src/containers/settings/RecipesScreen.js           |  10 +-
 src/containers/settings/ServicesScreen.js          |   9 +-
 src/containers/settings/SettingsWindow.js          |   5 +-
 src/containers/settings/SupportScreen.js           |   5 +-
 src/containers/settings/TeamScreen.js              |  14 +-
 .../subscription/SubscriptionFormScreen.js         |  17 +-
 .../announcements/components/AnnouncementScreen.js |   5 +-
 src/features/delayApp/Component.js                 |   8 +-
 src/features/nightlyBuilds/Component.js            |  14 +-
 .../containers/PlanSelectionScreen.js              |   9 +-
 src/features/publishDebugInfo/Component.js         |   5 +-
 src/features/quickSwitch/Component.js              |   4 +-
 .../containers/TrialStatusBarScreen.js             |   5 +-
 .../webControls/containers/WebControlsScreen.js    |   9 +-
 .../workspaces/containers/EditWorkspaceScreen.js   |   5 +-
 .../workspaces/containers/WorkspacesScreen.js      |   5 +-
 src/i18n/locales/defaultMessages.json              | 412 ++++++++++-----------
 .../messages/src/components/layout/Sidebar.json    |  36 +-
 .../components/ui/ActivateTrialButton/index.json   |  28 +-
 .../ui/PremiumFeatureContainer/index.json          |   4 +-
 .../src/components/ui/UpgradeButton/index.json     |   4 +-
 .../src/containers/settings/EditServiceScreen.json |  76 ++--
 .../components/AnnouncementScreen.json             |   4 +-
 .../messages/src/features/delayApp/Component.json  |  20 +-
 .../src/features/nightlyBuilds/Component.json      |  16 +-
 .../containers/PlanSelectionScreen.json            |  16 +-
 .../src/features/publishDebugInfo/Component.json   |  28 +-
 53 files changed, 443 insertions(+), 542 deletions(-)

(limited to 'src')

diff --git a/src/I18n.js b/src/I18n.js
index 14ee6599c..13513fe73 100644
--- a/src/I18n.js
+++ b/src/I18n.js
@@ -6,6 +6,7 @@ import { IntlProvider } from 'react-intl';
 import { oneOrManyChildElements } from './prop-types';
 import translations from './i18n/translations';
 import UserStore from './stores/UserStore';
+import AppStore from './stores/AppStore';
 
 export default @inject('stores') @observer class I18N extends Component {
   componentDidUpdate() {
@@ -28,6 +29,7 @@ export default @inject('stores') @observer class I18N extends Component {
 
 I18N.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
+    app: PropTypes.instanceOf(AppStore).isRequired,
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   children: oneOrManyChildElements.isRequired,
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index ee5699a83..802538eba 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -10,6 +10,8 @@ import { ctrlKey, isMac } from '../../environment';
 import { workspaceStore } from '../../features/workspaces';
 import { todosStore } from '../../features/todos';
 import { todoActions } from '../../features/todos/actions';
+import AppStore from '../../stores/AppStore';
+import SettingsStore from '../../stores/SettingsStore';
 
 // Platform specific shortcut keys
 const settingsShortcutKey = isMac ? ',' : 'P';
@@ -61,6 +63,13 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
     isWorkspaceDrawerOpen: PropTypes.bool.isRequired,
     toggleWorkspaceDrawer: PropTypes.func.isRequired,
     isTodosServiceActive: PropTypes.bool.isRequired,
+    stores: PropTypes.shape({
+      app: PropTypes.instanceOf(AppStore).isRequired,
+      settings: PropTypes.instanceOf(SettingsStore).isRequired,
+    }).isRequired,
+    actions: PropTypes.shape({
+      settings: PropTypes.instanceOf(SettingsStore).isRequired,
+    }).isRequired,
   };
 
   static contextTypes = {
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 616c8c587..cebab2f12 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -57,9 +57,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
       router: PropTypes.instanceOf(RouterStore).isRequired,
     }).isRequired,
     actions: PropTypes.shape({
-      settings: PropTypes.shape({
-        update: PropTypes.func.isRequired,
-      }).isRequired,
+      settings: PropTypes.instanceOf(SettingsStore).isRequired,
     }).isRequired,
     serviceCount: PropTypes.number.isRequired,
     workspaceCount: PropTypes.number.isRequired,
diff --git a/src/components/subscription/SubscriptionPopup.js b/src/components/subscription/SubscriptionPopup.js
index 12a51ad7b..0df43fd4b 100644
--- a/src/components/subscription/SubscriptionPopup.js
+++ b/src/components/subscription/SubscriptionPopup.js
@@ -57,7 +57,6 @@ export default @observer class SubscriptionPopup extends Component {
         <div className="subscription-popup__content">
           <Webview
             className="subscription-popup__webview"
-
             autosize
             allowpopups
             src={encodeURI(url)}
diff --git a/src/components/ui/ActivateTrialButton/index.js b/src/components/ui/ActivateTrialButton/index.js
index 340123c2f..8f4d21f64 100644
--- a/src/components/ui/ActivateTrialButton/index.js
+++ b/src/components/ui/ActivateTrialButton/index.js
@@ -7,6 +7,7 @@ import classnames from 'classnames';
 import { Button } from '@meetfranz/forms';
 
 import UserStore from '../../../stores/UserStore';
+import UIStore from '../../../stores/UIStore';
 
 const messages = defineMessages({
   action: {
@@ -101,8 +102,6 @@ ActivateTrialButton.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    ui: PropTypes.shape({
-      openSettings: PropTypes.func.isRequired,
-    }).isRequired,
+    ui: PropTypes.instanceOf(UIStore).isRequired,
   }).isRequired,
 };
diff --git a/src/components/ui/FAB.js b/src/components/ui/FAB.js
index 9359a3c6c..633edbe2c 100644
--- a/src/components/ui/FAB.js
+++ b/src/components/ui/FAB.js
@@ -3,23 +3,19 @@
  */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { observer, inject } from 'mobx-react';
+import { observer } from 'mobx-react';
 import classnames from 'classnames';
 
-export default @inject('stores') @observer class Button extends Component {
+import { oneOrManyChildElements } from '../../prop-types';
+
+export default @observer class Button extends Component {
   static propTypes = {
     className: PropTypes.string,
     disabled: PropTypes.bool,
     onClick: PropTypes.func,
     type: PropTypes.string,
+    children: oneOrManyChildElements.isRequired,
     htmlForm: PropTypes.string,
-    stores: PropTypes.shape({
-      settings: PropTypes.shape({
-        app: PropTypes.shape({
-          accentColor: PropTypes.string.isRequired,
-        }).isRequired,
-      }).isRequired,
-    }).isRequired,
   };
 
   static defaultProps = {
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js
index d8cdc2e8a..97ab93dcf 100644
--- a/src/components/ui/FullscreenLoader/index.js
+++ b/src/components/ui/FullscreenLoader/index.js
@@ -17,6 +17,9 @@ export default @inject('stores') @withTheme @injectSheet(styles) @observer class
     spinnerColor: PropTypes.string,
     children: PropTypes.node,
     stores: PropTypes.shape({
+      app: PropTypes.shape({
+        accentColor: PropTypes.string.isRequired,
+      }).isRequired,
       settings: PropTypes.shape({
         app: PropTypes.shape({
           accentColor: PropTypes.string.isRequired,
diff --git a/src/components/ui/PremiumFeatureContainer/index.js b/src/components/ui/PremiumFeatureContainer/index.js
index 36bf38c98..1e100f9d8 100644
--- a/src/components/ui/PremiumFeatureContainer/index.js
+++ b/src/components/ui/PremiumFeatureContainer/index.js
@@ -10,6 +10,7 @@ import UserStore from '../../../stores/UserStore';
 
 import styles from './styles';
 import FeaturesStore from '../../../stores/FeaturesStore';
+import UIStore from '../../../stores/UIStore';
 
 const messages = defineMessages({
   action: {
@@ -93,9 +94,7 @@ PremiumFeatureContainer.wrappedComponent.propTypes = {
     features: PropTypes.instanceOf(FeaturesStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    ui: PropTypes.shape({
-      openSettings: PropTypes.func.isRequired,
-    }).isRequired,
+    ui: PropTypes.instanceOf(UIStore).isRequired,
   }).isRequired,
 };
 
diff --git a/src/components/ui/Tabs/Tabs.js b/src/components/ui/Tabs/Tabs.js
index 12f650ffd..196cddc66 100644
--- a/src/components/ui/Tabs/Tabs.js
+++ b/src/components/ui/Tabs/Tabs.js
@@ -36,7 +36,7 @@ export default @observer class Tab extends Component {
         <div className="content-tabs__tabs">
           {React.Children.map(children, (child, i) => (
             <button
-              key={i}
+              key="{i}"
               className={classnames({
                 'content-tabs__item': true,
                 'is-active': this.state.active === i,
@@ -51,7 +51,7 @@ export default @observer class Tab extends Component {
         <div className="content-tabs__content">
           {React.Children.map(children, (child, i) => (
             <div
-              key={i}
+              key="{i}"
               className={classnames({
                 'content-tabs__item': true,
                 'is-active': this.state.active === i,
diff --git a/src/components/ui/ToggleRaw.js b/src/components/ui/ToggleRaw.js
index ee817356b..dcaf664e1 100644
--- a/src/components/ui/ToggleRaw.js
+++ b/src/components/ui/ToggleRaw.js
@@ -14,6 +14,7 @@ export default @observer class ToggleRaw extends Component {
       id: PropTypes.string,
       name: PropTypes.string,
       label: PropTypes.string,
+      error: PropTypes.string,
     }).isRequired,
     className: PropTypes.string,
     showLabel: PropTypes.bool,
diff --git a/src/components/ui/UpgradeButton/index.js b/src/components/ui/UpgradeButton/index.js
index 1b764bd90..eade46cfd 100644
--- a/src/components/ui/UpgradeButton/index.js
+++ b/src/components/ui/UpgradeButton/index.js
@@ -7,6 +7,7 @@ import { Button } from '@meetfranz/forms';
 
 import UserStore from '../../../stores/UserStore';
 import ActivateTrialButton from '../ActivateTrialButton';
+import UIStore from '../../../stores/UIStore';
 
 const messages = defineMessages({
   upgradeToPro: {
@@ -77,8 +78,6 @@ UpgradeButton.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    ui: PropTypes.shape({
-      openSettings: PropTypes.func.isRequired,
-    }).isRequired,
+    ui: PropTypes.instanceOf(UIStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js
index 883a6ea60..f99a8a73f 100644
--- a/src/containers/auth/AuthLayoutContainer.js
+++ b/src/containers/auth/AuthLayoutContainer.js
@@ -7,9 +7,12 @@ import AuthLayout from '../../components/auth/AuthLayout';
 import AppStore from '../../stores/AppStore';
 import UserStore from '../../stores/UserStore';
 import GlobalErrorStore from '../../stores/GlobalErrorStore';
+import UIStore from '../../stores/UIStore';
+import SettingsStore from '../../stores/SettingsStore';
 import AppLoader from '../../components/ui/AppLoader';
 
 import { oneOrManyChildElements } from '../../prop-types';
+import FeaturesStore from '../../stores/FeaturesStore';
 
 export default @inject('stores', 'actions') @observer class AuthLayoutContainer extends Component {
   static propTypes = {
@@ -71,12 +74,13 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer
 AuthLayoutContainer.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
     app: PropTypes.instanceOf(AppStore).isRequired,
+    features: PropTypes.instanceOf(FeaturesStore).isRequired,
     globalError: PropTypes.instanceOf(GlobalErrorStore).isRequired,
     user: PropTypes.instanceOf(UserStore).isRequired,
+    ui: PropTypes.instanceOf(UIStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    app: PropTypes.shape({
-      healthCheck: PropTypes.func.isRequired,
-    }).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/auth/ChangeServerScreen.js b/src/containers/auth/ChangeServerScreen.js
index 5c58087a3..28ecc0198 100644
--- a/src/containers/auth/ChangeServerScreen.js
+++ b/src/containers/auth/ChangeServerScreen.js
@@ -39,9 +39,7 @@ export default @inject('stores', 'actions') @observer class ChangeServerScreen e
 
 ChangeServerScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    settings: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-    }).isRequired,
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js
index 4a93891d6..9143ef616 100644
--- a/src/containers/auth/ImportScreen.js
+++ b/src/containers/auth/ImportScreen.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
+import { RouterStore } from 'mobx-react-router';
 import Import from '../../components/auth/Import';
 import UserStore from '../../stores/UserStore';
 
@@ -25,11 +26,10 @@ export default @inject('stores', 'actions') @observer class ImportScreen extends
 
 ImportScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    user: PropTypes.shape({
-      importLegacyServices: PropTypes.func.isRequired,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
+    router: PropTypes.instanceOf(RouterStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js
index a04107072..4e97c6573 100644
--- a/src/containers/auth/LockedScreen.js
+++ b/src/containers/auth/LockedScreen.js
@@ -5,6 +5,7 @@ import Locked from '../../components/auth/Locked';
 import SettingsStore from '../../stores/SettingsStore';
 
 import { hash } from '../../helpers/password-helpers';
+import UserStore from '../../stores/UserStore';
 
 export default @inject('stores', 'actions') @observer class LockedScreen extends Component {
   state = {
@@ -75,11 +76,10 @@ export default @inject('stores', 'actions') @observer class LockedScreen extends
 
 LockedScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    settings: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-    }).isRequired,
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js
index d17820ad6..e636f99e0 100644
--- a/src/containers/auth/LoginScreen.js
+++ b/src/containers/auth/LoginScreen.js
@@ -30,9 +30,7 @@ export default @inject('stores', 'actions') @observer class LoginScreen extends
 
 LoginScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    user: PropTypes.shape({
-      login: PropTypes.func.isRequired,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js
index 5b238860e..9c6732f1a 100644
--- a/src/containers/auth/PasswordScreen.js
+++ b/src/containers/auth/PasswordScreen.js
@@ -22,9 +22,7 @@ export default @inject('stores', 'actions') @observer class PasswordScreen exten
 
 PasswordScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    user: PropTypes.shape({
-      retrievePassword: PropTypes.func.isRequired,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
diff --git a/src/containers/auth/PricingScreen.js b/src/containers/auth/PricingScreen.js
index 21c859c12..97bf1f6be 100644
--- a/src/containers/auth/PricingScreen.js
+++ b/src/containers/auth/PricingScreen.js
@@ -7,6 +7,7 @@ import Pricing from '../../components/auth/Pricing';
 import UserStore from '../../stores/UserStore';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
+import FeaturesStore from '../../stores/FeaturesStore';
 
 export default @inject('stores', 'actions') @observer class PricingScreen extends Component {
   static propTypes = {
@@ -72,12 +73,11 @@ export default @inject('stores', 'actions') @observer class PricingScreen extend
 
 PricingScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    user: PropTypes.shape({
-      activateTrial: PropTypes.func.isRequired,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
     router: PropTypes.instanceOf(RouterStore).isRequired,
+    features: PropTypes.instanceOf(FeaturesStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.js
index 1c4fa6c22..2a8f2c010 100644
--- a/src/containers/auth/SetupAssistantScreen.js
+++ b/src/containers/auth/SetupAssistantScreen.js
@@ -3,6 +3,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 
+import { RouterStore } from 'mobx-react-router';
 import { DEFAULT_TODO_RECIPE_ID, DEFAULT_TODO_SERVICE_NAME } from '../../config';
 import { sleep } from '../../helpers/async-helpers';
 import SetupAssistant from '../../components/auth/SetupAssistant';
@@ -116,18 +117,13 @@ export default @inject('stores', 'actions') @observer class SetupAssistantScreen
 SetupAssistantScreen.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
     services: PropTypes.instanceOf(ServicesStore),
+    router: PropTypes.instanceOf(RouterStore).isRequired,
     recipes: PropTypes.instanceOf(RecipesStore),
     user: PropTypes.instanceOf(UserStore),
   }).isRequired,
   actions: PropTypes.shape({
-    user: PropTypes.shape({
-      invite: PropTypes.func.isRequired,
-    }).isRequired,
-    service: PropTypes.shape({
-      createService: PropTypes.func.isRequired,
-    }).isRequired,
-    recipe: PropTypes.shape({
-      install: PropTypes.func.isRequired,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
+    service: PropTypes.instanceOf(ServicesStore).isRequired,
+    recipe: PropTypes.instanceOf(RecipesStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js
index 803fe1cd9..42ee09f33 100644
--- a/src/containers/auth/SignupScreen.js
+++ b/src/containers/auth/SignupScreen.js
@@ -45,9 +45,7 @@ export default @inject('stores', 'actions') @observer class SignupScreen extends
 
 SignupScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    user: PropTypes.shape({
-      signup: PropTypes.func.isRequired,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index d7e413bb9..7a12aee83 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -182,34 +182,11 @@ AppLayoutContainer.wrappedComponent.propTypes = {
     workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    service: PropTypes.shape({
-      setActive: PropTypes.func.isRequired,
-      reload: PropTypes.func.isRequired,
-      toggleNotifications: PropTypes.func.isRequired,
-      toggleAudio: PropTypes.func.isRequired,
-      handleIPCMessage: PropTypes.func.isRequired,
-      setWebviewReference: PropTypes.func.isRequired,
-      detachService: PropTypes.func.isRequired,
-      openWindow: PropTypes.func.isRequired,
-      reloadUpdatedServices: PropTypes.func.isRequired,
-      updateService: PropTypes.func.isRequired,
-      deleteService: PropTypes.func.isRequired,
-      reorder: PropTypes.func.isRequired,
-    }).isRequired,
-    news: PropTypes.shape({
-      hide: PropTypes.func.isRequired,
-    }).isRequired,
-    ui: PropTypes.shape({
-      openSettings: PropTypes.func.isRequired,
-      closeSettings: PropTypes.func.isRequired,
-    }).isRequired,
-    app: PropTypes.shape({
-      installUpdate: PropTypes.func.isRequired,
-      toggleMuteApp: PropTypes.func.isRequired,
-    }).isRequired,
-    requests: PropTypes.shape({
-      retryRequiredRequests: PropTypes.func.isRequired,
-    }).isRequired,
+    service: PropTypes.instanceOf(ServicesStore).isRequired,
+    news: PropTypes.instanceOf(NewsStore).isRequired,
+    ui: PropTypes.instanceOf(UIStore).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+    requests: PropTypes.instanceOf(RequestStore).isRequired,
   }).isRequired,
   children: oneOrManyChildElements,
 };
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index 98e212192..2c9cac084 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -104,16 +104,8 @@ AccountScreen.wrappedComponent.propTypes = {
     app: PropTypes.instanceOf(AppStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    payment: PropTypes.shape({
-      createDashboardUrl: PropTypes.func.isRequired,
-      upgradeAccount: PropTypes.func.isRequired,
-    }).isRequired,
-    app: PropTypes.shape({
-      openExternalUrl: PropTypes.func.isRequired,
-    }).isRequired,
-    user: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-      delete: PropTypes.func.isRequired,
-    }).isRequired,
+    payment: PropTypes.instanceOf(PaymentStore).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 77548bdcf..ddf2d2d25 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 
+import { RouterStore } from 'mobx-react-router';
 import UserStore from '../../stores/UserStore';
 import RecipesStore from '../../stores/RecipesStore';
 import ServicesStore from '../../stores/ServicesStore';
@@ -415,20 +416,8 @@ EditServiceScreen.wrappedComponent.propTypes = {
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
     features: PropTypes.instanceOf(FeaturesStore).isRequired,
   }).isRequired,
-  router: PropTypes.shape({
-    params: PropTypes.shape({
-      action: PropTypes.string.isRequired,
-    }).isRequired,
-  }).isRequired,
+  router: PropTypes.instanceOf(RouterStore).isRequired,
   actions: PropTypes.shape({
-    service: PropTypes.shape({
-      createService: PropTypes.func.isRequired,
-      updateService: PropTypes.func.isRequired,
-      deleteService: PropTypes.func.isRequired,
-      openRecipeFile: PropTypes.func.isRequired,
-    }).isRequired,
-    // settings: PropTypes.shape({
-    //   update: PropTypes.func.isRequred,
-    // }).isRequired,
+    service: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 0a8258478..93c5daca2 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -679,23 +679,10 @@ EditSettingsScreen.wrappedComponent.propTypes = {
     workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    app: PropTypes.shape({
-      launchOnStartup: PropTypes.func.isRequired,
-      checkForUpdates: PropTypes.func.isRequired,
-      installUpdate: PropTypes.func.isRequired,
-      clearAllCache: PropTypes.func.isRequired,
-    }).isRequired,
-    settings: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-    }).isRequired,
-    user: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-    }).isRequired,
-    todos: PropTypes.shape({
-      toggleTodosFeatureVisibility: PropTypes.func.isRequired,
-    }).isRequired,
-    workspaces: PropTypes.shape({
-      toggleKeepAllWorkspacesLoadedSetting: PropTypes.func.isRequired,
-    }).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
+    todos: PropTypes.instanceOf(TodosStore).isRequired,
+    workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index 81f689400..8e93164de 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -153,9 +153,6 @@ EditUserScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    user: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-      resetStatus: PropTypes.func.isRequired,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js
index cc36849e8..4fdaef08b 100644
--- a/src/containers/settings/InviteScreen.js
+++ b/src/containers/settings/InviteScreen.js
@@ -4,6 +4,7 @@ import { inject, observer } from 'mobx-react';
 
 import Invite from '../../components/auth/Invite';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
+import UserStore from '../../stores/UserStore';
 
 export default @inject('stores', 'actions') @observer class InviteScreen extends Component {
   componentWillUnmount() {
@@ -29,13 +30,9 @@ export default @inject('stores', 'actions') @observer class InviteScreen extends
 
 InviteScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    user: PropTypes.shape({
-      invite: PropTypes.func.isRequired,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
-    user: PropTypes.shape({
-      inviteRequest: PropTypes.object,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index 74abcacee..72d551bc2 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -17,6 +17,7 @@ import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { FRANZ_DEV_DOCS, RECIPES_PATH } from '../../config';
 import { communityRecipesStore } from '../../features/communityRecipes';
 import RecipePreview from '../../models/RecipePreview';
+import AppStore from '../../stores/AppStore';
 
 export default @inject('stores', 'actions') @observer class RecipesScreen extends Component {
   static propTypes = {
@@ -76,7 +77,6 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
     }
   }
 
-
   prepareRecipes(recipes) {
     return recipes
     // Filter out duplicate recipes
@@ -186,12 +186,8 @@ RecipesScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    app: PropTypes.shape({
-      openExternalUrl: PropTypes.func.isRequired,
-    }).isRequired,
-    service: PropTypes.shape({
-      showAddServiceInterface: PropTypes.func.isRequired,
-    }).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+    service: PropTypes.instanceOf(ServiceStore).isRequired,
     recipePreview: PropTypes.shape({
       search: PropTypes.func.isRequired,
     }).isRequired,
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js
index a501bf530..eb2b1bcb5 100644
--- a/src/containers/settings/ServicesScreen.js
+++ b/src/containers/settings/ServicesScreen.js
@@ -63,13 +63,6 @@ ServicesScreen.wrappedComponent.propTypes = {
     router: PropTypes.instanceOf(RouterStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    service: PropTypes.shape({
-      showAddServiceInterface: PropTypes.func.isRequired,
-      deleteService: PropTypes.func.isRequired,
-      toggleService: PropTypes.func.isRequired,
-      filter: PropTypes.func.isRequired,
-      resetFilter: PropTypes.func.isRequired,
-      resetStatus: PropTypes.func.isRequired,
-    }).isRequired,
+    service: PropTypes.instanceOf(ServiceStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js
index 440d32a46..89c2aaa27 100644
--- a/src/containers/settings/SettingsWindow.js
+++ b/src/containers/settings/SettingsWindow.js
@@ -9,6 +9,7 @@ import Layout from '../../components/settings/SettingsLayout';
 import Navigation from '../../components/settings/navigation/SettingsNavigation';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { workspaceStore } from '../../features/workspaces';
+import UIStore from '../../stores/UIStore';
 
 export default @inject('stores', 'actions') @observer class SettingsContainer extends Component {
   portalRoot = document.querySelector('#portalContainer');
@@ -57,8 +58,6 @@ SettingsContainer.wrappedComponent.propTypes = {
     services: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    ui: PropTypes.shape({
-      closeSettings: PropTypes.func.isRequired,
-    }),
+    ui: PropTypes.instanceOf(UIStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/SupportScreen.js b/src/containers/settings/SupportScreen.js
index 34dce1dae..7d3b22f19 100644
--- a/src/containers/settings/SupportScreen.js
+++ b/src/containers/settings/SupportScreen.js
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 
 import SupportFerdi from '../../components/settings/supportFerdi/SupportFerdiDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
+import AppStore from '../../stores/AppStore';
 
 export default @inject('actions') class SupportScreen extends Component {
   constructor(props) {
@@ -29,8 +30,6 @@ export default @inject('actions') class SupportScreen extends Component {
 
 SupportScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    app: PropTypes.shape({
-      openExternalUrl: PropTypes.func.isRequired,
-    }).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js
index c1360a666..a627a047a 100644
--- a/src/containers/settings/TeamScreen.js
+++ b/src/containers/settings/TeamScreen.js
@@ -9,6 +9,7 @@ import SettingsStore from '../../stores/SettingsStore';
 import TeamDashboard from '../../components/settings/team/TeamDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { DEV_API_FRANZ_WEBSITE } from '../../config';
+import PaymentStore from '../../stores/PaymentStore';
 
 export default @inject('stores', 'actions') @observer class TeamScreen extends Component {
   handleWebsiteLink(route) {
@@ -47,15 +48,8 @@ TeamScreen.wrappedComponent.propTypes = {
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    payment: PropTypes.shape({
-      createDashboardUrl: PropTypes.func.isRequired,
-    }).isRequired,
-    app: PropTypes.shape({
-      openExternalUrl: PropTypes.func.isRequired,
-    }).isRequired,
-    user: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-      delete: PropTypes.func.isRequired,
-    }).isRequired,
+    payment: PropTypes.instanceOf(PaymentStore).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/subscription/SubscriptionFormScreen.js b/src/containers/subscription/SubscriptionFormScreen.js
index 2d1f3d0eb..e5c8207be 100644
--- a/src/containers/subscription/SubscriptionFormScreen.js
+++ b/src/containers/subscription/SubscriptionFormScreen.js
@@ -7,6 +7,9 @@ import PaymentStore from '../../stores/PaymentStore';
 
 import SubscriptionForm from '../../components/subscription/SubscriptionForm';
 import TrialForm from '../../components/subscription/TrialForm';
+import UserStore from '../../stores/UserStore';
+import FeaturesStore from '../../stores/FeaturesStore';
+import AppStore from '../../stores/AppStore';
 
 export default @inject('stores', 'actions') @observer class SubscriptionFormScreen extends Component {
   static propTypes = {
@@ -84,17 +87,13 @@ export default @inject('stores', 'actions') @observer class SubscriptionFormScre
 
 SubscriptionFormScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    app: PropTypes.shape({
-      openExternalUrl: PropTypes.func.isRequired,
-    }).isRequired,
-    payment: PropTypes.shape({
-      createHostedPage: PropTypes.func.isRequired,
-    }).isRequired,
-    user: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-    }).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+    payment: PropTypes.instanceOf(PaymentStore).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
     payment: PropTypes.instanceOf(PaymentStore).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
+    features: PropTypes.instanceOf(FeaturesStore).isRequired,
   }).isRequired,
 };
diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js
index 2f25e7139..659cb4961 100644
--- a/src/features/announcements/components/AnnouncementScreen.js
+++ b/src/features/announcements/components/AnnouncementScreen.js
@@ -8,6 +8,7 @@ import { Button } from '@meetfranz/forms';
 
 import { announcementsStore } from '../index';
 import UIStore from '../../../stores/UIStore';
+import AppStore from '../../../stores/AppStore';
 
 const renderer = new marked.Renderer();
 
@@ -193,9 +194,7 @@ class AnnouncementScreen extends Component {
       ui: PropTypes.instanceOf(UIStore).isRequired,
     }).isRequired,
     actions: PropTypes.shape({
-      app: PropTypes.shape({
-        openExternalUrl: PropTypes.func.isRequired,
-      }).isRequired,
+      app: PropTypes.instanceOf(AppStore).isRequired,
     }).isRequired,
   };
 
diff --git a/src/features/delayApp/Component.js b/src/features/delayApp/Component.js
index 4ea37f88d..6471240ab 100644
--- a/src/features/delayApp/Component.js
+++ b/src/features/delayApp/Component.js
@@ -9,6 +9,8 @@ import { Button } from '@meetfranz/forms';
 import { config } from './constants';
 import styles from './styles';
 import UserStore from '../../stores/UserStore';
+import UIStore from '../../stores/UIStore';
+import { FeatureStore } from '../utils/FeatureStore';
 
 const messages = defineMessages({
   headline: {
@@ -109,10 +111,10 @@ export default @inject('stores', 'actions') @injectSheet(styles) @observer class
 DelayApp.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
+    features: PropTypes.instanceOf(FeatureStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    ui: PropTypes.shape({
-      openSettings: PropTypes.func.isRequired,
-    }).isRequired,
+    ui: PropTypes.instanceOf(UIStore).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
diff --git a/src/features/nightlyBuilds/Component.js b/src/features/nightlyBuilds/Component.js
index 3133672ec..5a809aaf2 100644
--- a/src/features/nightlyBuilds/Component.js
+++ b/src/features/nightlyBuilds/Component.js
@@ -9,6 +9,8 @@ import Modal from '../../components/ui/Modal';
 import Button from '../../components/ui/Button';
 import { state as ModalState } from './store';
 import SettingsStore from '../../stores/SettingsStore';
+import UIStore from '../../stores/UIStore';
+import UserStore from '../../stores/UserStore';
 
 const messages = defineMessages({
   title: {
@@ -127,15 +129,9 @@ nightlyBuildsModal.wrappedComponent.propTypes = {
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    settings: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-    }).isRequired,
-    user: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-    }).isRequired,
-    ui: PropTypes.shape({
-      openSettings: PropTypes.func.isRequired,
-    }).isRequired,
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
+    ui: PropTypes.instanceOf(UIStore).isRequired,
   }).isRequired,
   classes: PropTypes.object.isRequired,
 };
diff --git a/src/features/planSelection/containers/PlanSelectionScreen.js b/src/features/planSelection/containers/PlanSelectionScreen.js
index fba65506e..594829c01 100644
--- a/src/features/planSelection/containers/PlanSelectionScreen.js
+++ b/src/features/planSelection/containers/PlanSelectionScreen.js
@@ -9,6 +9,7 @@ import UserStore from '../../../stores/UserStore';
 import PlanSelection from '../components/PlanSelection';
 import ErrorBoundary from '../../../components/util/ErrorBoundary';
 import { planSelectionStore } from '..';
+import PaymentStore from '../../../stores/PaymentStore';
 
 const messages = defineMessages({
   dialogTitle: {
@@ -109,15 +110,11 @@ PlanSelectionScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    payment: PropTypes.shape({
-      upgradeAccount: PropTypes.func.isRequired,
-    }),
+    payment: PropTypes.instanceOf(PaymentStore),
     planSelection: PropTypes.shape({
       downgradeAccount: PropTypes.func.isRequired,
       hideOverlay: PropTypes.func.isRequired,
     }),
-    user: PropTypes.shape({
-      activateTrial: PropTypes.func.isRequired,
-    }),
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
diff --git a/src/features/publishDebugInfo/Component.js b/src/features/publishDebugInfo/Component.js
index 63f15fe7b..4308b8f09 100644
--- a/src/features/publishDebugInfo/Component.js
+++ b/src/features/publishDebugInfo/Component.js
@@ -11,6 +11,7 @@ import Input from '../../components/ui/Input';
 import Modal from '../../components/ui/Modal';
 import { DEBUG_API } from '../../config';
 import AppStore from '../../stores/AppStore';
+import ServicesStore from '../../stores/ServicesStore';
 
 
 const messages = defineMessages({
@@ -201,8 +202,6 @@ PublishDebugLogModal.wrappedComponent.propTypes = {
     app: PropTypes.instanceOf(AppStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    service: PropTypes.shape({
-      setActive: PropTypes.func.isRequired,
-    }).isRequired,
+    service: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
 };
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
index 01cd3b09b..04822db71 100644
--- a/src/features/quickSwitch/Component.js
+++ b/src/features/quickSwitch/Component.js
@@ -349,8 +349,6 @@ QuickSwitchModal.wrappedComponent.propTypes = {
     services: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    service: PropTypes.shape({
-      setActive: PropTypes.func.isRequired,
-    }).isRequired,
+    service: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
 };
diff --git a/src/features/trialStatusBar/containers/TrialStatusBarScreen.js b/src/features/trialStatusBar/containers/TrialStatusBarScreen.js
index e15a1204f..715251854 100644
--- a/src/features/trialStatusBar/containers/TrialStatusBarScreen.js
+++ b/src/features/trialStatusBar/containers/TrialStatusBarScreen.js
@@ -10,6 +10,7 @@ import TrialStatusBar from '../components/TrialStatusBar';
 import ErrorBoundary from '../../../components/util/ErrorBoundary';
 import { trialStatusBarStore } from '..';
 import { i18nPlanName } from '../../../helpers/plan-helpers';
+import PaymentStore from '../../../stores/PaymentStore';
 
 @inject('stores', 'actions') @observer
 class TrialStatusBarScreen extends Component {
@@ -102,8 +103,6 @@ TrialStatusBarScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    payment: PropTypes.shape({
-      upgradeAccount: PropTypes.func.isRequired,
-    }),
+    payment: PropTypes.instanceOf(PaymentStore),
   }).isRequired,
 };
diff --git a/src/features/webControls/containers/WebControlsScreen.js b/src/features/webControls/containers/WebControlsScreen.js
index 56ba60c37..d638b831c 100644
--- a/src/features/webControls/containers/WebControlsScreen.js
+++ b/src/features/webControls/containers/WebControlsScreen.js
@@ -7,6 +7,7 @@ import WebControls from '../components/WebControls';
 import ServicesStore from '../../../stores/ServicesStore';
 import Service from '../../../models/Service';
 import { SEARCH_ENGINE_URLS } from '../../../config';
+import AppStore from '../../../stores/AppStore';
 
 const URL_EVENTS = [
   'load-commit',
@@ -128,11 +129,7 @@ WebControlsScreen.wrappedComponent.propTypes = {
     services: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    app: PropTypes.shape({
-      openExternalUrl: PropTypes.func.isRequired,
-    }).isRequired,
-    service: PropTypes.shape({
-      reloadActive: PropTypes.func.isRequired,
-    }).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+    service: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
 };
diff --git a/src/features/workspaces/containers/EditWorkspaceScreen.js b/src/features/workspaces/containers/EditWorkspaceScreen.js
index 7eaabc1ea..5eca71259 100644
--- a/src/features/workspaces/containers/EditWorkspaceScreen.js
+++ b/src/features/workspaces/containers/EditWorkspaceScreen.js
@@ -8,14 +8,13 @@ import ServicesStore from '../../../stores/ServicesStore';
 import Workspace from '../models/Workspace';
 import { workspaceStore } from '../index';
 import { deleteWorkspaceRequest, updateWorkspaceRequest } from '../api';
+import WorkspacesStore from '../store';
 
 @inject('stores', 'actions') @observer
 class EditWorkspaceScreen extends Component {
   static propTypes = {
     actions: PropTypes.shape({
-      workspace: PropTypes.shape({
-        delete: PropTypes.func.isRequired,
-      }),
+      workspaces: PropTypes.instanceOf(WorkspacesStore),
     }).isRequired,
     stores: PropTypes.shape({
       services: PropTypes.instanceOf(ServicesStore).isRequired,
diff --git a/src/features/workspaces/containers/WorkspacesScreen.js b/src/features/workspaces/containers/WorkspacesScreen.js
index affbd230d..c241cd622 100644
--- a/src/features/workspaces/containers/WorkspacesScreen.js
+++ b/src/features/workspaces/containers/WorkspacesScreen.js
@@ -10,14 +10,13 @@ import {
   getUserWorkspacesRequest,
   updateWorkspaceRequest,
 } from '../api';
+import WorkspacesStore from '../store';
 
 @inject('stores', 'actions') @observer
 class WorkspacesScreen extends Component {
   static propTypes = {
     actions: PropTypes.shape({
-      workspace: PropTypes.shape({
-        edit: PropTypes.func.isRequired,
-      }),
+      workspaces: PropTypes.instanceOf(WorkspacesStore),
     }).isRequired,
   };
 
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 8225b50ef..984ec22e5 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -1266,117 +1266,117 @@
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 23
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.settings",
         "start": {
           "column": 12,
-          "line": 18
+          "line": 20
         }
       },
       {
         "defaultMessage": "!!!Add new service",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 27
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.addNewService",
         "start": {
           "column": 17,
-          "line": 22
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 31
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 8,
-          "line": 26
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 35
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 10,
-          "line": 30
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 39
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.openWorkspaceDrawer",
         "start": {
           "column": 23,
-          "line": 34
+          "line": 36
         }
       },
       {
         "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
-          "line": 41
+          "line": 43
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.closeWorkspaceDrawer",
         "start": {
           "column": 24,
-          "line": 38
+          "line": 40
         }
       },
       {
         "defaultMessage": "!!!Open Franz Todos",
         "end": {
           "column": 3,
-          "line": 45
+          "line": 47
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.openTodosDrawer",
         "start": {
           "column": 19,
-          "line": 42
+          "line": 44
         }
       },
       {
         "defaultMessage": "!!!Close Franz Todos",
         "end": {
           "column": 3,
-          "line": 49
+          "line": 51
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.closeTodosDrawer",
         "start": {
           "column": 20,
-          "line": 46
+          "line": 48
         }
       },
       {
         "defaultMessage": "!!!Lock Ferdi",
         "end": {
           "column": 3,
-          "line": 53
+          "line": 55
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.lockFerdi",
         "start": {
           "column": 13,
-          "line": 50
+          "line": 52
         }
       }
     ],
@@ -4256,91 +4256,91 @@
         "defaultMessage": "!!!Get a Franz Supporter License",
         "end": {
           "column": 3,
-          "line": 15
+          "line": 16
         },
         "file": "src/components/ui/ActivateTrialButton/index.js",
         "id": "feature.delayApp.upgrade.action",
         "start": {
           "column": 10,
-          "line": 12
+          "line": 13
         }
       },
       {
         "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
         "end": {
           "column": 3,
-          "line": 19
+          "line": 20
         },
         "file": "src/components/ui/ActivateTrialButton/index.js",
         "id": "feature.delayApp.trial.action",
         "start": {
           "column": 15,
-          "line": 16
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!Upgrade account",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 24
         },
         "file": "src/components/ui/ActivateTrialButton/index.js",
         "id": "feature.delayApp.upgrade.actionShort",
         "start": {
           "column": 15,
-          "line": 20
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Activate the free Franz Professional trial",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 28
         },
         "file": "src/components/ui/ActivateTrialButton/index.js",
         "id": "feature.delayApp.trial.actionShort",
         "start": {
           "column": 20,
-          "line": 24
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!No strings attached",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 32
         },
         "file": "src/components/ui/ActivateTrialButton/index.js",
         "id": "pricing.trial.terms.headline",
         "start": {
           "column": 29,
-          "line": 28
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!No credit card required",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 36
         },
         "file": "src/components/ui/ActivateTrialButton/index.js",
         "id": "pricing.trial.terms.noCreditCard",
         "start": {
           "column": 16,
-          "line": 32
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Your free trial ends automatically after 14 days",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 40
         },
         "file": "src/components/ui/ActivateTrialButton/index.js",
         "id": "pricing.trial.terms.automaticTrialEnd",
         "start": {
           "column": 21,
-          "line": 36
+          "line": 37
         }
       }
     ],
@@ -4565,13 +4565,13 @@
         "defaultMessage": "!!!Upgrade account",
         "end": {
           "column": 3,
-          "line": 18
+          "line": 19
         },
         "file": "src/components/ui/PremiumFeatureContainer/index.js",
         "id": "premiumFeature.button.upgradeAccount",
         "start": {
           "column": 10,
-          "line": 15
+          "line": 16
         }
       }
     ],
@@ -4583,13 +4583,13 @@
         "defaultMessage": "!!!Upgrade to Franz Professional",
         "end": {
           "column": 3,
-          "line": 15
+          "line": 16
         },
         "file": "src/components/ui/UpgradeButton/index.js",
         "id": "global.upgradeButton.upgradeToPro",
         "start": {
           "column": 16,
-          "line": 12
+          "line": 13
         }
       }
     ],
@@ -4650,247 +4650,247 @@
         "defaultMessage": "!!!Name",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 32
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.name",
         "start": {
           "column": 8,
-          "line": 28
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Enable service",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 36
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableService",
         "start": {
           "column": 17,
-          "line": 32
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Enable hibernation",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 40
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableHibernation",
         "start": {
           "column": 21,
-          "line": 36
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Enable Notifications",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 44
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableNotification",
         "start": {
           "column": 22,
-          "line": 40
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Show unread message badges",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 48
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableBadge",
         "start": {
           "column": 15,
-          "line": 44
+          "line": 45
         }
       },
       {
         "defaultMessage": "!!!Enable audio",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 52
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableAudio",
         "start": {
           "column": 15,
-          "line": 48
+          "line": 49
         }
       },
       {
         "defaultMessage": "!!!Team",
         "end": {
           "column": 3,
-          "line": 55
+          "line": 56
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.team",
         "start": {
           "column": 8,
-          "line": 52
+          "line": 53
         }
       },
       {
         "defaultMessage": "!!!Service URL",
         "end": {
           "column": 3,
-          "line": 59
+          "line": 60
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.customUrl",
         "start": {
           "column": 13,
-          "line": 56
+          "line": 57
         }
       },
       {
         "defaultMessage": "!!!Show message badge for all new messages",
         "end": {
           "column": 3,
-          "line": 63
+          "line": 64
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.indirectMessages",
         "start": {
           "column": 20,
-          "line": 60
+          "line": 61
         }
       },
       {
         "defaultMessage": "!!!Custom icon",
         "end": {
           "column": 3,
-          "line": 67
+          "line": 68
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.icon",
         "start": {
           "column": 8,
-          "line": 64
+          "line": 65
         }
       },
       {
         "defaultMessage": "!!!Enable Dark Mode",
         "end": {
           "column": 3,
-          "line": 71
+          "line": 72
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableDarkMode",
         "start": {
           "column": 18,
-          "line": 68
+          "line": 69
         }
       },
       {
         "defaultMessage": "!!!Dark Reader Brightness",
         "end": {
           "column": 3,
-          "line": 75
+          "line": 76
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.darkReaderBrightness",
         "start": {
           "column": 24,
-          "line": 72
+          "line": 73
         }
       },
       {
         "defaultMessage": "!!!Dark Reader Contrast",
         "end": {
           "column": 3,
-          "line": 79
+          "line": 80
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.darkReaderContrast",
         "start": {
           "column": 22,
-          "line": 76
+          "line": 77
         }
       },
       {
         "defaultMessage": "!!!Dark Reader Sepia",
         "end": {
           "column": 3,
-          "line": 83
+          "line": 84
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.darkReaderSepia",
         "start": {
           "column": 19,
-          "line": 80
+          "line": 81
         }
       },
       {
         "defaultMessage": "!!!Use Proxy",
         "end": {
           "column": 3,
-          "line": 87
+          "line": 88
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.isEnabled",
         "start": {
           "column": 15,
-          "line": 84
+          "line": 85
         }
       },
       {
         "defaultMessage": "!!!Proxy Host/IP",
         "end": {
           "column": 3,
-          "line": 91
+          "line": 92
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.host",
         "start": {
           "column": 13,
-          "line": 88
+          "line": 89
         }
       },
       {
         "defaultMessage": "!!!Port",
         "end": {
           "column": 3,
-          "line": 95
+          "line": 96
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.port",
         "start": {
           "column": 13,
-          "line": 92
+          "line": 93
         }
       },
       {
         "defaultMessage": "!!!User",
         "end": {
           "column": 3,
-          "line": 99
+          "line": 100
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.user",
         "start": {
           "column": 13,
-          "line": 96
+          "line": 97
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 103
+          "line": 104
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.password",
         "start": {
           "column": 17,
-          "line": 100
+          "line": 101
         }
       }
     ],
@@ -4902,585 +4902,585 @@
         "defaultMessage": "!!!Launch Ferdi on start",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 34
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.autoLaunchOnStart",
         "start": {
           "column": 21,
-          "line": 32
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Open in background",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 38
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.autoLaunchInBackground",
         "start": {
           "column": 26,
-          "line": 36
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!Keep Ferdi in background when closing the window",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 42
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.runInBackground",
         "start": {
           "column": 19,
-          "line": 40
+          "line": 39
         }
       },
       {
         "defaultMessage": "!!!Start minimized",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 46
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.startMinimized",
         "start": {
           "column": 18,
-          "line": 44
+          "line": 43
         }
       },
       {
         "defaultMessage": "!!!Always show Ferdi in System Tray",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 50
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSystemTray",
         "start": {
           "column": 20,
-          "line": 48
+          "line": 47
         }
       },
       {
         "defaultMessage": "!!!Always show Ferdi in Menu Bar",
         "end": {
           "column": 3,
-          "line": 55
+          "line": 54
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableMenuBar",
         "start": {
           "column": 17,
-          "line": 52
+          "line": 51
         }
       },
       {
         "defaultMessage": "!!!Reload Ferdi after system resume",
         "end": {
           "column": 3,
-          "line": 59
+          "line": 58
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.reloadAfterResume",
         "start": {
           "column": 21,
-          "line": 56
+          "line": 55
         }
       },
       {
         "defaultMessage": "!!!Minimize Ferdi to system tray",
         "end": {
           "column": 3,
-          "line": 63
+          "line": 62
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.minimizeToSystemTray",
         "start": {
           "column": 24,
-          "line": 60
+          "line": 59
         }
       },
       {
         "defaultMessage": "!!!Close Ferdi to system tray",
         "end": {
           "column": 3,
-          "line": 67
+          "line": 66
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.closeToSystemTray",
         "start": {
           "column": 21,
-          "line": 64
+          "line": 63
         }
       },
       {
         "defaultMessage": "!!!Don't show message content in notifications",
         "end": {
           "column": 3,
-          "line": 71
+          "line": 70
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.privateNotifications",
         "start": {
           "column": 24,
-          "line": 68
+          "line": 67
         }
       },
       {
         "defaultMessage": "!!!Don't show notifications for clipboard events",
         "end": {
           "column": 3,
-          "line": 75
+          "line": 74
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.clipboardNotifications",
         "start": {
           "column": 26,
-          "line": 72
+          "line": 71
         }
       },
       {
         "defaultMessage": "!!!Notify TaskBar/Dock on new message",
         "end": {
           "column": 3,
-          "line": 79
+          "line": 78
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.notifyTaskBarOnMessage",
         "start": {
           "column": 26,
-          "line": 76
+          "line": 75
         }
       },
       {
         "defaultMessage": "!!!Navigation bar behaviour",
         "end": {
           "column": 3,
-          "line": 83
+          "line": 82
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.navigationBarBehaviour",
         "start": {
           "column": 26,
-          "line": 80
+          "line": 79
         }
       },
       {
         "defaultMessage": "!!!Search engine",
         "end": {
           "column": 3,
-          "line": 87
+          "line": 86
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.searchEngine",
         "start": {
           "column": 16,
-          "line": 84
+          "line": 83
         }
       },
       {
         "defaultMessage": "!!!Send telemetry data",
         "end": {
           "column": 3,
-          "line": 91
+          "line": 90
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.sentry",
         "start": {
           "column": 10,
-          "line": 88
+          "line": 87
         }
       },
       {
         "defaultMessage": "!!!Enable service hibernation",
         "end": {
           "column": 3,
-          "line": 95
+          "line": 94
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.hibernate",
         "start": {
           "column": 13,
-          "line": 92
+          "line": 91
         }
       },
       {
         "defaultMessage": "!!!Keep services in hibernation on startup",
         "end": {
           "column": 3,
-          "line": 99
+          "line": 98
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.hibernateOnStartup",
         "start": {
           "column": 22,
-          "line": 96
+          "line": 95
         }
       },
       {
         "defaultMessage": "!!!Hibernation strategy",
         "end": {
           "column": 3,
-          "line": 103
+          "line": 102
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.hibernationStrategy",
         "start": {
           "column": 23,
-          "line": 100
+          "line": 99
         }
       },
       {
         "defaultMessage": "!!!Todo Server",
         "end": {
           "column": 3,
-          "line": 107
+          "line": 106
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.predefinedTodoServer",
         "start": {
           "column": 24,
-          "line": 104
+          "line": 103
         }
       },
       {
         "defaultMessage": "!!!Custom TodoServer",
         "end": {
           "column": 3,
-          "line": 111
+          "line": 110
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.customTodoServer",
         "start": {
           "column": 20,
-          "line": 108
+          "line": 107
         }
       },
       {
         "defaultMessage": "!!!Enable Password Lock",
         "end": {
           "column": 3,
-          "line": 115
+          "line": 114
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableLock",
         "start": {
           "column": 14,
-          "line": 112
+          "line": 111
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 119
+          "line": 118
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.lockPassword",
         "start": {
           "column": 16,
-          "line": 116
+          "line": 115
         }
       },
       {
         "defaultMessage": "!!!Allow using Touch ID to unlock",
         "end": {
           "column": 3,
-          "line": 123
+          "line": 122
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.useTouchIdToUnlock",
         "start": {
           "column": 22,
-          "line": 120
+          "line": 119
         }
       },
       {
         "defaultMessage": "!!!Lock after inactivity",
         "end": {
           "column": 3,
-          "line": 127
+          "line": 126
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.inactivityLock",
         "start": {
           "column": 18,
-          "line": 124
+          "line": 123
         }
       },
       {
         "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
         "end": {
           "column": 3,
-          "line": 131
+          "line": 130
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDEnabled",
         "start": {
           "column": 23,
-          "line": 128
+          "line": 127
         }
       },
       {
         "defaultMessage": "!!!From",
         "end": {
           "column": 3,
-          "line": 135
+          "line": 134
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDStart",
         "start": {
           "column": 21,
-          "line": 132
+          "line": 131
         }
       },
       {
         "defaultMessage": "!!!To",
         "end": {
           "column": 3,
-          "line": 139
+          "line": 138
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDEnd",
         "start": {
           "column": 19,
-          "line": 136
+          "line": 135
         }
       },
       {
         "defaultMessage": "!!!Language",
         "end": {
           "column": 3,
-          "line": 143
+          "line": 142
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.language",
         "start": {
           "column": 12,
-          "line": 140
+          "line": 139
         }
       },
       {
         "defaultMessage": "!!!Dark Mode",
         "end": {
           "column": 3,
-          "line": 147
+          "line": 146
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.darkMode",
         "start": {
           "column": 12,
-          "line": 144
+          "line": 143
         }
       },
       {
         "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
         "end": {
           "column": 3,
-          "line": 151
+          "line": 150
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.adaptableDarkMode",
         "start": {
           "column": 21,
-          "line": 148
+          "line": 147
         }
       },
       {
         "defaultMessage": "!!!Enable universal Dark Mode",
         "end": {
           "column": 3,
-          "line": 155
+          "line": 154
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.universalDarkMode",
         "start": {
           "column": 21,
-          "line": 152
+          "line": 151
         }
       },
       {
         "defaultMessage": "!!!Sidebar width",
         "end": {
           "column": 3,
-          "line": 159
+          "line": 158
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.serviceRibbonWidth",
         "start": {
           "column": 22,
-          "line": 156
+          "line": 155
         }
       },
       {
         "defaultMessage": "!!!Service icon size",
         "end": {
           "column": 3,
-          "line": 163
+          "line": 162
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.iconSize",
         "start": {
           "column": 12,
-          "line": 160
+          "line": 159
         }
       },
       {
         "defaultMessage": "!!!Use vertical style",
         "end": {
           "column": 3,
-          "line": 167
+          "line": 166
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.useVerticalStyle",
         "start": {
           "column": 20,
-          "line": 164
+          "line": 163
         }
       },
       {
         "defaultMessage": "!!!Always show workspace drawer",
         "end": {
           "column": 3,
-          "line": 171
+          "line": 170
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.alwaysShowWorkspaces",
         "start": {
           "column": 24,
-          "line": 168
+          "line": 167
         }
       },
       {
         "defaultMessage": "!!!Accent color",
         "end": {
           "column": 3,
-          "line": 175
+          "line": 174
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.accentColor",
         "start": {
           "column": 15,
-          "line": 172
+          "line": 171
         }
       },
       {
         "defaultMessage": "!!!Display disabled services tabs",
         "end": {
           "column": 3,
-          "line": 179
+          "line": 178
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDisabledServices",
         "start": {
           "column": 24,
-          "line": 176
+          "line": 175
         }
       },
       {
         "defaultMessage": "!!!Show unread message badge when notifications are disabled",
         "end": {
           "column": 3,
-          "line": 183
+          "line": 182
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showMessagesBadgesWhenMuted",
         "start": {
           "column": 29,
-          "line": 180
+          "line": 179
         }
       },
       {
         "defaultMessage": "!!!Show draggable area on window",
         "end": {
           "column": 3,
-          "line": 187
+          "line": 186
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDragArea",
         "start": {
           "column": 16,
-          "line": 184
+          "line": 183
         }
       },
       {
         "defaultMessage": "!!!Enable spell checking",
         "end": {
           "column": 3,
-          "line": 191
+          "line": 190
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSpellchecking",
         "start": {
           "column": 23,
-          "line": 188
+          "line": 187
         }
       },
       {
         "defaultMessage": "!!!Enable GPU Acceleration",
         "end": {
           "column": 3,
-          "line": 195
+          "line": 194
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableGPUAcceleration",
         "start": {
           "column": 25,
-          "line": 192
+          "line": 191
         }
       },
       {
         "defaultMessage": "!!!Include beta versions",
         "end": {
           "column": 3,
-          "line": 199
+          "line": 198
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.beta",
         "start": {
           "column": 8,
-          "line": 196
+          "line": 195
         }
       },
       {
         "defaultMessage": "!!!Enable updates",
         "end": {
           "column": 3,
-          "line": 203
+          "line": 202
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.automaticUpdates",
         "start": {
           "column": 20,
-          "line": 200
+          "line": 199
         }
       },
       {
         "defaultMessage": "!!!Enable Franz Todos",
         "end": {
           "column": 3,
-          "line": 207
+          "line": 206
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableTodos",
         "start": {
           "column": 15,
-          "line": 204
+          "line": 203
         }
       },
       {
         "defaultMessage": "!!!Keep all workspaces loaded",
         "end": {
           "column": 3,
-          "line": 211
+          "line": 210
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.keepAllWorkspacesLoaded",
         "start": {
           "column": 27,
-          "line": 208
+          "line": 207
         }
       }
     ],
@@ -5614,13 +5614,13 @@
         "defaultMessage": "!!!Changes in Ferdi {version}",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 23
         },
         "file": "src/features/announcements/components/AnnouncementScreen.js",
         "id": "feature.announcements.changelog.headline",
         "start": {
           "column": 12,
-          "line": 19
+          "line": 20
         }
       }
     ],
@@ -5650,65 +5650,65 @@
         "defaultMessage": "!!!Please purchase license to skip waiting",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 19
         },
         "file": "src/features/delayApp/Component.js",
         "id": "feature.delayApp.headline",
         "start": {
           "column": 12,
-          "line": 14
+          "line": 16
         }
       },
       {
         "defaultMessage": "!!!Get the free Franz Professional 14 day trial and skip the line",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 23
         },
         "file": "src/features/delayApp/Component.js",
         "id": "feature.delayApp.trial.headline",
         "start": {
           "column": 17,
-          "line": 18
+          "line": 20
         }
       },
       {
         "defaultMessage": "!!!Upgrade Franz",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 27
         },
         "file": "src/features/delayApp/Component.js",
         "id": "feature.delayApp.upgrade.action",
         "start": {
           "column": 10,
-          "line": 22
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 31
         },
         "file": "src/features/delayApp/Component.js",
         "id": "feature.delayApp.trial.action",
         "start": {
           "column": 15,
-          "line": 26
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Ferdi will continue in {seconds} seconds.",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 35
         },
         "file": "src/features/delayApp/Component.js",
         "id": "feature.delayApp.text",
         "start": {
           "column": 8,
-          "line": 30
+          "line": 32
         }
       }
     ],
@@ -5720,52 +5720,52 @@
         "defaultMessage": "!!!Nightly Builds",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 19
         },
         "file": "src/features/nightlyBuilds/Component.js",
         "id": "feature.nightlyBuilds.title",
         "start": {
           "column": 9,
-          "line": 14
+          "line": 16
         }
       },
       {
         "defaultMessage": "!!!Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 23
         },
         "file": "src/features/nightlyBuilds/Component.js",
         "id": "feature.nightlyBuilds.info",
         "start": {
           "column": 8,
-          "line": 18
+          "line": 20
         }
       },
       {
         "defaultMessage": "!!!Activate",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 27
         },
         "file": "src/features/nightlyBuilds/Component.js",
         "id": "feature.nightlyBuilds.activate",
         "start": {
           "column": 12,
-          "line": 22
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Cancel",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 31
         },
         "file": "src/features/nightlyBuilds/Component.js",
         "id": "feature.nightlyBuilds.cancel",
         "start": {
           "column": 10,
-          "line": 26
+          "line": 28
         }
       }
     ],
@@ -6013,52 +6013,52 @@
         "defaultMessage": "!!!Downgrade your Franz Plan",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 18
         },
         "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
         "id": "feature.planSelection.fullscreen.dialog.title",
         "start": {
           "column": 15,
-          "line": 14
+          "line": 15
         }
       },
       {
         "defaultMessage": "!!!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.",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 22
         },
         "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
         "id": "feature.planSelection.fullscreen.dialog.message",
         "start": {
           "column": 17,
-          "line": 18
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Downgrade to Free",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 26
         },
         "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
         "id": "feature.planSelection.fullscreen.dialog.cta.downgrade",
         "start": {
           "column": 22,
-          "line": 22
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Choose Personal",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 30
         },
         "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
         "id": "feature.planSelection.fullscreen.dialog.cta.upgrade",
         "start": {
           "column": 20,
-          "line": 26
+          "line": 27
         }
       }
     ],
@@ -6070,91 +6070,91 @@
         "defaultMessage": "!!!Publish debug information",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 21
         },
         "file": "src/features/publishDebugInfo/Component.js",
         "id": "feature.publishDebugInfo.title",
         "start": {
           "column": 9,
-          "line": 17
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!!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",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 25
         },
         "file": "src/features/publishDebugInfo/Component.js",
         "id": "feature.publishDebugInfo.info",
         "start": {
           "column": 8,
-          "line": 21
+          "line": 22
         }
       },
       {
         "defaultMessage": "!!!There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 29
         },
         "file": "src/features/publishDebugInfo/Component.js",
         "id": "feature.publishDebugInfo.error",
         "start": {
           "column": 9,
-          "line": 25
+          "line": 26
         }
       },
       {
         "defaultMessage": "!!!Privacy policy",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 33
         },
         "file": "src/features/publishDebugInfo/Component.js",
         "id": "feature.publishDebugInfo.privacy",
         "start": {
           "column": 11,
-          "line": 29
+          "line": 30
         }
       },
       {
         "defaultMessage": "!!!Terms of service",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 37
         },
         "file": "src/features/publishDebugInfo/Component.js",
         "id": "feature.publishDebugInfo.terms",
         "start": {
           "column": 9,
-          "line": 33
+          "line": 34
         }
       },
       {
         "defaultMessage": "!!!Accept and publish",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 41
         },
         "file": "src/features/publishDebugInfo/Component.js",
         "id": "feature.publishDebugInfo.publish",
         "start": {
           "column": 11,
-          "line": 37
+          "line": 38
         }
       },
       {
         "defaultMessage": "!!!Your debug log was published and is now availible at",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 45
         },
         "file": "src/features/publishDebugInfo/Component.js",
         "id": "feature.publishDebugInfo.published",
         "start": {
           "column": 13,
-          "line": 41
+          "line": 42
         }
       }
     ],
diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json
index 0495aa970..2d8fe0676 100644
--- a/src/i18n/messages/src/components/layout/Sidebar.json
+++ b/src/i18n/messages/src/components/layout/Sidebar.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 18,
+      "line": 20,
       "column": 12
     },
     "end": {
-      "line": 21,
+      "line": 23,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Add new service",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 22,
+      "line": 24,
       "column": 17
     },
     "end": {
-      "line": 25,
+      "line": 27,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 26,
+      "line": 28,
       "column": 8
     },
     "end": {
-      "line": 29,
+      "line": 31,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 30,
+      "line": 32,
       "column": 10
     },
     "end": {
-      "line": 33,
+      "line": 35,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 34,
+      "line": 36,
       "column": 23
     },
     "end": {
-      "line": 37,
+      "line": 39,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 38,
+      "line": 40,
       "column": 24
     },
     "end": {
-      "line": 41,
+      "line": 43,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Open Franz Todos",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 42,
+      "line": 44,
       "column": 19
     },
     "end": {
-      "line": 45,
+      "line": 47,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Close Franz Todos",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 46,
+      "line": 48,
       "column": 20
     },
     "end": {
-      "line": 49,
+      "line": 51,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Lock Ferdi",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 50,
+      "line": 52,
       "column": 13
     },
     "end": {
-      "line": 53,
+      "line": 55,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json b/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json
index 6370e4bb9..fd969da78 100644
--- a/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json
+++ b/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Get a Franz Supporter License",
     "file": "src/components/ui/ActivateTrialButton/index.js",
     "start": {
-      "line": 12,
+      "line": 13,
       "column": 10
     },
     "end": {
-      "line": 15,
+      "line": 16,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
     "file": "src/components/ui/ActivateTrialButton/index.js",
     "start": {
-      "line": 16,
+      "line": 17,
       "column": 15
     },
     "end": {
-      "line": 19,
+      "line": 20,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Upgrade account",
     "file": "src/components/ui/ActivateTrialButton/index.js",
     "start": {
-      "line": 20,
+      "line": 21,
       "column": 15
     },
     "end": {
-      "line": 23,
+      "line": 24,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Activate the free Franz Professional trial",
     "file": "src/components/ui/ActivateTrialButton/index.js",
     "start": {
-      "line": 24,
+      "line": 25,
       "column": 20
     },
     "end": {
-      "line": 27,
+      "line": 28,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!No strings attached",
     "file": "src/components/ui/ActivateTrialButton/index.js",
     "start": {
-      "line": 28,
+      "line": 29,
       "column": 29
     },
     "end": {
-      "line": 31,
+      "line": 32,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!No credit card required",
     "file": "src/components/ui/ActivateTrialButton/index.js",
     "start": {
-      "line": 32,
+      "line": 33,
       "column": 16
     },
     "end": {
-      "line": 35,
+      "line": 36,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Your free trial ends automatically after 14 days",
     "file": "src/components/ui/ActivateTrialButton/index.js",
     "start": {
-      "line": 36,
+      "line": 37,
       "column": 21
     },
     "end": {
-      "line": 39,
+      "line": 40,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json b/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
index 320d3ca3e..0cde4cee5 100644
--- a/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
+++ b/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Upgrade account",
     "file": "src/components/ui/PremiumFeatureContainer/index.js",
     "start": {
-      "line": 15,
+      "line": 16,
       "column": 10
     },
     "end": {
-      "line": 18,
+      "line": 19,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/ui/UpgradeButton/index.json b/src/i18n/messages/src/components/ui/UpgradeButton/index.json
index f270f5a65..28e44cb66 100644
--- a/src/i18n/messages/src/components/ui/UpgradeButton/index.json
+++ b/src/i18n/messages/src/components/ui/UpgradeButton/index.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Upgrade to Franz Professional",
     "file": "src/components/ui/UpgradeButton/index.js",
     "start": {
-      "line": 12,
+      "line": 13,
       "column": 16
     },
     "end": {
-      "line": 15,
+      "line": 16,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/containers/settings/EditServiceScreen.json b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
index 6744a9ff3..ad97781c4 100644
--- a/src/i18n/messages/src/containers/settings/EditServiceScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Name",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 28,
+      "line": 29,
       "column": 8
     },
     "end": {
-      "line": 31,
+      "line": 32,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Enable service",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 32,
+      "line": 33,
       "column": 17
     },
     "end": {
-      "line": 35,
+      "line": 36,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Enable hibernation",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 36,
+      "line": 37,
       "column": 21
     },
     "end": {
-      "line": 39,
+      "line": 40,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Enable Notifications",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 40,
+      "line": 41,
       "column": 22
     },
     "end": {
-      "line": 43,
+      "line": 44,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Show unread message badges",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 44,
+      "line": 45,
       "column": 15
     },
     "end": {
-      "line": 47,
+      "line": 48,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Enable audio",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 48,
+      "line": 49,
       "column": 15
     },
     "end": {
-      "line": 51,
+      "line": 52,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Team",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 52,
+      "line": 53,
       "column": 8
     },
     "end": {
-      "line": 55,
+      "line": 56,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Service URL",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 56,
+      "line": 57,
       "column": 13
     },
     "end": {
-      "line": 59,
+      "line": 60,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Show message badge for all new messages",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 60,
+      "line": 61,
       "column": 20
     },
     "end": {
-      "line": 63,
+      "line": 64,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Custom icon",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 64,
+      "line": 65,
       "column": 8
     },
     "end": {
-      "line": 67,
+      "line": 68,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Enable Dark Mode",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 68,
+      "line": 69,
       "column": 18
     },
     "end": {
-      "line": 71,
+      "line": 72,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Dark Reader Brightness",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 72,
+      "line": 73,
       "column": 24
     },
     "end": {
-      "line": 75,
+      "line": 76,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Dark Reader Contrast",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 76,
+      "line": 77,
       "column": 22
     },
     "end": {
-      "line": 79,
+      "line": 80,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Dark Reader Sepia",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 80,
+      "line": 81,
       "column": 19
     },
     "end": {
-      "line": 83,
+      "line": 84,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!Use Proxy",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 84,
+      "line": 85,
       "column": 15
     },
     "end": {
-      "line": 87,
+      "line": 88,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Proxy Host/IP",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 88,
+      "line": 89,
       "column": 13
     },
     "end": {
-      "line": 91,
+      "line": 92,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!Port",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 92,
+      "line": 93,
       "column": 13
     },
     "end": {
-      "line": 95,
+      "line": 96,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!User",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 96,
+      "line": 97,
       "column": 13
     },
     "end": {
-      "line": 99,
+      "line": 100,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 100,
+      "line": 101,
       "column": 17
     },
     "end": {
-      "line": 103,
+      "line": 104,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json b/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json
index ba8b624a1..6b94ff792 100644
--- a/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json
+++ b/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Changes in Ferdi {version}",
     "file": "src/features/announcements/components/AnnouncementScreen.js",
     "start": {
-      "line": 19,
+      "line": 20,
       "column": 12
     },
     "end": {
-      "line": 22,
+      "line": 23,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/delayApp/Component.json b/src/i18n/messages/src/features/delayApp/Component.json
index f1d6886f5..7ec0e69a0 100644
--- a/src/i18n/messages/src/features/delayApp/Component.json
+++ b/src/i18n/messages/src/features/delayApp/Component.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Please purchase license to skip waiting",
     "file": "src/features/delayApp/Component.js",
     "start": {
-      "line": 14,
+      "line": 16,
       "column": 12
     },
     "end": {
-      "line": 17,
+      "line": 19,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Get the free Franz Professional 14 day trial and skip the line",
     "file": "src/features/delayApp/Component.js",
     "start": {
-      "line": 18,
+      "line": 20,
       "column": 17
     },
     "end": {
-      "line": 21,
+      "line": 23,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Upgrade Franz",
     "file": "src/features/delayApp/Component.js",
     "start": {
-      "line": 22,
+      "line": 24,
       "column": 10
     },
     "end": {
-      "line": 25,
+      "line": 27,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
     "file": "src/features/delayApp/Component.js",
     "start": {
-      "line": 26,
+      "line": 28,
       "column": 15
     },
     "end": {
-      "line": 29,
+      "line": 31,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Ferdi will continue in {seconds} seconds.",
     "file": "src/features/delayApp/Component.js",
     "start": {
-      "line": 30,
+      "line": 32,
       "column": 8
     },
     "end": {
-      "line": 33,
+      "line": 35,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/nightlyBuilds/Component.json b/src/i18n/messages/src/features/nightlyBuilds/Component.json
index 6b86ec29f..084079635 100644
--- a/src/i18n/messages/src/features/nightlyBuilds/Component.json
+++ b/src/i18n/messages/src/features/nightlyBuilds/Component.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Nightly Builds",
     "file": "src/features/nightlyBuilds/Component.js",
     "start": {
-      "line": 14,
+      "line": 16,
       "column": 9
     },
     "end": {
-      "line": 17,
+      "line": 19,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
     "file": "src/features/nightlyBuilds/Component.js",
     "start": {
-      "line": 18,
+      "line": 20,
       "column": 8
     },
     "end": {
-      "line": 21,
+      "line": 23,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Activate",
     "file": "src/features/nightlyBuilds/Component.js",
     "start": {
-      "line": 22,
+      "line": 24,
       "column": 12
     },
     "end": {
-      "line": 25,
+      "line": 27,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Cancel",
     "file": "src/features/nightlyBuilds/Component.js",
     "start": {
-      "line": 26,
+      "line": 28,
       "column": 10
     },
     "end": {
-      "line": 29,
+      "line": 31,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/planSelection/containers/PlanSelectionScreen.json b/src/i18n/messages/src/features/planSelection/containers/PlanSelectionScreen.json
index 290d1547d..40e08c233 100644
--- a/src/i18n/messages/src/features/planSelection/containers/PlanSelectionScreen.json
+++ b/src/i18n/messages/src/features/planSelection/containers/PlanSelectionScreen.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Downgrade your Franz Plan",
     "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
     "start": {
-      "line": 14,
+      "line": 15,
       "column": 15
     },
     "end": {
-      "line": 17,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!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.",
     "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
     "start": {
-      "line": 18,
+      "line": 19,
       "column": 17
     },
     "end": {
-      "line": 21,
+      "line": 22,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Downgrade to Free",
     "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
     "start": {
-      "line": 22,
+      "line": 23,
       "column": 22
     },
     "end": {
-      "line": 25,
+      "line": 26,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Choose Personal",
     "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
     "start": {
-      "line": 26,
+      "line": 27,
       "column": 20
     },
     "end": {
-      "line": 29,
+      "line": 30,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/publishDebugInfo/Component.json b/src/i18n/messages/src/features/publishDebugInfo/Component.json
index 25048ace6..85fbe7ca6 100644
--- a/src/i18n/messages/src/features/publishDebugInfo/Component.json
+++ b/src/i18n/messages/src/features/publishDebugInfo/Component.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Publish debug information",
     "file": "src/features/publishDebugInfo/Component.js",
     "start": {
-      "line": 17,
+      "line": 18,
       "column": 9
     },
     "end": {
-      "line": 20,
+      "line": 21,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!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",
     "file": "src/features/publishDebugInfo/Component.js",
     "start": {
-      "line": 21,
+      "line": 22,
       "column": 8
     },
     "end": {
-      "line": 24,
+      "line": 25,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
     "file": "src/features/publishDebugInfo/Component.js",
     "start": {
-      "line": 25,
+      "line": 26,
       "column": 9
     },
     "end": {
-      "line": 28,
+      "line": 29,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Privacy policy",
     "file": "src/features/publishDebugInfo/Component.js",
     "start": {
-      "line": 29,
+      "line": 30,
       "column": 11
     },
     "end": {
-      "line": 32,
+      "line": 33,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Terms of service",
     "file": "src/features/publishDebugInfo/Component.js",
     "start": {
-      "line": 33,
+      "line": 34,
       "column": 9
     },
     "end": {
-      "line": 36,
+      "line": 37,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Accept and publish",
     "file": "src/features/publishDebugInfo/Component.js",
     "start": {
-      "line": 37,
+      "line": 38,
       "column": 11
     },
     "end": {
-      "line": 40,
+      "line": 41,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Your debug log was published and is now availible at",
     "file": "src/features/publishDebugInfo/Component.js",
     "start": {
-      "line": 41,
+      "line": 42,
       "column": 13
     },
     "end": {
-      "line": 44,
+      "line": 45,
       "column": 3
     }
   }
-- 
cgit v1.2.3-70-g09d2