39 files changed, 1409 insertions, 180 deletions
diff --git a/.gitignore b/.gitignore
index d38c475bf..626cd7ea2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ yarn-error.log
 npm-debug.log*
 lerna-debug.log
 uidev/lib
+*.tsbuildinfo
+\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 29bdd5ba8..e0fd7b8ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ before_script:
  - travis_retry npm install node-sass -g
 script:
  - travis_retry travis_wait 100 npm run build
 cache: npm
 branches:
diff --git a/electron-builder.yml b/electron-builder.yml
index 23625c825..330fc64e1 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -60,4 +60,5 @@ protocols:
 asarUnpack:
  - ./recipes
+  - ./node_modules/mac-screen-capture-permissions
  - ./assets/images/taskbar
diff --git a/package-lock.json b/package-lock.json
index 2200d61d1..b1aa4e88d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10525,6 +10525,15 @@
        }
      }
    },
+    "electron-util": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/electron-util/-/electron-util-0.14.0.tgz",
+      "integrity": "sha512-f8DXlOLrI7aq2S1yRlgx8Dc+Zbq5hlKKyVUnc73HyLEijo8/0KT9Cqlcduy75qwwynVw+cvbuqtqgIlrHLijyw==",
+      "requires": {
+        "electron-is-dev": "^1.1.0",
+        "new-github-issue-url": "^0.2.1"
+      }
+    },
    "electron-window-state": {
      "version": "5.0.3",
      "resolved": "https://registry.npmjs.org/electron-window-state/-/electron-window-state-5.0.3.tgz",
@@ -18541,6 +18550,118 @@
      "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz",
      "integrity": "sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0="
    },
+    "mac-screen-capture-permissions": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mac-screen-capture-permissions/-/mac-screen-capture-permissions-1.1.0.tgz",
+      "integrity": "sha512-jMRumlB3FScui/7yW+5FqqbuO7CQ0XOJVT5oTsb7W9eRQDhCIpJpIF0XxLVXwq2DIOp0fYsz1LFiBjnyDYULyQ==",
+      "requires": {
+        "electron-util": "^0.13.0",
+        "execa": "^2.0.4",
+        "macos-version": "^5.2.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.2",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz",
+          "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==",
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "electron-util": {
+          "version": "0.13.1",
+          "resolved": "https://registry.npmjs.org/electron-util/-/electron-util-0.13.1.tgz",
+          "integrity": "sha512-CvOuAyQPaPtnDp7SspwnT1yTb1yynw6yp4LrZCfEJ7TG/kJFiZW9RqMHlCEFWMn3QNoMkNhGVeCvWJV5NsYyuQ==",
+          "requires": {
+            "electron-is-dev": "^1.1.0",
+            "new-github-issue-url": "^0.2.1"
+          }
+        },
+        "execa": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-2.1.0.tgz",
+          "integrity": "sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==",
+          "requires": {
+            "cross-spawn": "^7.0.0",
+            "get-stream": "^5.0.0",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^3.0.0",
+            "onetime": "^5.1.0",
+            "p-finally": "^2.0.0",
+            "signal-exit": "^3.0.2",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
+          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "is-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
+        },
+        "merge-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+          "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+        },
+        "npm-run-path": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-3.1.0.tgz",
+          "integrity": "sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==",
+          "requires": {
+            "path-key": "^3.0.0"
+          }
+        },
+        "onetime": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
+          "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+          "requires": {
+            "mimic-fn": "^2.1.0"
+          }
+        },
+        "p-finally": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
+          "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw=="
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
    "macos-notification-state": {
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/macos-notification-state/-/macos-notification-state-1.3.1.tgz",
@@ -18556,6 +18677,14 @@
      "integrity": "sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA==",
      "dev": true
    },
+    "macos-version": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/macos-version/-/macos-version-5.2.0.tgz",
+      "integrity": "sha512-egt1bqVE1evUjCup2QN2F0g42AuVcumdM31xNbABz+uXquYPzWP4OrqDm+HpCfM+6t4JzWrzABQW+MZM+FW+Jg==",
+      "requires": {
+        "semver": "^5.6.0"
+      }
+    },
    "macroable": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/macroable/-/macroable-1.0.0.tgz",
@@ -18685,9 +18814,9 @@
      }
    },
    "marked": {
-      "version": "0.7.0",
+      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.6.1.tgz",
-      "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="
+      "integrity": "sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA=="
    },
    "matchdep": {
      "version": "2.0.0",
@@ -18990,8 +19119,7 @@
    "mimic-fn": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-      "dev": true
    },
    "mimic-response": {
      "version": "1.0.1",
@@ -19480,6 +19608,11 @@
      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
      "dev": true
    },
+    "new-github-issue-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/new-github-issue-url/-/new-github-issue-url-0.2.1.tgz",
+      "integrity": "sha512-md4cGoxuT4T4d/HDOXbrUHkTKrp/vp+m3aOA7XXVYwNsUNMK49g3SQicTSeV5GIz/5QVGAeYRAOlyp9OvlgsYA=="
+    },
    "next-tick": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
@@ -24962,6 +25095,11 @@
      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
      "dev": true
    },
+    "strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
+    },
    "strip-indent": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
diff --git a/package.json b/package.json
index c267f6ae2..5c9be8488 100644
--- a/package.json
+++ b/package.json
@@ -77,6 +77,7 @@
    "electron-react-titlebar": "0.8.2",
    "electron-spellchecker": "2.2.1",
    "electron-updater": "4.2.5",
+    "electron-util": "0.14.0",
    "electron-window-state": "5.0.3",
    "fs-extra": "7.0.1",
    "gulp-csso": "3.0.1",
@@ -85,8 +86,10 @@
    "gulp-uglify": "3.0.2",
    "hex-to-rgba": "1.0.2",
    "jsonwebtoken": "8.5.1",
-    "lodash": "4.17.15",
+    "lodash": "^4.17.4",
-    "marked": "0.7.0",
+    "mac-screen-capture-permissions": "1.1.0",
+    "macos-version": "5.2.0",
+    "marked": "0.6.1",
    "mdi": "^1.9.33",
    "mime-types": "2.1.25",
    "mobx": "5.15.0",
@@ -138,7 +141,7 @@
    "@babel/preset-react": "7.7.4",
    "@babel/register": "7.7.4",
    "@types/classnames": "^2.2.6",
-    "@types/color": "^3.0.0",
+    "@types/color": "3.0.0",
    "@types/color-convert": "^1.9.0",
    "@types/jss": "^9.5.7",
    "@types/lodash": "4.14.149",
diff --git a/packages/theme/package-lock.json b/packages/theme/package-lock.json
index f74af2f24..85a87cf04 100644
--- a/packages/theme/package-lock.json
+++ b/packages/theme/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "@meetfranz/theme",
-  "version": "1.0.4",
+  "version": "1.0.14",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts
index 30cc19d99..b436d92f9 100644
--- a/packages/theme/src/themes/dark/index.ts
+++ b/packages/theme/src/themes/dark/index.ts
@@ -65,7 +65,7 @@ export const selectOptionItemHoverColor = selectColor;
 export const selectSearchColor = inputBackground;
 // Modal
-export const colorModalOverlayBackground = color(legacyStyles.darkThemeBlack).alpha(0.8).rgb().string();
+export const colorModalOverlayBackground = color(legacyStyles.darkThemeBlack).alpha(0.9).rgb().string();
 export const colorModalBackground = legacyStyles.darkThemeGrayDark;
 // Services
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts
index edf56f21e..f8dc36574 100644
--- a/packages/theme/src/themes/default/index.ts
+++ b/packages/theme/src/themes/default/index.ts
@@ -1,7 +1,6 @@
 import color from 'color';
 import { cloneDeep } from 'lodash';
-import { darkgreen } from 'color-name';
 import * as legacyStyles from '../legacy';
 export interface IStyleTypes {
@@ -145,7 +144,7 @@ export const badgeFontSize = uiFontSize - 2;
 export const badgeBorderRadius = 50;
 // Modal
-export const colorModalOverlayBackground = color('#000').alpha(0.5).rgb().string();
+export const colorModalOverlayBackground = color('#000').alpha(0.8).rgb().string();
 export const colorModalBackground = colorContentBackground;
 // Services
diff --git a/src/components/services/content/ConnectionLostBanner.js b/src/components/services/content/ConnectionLostBanner.js
new file mode 100644
index 000000000..9609a65b1
--- /dev/null
+++ b/src/components/services/content/ConnectionLostBanner.js
@@ -0,0 +1,119 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import injectSheet from 'react-jss';
+import { Icon } from '@meetfranz/ui';
+import { intlShape, defineMessages } from 'react-intl';
+import {
+  mdiAlert,
+} from '@mdi/js';
+import { LIVE_API_WEBSITE } from '../../../config';
+// import { Button } from '@meetfranz/forms';
+const messages = defineMessages({
+  text: {
+    id: 'connectionLostBanner.message',
+    defaultMessage: '!!!Oh no! Franz lost the connection to {name}.',
+  },
+  moreInformation: {
+    id: 'connectionLostBanner.informationLink',
+    defaultMessage: '!!!What happened?',
+  },
+  cta: {
+    id: 'connectionLostBanner.cta',
+    defaultMessage: '!!!Reload Service',
+  },
+});
+const styles = theme => ({
+  root: {
+    background: theme.colorBackground,
+    borderRadius: theme.borderRadius,
+    position: 'absolute',
+    zIndex: 300,
+    height: 50,
+    display: 'flex',
+    flexDirection: 'row',
+    alignItems: 'center',
+    bottom: 10,
+    right: 10,
+    justifyContent: 'center',
+    padding: 10,
+    fontSize: 12,
+  },
+  link: {
+    display: 'inline-flex',
+    opacity: 0.7,
+  },
+  button: {
+    transition: 'opacity 0.25s',
+    color: theme.colorText,
+    border: [1, 'solid', theme.colorText],
+    borderRadius: theme.borderRadiusSmall,
+    padding: 4,
+    fontSize: 12,
+    marginLeft: 15,
+    '&:hover': {
+      opacity: 0.8,
+    },
+  },
+  icon: {
+    marginRight: 10,
+    fill: theme.styleTypes.danger.accent,
+  },
+});
+@injectSheet(styles) @observer
+class ConnectionLostBanner extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    name: PropTypes.string.isRequired,
+    reload: PropTypes.func.isRequired,
+  }
+  static contextTypes = {
+    intl: intlShape,
+  };
+  inputRef = React.createRef();
+  render() {
+    const {
+      classes,
+      name,
+      reload,
+    } = this.props;
+    const { intl } = this.context;
+    return (
+      <div className={classes.root}>
+        <Icon
+          icon={mdiAlert}
+          className={classes.icon}
+        />
+        <p>
+          {intl.formatMessage(messages.text, { name })}
+          <br />
+          <a
+            href={`${LIVE_API_WEBSITE}/support#what-does-franz-lost-the-connection-to-service-mean`}
+            className={classes.link}
+          >
+            {intl.formatMessage(messages.moreInformation)}
+          </a>
+        </p>
+        <button
+          type="button"
+          className={classes.button}
+          onClick={reload}
+        >
+          {intl.formatMessage(messages.cta)}
+        </button>
+      </div>
+    );
+  }
+}
+export default ConnectionLostBanner;
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index f6832038a..d91016c71 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -193,7 +193,7 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
          </Fragment>
        ) : (
          <>
-            {!service.isHibernating ? (
+            {(!service.isHibernating || service.disableHibernation) ? (
              <>
                {showNavBar && (
                  <WebControlsScreen service={service} />
@@ -203,6 +203,12 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
                  setWebviewReference={setWebviewReference}
                  detachService={detachService}
                />
+                {/* {service.lostRecipeConnection && (
+                  <ConnectionLostBanner
+                    name={service.name}
+                    reload={reload}
+                  />
+                )} */}
              </>
            ) : (
              <div>
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index 36338a910..ea7a66a62 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -145,7 +145,7 @@ class TabItem extends Component {
                •
            </span>
          )}
-          {service.isHibernating && (
+          {service.isHibernating && !service.disableHibernation && (
            <span className="tab-item__message-count hibernating">
              •
            </span>
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index bb4f4a76f..4fd1f99ef 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -94,6 +94,10 @@ const messages = defineMessages({
    id: 'settings.service.form.isMutedInfo',
    defaultMessage: '!!!When disabled, all notification sounds and audio playback are muted',
  },
+  disableHibernationInfo: {
+    id: 'settings.service.form.disableHibernationInfo',
+    defaultMessage: '!!!You currently have hibernation enabled but you can disable hibernation for individual services using this option.',
+  },
  headlineNotifications: {
    id: 'settings.service.form.headlineNotifications',
    defaultMessage: '!!!Notifications',
@@ -154,6 +158,7 @@ export default @observer class EditServiceForm extends Component {
    isProxyFeatureEnabled: PropTypes.bool.isRequired,
    isServiceProxyIncludedInCurrentPlan: PropTypes.bool.isRequired,
    isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired,
+    isHibernationFeatureActive: PropTypes.bool.isRequired,
  };
  static defaultProps = {
@@ -219,6 +224,7 @@ export default @observer class EditServiceForm extends Component {
      isProxyFeatureEnabled,
      isServiceProxyIncludedInCurrentPlan,
      isSpellcheckerIncludedInCurrentPlan,
+      isHibernationFeatureActive,
    } = this.props;
    const { intl } = this.context;
@@ -365,6 +371,14 @@ export default @observer class EditServiceForm extends Component {
                <div className="settings__settings-group">
                  <h3>{intl.formatMessage(messages.headlineGeneral)}</h3>
                  <Toggle field={form.$('isEnabled')} />
+                  {isHibernationFeatureActive && (
+                    <>
+                      <Toggle field={form.$('disableHibernation')} />
+                      <p className="settings__help">
+                        {intl.formatMessage(messages.disableHibernationInfo)}
+                      </p>
+                    </>
+                  )}
                  <Toggle field={form.$('isDarkModeEnabled')} />
                  {form.$('isDarkModeEnabled').value
                    && (
diff --git a/src/components/ui/FeatureList.js b/src/components/ui/FeatureList.js
index f1039709c..dbc2a9078 100644
--- a/src/components/ui/FeatureList.js
+++ b/src/components/ui/FeatureList.js
@@ -66,6 +66,10 @@ const messages = defineMessages({
    id: 'pricing.features.adFree',
    defaultMessage: '!!!Forever ad-free',
  },
+  appDelayEnabled: {
+    id: 'pricing.features.appDelaysEnabled',
+    defaultMessage: '!!!Occasional Waiting Screens',
+  },
 });
 export class FeatureList extends Component {
@@ -96,6 +100,7 @@ export class FeatureList extends Component {
    const features = [];
    if (plan === PLANS.FREE) {
      features.push(
+        messages.appDelayEnabled,
        messages.upToThreeServices,
        messages.availableRecipes,
        messages.accountSync,
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 560068efc..14c1ef41e 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -33,6 +33,10 @@ const messages = defineMessages({
    id: 'settings.service.form.enableService',
    defaultMessage: '!!!Enable service',
  },
+  disableHibernation: {
+    id: 'settings.service.form.disableHibernation',
+    defaultMessage: '!!!Disable hibernation',
+  },
  enableNotification: {
    id: 'settings.service.form.enableNotification',
    defaultMessage: '!!!Enable Notifications',
@@ -134,8 +138,11 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
    const {
      stores,
+      router,
    } = this.props;
+    const { action } = router.params;
    let defaultSpellcheckerLanguage = SPELLCHECKER_LOCALES[stores.settings.app.spellcheckerLanguage];
    if (stores.settings.app.spellcheckerLanguage === 'automatic') {
@@ -160,6 +167,11 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
          value: service.isEnabled,
          default: true,
        },
+        disableHibernation: {
+          label: intl.formatMessage(messages.disableHibernation),
+          value: action !== 'edit' ? false : service.disableHibernation,
+          default: false,
+        },
        isNotificationEnabled: {
          label: intl.formatMessage(messages.enableNotification),
          value: service.isNotificationEnabled,
@@ -327,7 +339,9 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
  }
  render() {
-    const { recipes, services, user } = this.props.stores;
+    const {
+      recipes, services, user, settings,
+    } = this.props.stores;
    const { action } = this.props.router.params;
    let recipe;
@@ -381,6 +395,7 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
          isProxyFeatureEnabled={proxyFeature.isEnabled}
          isServiceProxyIncludedInCurrentPlan={proxyFeature.isIncludedInCurrentPlan}
          isSpellcheckerIncludedInCurrentPlan={spellcheckerFeature.isIncludedInCurrentPlan}
+          isHibernationFeatureActive={settings.app.hibernate}
        />
      </ErrorBoundary>
    );
diff --git a/src/electron/macOSPermissions.js b/src/electron/macOSPermissions.js
new file mode 100644
index 000000000..4ba6a7619
--- /dev/null
+++ b/src/electron/macOSPermissions.js
@@ -0,0 +1,14 @@
+import { systemPreferences } from 'electron';
+import {
+  hasScreenCapturePermission,
+  hasPromptedForPermission,
+} from 'mac-screen-capture-permissions';
+export default function () {
+  systemPreferences.askForMediaAccess('camera');
+  systemPreferences.askForMediaAccess('microphone');
+  if (!hasPromptedForPermission()) {
+    hasScreenCapturePermission();
+  }
+}
diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js
index 38de2dbc8..2f25e7139 100644
--- a/src/features/announcements/components/AnnouncementScreen.js
+++ b/src/features/announcements/components/AnnouncementScreen.js
@@ -192,6 +192,11 @@ class AnnouncementScreen extends Component {
    stores: PropTypes.shape({
      ui: PropTypes.instanceOf(UIStore).isRequired,
    }).isRequired,
+    actions: PropTypes.shape({
+      app: PropTypes.shape({
+        openExternalUrl: PropTypes.func.isRequired,
+      }).isRequired,
+    }).isRequired,
  };
  static contextTypes = {
@@ -199,7 +204,7 @@ class AnnouncementScreen extends Component {
  };
  render() {
-    const { classes, stores } = this.props;
+    const { classes, stores, actions } = this.props;
    const { intl } = this.context;
    const { changelog, announcement } = announcementsStore;
    const themeImage = stores.ui.isDarkThemeActive ? 'dark' : 'light';
@@ -223,14 +228,23 @@ class AnnouncementScreen extends Component {
                      __html: marked(announcement.main.text, markedOptions),
                    }}
                  />
-                  <div className={classes.mainCtaButton}>
+                  {(announcement.main.cta.label || announcement.main.cta.href) && (
-                    <Button
+                    <div className={classes.mainCtaButton}>
-                      label={announcement.main.cta.label}
+                      <Button
-                      onClick={() => {
+                        label={announcement.main.cta.label}
-                        window.location.href = `#${announcement.main.cta.href}`;
+                        onClick={() => {
-                      }}
+                          const {
-                    />
+                            href,
-                  </div>
+                          } = announcement.main.cta;
+                          if (announcement.main.cta.href.startsWith('http')) {
+                            actions.app.openExternalUrl({ url: href });
+                          } else {
+                            window.location.href = `#${href}`;
+                          }
+                        }}
+                      />
+                    </div>
+                  )}
                </div>
              </div>
            </div>
@@ -250,7 +264,14 @@ class AnnouncementScreen extends Component {
                    <Button
                      label={announcement.spotlight.cta.label}
                      onClick={() => {
-                        window.location.href = `#${announcement.spotlight.cta.href}`;
+                        const {
+                          href,
+                        } = announcement.spotlight.cta;
+                        if (announcement.spotlight.cta.href.startsWith('http')) {
+                          actions.app.openExternalUrl({ url: href });
+                        } else {
+                          window.location.href = `#${href}`;
+                        }
                      }}
                    />
                  </div>
diff --git a/src/features/planSelection/components/PlanItem.js b/src/features/planSelection/components/PlanItem.js
index ec061377b..3855fedf1 100644
--- a/src/features/planSelection/components/PlanItem.js
+++ b/src/features/planSelection/components/PlanItem.js
@@ -49,6 +49,7 @@ const styles = theme => ({
  priceWrapper: {
    height: 50,
    marginBottom: 0,
+    marginTop: ({ text }) => (!text ? 15 : 0),
  },
  price: {
    fontSize: 50,
@@ -64,7 +65,7 @@ const styles = theme => ({
  cta: {
    background: theme.styleTypes.primary.accent,
    color: theme.styleTypes.primary.contrast,
-    margin: [40, 'auto', 0, 'auto'],
+    margin: [30, 'auto', 0, 'auto'],
  },
  divider: {
    width: 40,
@@ -77,10 +78,14 @@ const styles = theme => ({
    background: color(theme.styleTypes.primary.accent).darken(0.25).hex(),
    color: theme.styleTypes.primary.contrast,
    position: 'relative',
+    height: 'auto',
  },
  content: {
    padding: [10, 20, 20],
    background: '#EFEFEF',
+    display: 'flex',
+    flexDirection: 'column',
+    justifyContent: 'space-between',
  },
  simpleCTA: {
    background: 'none',
@@ -167,10 +172,14 @@ export default @observer @injectSheet(styles) class PlanItem extends Component {
            </div>
          )}
          <H2 className={classes.planName}>{name}</H2>
-          <p className={classes.text}>
+          {text && (
-            {text}
+            <>
-          </p>
+              <p className={classes.text}>
-          <hr className={classes.divider} />
+                {text}
+              </p>
+              <hr className={classes.divider} />
+            </>
+          )}
          <p className={classes.priceWrapper}>
            <span className={classes.currency}>{currency}</span>
            <span className={classes.price}>
diff --git a/src/features/planSelection/components/PlanSelection.js b/src/features/planSelection/components/PlanSelection.js
index 4bf5238dd..6f0dd30ad 100644
--- a/src/features/planSelection/components/PlanSelection.js
+++ b/src/features/planSelection/components/PlanSelection.js
@@ -6,7 +6,7 @@ import { defineMessages, intlShape } from 'react-intl';
 import { H1, H2, Icon } from '@meetfranz/ui';
 import color from 'color';
-import { mdiRocket, mdiArrowRight } from '@mdi/js';
+import { mdiArrowRight } from '@mdi/js';
 import PlanItem from './PlanItem';
 import { i18nPlanName } from '../../../helpers/plan-helpers';
 import { PLANS } from '../../../config';
@@ -79,10 +79,10 @@ const styles = theme => ({
    overflowY: 'scroll',
  },
  container: {
-    width: '80%',
+    // width: '80%',
    height: 'auto',
-    background: theme.styleTypes.primary.accent,
+    // background: theme.styleTypes.primary.accent,
-    padding: 40,
+    // padding: 40,
    borderRadius: theme.borderRadius,
    maxWidth: 1000,
@@ -104,23 +104,6 @@ const styles = theme => ({
      boxShadow: [0, 2, 30, color('#000').alpha(0.1).rgb().string()],
    },
  },
-  bigIcon: {
-    background: theme.styleTypes.danger.accent,
-    width: 120,
-    height: 120,
-    display: 'flex',
-    alignItems: 'center',
-    borderRadius: '100%',
-    justifyContent: 'center',
-    margin: [-100, 'auto', 20],
-    '& svg': {
-      width: '80px !important',
-      height: '80px !important',
-      filter: 'drop-shadow( 0px 2px 3px rgba(0, 0, 0, 0.3))',
-      fill: theme.styleTypes.danger.contrast,
-    },
-  },
  headline: {
    fontSize: 40,
  },
@@ -158,7 +141,7 @@ const styles = theme => ({
    overflow: 'scroll-x',
  },
  featuredPlan: {
-    transform: 'scale(1.05)',
+    transform: ({ isPersonalPlanAvailable }) => (isPersonalPlanAvailable ? 'scale(1.05)' : null),
  },
  disclaimer: {
    textAlign: 'right',
@@ -177,8 +160,13 @@ class PlanSelection extends Component {
    upgradeAccount: PropTypes.func.isRequired,
    stayOnFree: PropTypes.func.isRequired,
    hadSubscription: PropTypes.bool.isRequired,
+    isPersonalPlanAvailable: PropTypes.bool,
  };
+  static defaultProps = {
+    isPersonalPlanAvailable: true,
+  }
  static contextTypes = {
    intl: intlShape,
  };
@@ -196,6 +184,7 @@ class PlanSelection extends Component {
      upgradeAccount,
      stayOnFree,
      hadSubscription,
+      isPersonalPlanAvailable,
    } = this.props;
    const { intl } = this.context;
@@ -206,15 +195,14 @@ class PlanSelection extends Component {
          className={classes.root}
        >
          <div className={classes.container}>
-            <div className={classes.bigIcon}>
-              <Icon icon={mdiRocket} />
-            </div>
            <H1 className={classes.headline}>{intl.formatMessage(messages.welcome, { name: firstname })}</H1>
-            <H2 className={classes.subheadline}>{intl.formatMessage(messages.subheadline)}</H2>
+            {isPersonalPlanAvailable && (
+              <H2 className={classes.subheadline}>{intl.formatMessage(messages.subheadline)}</H2>
+            )}
            <div className={classes.plans}>
              <PlanItem
                name={i18nPlanName(PLANS.FREE, intl)}
-                text={intl.formatMessage(messages.textFree)}
+                text={isPersonalPlanAvailable ? intl.formatMessage(messages.textFree) : null}
                price={0}
                currency={currency}
                ctaLabel={intl.formatMessage(subscriptionExpired ? messages.ctaDowngradeFree : messages.ctaStayOnFree)}
@@ -228,33 +216,35 @@ class PlanSelection extends Component {
              </PlanItem>
              <PlanItem
                name={i18nPlanName(plans.pro.yearly.id, intl)}
-                text={intl.formatMessage(messages.textProfessional)}
+                text={isPersonalPlanAvailable ? intl.formatMessage(messages.textProfessional) : null}
                price={plans.pro.yearly.price}
                currency={currency}
                ctaLabel={intl.formatMessage(hadSubscription ? messages.shortActionPro : messages.actionTrial)}
                upgrade={() => upgradeAccount(plans.pro.yearly.id)}
                className={classes.featuredPlan}
                perUser
-                bestValue
+                bestValue={isPersonalPlanAvailable}
-              >
-                <FeatureList
-                  plan={PLANS.PRO}
-                  className={classes.featureList}
-                />
-              </PlanItem>
-              <PlanItem
-                name={i18nPlanName(plans.personal.yearly.id, intl)}
-                text={intl.formatMessage(messages.textPersonal)}
-                price={plans.personal.yearly.price}
-                currency={currency}
-                ctaLabel={intl.formatMessage(hadSubscription ? messages.shortActionPersonal : messages.actionTrial)}
-                upgrade={() => upgradeAccount(plans.personal.yearly.id)}
              >
                <FeatureList
-                  plan={PLANS.PERSONAL}
+                  plan={isPersonalPlanAvailable ? PLANS.PRO : null}
                  className={classes.featureList}
                />
              </PlanItem>
+              {isPersonalPlanAvailable && (
+                <PlanItem
+                  name={i18nPlanName(plans.personal.yearly.id, intl)}
+                  text={intl.formatMessage(messages.textPersonal)}
+                  price={plans.personal.yearly.price}
+                  currency={currency}
+                  ctaLabel={intl.formatMessage(hadSubscription ? messages.shortActionPersonal : messages.actionTrial)}
+                  upgrade={() => upgradeAccount(plans.personal.yearly.id)}
+                >
+                  <FeatureList
+                    plan={PLANS.PERSONAL}
+                    className={classes.featureList}
+                  />
+                </PlanItem>
+              )}
            </div>
            <div className={classes.footer}>
              <a
diff --git a/src/features/planSelection/containers/PlanSelectionScreen.js b/src/features/planSelection/containers/PlanSelectionScreen.js
index d202c924e..e4d85cda5 100644
--- a/src/features/planSelection/containers/PlanSelectionScreen.js
+++ b/src/features/planSelection/containers/PlanSelectionScreen.js
@@ -53,7 +53,8 @@ class PlanSelectionScreen extends Component {
    const { intl } = this.context;
    const { user, features } = this.props.stores;
-    const { plans, currency } = features.features.pricingConfig;
+    const { isPersonalPlanAvailable, pricingConfig } = features.features;
+    const { plans, currency } = pricingConfig;
    const { activateTrial } = this.props.actions.user;
    const { downgradeAccount, hideOverlay } = this.props.actions.planSelection;
@@ -95,6 +96,7 @@ class PlanSelectionScreen extends Component {
          }}
          subscriptionExpired={user.team && user.team.state === 'expired' && !user.team.userHasDowngraded}
          hadSubscription={user.data.hadSubscription}
+          isPersonalPlanAvailable={isPersonalPlanAvailable}
        />
      </ErrorBoundary>
    );
diff --git a/src/helpers/plan-helpers.js b/src/helpers/plan-helpers.js
index ee22e4471..b474f8bbd 100644
--- a/src/helpers/plan-helpers.js
+++ b/src/helpers/plan-helpers.js
@@ -20,6 +20,10 @@ const messages = defineMessages({
  },
 });
+export function cleanupPlanId(id) {
+  return id.replace(/(.*)-x[0-9]/, '$1');
+}
 export function i18nPlanName(planId, intl) {
  if (!planId) {
    throw new Error('planId is required');
@@ -29,7 +33,9 @@ export function i18nPlanName(planId, intl) {
    throw new Error('intl context is required');
  }
-  const plan = PLANS_MAPPING[planId];
+  const id = cleanupPlanId(planId);
+  const plan = PLANS_MAPPING[id];
  return intl.formatMessage(messages[plan]);
 }
@@ -39,7 +45,9 @@ export function getPlan(planId) {
    throw new Error('planId is required');
  }
-  const plan = PLANS_MAPPING[planId];
+  const id = cleanupPlanId(planId);
+  const plan = PLANS_MAPPING[id];
  return plan;
 }
diff --git a/src/helpers/userAgent-helpers.js b/src/helpers/userAgent-helpers.js
new file mode 100644
index 000000000..15edc1054
--- /dev/null
+++ b/src/helpers/userAgent-helpers.js
@@ -0,0 +1,45 @@
+import { remote, app } from 'electron';
+import os from 'os';
+import macosVersion from 'macos-version';
+import { isMac, isWindows } from '../environment';
+// This helper gets included from the backend and frontend but we only need to use "remote"
+// if we are in the frontend
+const ferdiVersion = remote && remote.app ? remote.app.getVersion() : app.getVersion();
+function macOS() {
+  const version = macosVersion();
+  return `Macintosh; Intel Mac OS X ${version.replace(/\./g, '_')}`;
+}
+function windows() {
+  const version = os.release();
+  const [majorVersion, minorVersion] = version.split('.');
+  return `Windows NT ${majorVersion}.${minorVersion}; Win64; x64`;
+}
+function linux() {
+  return 'X11; Ubuntu; Linux x86_64';
+}
+export default function userAgent(removeChromeVersion = false) {
+  let platformString = '';
+  if (isMac) {
+    platformString = macOS();
+  } else if (isWindows) {
+    platformString = windows();
+  } else {
+    platformString = linux();
+  }
+  let applicationString = '';
+  if (!removeChromeVersion) {
+    applicationString = ` Ferdi/${ferdiVersion} (Electron ${process.versions.electron})`;
+  }
+  // TODO: Update AppleWebKit and Safari version after electron update
+  return `Mozilla/5.0 (${platformString}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome${!removeChromeVersion ? `/${process.versions.chrome}` : ''} Safari/537.36${applicationString}`;
+  // Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) old-airport-include/1.0.0 Chrome Electron/7.1.7 Safari/537.36
+}
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 56d0b1971..f3ff7caf3 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -1193,6 +1193,190 @@
  {
    "descriptors": [
      {
+        "defaultMessage": "!!!Home",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/services/content/ConnectionBanner.js",
+        "id": "webControls.goHome",
+        "start": {
+          "column": 10,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Open in Browser",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/services/content/ConnectionBanner.js",
+        "id": "webControls.openInBrowser",
+        "start": {
+          "column": 17,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Back",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/components/services/content/ConnectionBanner.js",
+        "id": "webControls.back",
+        "start": {
+          "column": 8,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Forward",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/services/content/ConnectionBanner.js",
+        "id": "webControls.forward",
+        "start": {
+          "column": 11,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/components/services/content/ConnectionBanner.js",
+        "id": "webControls.reload",
+        "start": {
+          "column": 10,
+          "line": 29
+        }
+      }
+    ],
+    "path": "src/components/services/content/ConnectionBanner.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Home",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/services/content/ConnectionLost.js",
+        "id": "webControls.goHome",
+        "start": {
+          "column": 10,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Open in Browser",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/services/content/ConnectionLost.js",
+        "id": "webControls.openInBrowser",
+        "start": {
+          "column": 17,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Back",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/components/services/content/ConnectionLost.js",
+        "id": "webControls.back",
+        "start": {
+          "column": 8,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Forward",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/services/content/ConnectionLost.js",
+        "id": "webControls.forward",
+        "start": {
+          "column": 11,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/components/services/content/ConnectionLost.js",
+        "id": "webControls.reload",
+        "start": {
+          "column": 10,
+          "line": 29
+        }
+      }
+    ],
+    "path": "src/components/services/content/ConnectionLost.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Oh no! Franz lost the connection to {name}.",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/services/content/ConnectionLostBanner.js",
+        "id": "connectionLostBanner.message",
+        "start": {
+          "column": 8,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!What happened?",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/components/services/content/ConnectionLostBanner.js",
+        "id": "connectionLostBanner.informationLink",
+        "start": {
+          "column": 19,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload Service",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/components/services/content/ConnectionLostBanner.js",
+        "id": "connectionLostBanner.cta",
+        "start": {
+          "column": 7,
+          "line": 23
+        }
+      }
+    ],
+    "path": "src/components/services/content/ConnectionLostBanner.json"
+  },
+  {
+    "descriptors": [
+      {
        "defaultMessage": "!!!Oh no!",
        "end": {
          "column": 3,
@@ -1434,6 +1618,76 @@
  {
    "descriptors": [
      {
+        "defaultMessage": "!!!Home",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/services/content/WebControls.js",
+        "id": "webControls.goHome",
+        "start": {
+          "column": 10,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Open in Browser",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/services/content/WebControls.js",
+        "id": "webControls.openInBrowser",
+        "start": {
+          "column": 17,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Back",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/components/services/content/WebControls.js",
+        "id": "webControls.back",
+        "start": {
+          "column": 8,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Forward",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/services/content/WebControls.js",
+        "id": "webControls.forward",
+        "start": {
+          "column": 11,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/components/services/content/WebControls.js",
+        "id": "webControls.reload",
+        "start": {
+          "column": 10,
+          "line": 29
+        }
+      }
+    ],
+    "path": "src/components/services/content/WebControls.json"
+  },
+  {
+    "descriptors": [
+      {
        "defaultMessage": "!!!Oh no!",
        "end": {
          "column": 3,
@@ -2421,107 +2675,120 @@
        }
      },
      {
-        "defaultMessage": "!!!Notifications",
+        "defaultMessage": "!!!You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
        "end": {
          "column": 3,
          "line": 99
        },
        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.disableHibernationInfo",
+        "start": {
+          "column": 26,
+          "line": 96
+        }
+      },
+      {
+        "defaultMessage": "!!!Notifications",
+        "end": {
+          "column": 3,
+          "line": 103
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
        "id": "settings.service.form.headlineNotifications",
        "start": {
          "column": 25,
-          "line": 96
+          "line": 100
        }
      },
      {
        "defaultMessage": "!!!Unread message badges",
        "end": {
          "column": 3,
-          "line": 103
+          "line": 107
        },
        "file": "src/components/settings/services/EditServiceForm.js",
        "id": "settings.service.form.headlineBadges",
        "start": {
          "column": 18,
-          "line": 100
+          "line": 104
        }
      },
      {
        "defaultMessage": "!!!General",
        "end": {
          "column": 3,
-          "line": 107
+          "line": 111
        },
        "file": "src/components/settings/services/EditServiceForm.js",
        "id": "settings.service.form.headlineGeneral",
        "start": {
          "column": 19,
-          "line": 104
+          "line": 108
        }
      },
      {
        "defaultMessage": "!!!Delete",
        "end": {
          "column": 3,
-          "line": 111
+          "line": 115
        },
        "file": "src/components/settings/services/EditServiceForm.js",
        "id": "settings.service.form.iconDelete",
        "start": {
          "column": 14,
-          "line": 108
+          "line": 112
        }
      },
      {
        "defaultMessage": "!!!Drop your image, or click here",
        "end": {
          "column": 3,
-          "line": 115
+          "line": 119
        },
        "file": "src/components/settings/services/EditServiceForm.js",
        "id": "settings.service.form.iconUpload",
        "start": {
          "column": 14,
-          "line": 112
+          "line": 116
        }
      },
      {
        "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
        "end": {
          "column": 3,
-          "line": 119
+          "line": 123
        },
        "file": "src/components/settings/services/EditServiceForm.js",
        "id": "settings.service.form.proxy.headline",
        "start": {
          "column": 17,
-          "line": 116
+          "line": 120
        }
      },
      {
        "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
        "end": {
          "column": 3,
-          "line": 123
+          "line": 127
        },
        "file": "src/components/settings/services/EditServiceForm.js",
        "id": "settings.service.form.proxy.restartInfo",
        "start": {
          "column": 20,
-          "line": 120
+          "line": 124
        }
      },
      {
        "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
        "end": {
          "column": 3,
-          "line": 127
+          "line": 131
        },
        "file": "src/components/settings/services/EditServiceForm.js",
        "id": "settings.service.form.proxy.info",
        "start": {
          "column": 13,
-          "line": 124
+          "line": 128
        }
      }
    ],
@@ -3888,6 +4155,19 @@
          "column": 10,
          "line": 65
        }
+      },
+      {
+        "defaultMessage": "!!!Occasional Waiting Screens",
+        "end": {
+          "column": 3,
+          "line": 72
+        },
+        "file": "src/components/ui/FeatureList.js",
+        "id": "pricing.features.appDelaysEnabled",
+        "start": {
+          "column": 19,
+          "line": 69
+        }
      }
    ],
    "path": "src/components/ui/FeatureList.json"
@@ -4006,172 +4286,185 @@
        }
      },
      {
-        "defaultMessage": "!!!Enable Notifications",
+        "defaultMessage": "!!!Disable hibernation",
        "end": {
          "column": 3,
          "line": 39
        },
        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableNotification",
+        "id": "settings.service.form.disableHibernation",
        "start": {
          "column": 22,
          "line": 36
        }
      },
      {
-        "defaultMessage": "!!!Show unread message badges",
+        "defaultMessage": "!!!Enable Notifications",
        "end": {
          "column": 3,
          "line": 43
        },
        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.enableNotification",
+        "start": {
+          "column": 22,
+          "line": 40
+        }
+      },
+      {
+        "defaultMessage": "!!!Show unread message badges",
+        "end": {
+          "column": 3,
+          "line": 47
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
        "id": "settings.service.form.enableBadge",
        "start": {
          "column": 15,
-          "line": 40
+          "line": 44
        }
      },
      {
        "defaultMessage": "!!!Enable audio",
        "end": {
          "column": 3,
-          "line": 47
+          "line": 51
        },
        "file": "src/containers/settings/EditServiceScreen.js",
        "id": "settings.service.form.enableAudio",
        "start": {
          "column": 15,
-          "line": 44
+          "line": 48
        }
      },
      {
        "defaultMessage": "!!!Team",
        "end": {
          "column": 3,
-          "line": 51
+          "line": 55
        },
        "file": "src/containers/settings/EditServiceScreen.js",
        "id": "settings.service.form.team",
        "start": {
          "column": 8,
-          "line": 48
+          "line": 52
        }
      },
      {
        "defaultMessage": "!!!Service URL",
        "end": {
          "column": 3,
-          "line": 55
+          "line": 59
        },
        "file": "src/containers/settings/EditServiceScreen.js",
        "id": "settings.service.form.customUrl",
        "start": {
          "column": 13,
-          "line": 52
+          "line": 56
        }
      },
      {
        "defaultMessage": "!!!Show message badge for all new messages",
        "end": {
          "column": 3,
-          "line": 59
+          "line": 63
        },
        "file": "src/containers/settings/EditServiceScreen.js",
        "id": "settings.service.form.indirectMessages",
        "start": {
          "column": 20,
-          "line": 56
+          "line": 60
        }
      },
      {
        "defaultMessage": "!!!Custom icon",
        "end": {
          "column": 3,
-          "line": 63
+          "line": 67
        },
        "file": "src/containers/settings/EditServiceScreen.js",
        "id": "settings.service.form.icon",
        "start": {
          "column": 8,
-          "line": 60
+          "line": 64
        }
      },
      {
        "defaultMessage": "!!!Enable Dark Mode",
        "end": {
          "column": 3,
-          "line": 67
+          "line": 71
        },
        "file": "src/containers/settings/EditServiceScreen.js",
        "id": "settings.service.form.enableDarkMode",
        "start": {
          "column": 18,
-          "line": 64
+          "line": 68
        }
      },
      {
        "defaultMessage": "!!!Use Proxy",
        "end": {
          "column": 3,
-          "line": 71
+          "line": 75
        },
        "file": "src/containers/settings/EditServiceScreen.js",
        "id": "settings.service.form.proxy.isEnabled",
        "start": {
          "column": 15,
-          "line": 68
+          "line": 72
        }
      },
      {
        "defaultMessage": "!!!Proxy Host/IP",
        "end": {
          "column": 3,
-          "line": 75
+          "line": 79
        },
        "file": "src/containers/settings/EditServiceScreen.js",
        "id": "settings.service.form.proxy.host",
        "start": {
          "column": 13,
-          "line": 72
+          "line": 76
        }
      },
      {
        "defaultMessage": "!!!Port",
        "end": {
          "column": 3,
-          "line": 79
+          "line": 83
        },
        "file": "src/containers/settings/EditServiceScreen.js",
        "id": "settings.service.form.proxy.port",
        "start": {
          "column": 13,
-          "line": 76
+          "line": 80
        }
      },
      {
        "defaultMessage": "!!!User",
        "end": {
          "column": 3,
-          "line": 83
+          "line": 87
        },
        "file": "src/containers/settings/EditServiceScreen.js",
        "id": "settings.service.form.proxy.user",
        "start": {
          "column": 13,
-          "line": 80
+          "line": 84
        }
      },
      {
        "defaultMessage": "!!!Password",
        "end": {
          "column": 3,
-          "line": 87
+          "line": 91
        },
        "file": "src/containers/settings/EditServiceScreen.js",
        "id": "settings.service.form.proxy.password",
        "start": {
          "column": 17,
-          "line": 84
+          "line": 88
        }
      }
    ],
@@ -5327,6 +5620,76 @@
  {
    "descriptors": [
      {
+        "defaultMessage": "!!!Home",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/features/recipeConnectionLost/components/WebControls.js",
+        "id": "webControls.goHome",
+        "start": {
+          "column": 10,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Open in Browser",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/features/recipeConnectionLost/components/WebControls.js",
+        "id": "webControls.openInBrowser",
+        "start": {
+          "column": 17,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Back",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/features/recipeConnectionLost/components/WebControls.js",
+        "id": "webControls.back",
+        "start": {
+          "column": 8,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Forward",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/features/recipeConnectionLost/components/WebControls.js",
+        "id": "webControls.forward",
+        "start": {
+          "column": 11,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/features/recipeConnectionLost/components/WebControls.js",
+        "id": "webControls.reload",
+        "start": {
+          "column": 10,
+          "line": 29
+        }
+      }
+    ],
+    "path": "src/features/recipeConnectionLost/components/WebControls.json"
+  },
+  {
+    "descriptors": [
+      {
        "defaultMessage": "!!!Changes in Franz {version}",
        "end": {
          "column": 3,
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 947f927e7..8a95970a2 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -4,6 +4,9 @@
  "changeserver.headline": "Change server",
  "changeserver.label": "Server",
  "changeserver.submit": "Submit",
+  "connectionLostBanner.cta": "Reload Service",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
  "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
  "feature.debugger.title": "Publish debugging information",
  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -183,6 +186,7 @@
  "pricing.features.accountSync": "Account Synchronisation",
  "pricing.features.adFree": "Forever ad-free",
  "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
  "pricing.features.customWebsites": "Add Custom Websites",
  "pricing.features.desktopNotifications": "Desktop Notifications",
  "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -305,8 +309,8 @@
  "settings.app.form.sentry": "Send telemetry data",
  "settings.app.form.serviceRibbonWidth": "Sidebar width",
  "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -366,6 +370,8 @@
  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
  "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
  "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
  "settings.service.form.editServiceHeadline": "Edit {name}",
  "settings.service.form.enableAudio": "Enable audio",
  "settings.service.form.enableBadge": "Show unread message badges",
diff --git a/src/i18n/messages/src/components/services/content/ConnectionBanner.json b/src/i18n/messages/src/components/services/content/ConnectionBanner.json
new file mode 100644
index 000000000..1047c28b5
--- /dev/null
+++ b/src/i18n/messages/src/components/services/content/ConnectionBanner.json
@@ -0,0 +1,67 @@
+[
+  {
+    "id": "webControls.goHome",
+    "defaultMessage": "!!!Home",
+    "file": "src/components/services/content/ConnectionBanner.js",
+    "start": {
+      "line": 13,
+      "column": 10
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.openInBrowser",
+    "defaultMessage": "!!!Open in Browser",
+    "file": "src/components/services/content/ConnectionBanner.js",
+    "start": {
+      "line": 17,
+      "column": 17
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.back",
+    "defaultMessage": "!!!Back",
+    "file": "src/components/services/content/ConnectionBanner.js",
+    "start": {
+      "line": 21,
+      "column": 8
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.forward",
+    "defaultMessage": "!!!Forward",
+    "file": "src/components/services/content/ConnectionBanner.js",
+    "start": {
+      "line": 25,
+      "column": 11
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.reload",
+    "defaultMessage": "!!!Reload",
+    "file": "src/components/services/content/ConnectionBanner.js",
+    "start": {
+      "line": 29,
+      "column": 10
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  }
+]
+\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ConnectionLost.json b/src/i18n/messages/src/components/services/content/ConnectionLost.json
new file mode 100644
index 000000000..ee3f7a4ba
--- /dev/null
+++ b/src/i18n/messages/src/components/services/content/ConnectionLost.json
@@ -0,0 +1,67 @@
+[
+  {
+    "id": "webControls.goHome",
+    "defaultMessage": "!!!Home",
+    "file": "src/components/services/content/ConnectionLost.js",
+    "start": {
+      "line": 13,
+      "column": 10
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.openInBrowser",
+    "defaultMessage": "!!!Open in Browser",
+    "file": "src/components/services/content/ConnectionLost.js",
+    "start": {
+      "line": 17,
+      "column": 17
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.back",
+    "defaultMessage": "!!!Back",
+    "file": "src/components/services/content/ConnectionLost.js",
+    "start": {
+      "line": 21,
+      "column": 8
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.forward",
+    "defaultMessage": "!!!Forward",
+    "file": "src/components/services/content/ConnectionLost.js",
+    "start": {
+      "line": 25,
+      "column": 11
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.reload",
+    "defaultMessage": "!!!Reload",
+    "file": "src/components/services/content/ConnectionLost.js",
+    "start": {
+      "line": 29,
+      "column": 10
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  }
+]
+\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json b/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json
new file mode 100644
index 000000000..fd7019f41
--- /dev/null
+++ b/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json
@@ -0,0 +1,41 @@
+[
+  {
+    "id": "connectionLostBanner.message",
+    "defaultMessage": "!!!Oh no! Franz lost the connection to {name}.",
+    "file": "src/components/services/content/ConnectionLostBanner.js",
+    "start": {
+      "line": 15,
+      "column": 8
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "connectionLostBanner.informationLink",
+    "defaultMessage": "!!!What happened?",
+    "file": "src/components/services/content/ConnectionLostBanner.js",
+    "start": {
+      "line": 19,
+      "column": 19
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "connectionLostBanner.cta",
+    "defaultMessage": "!!!Reload Service",
+    "file": "src/components/services/content/ConnectionLostBanner.js",
+    "start": {
+      "line": 23,
+      "column": 7
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  }
+]
+\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/WebControls.json b/src/i18n/messages/src/components/services/content/WebControls.json
new file mode 100644
index 000000000..5af5143d0
--- /dev/null
+++ b/src/i18n/messages/src/components/services/content/WebControls.json
@@ -0,0 +1,67 @@
+[
+  {
+    "id": "webControls.goHome",
+    "defaultMessage": "!!!Home",
+    "file": "src/components/services/content/WebControls.js",
+    "start": {
+      "line": 13,
+      "column": 10
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.openInBrowser",
+    "defaultMessage": "!!!Open in Browser",
+    "file": "src/components/services/content/WebControls.js",
+    "start": {
+      "line": 17,
+      "column": 17
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.back",
+    "defaultMessage": "!!!Back",
+    "file": "src/components/services/content/WebControls.js",
+    "start": {
+      "line": 21,
+      "column": 8
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.forward",
+    "defaultMessage": "!!!Forward",
+    "file": "src/components/services/content/WebControls.js",
+    "start": {
+      "line": 25,
+      "column": 11
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.reload",
+    "defaultMessage": "!!!Reload",
+    "file": "src/components/services/content/WebControls.js",
+    "start": {
+      "line": 29,
+      "column": 10
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  }
+]
+\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/EditServiceForm.json b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
index df64c8a5f..811c49498 100644
--- a/src/i18n/messages/src/components/settings/services/EditServiceForm.json
+++ b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
@@ -234,15 +234,28 @@
    }
  },
  {
+    "id": "settings.service.form.disableHibernationInfo",
+    "defaultMessage": "!!!You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 96,
+      "column": 26
+    },
+    "end": {
+      "line": 99,
+      "column": 3
+    }
+  },
+  {
    "id": "settings.service.form.headlineNotifications",
    "defaultMessage": "!!!Notifications",
    "file": "src/components/settings/services/EditServiceForm.js",
    "start": {
-      "line": 96,
+      "line": 100,
      "column": 25
    },
    "end": {
-      "line": 99,
+      "line": 103,
      "column": 3
    }
  },
@@ -251,11 +264,11 @@
    "defaultMessage": "!!!Unread message badges",
    "file": "src/components/settings/services/EditServiceForm.js",
    "start": {
-      "line": 100,
+      "line": 104,
      "column": 18
    },
    "end": {
-      "line": 103,
+      "line": 107,
      "column": 3
    }
  },
@@ -264,11 +277,11 @@
    "defaultMessage": "!!!General",
    "file": "src/components/settings/services/EditServiceForm.js",
    "start": {
-      "line": 104,
+      "line": 108,
      "column": 19
    },
    "end": {
-      "line": 107,
+      "line": 111,
      "column": 3
    }
  },
@@ -277,11 +290,11 @@
    "defaultMessage": "!!!Delete",
    "file": "src/components/settings/services/EditServiceForm.js",
    "start": {
-      "line": 108,
+      "line": 112,
      "column": 14
    },
    "end": {
-      "line": 111,
+      "line": 115,
      "column": 3
    }
  },
@@ -290,11 +303,11 @@
    "defaultMessage": "!!!Drop your image, or click here",
    "file": "src/components/settings/services/EditServiceForm.js",
    "start": {
-      "line": 112,
+      "line": 116,
      "column": 14
    },
    "end": {
-      "line": 115,
+      "line": 119,
      "column": 3
    }
  },
@@ -303,11 +316,11 @@
    "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
    "file": "src/components/settings/services/EditServiceForm.js",
    "start": {
-      "line": 116,
+      "line": 120,
      "column": 17
    },
    "end": {
-      "line": 119,
+      "line": 123,
      "column": 3
    }
  },
@@ -316,11 +329,11 @@
    "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
    "file": "src/components/settings/services/EditServiceForm.js",
    "start": {
-      "line": 120,
+      "line": 124,
      "column": 20
    },
    "end": {
-      "line": 123,
+      "line": 127,
      "column": 3
    }
  },
@@ -329,11 +342,11 @@
    "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
    "file": "src/components/settings/services/EditServiceForm.js",
    "start": {
-      "line": 124,
+      "line": 128,
      "column": 13
    },
    "end": {
-      "line": 127,
+      "line": 131,
      "column": 3
    }
  }
diff --git a/src/i18n/messages/src/components/ui/FeatureList.json b/src/i18n/messages/src/components/ui/FeatureList.json
index 3201115b3..8d1dc4360 100644
--- a/src/i18n/messages/src/components/ui/FeatureList.json
+++ b/src/i18n/messages/src/components/ui/FeatureList.json
@@ -193,5 +193,18 @@
      "line": 68,
      "column": 3
    }
+  },
+  {
+    "id": "pricing.features.appDelaysEnabled",
+    "defaultMessage": "!!!Occasional Waiting Screens",
+    "file": "src/components/ui/FeatureList.js",
+    "start": {
+      "line": 69,
+      "column": 19
+    },
+    "end": {
+      "line": 72,
+      "column": 3
+    }
  }
 ]
 \ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditServiceScreen.json b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
index 9b46a1e6f..36937ebf8 100644
--- a/src/i18n/messages/src/containers/settings/EditServiceScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
@@ -26,8 +26,8 @@
    }
  },
  {
-    "id": "settings.service.form.enableNotification",
+    "id": "settings.service.form.disableHibernation",
-    "defaultMessage": "!!!Enable Notifications",
+    "defaultMessage": "!!!Disable hibernation",
    "file": "src/containers/settings/EditServiceScreen.js",
    "start": {
      "line": 36,
@@ -39,15 +39,28 @@
    }
  },
  {
+    "id": "settings.service.form.enableNotification",
+    "defaultMessage": "!!!Enable Notifications",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 40,
+      "column": 22
+    },
+    "end": {
+      "line": 43,
+      "column": 3
+    }
+  },
+  {
    "id": "settings.service.form.enableBadge",
    "defaultMessage": "!!!Show unread message badges",
    "file": "src/containers/settings/EditServiceScreen.js",
    "start": {
-      "line": 40,
+      "line": 44,
      "column": 15
    },
    "end": {
-      "line": 43,
+      "line": 47,
      "column": 3
    }
  },
@@ -56,11 +69,11 @@
    "defaultMessage": "!!!Enable audio",
    "file": "src/containers/settings/EditServiceScreen.js",
    "start": {
-      "line": 44,
+      "line": 48,
      "column": 15
    },
    "end": {
-      "line": 47,
+      "line": 51,
      "column": 3
    }
  },
@@ -69,11 +82,11 @@
    "defaultMessage": "!!!Team",
    "file": "src/containers/settings/EditServiceScreen.js",
    "start": {
-      "line": 48,
+      "line": 52,
      "column": 8
    },
    "end": {
-      "line": 51,
+      "line": 55,
      "column": 3
    }
  },
@@ -82,11 +95,11 @@
    "defaultMessage": "!!!Service URL",
    "file": "src/containers/settings/EditServiceScreen.js",
    "start": {
-      "line": 52,
+      "line": 56,
      "column": 13
    },
    "end": {
-      "line": 55,
+      "line": 59,
      "column": 3
    }
  },
@@ -95,11 +108,11 @@
    "defaultMessage": "!!!Show message badge for all new messages",
    "file": "src/containers/settings/EditServiceScreen.js",
    "start": {
-      "line": 56,
+      "line": 60,
      "column": 20
    },
    "end": {
-      "line": 59,
+      "line": 63,
      "column": 3
    }
  },
@@ -108,11 +121,11 @@
    "defaultMessage": "!!!Custom icon",
    "file": "src/containers/settings/EditServiceScreen.js",
    "start": {
-      "line": 60,
+      "line": 64,
      "column": 8
    },
    "end": {
-      "line": 63,
+      "line": 67,
      "column": 3
    }
  },
@@ -121,11 +134,11 @@
    "defaultMessage": "!!!Enable Dark Mode",
    "file": "src/containers/settings/EditServiceScreen.js",
    "start": {
-      "line": 64,
+      "line": 68,
      "column": 18
    },
    "end": {
-      "line": 67,
+      "line": 71,
      "column": 3
    }
  },
@@ -134,11 +147,11 @@
    "defaultMessage": "!!!Use Proxy",
    "file": "src/containers/settings/EditServiceScreen.js",
    "start": {
-      "line": 68,
+      "line": 72,
      "column": 15
    },
    "end": {
-      "line": 71,
+      "line": 75,
      "column": 3
    }
  },
@@ -147,11 +160,11 @@
    "defaultMessage": "!!!Proxy Host/IP",
    "file": "src/containers/settings/EditServiceScreen.js",
    "start": {
-      "line": 72,
+      "line": 76,
      "column": 13
    },
    "end": {
-      "line": 75,
+      "line": 79,
      "column": 3
    }
  },
@@ -160,11 +173,11 @@
    "defaultMessage": "!!!Port",
    "file": "src/containers/settings/EditServiceScreen.js",
    "start": {
-      "line": 76,
+      "line": 80,
      "column": 13
    },
    "end": {
-      "line": 79,
+      "line": 83,
      "column": 3
    }
  },
@@ -173,11 +186,11 @@
    "defaultMessage": "!!!User",
    "file": "src/containers/settings/EditServiceScreen.js",
    "start": {
-      "line": 80,
+      "line": 84,
      "column": 13
    },
    "end": {
-      "line": 83,
+      "line": 87,
      "column": 3
    }
  },
@@ -186,11 +199,11 @@
    "defaultMessage": "!!!Password",
    "file": "src/containers/settings/EditServiceScreen.js",
    "start": {
-      "line": 84,
+      "line": 88,
      "column": 17
    },
    "end": {
-      "line": 87,
+      "line": 91,
      "column": 3
    }
  }
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 5e084c1e1..42199503b 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -300,7 +300,7 @@
  },
  {
    "id": "settings.app.form.adaptableDarkMode",
-    "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting",
+    "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
      "line": 121,
diff --git a/src/i18n/messages/src/features/recipeConnectionLost/components/WebControls.json b/src/i18n/messages/src/features/recipeConnectionLost/components/WebControls.json
new file mode 100644
index 000000000..f3bcaf345
--- /dev/null
+++ b/src/i18n/messages/src/features/recipeConnectionLost/components/WebControls.json
@@ -0,0 +1,67 @@
+[
+  {
+    "id": "webControls.goHome",
+    "defaultMessage": "!!!Home",
+    "file": "src/features/recipeConnectionLost/components/WebControls.js",
+    "start": {
+      "line": 13,
+      "column": 10
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.openInBrowser",
+    "defaultMessage": "!!!Open in Browser",
+    "file": "src/features/recipeConnectionLost/components/WebControls.js",
+    "start": {
+      "line": 17,
+      "column": 17
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.back",
+    "defaultMessage": "!!!Back",
+    "file": "src/features/recipeConnectionLost/components/WebControls.js",
+    "start": {
+      "line": 21,
+      "column": 8
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.forward",
+    "defaultMessage": "!!!Forward",
+    "file": "src/features/recipeConnectionLost/components/WebControls.js",
+    "start": {
+      "line": 25,
+      "column": 11
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.reload",
+    "defaultMessage": "!!!Reload",
+    "file": "src/features/recipeConnectionLost/components/WebControls.js",
+    "start": {
+      "line": 29,
+      "column": 10
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  }
+]
+\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index 594097288..e5f678759 100644
--- a/src/index.js
+++ b/src/index.js
@@ -37,6 +37,7 @@ import Tray from './lib/Tray';
 import Settings from './electron/Settings';
 import handleDeepLink from './electron/deepLinking';
 import { isPositionValid } from './electron/windowUtils';
+// import askFormacOSPermissions from './electron/macOSPermissions';
 import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
 import './electron/exception';
@@ -46,10 +47,14 @@ import {
 } from './config';
 import { asarPath } from './helpers/asar-helpers';
 import { isValidExternalURL } from './helpers/url-helpers';
-/* eslint-enable import/first */
+import userAgent from './helpers/userAgent-helpers';
 const debug = require('debug')('Ferdi:App');
+// Globally set useragent to fix user agent override in service workers
+debug('Set userAgent to ', userAgent());
+app.userAgentFallback = userAgent();
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow;
@@ -182,6 +187,7 @@ const createWindow = () => {
      nodeIntegration: true,
      webviewTag: true,
      preload: path.join(__dirname, 'sentry.js'),
+      enableRemoteModule: true,
    },
  });
@@ -291,6 +297,11 @@ const createWindow = () => {
    }
  });
+  // Asking for permissions like this currently crashes Ferdi
+  // if (isMac) {
+  //   askFormacOSPermissions();
+  // }
  mainWindow.on('show', () => {
    debug('Skip taskbar: true');
    mainWindow.setSkipTaskbar(false);
diff --git a/src/internal-server b/src/internal-server
-Subproject 38fc9925d88971cee26cc08343da2f0e153c053
+Subproject 95ae59926dbd88d55a5377be997558a9e112ab4
diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index 6655f8310..dcb998a19 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -38,6 +38,8 @@ export default class Recipe {
  disablewebsecurity = false;
+  autoHibernate = false;
  constructor(data) {
    if (!data) {
      throw Error('Recipe config not valid');
@@ -78,6 +80,8 @@ export default class Recipe {
    this.disablewebsecurity = data.config.disablewebsecurity || this.disablewebsecurity;
+    this.autoHibernate = data.config.autoHibernate || this.autoHibernate;
    this.message = data.config.message || this.message;
  }
diff --git a/src/models/Service.js b/src/models/Service.js
index f073ac9fc..dc8febe0b 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -2,6 +2,8 @@ import { autorun, computed, observable } from 'mobx';
 import normalizeUrl from 'normalize-url';
 import path from 'path';
+import userAgent from '../helpers/userAgent-helpers';
 const debug = require('debug')('Ferdi:Service');
 export const RESTRICTION_TYPES = {
@@ -74,6 +76,20 @@ export default class Service {
  @observable restrictionType = null;
+  @observable isHibernationEnabled = false;
+  @observable lastUsed = Date.now(); // timestamp
+  @observable lastPoll = null;
+  @observable lastPollAnswer = null;
+  @observable lostRecipeConnection = false;
+  @observable lostRecipeReloadAttempt = 0;
+  @observable chromelessUserAgent = false;
  constructor(data, recipe) {
    if (!data) {
      console.error('Service config not valid');
@@ -119,6 +135,8 @@ export default class Service {
    this.spellcheckerLanguage = data.spellcheckerLanguage !== undefined ? data.spellcheckerLanguage : this.spellcheckerLanguage;
+    this.isHibernationEnabled = data.isHibernationEnabled !== undefined ? data.isHibernationEnabled : this.isHibernationEnabled;
    this.recipe = recipe;
    autorun(() => {
@@ -187,21 +205,34 @@ export default class Service {
  }
  @computed get userAgent() {
-    let { userAgent } = window.navigator;
+    let ua = userAgent(this.chromelessUserAgent);
    if (typeof this.recipe.overrideUserAgent === 'function') {
-      userAgent = this.recipe.overrideUserAgent();
+      ua = this.recipe.overrideUserAgent();
    }
-    // Remove Ferdi as it can cause incompatabilities with services.
+    return ua;
-    // This way, Ferdi will look like a normal Chrome instance
-    userAgent = userAgent.replace(/(Ferdi|Electron)([^\s]+\s)/g, '');
-    return userAgent;
  }
  initializeWebViewEvents({ handleIPCMessage, openWindow, stores }) {
    const webContents = this.webview.getWebContents();
+    const handleUserAgent = (url, forwardingHack = false) => {
+      if (url.startsWith('https://accounts.google.com')) {
+        if (!this.chromelessUserAgent) {
+          debug('Setting user agent to chromeless for url', url);
+          this.webview.setUserAgent(userAgent(true));
+          if (forwardingHack) {
+            this.webview.loadURL(url);
+          }
+          this.chromelessUserAgent = true;
+        }
+      } else if (this.chromelessUserAgent) {
+        debug('Setting user agent to contain chrome');
+        this.webview.setUserAgent(this.userAgent);
+        this.chromelessUserAgent = false;
+      }
+    };
    this.webview.addEventListener('ipc-message', e => handleIPCMessage({
      serviceId: this.id,
      channel: e.channel,
@@ -209,7 +240,6 @@ export default class Service {
    }));
    this.webview.addEventListener('new-window', (event, url, frameName, options) => {
-      console.log('open window', event, url, frameName, options);
      openWindow({
        event,
        url,
@@ -218,6 +248,9 @@ export default class Service {
      });
    });
+    this.webview.addEventListener('will-navigate', event => handleUserAgent(event.url, true));
    this.webview.addEventListener('did-start-loading', (event) => {
      debug('Did start load', this.name, event);
@@ -235,7 +268,10 @@ export default class Service {
    };
    this.webview.addEventListener('did-frame-finish-load', didLoad.bind(this));
-    this.webview.addEventListener('did-navigate', didLoad.bind(this));
+    this.webview.addEventListener('did-navigate', (event) => {
+      handleUserAgent(event.url);
+      didLoad();
+    });
    this.webview.addEventListener('did-fail-load', (event) => {
      debug('Service failed to load', this.name, event);
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index e2e3760a8..da6055e5f 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -218,13 +218,16 @@ export default class AppStore extends Store {
    // macOS catalina notifications hack
    // notifications got stuck after upgrade but forcing a notification
    // via `new Notification` triggered the permission request
-    if (isMac && !localStorage.getItem(CATALINA_NOTIFICATION_HACK_KEY)) {
+    if (isMac) {
-      // eslint-disable-next-line no-new
+      if (!localStorage.getItem(CATALINA_NOTIFICATION_HACK_KEY)) {
-      new window.Notification('Welcome to Franz 5', {
+        debug('Triggering macOS Catalina notification permission trigger');
-        body: 'Have a wonderful day & happy messaging.',
+        // eslint-disable-next-line no-new
-      });
+        new window.Notification('Welcome to Franz 5', {
+          body: 'Have a wonderful day & happy messaging.',
+        });
-      localStorage.setItem(CATALINA_NOTIFICATION_HACK_KEY, true);
+        localStorage.setItem(CATALINA_NOTIFICATION_HACK_KEY, true);
+      }
    }
  }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 19e6f8299..80c7d7e81 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -5,7 +5,7 @@ import {
  computed,
  observable,
 } from 'mobx';
-import { remove } from 'lodash';
+import { debounce, remove } from 'lodash';
 import ms from 'ms';
 import fs from 'fs-extra';
 import path from 'path';
@@ -127,6 +127,60 @@ export default class ServicesStore extends Store {
    );
  }
+  initialize() {
+    super.initialize();
+    // Check services to become hibernated
+    this.serviceMaintenanceTick();
+  }
+  teardown() {
+    super.teardown();
+    // Stop checking services for hibernation
+    this.serviceMaintenanceTick.cancel();
+  }
+  /**
+   * Сheck for services to become hibernated.
+   */
+  serviceMaintenanceTick = debounce(() => {
+    this._serviceMaintenance();
+    this.serviceMaintenanceTick();
+    debug('Service maintenance tick');
+  }, ms('10s'));
+  /**
+   * Run various maintenance tasks on services
+   */
+  _serviceMaintenance() {
+    this.all.forEach((service) => {
+      // Defines which services should be hibernated.
+      if (!service.isActive && (Date.now() - service.lastUsed > ms('5m'))) {
+        // If service is stale for 5 min, hibernate it.
+        this._hibernate({ serviceId: service.id });
+      }
+      if (service.lastPoll && (service.lastPoll) - service.lastPollAnswer > ms('30s')) {
+        // If service did not reply for more than 30s try to reload.
+        if (!service.isActive) {
+          if (this.stores.app.isOnline && service.lostRecipeReloadAttempt < 3) {
+            service.webview.reload();
+            service.lostRecipeReloadAttempt += 1;
+            service.lostRecipeConnection = false;
+          }
+        } else {
+          service.lostRecipeConnection = true;
+        }
+      } else {
+        service.lostRecipeConnection = false;
+        service.lostRecipeReloadAttempt = 0;
+      }
+    });
+  }
+  // Computed props
  @computed get all() {
    if (this.stores.user.isLoggedIn) {
      const services = this.allServicesRequest.execute().result;
@@ -379,6 +433,7 @@ export default class ServicesStore extends Store {
      this.all[index].isActive = false;
    });
    service.isActive = true;
+    service.lastUsed = Date.now();
    // Update list of last used services
    this.lastUsedServices = this.lastUsedServices.filter(id => id !== serviceId);
@@ -475,10 +530,16 @@ export default class ServicesStore extends Store {
    const service = this.one(serviceId);
    if (channel === 'hello') {
+      debug('Received hello event from', serviceId);
      this._initRecipePolling(service.id);
      this._initializeServiceRecipeInWebview(serviceId);
      this._shareSettingsWithServiceProcess();
+    } else if (channel === 'alive') {
+      service.lastPollAnswer = Date.now();
    } else if (channel === 'messages') {
+      debug(`Received unread message info from '${serviceId}'`, args[0]);
      this.actions.service.setUnreadMessageCount({
        serviceId,
        count: {
@@ -600,6 +661,7 @@ export default class ServicesStore extends Store {
    if (!service.isEnabled) return;
    service.resetMessageCount();
+    service.lostRecipeConnection = false;
    // service.webview.loadURL(service.url);
    service.webview.reload();
@@ -777,7 +839,7 @@ export default class ServicesStore extends Store {
      const isMuted = isAppMuted || service.isMuted;
      if (isAttached) {
-        service.webview.setAudioMuted(isMuted);
+        service.webview.audioMuted = isMuted;
      }
    });
  }
@@ -863,6 +925,7 @@ export default class ServicesStore extends Store {
        service.webview.send('poll');
        service.timer = setTimeout(loop, delay);
+        service.lastPoll = Date.now();
      };
      loop();
diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js
index 4fac21c55..add5fffa6 100644
--- a/src/webview/lib/RecipeWebview.js
+++ b/src/webview/lib/RecipeWebview.js
@@ -14,6 +14,10 @@ class RecipeWebview {
      this.loopFunc();
      debug('Poll event');
+      // This event is for checking if the service recipe is still actively
+      // communicating with the client
+      ipcRenderer.sendToHost('alive');
    });
  }