Merge branch 'release/5.4.0-beta.3' into fix/only-load-workspace-related-services

36 files changed, 534 insertions, 287 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cc0e4f52..6f4a960e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,39 @@
+# [5.4.0-beta.2](https://github.com/meetfranz/franz/compare/v5.4.0-beta.1...v5.4.0-beta.2) (2019-10-04)
+
+
+### Bug Fixes
+
+* **App:** Fix service issue that crashes the app
+
+
+# [5.4.0-beta.1](https://github.com/meetfranz/franz/compare/v5.3.3...v5.4.0-beta.1) (2019-10-04)
+
+### Features
+
+* **Custom Websites:** Added navigation bar for "Custom Website" service ([f8fbaad](https://github.com/meetfranz/franz/commit/f8fbaad))
+* **Mac:** Open Franz window with `Cmd+1` ([71831ec](https://github.com/meetfranz/franz/commit/71831ec))
+* **Todos:** Allow Franz Todos to open links in browser ([5ba6723](https://github.com/meetfranz/franz/commit/5ba6723))
+* **Service API:** Share `team`, `url` and `hasCustomIcon` with service ([9f4f3e7](https://github.com/meetfranz/franz/commit/9f4f3e7))
+
+
+
+### Bug Fixes
+
+* **App:** Fix "Paste And Match Style" ([490a988](https://github.com/meetfranz/franz/commit/490a988))
+* **macOS:** Only show services in Touch Bar that should be visible ([077ad22](https://github.com/meetfranz/franz/commit/077ad22))
+* **Service Proxies:** Fix proxy setting rehydration ([e2126a6](https://github.com/meetfranz/franz/commit/e2126a6))
+* **Settings:** Fix cache size calculation after clearing cache ([a31566d](https://github.com/meetfranz/franz/commit/a31566d))
+* **Spell check:** Fix spell checker to initialize without loaded dictionary ([734732f](https://github.com/meetfranz/franz/commit/734732f))
+* **Spell check:** Fix "undefined" language in context menu ([cc03883](https://github.com/meetfranz/franz/commit/cc03883))
+* **App:** Fix Basic Auth overlay background in Dark Mode ([027e50d](https://github.com/meetfranz/franz/commit/027e50d))
+
+### General
+
+* **App:** Updated electron to 6.0.11 ([34aab68](https://github.com/meetfranz/franz/commit/34aab68))
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+
+
+
 # [5.3.3](https://github.com/meetfranz/franz/compare/v5.3.1...v5.3.3) (2019-09-17)
 
 ### Features
diff --git a/package.json b/package.json
index 09874bc59..3e32b65db 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "franz",
   "productName": "Franz",
   "appId": "com.meetfranz.franz",
-  "version": "5.3.3",
+  "version": "5.4.0-beta.2",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "adlk x franz - Stefan Malzner",
   "main": "index.js",
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index e8df58a1e..3b09518c5 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -13,6 +13,7 @@ import ServiceDisabled from './ServiceDisabled';
 import ServiceRestricted from './ServiceRestricted';
 import ServiceWebview from './ServiceWebview';
 import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen';
+import { CUSTOM_WEBSITE_ID } from '../../../features/webControls/constants';
 
 export default @observer class ServiceView extends Component {
   static propTypes = {
@@ -139,7 +140,7 @@ export default @observer class ServiceView extends Component {
               />
             ) : (
               <>
-                {service.recipe.id === 'franz-custom-website' && (
+                {service.recipe.id === CUSTOM_WEBSITE_ID && (
                   <WebControlsScreen service={service} />
                 )}
                 <ServiceWebview
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
index 28b079e6b..5b28fb7c8 100644
--- a/src/features/delayApp/index.js
+++ b/src/features/delayApp/index.js
@@ -67,12 +67,12 @@ export default function init(stores) {
             gaPage('/delayApp');
             gaEvent('DelayApp', 'show', 'Delay App Feature');
 
-            timeLastDelay = moment();
-            shownAfterLaunch = true;
 
             setTimeout(() => {
               debug('Resetting app delay');
 
+              shownAfterLaunch = true;
+              timeLastDelay = moment();
               setVisibility(false);
             }, config.delayDuration + 1000); // timer needs to be able to hit 0
           } else {
diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js
index a39fcfe0e..c6331073b 100644
--- a/src/features/webControls/components/WebControls.js
+++ b/src/features/webControls/components/WebControls.js
@@ -148,6 +148,7 @@ class WebControls extends Component {
           type="button"
           className={classes.button}
           data-tip={intl.formatMessage(messages.goHome)}
+          data-place="bottom"
         >
           <Icon
             icon={mdiHomeOutline}
@@ -160,6 +161,7 @@ class WebControls extends Component {
           className={classes.button}
           disabled={!canGoBack}
           data-tip={intl.formatMessage(messages.back)}
+          data-place="bottom"
         >
           <Icon
             icon={mdiArrowLeft}
@@ -172,6 +174,7 @@ class WebControls extends Component {
           className={classes.button}
           disabled={!canGoForward}
           data-tip={intl.formatMessage(messages.forward)}
+          data-place="bottom"
         >
           <Icon
             icon={mdiArrowRight}
@@ -183,6 +186,7 @@ class WebControls extends Component {
           type="button"
           className={classes.button}
           data-tip={intl.formatMessage(messages.reload)}
+          data-place="bottom"
         >
           <Icon
             icon={mdiReload}
@@ -196,6 +200,7 @@ class WebControls extends Component {
             inputUrl: event.target.value,
           })}
           onFocus={(event) => {
+            console.log('on focus event');
             event.target.select();
             this.setState({
               editUrl: true,
@@ -223,14 +228,13 @@ class WebControls extends Component {
           type="button"
           className={classes.button}
           data-tip={intl.formatMessage(messages.openInBrowser)}
-          data-place="left"
+          data-place="bottom"
         >
           <Icon
             icon={mdiEarth}
             className={classes.icon}
           />
         </button>
-        {/* <ReactTooltip place="bottom" type="dark" effect="solid" /> */}
       </div>
     );
   }
diff --git a/src/features/webControls/constants.js b/src/features/webControls/constants.js
new file mode 100644
index 000000000..270a3568e
--- /dev/null
+++ b/src/features/webControls/constants.js
@@ -0,0 +1 @@
+export const CUSTOM_WEBSITE_ID = 'franz-custom-website';
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index b83fe335a..13227e033 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -146,16 +146,8 @@ export default class WorkspacesStore extends FeatureStore {
 
   filterServicesByActiveWorkspace = (services) => {
     const { activeWorkspace, isFeatureActive } = this;
-    if (isFeatureActive) {
-      if (activeWorkspace) {
-        return this.getWorkspaceServices(activeWorkspace);
-      }
-      // There is no active workspace yet but we might be still loading them
-      if (!getUserWorkspacesRequest.wasExecuted || getUserWorkspacesRequest.isExecutingFirstTime) {
-        // If so, do not show any services to avoid loading all of them unfiltered
-        // and then having the filter flashing in (which is ugly and slow).
-        return [];
-      }
+    if (isFeatureActive && activeWorkspace) {
+      return this.getWorkspaceServices(activeWorkspace);
     }
     return services;
   };
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index c194c9c1f..be22bd411 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -91,6 +91,7 @@
    "menu.services" : "Serveis",
    "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Afegeix un servei...",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Activate next service",
    "menu.todos" : "Todos",
    "menu.todos.enableTodos" : "Enable Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} es requerit",
    "validation.url" : "{field} es una URL no vàlida",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Recarrega",
    "welcome.loginButton" : "Inicia sessió al teu compte",
    "welcome.signupButton" : "Crea un compte gratuït",
    "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index e87da33a4..d49b626f7 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -91,6 +91,7 @@
    "menu.services" : "Služby",
    "menu.services.activatePreviousService" : "Aktivovat předchozí službu",
    "menu.services.addNewService" : "Přidat novou službu...",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Aktivovat další službu",
    "menu.todos" : "Úkoly",
    "menu.todos.enableTodos" : "Aktivovat Úkoly",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} je povinné",
    "validation.url" : "{field} není validní URL",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Obnovit",
    "welcome.loginButton" : "Přihlášení do vašeho účtu",
    "welcome.signupButton" : "Vytvořit účet zdarma",
    "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 1a5625963..8b46a46f0 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -91,6 +91,7 @@
    "menu.services" : "Dienste",
    "menu.services.activatePreviousService" : "Vorheriger Dienst",
    "menu.services.addNewService" : "Dienst hinzufügen",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Nächster Dienst",
    "menu.todos" : "ToDos",
    "menu.todos.enableTodos" : "Enable Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "Mindestens ein Wert wird benötigt",
    "validation.required" : "{field} wird benötigt",
    "validation.url" : "{field} ist keine gültige URL",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Neu laden",
    "welcome.loginButton" : "Bei Franz einloggen",
    "welcome.signupButton" : "Kostenloses Konto erstellen",
    "workspaceDrawer.addNewWorkspaceLabel" : "Neuen Workspace hinzufügen",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index e12b6b49b..703f800f9 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -4796,806 +4796,819 @@
         "defaultMessage": "!!!Edit",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 21
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit",
         "start": {
           "column": 8,
-          "line": 17
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!!Undo",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 25
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.undo",
         "start": {
           "column": 8,
-          "line": 21
+          "line": 22
         }
       },
       {
         "defaultMessage": "!!!Redo",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 29
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.redo",
         "start": {
           "column": 8,
-          "line": 25
+          "line": 26
         }
       },
       {
         "defaultMessage": "!!!Cut",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 33
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.cut",
         "start": {
           "column": 7,
-          "line": 29
+          "line": 30
         }
       },
       {
         "defaultMessage": "!!!Copy",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 37
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.copy",
         "start": {
           "column": 8,
-          "line": 33
+          "line": 34
         }
       },
       {
         "defaultMessage": "!!!Paste",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 41
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.paste",
         "start": {
           "column": 9,
-          "line": 37
+          "line": 38
         }
       },
       {
         "defaultMessage": "!!!Paste And Match Style",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 45
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.pasteAndMatchStyle",
         "start": {
           "column": 22,
-          "line": 41
+          "line": 42
         }
       },
       {
         "defaultMessage": "!!!Delete",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 49
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.delete",
         "start": {
           "column": 10,
-          "line": 45
+          "line": 46
         }
       },
       {
         "defaultMessage": "!!!Select All",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 53
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.selectAll",
         "start": {
           "column": 13,
-          "line": 49
+          "line": 50
         }
       },
       {
         "defaultMessage": "!!!Speech",
         "end": {
           "column": 3,
-          "line": 56
+          "line": 57
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.speech",
         "start": {
           "column": 10,
-          "line": 53
+          "line": 54
         }
       },
       {
         "defaultMessage": "!!!Start Speaking",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 61
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startSpeaking",
         "start": {
           "column": 17,
-          "line": 57
+          "line": 58
         }
       },
       {
         "defaultMessage": "!!!Stop Speaking",
         "end": {
           "column": 3,
-          "line": 64
+          "line": 65
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.stopSpeaking",
         "start": {
           "column": 16,
-          "line": 61
+          "line": 62
         }
       },
       {
         "defaultMessage": "!!!Start Dictation",
         "end": {
           "column": 3,
-          "line": 68
+          "line": 69
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startDictation",
         "start": {
           "column": 18,
-          "line": 65
+          "line": 66
         }
       },
       {
         "defaultMessage": "!!!Emoji & Symbols",
         "end": {
           "column": 3,
-          "line": 72
+          "line": 73
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.emojiSymbols",
         "start": {
           "column": 16,
-          "line": 69
+          "line": 70
         }
       },
       {
         "defaultMessage": "!!!Actual Size",
         "end": {
           "column": 3,
-          "line": 76
+          "line": 77
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.resetZoom",
         "start": {
           "column": 13,
-          "line": 73
+          "line": 74
         }
       },
       {
         "defaultMessage": "!!!Zoom In",
         "end": {
           "column": 3,
-          "line": 80
+          "line": 81
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomIn",
         "start": {
           "column": 10,
-          "line": 77
+          "line": 78
         }
       },
       {
         "defaultMessage": "!!!Zoom Out",
         "end": {
           "column": 3,
-          "line": 84
+          "line": 85
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomOut",
         "start": {
           "column": 11,
-          "line": 81
+          "line": 82
         }
       },
       {
         "defaultMessage": "!!!Enter Full Screen",
         "end": {
           "column": 3,
-          "line": 88
+          "line": 89
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.enterFullScreen",
         "start": {
           "column": 19,
-          "line": 85
+          "line": 86
         }
       },
       {
         "defaultMessage": "!!!Exit Full Screen",
         "end": {
           "column": 3,
-          "line": 92
+          "line": 93
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.exitFullScreen",
         "start": {
           "column": 18,
-          "line": 89
+          "line": 90
         }
       },
       {
         "defaultMessage": "!!!Toggle Full Screen",
         "end": {
           "column": 3,
-          "line": 96
+          "line": 97
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleFullScreen",
         "start": {
           "column": 20,
-          "line": 93
+          "line": 94
         }
       },
       {
         "defaultMessage": "!!!Toggle Developer Tools",
         "end": {
           "column": 3,
-          "line": 100
+          "line": 101
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleDevTools",
         "start": {
           "column": 18,
-          "line": 97
+          "line": 98
         }
       },
       {
         "defaultMessage": "!!!Toggle Todos Developer Tools",
         "end": {
           "column": 3,
-          "line": 104
+          "line": 105
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleTodosDevTools",
         "start": {
           "column": 23,
-          "line": 101
+          "line": 102
         }
       },
       {
         "defaultMessage": "!!!Toggle Service Developer Tools",
         "end": {
           "column": 3,
-          "line": 108
+          "line": 109
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleServiceDevTools",
         "start": {
           "column": 25,
-          "line": 105
+          "line": 106
         }
       },
       {
         "defaultMessage": "!!!Reload Service",
         "end": {
           "column": 3,
-          "line": 112
+          "line": 113
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadService",
         "start": {
           "column": 17,
-          "line": 109
+          "line": 110
         }
       },
       {
         "defaultMessage": "!!!Reload Franz",
         "end": {
           "column": 3,
-          "line": 116
+          "line": 117
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadFranz",
         "start": {
           "column": 15,
-          "line": 113
+          "line": 114
         }
       },
       {
         "defaultMessage": "!!!Minimize",
         "end": {
           "column": 3,
-          "line": 120
+          "line": 121
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.minimize",
         "start": {
           "column": 12,
-          "line": 117
+          "line": 118
         }
       },
       {
         "defaultMessage": "!!!Close",
         "end": {
           "column": 3,
-          "line": 124
+          "line": 125
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.close",
         "start": {
           "column": 9,
-          "line": 121
+          "line": 122
         }
       },
       {
         "defaultMessage": "!!!Learn More",
         "end": {
           "column": 3,
-          "line": 128
+          "line": 129
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.learnMore",
         "start": {
           "column": 13,
-          "line": 125
+          "line": 126
         }
       },
       {
         "defaultMessage": "!!!Changelog",
         "end": {
           "column": 3,
-          "line": 132
+          "line": 133
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.changelog",
         "start": {
           "column": 13,
-          "line": 129
+          "line": 130
         }
       },
       {
         "defaultMessage": "!!!Support",
         "end": {
           "column": 3,
-          "line": 136
+          "line": 137
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.support",
         "start": {
           "column": 11,
-          "line": 133
+          "line": 134
         }
       },
       {
         "defaultMessage": "!!!Copy Debug Information",
         "end": {
           "column": 3,
-          "line": 140
+          "line": 141
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfo",
         "start": {
           "column": 13,
-          "line": 137
+          "line": 138
         }
       },
       {
         "defaultMessage": "!!!Franz Debug Information",
         "end": {
           "column": 3,
-          "line": 144
+          "line": 145
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedHeadline",
         "start": {
           "column": 27,
-          "line": 141
+          "line": 142
         }
       },
       {
         "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
         "end": {
           "column": 3,
-          "line": 148
+          "line": 149
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedBody",
         "start": {
           "column": 23,
-          "line": 145
+          "line": 146
         }
       },
       {
         "defaultMessage": "!!!Terms of Service",
         "end": {
           "column": 3,
-          "line": 152
+          "line": 153
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.tos",
         "start": {
           "column": 7,
-          "line": 149
+          "line": 150
         }
       },
       {
         "defaultMessage": "!!!Privacy Statement",
         "end": {
           "column": 3,
-          "line": 156
+          "line": 157
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.privacy",
         "start": {
           "column": 11,
-          "line": 153
+          "line": 154
         }
       },
       {
         "defaultMessage": "!!!File",
         "end": {
           "column": 3,
-          "line": 160
+          "line": 161
         },
         "file": "src/lib/Menu.js",
         "id": "menu.file",
         "start": {
           "column": 8,
-          "line": 157
+          "line": 158
         }
       },
       {
         "defaultMessage": "!!!View",
         "end": {
           "column": 3,
-          "line": 164
+          "line": 165
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view",
         "start": {
           "column": 8,
-          "line": 161
+          "line": 162
         }
       },
       {
         "defaultMessage": "!!!Services",
         "end": {
           "column": 3,
-          "line": 168
+          "line": 169
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services",
         "start": {
           "column": 12,
-          "line": 165
+          "line": 166
         }
       },
       {
         "defaultMessage": "!!!Window",
         "end": {
           "column": 3,
-          "line": 172
+          "line": 173
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window",
         "start": {
           "column": 10,
-          "line": 169
+          "line": 170
         }
       },
       {
         "defaultMessage": "!!!Help",
         "end": {
           "column": 3,
-          "line": 176
+          "line": 177
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help",
         "start": {
           "column": 8,
-          "line": 173
+          "line": 174
         }
       },
       {
         "defaultMessage": "!!!About Franz",
         "end": {
           "column": 3,
-          "line": 180
+          "line": 181
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.about",
         "start": {
           "column": 9,
-          "line": 177
+          "line": 178
         }
       },
       {
         "defaultMessage": "!!!What's new?",
         "end": {
           "column": 3,
-          "line": 184
+          "line": 185
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.announcement",
         "start": {
           "column": 16,
-          "line": 181
+          "line": 182
         }
       },
       {
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 188
+          "line": 189
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.settings",
         "start": {
           "column": 12,
-          "line": 185
+          "line": 186
         }
       },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 192
+          "line": 193
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.checkForUpdates",
         "start": {
           "column": 19,
-          "line": 189
+          "line": 190
         }
       },
       {
         "defaultMessage": "!!!Hide",
         "end": {
           "column": 3,
-          "line": 196
+          "line": 197
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hide",
         "start": {
           "column": 8,
-          "line": 193
+          "line": 194
         }
       },
       {
         "defaultMessage": "!!!Hide Others",
         "end": {
           "column": 3,
-          "line": 200
+          "line": 201
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hideOthers",
         "start": {
           "column": 14,
-          "line": 197
+          "line": 198
         }
       },
       {
         "defaultMessage": "!!!Unhide",
         "end": {
           "column": 3,
-          "line": 204
+          "line": 205
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.unhide",
         "start": {
           "column": 10,
-          "line": 201
+          "line": 202
         }
       },
       {
         "defaultMessage": "!!!Quit",
         "end": {
           "column": 3,
-          "line": 208
+          "line": 209
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.quit",
         "start": {
           "column": 8,
-          "line": 205
+          "line": 206
         }
       },
       {
         "defaultMessage": "!!!Add New Service...",
         "end": {
           "column": 3,
-          "line": 212
+          "line": 213
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.addNewService",
         "start": {
           "column": 17,
-          "line": 209
+          "line": 210
         }
       },
       {
         "defaultMessage": "!!!Add New Workspace...",
         "end": {
           "column": 3,
-          "line": 216
+          "line": 217
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.addNewWorkspace",
         "start": {
           "column": 19,
-          "line": 213
+          "line": 214
         }
       },
       {
         "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
-          "line": 220
+          "line": 221
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.openWorkspaceDrawer",
         "start": {
           "column": 23,
-          "line": 217
+          "line": 218
         }
       },
       {
         "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
-          "line": 224
+          "line": 225
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.closeWorkspaceDrawer",
         "start": {
           "column": 24,
-          "line": 221
+          "line": 222
         }
       },
       {
         "defaultMessage": "!!!Activate next service...",
         "end": {
           "column": 3,
-          "line": 228
+          "line": 229
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.setNextServiceActive",
         "start": {
           "column": 23,
-          "line": 225
+          "line": 226
         }
       },
       {
         "defaultMessage": "!!!Activate previous service...",
         "end": {
           "column": 3,
-          "line": 232
+          "line": 233
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.activatePreviousService",
         "start": {
           "column": 27,
-          "line": 229
+          "line": 230
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 236
+          "line": 237
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 11,
-          "line": 233
+          "line": 234
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 240
+          "line": 241
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 13,
-          "line": 237
+          "line": 238
         }
       },
       {
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 244
+          "line": 245
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces",
         "start": {
           "column": 14,
-          "line": 241
+          "line": 242
         }
       },
       {
         "defaultMessage": "!!!Default",
         "end": {
           "column": 3,
-          "line": 248
+          "line": 249
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.defaultWorkspace",
         "start": {
           "column": 20,
-          "line": 245
+          "line": 246
         }
       },
       {
         "defaultMessage": "!!!Todos",
         "end": {
           "column": 3,
-          "line": 252
+          "line": 253
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos",
         "start": {
           "column": 9,
-          "line": 249
+          "line": 250
         }
       },
       {
         "defaultMessage": "!!!Open Todos drawer",
         "end": {
           "column": 3,
-          "line": 256
+          "line": 257
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.openTodosDrawer",
         "start": {
           "column": 19,
-          "line": 253
+          "line": 254
         }
       },
       {
         "defaultMessage": "!!!Close Todos drawer",
         "end": {
           "column": 3,
-          "line": 260
+          "line": 261
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.closeTodosDrawer",
         "start": {
           "column": 20,
-          "line": 257
+          "line": 258
         }
       },
       {
         "defaultMessage": "!!!Enable Todos",
         "end": {
           "column": 3,
-          "line": 264
+          "line": 265
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos.enableTodos",
         "start": {
           "column": 15,
-          "line": 261
+          "line": 262
+        }
+      },
+      {
+        "defaultMessage": "!!!Home",
+        "end": {
+          "column": 3,
+          "line": 269
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.services.goHome",
+        "start": {
+          "column": 17,
+          "line": 266
         }
       }
     ],
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index ac2747ee5..e8dd96a2e 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -91,6 +91,7 @@
    "menu.services" : "Υπηρεσίες",
    "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Νέα Υπηρεσία",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Activate next service",
    "menu.todos" : "Todos",
    "menu.todos.enableTodos" : "Enable Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} είναι υποχρεωτικό",
    "validation.url" : "{field} δεν είναι έγκυρος σύνδεσμος URL",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Επαναφόρτωση",
    "welcome.loginButton" : "Σύνδεση στο λογαριασμό σας",
    "welcome.signupButton" : "Δημιουργία δωρεάν λογαριασμού",
    "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index c2c6a9863..aea74768d 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -91,6 +91,7 @@
   "menu.services": "Services",
   "menu.services.activatePreviousService": "Activate previous service",
   "menu.services.addNewService": "Add New Service...",
+  "menu.services.goHome": "Home",
   "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index e015d1915..940da3606 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -91,6 +91,7 @@
    "menu.services" : "Servicios",
    "menu.services.activatePreviousService" : "Activa el servicio previo",
    "menu.services.addNewService" : "Añadir Nuevo Servicio...",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Activa el siguiente servicio",
    "menu.todos" : "Tareas pendientes",
    "menu.todos.enableTodos" : "Habilitar Herramientas",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "Al menos uno es requerido",
    "validation.required" : "{field} es obligatorio",
    "validation.url" : "{field} no es una URL válida",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Reload",
    "welcome.loginButton" : "Accede a tu cuenta",
    "welcome.signupButton" : "Crear una cuenta gratuita",
    "workspaceDrawer.addNewWorkspaceLabel" : "Añadir nueva área de trabajo",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index e39d84fe0..5ba652004 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -91,6 +91,7 @@
    "menu.services" : "Services",
    "menu.services.activatePreviousService" : "Activer le service précédent",
    "menu.services.addNewService" : "Ajouter un nouveau service...",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Activer le service suivant",
    "menu.todos" : "Todos",
    "menu.todos.enableTodos" : "Enable Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "Au moins un de ces champs est requis",
    "validation.required" : "{field} est requis",
    "validation.url" : "{field} n'est pas une URL valide",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Reload",
    "welcome.loginButton" : "Se connecter sur son compte",
    "welcome.signupButton" : "Créer un compte gratuit",
    "workspaceDrawer.addNewWorkspaceLabel" : "Ajouté un nouvel espace de travail",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 87a9eefe5..602ca6e73 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -91,6 +91,7 @@
    "menu.services" : "Seirbhísí",
    "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Cuir seirbhís nua leis",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Activate next service",
    "menu.todos" : "Todos",
    "menu.todos.enableTodos" : "Enable Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "At least one is required",
    "validation.required" : "Tá {field} de dhíth",
    "validation.url" : "Ní AAA bhailí é {field}",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Athlódáil",
    "welcome.loginButton" : "Logáil isteach i do chuntas",
    "welcome.signupButton" : "Cruthaigh cuntas nua",
    "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index aac707c00..78c017e96 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -91,6 +91,7 @@
    "menu.services" : "Services",
    "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Add New Service...",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Activate next service",
    "menu.todos" : "Todos",
    "menu.todos.enableTodos" : "Enable Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} is required",
    "validation.url" : "{field} is not a valid URL",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Ponovno učitavanje",
    "welcome.loginButton" : "Prijavite se na račun",
    "welcome.signupButton" : "Stvorite novi korisnički račun",
    "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 0d0ab7d58..c6e808a86 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -91,6 +91,7 @@
    "menu.services" : "Szolgáltatások",
    "menu.services.activatePreviousService" : "Előző szolgáltatás",
    "menu.services.addNewService" : "Új szolgáltatás hozzáadása...",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Következő szolgáltatás",
    "menu.todos" : "Tennivalók",
    "menu.todos.enableTodos" : "Enable Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "Legalább egy kitöltése szükséges",
    "validation.required" : "{field} kitöltése kötelező",
    "validation.url" : "{field} nem érvényes URL",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Újratöltés",
    "welcome.loginButton" : "Jelentkezz be a fiókodba",
    "welcome.signupButton" : "Új fiók létrehozása",
    "workspaceDrawer.addNewWorkspaceLabel" : "Munkaterület hozzáadása",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 4ea421df4..0c66f59bc 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -91,6 +91,7 @@
    "menu.services" : "Layanan",
    "menu.services.activatePreviousService" : "Aktifkan layanan sebelumnya",
    "menu.services.addNewService" : "Tambahkan Layanan Baru...",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Aktifkan layanan berikutnya",
    "menu.todos" : "Todos",
    "menu.todos.enableTodos" : "Enable Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "Setidaknya diperlukan satu",
    "validation.required" : "{field} wajib diisi",
    "validation.url" : "{field} bukan URL yang benar",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Muat Ulang",
    "welcome.loginButton" : "Masuk ke akun Anda",
    "welcome.signupButton" : "Buat akun gratis",
    "workspaceDrawer.addNewWorkspaceLabel" : "Tambah ruang kerja baru",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 47553fb7d..0b863099f 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -91,6 +91,7 @@
    "menu.services" : "Servizi",
    "menu.services.activatePreviousService" : "Attiva servizio precedente",
    "menu.services.addNewService" : "Aggiungi Nuovo Servizio...",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Attiva servizio seguente",
    "menu.todos" : "Attività",
    "menu.todos.enableTodos" : "Abilita Attività",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "Almeno un campo è richiesto",
    "validation.required" : "{field} è necessario",
    "validation.url" : "{field} non è un URL valido",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Ricarica",
    "welcome.loginButton" : "Accedi al tuo account",
    "welcome.signupButton" : "Crea un account gratuito",
    "workspaceDrawer.addNewWorkspaceLabel" : "Aggiungi un nuovo workspace",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index ae2725fd8..5af4c6bd1 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -91,6 +91,7 @@
    "menu.services" : "サービス",
    "menu.services.activatePreviousService" : "前のサービスを有効にする",
    "menu.services.addNewService" : "サービスを追加",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "次のサービスを有効にする",
    "menu.todos" : "Todos",
    "menu.todos.enableTodos" : "Enable Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "少なくとも1つは必要です",
    "validation.required" : "{field}は必須です",
    "validation.url" : "{field}は正しいURLではありません",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "再読み込み",
    "welcome.loginButton" : "アカウントにログイン",
    "welcome.signupButton" : "無料アカウントを作成",
    "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 32792017b..9b186b505 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -91,6 +91,7 @@
    "menu.services" : "Services",
    "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Add New Service...",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Activate next service",
    "menu.todos" : "Todos",
    "menu.todos.enableTodos" : "Enable Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} is required",
    "validation.url" : "{field} is not a valid URL",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "ჩატვირთვა",
    "welcome.loginButton" : "შედით თქვენს ანგარიშში",
    "welcome.signupButton" : "შექმენი ანგარიში, ეს უფასოა",
    "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 22b9551a7..80852f0de 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -91,6 +91,7 @@
    "menu.services" : "Services",
    "menu.services.activatePreviousService" : "Vorige dienst activeren",
    "menu.services.addNewService" : "Nieuwe service toevoegen...",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Volgende dienst activeren",
    "menu.todos" : "Todos",
    "menu.todos.enableTodos" : "Enable Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "Ten minste één is vereist",
    "validation.required" : "{field} is vereist",
    "validation.url" : "{field} is niet een geldige URL",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Herladen",
    "welcome.loginButton" : "Inloggen op je account",
    "welcome.signupButton" : "Maak een gratis account aan",
    "workspaceDrawer.addNewWorkspaceLabel" : "Voeg een nieuwe werkruimte toe",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 96dd7cc04..d302c7429 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -4,8 +4,8 @@
    "feature.announcements.changelog.headline" : "Wijzigingen in Franz {version}",
    "feature.delayApp.headline" : "Sponsor Franz om wachten over te slaan",
    "feature.delayApp.text" : "Franz gaat over {seconds} seconden verder.",
-   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
-   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.action" : "Ja, ik wil graag 14 dagen lang Franz Professional uitproberen",
+   "feature.delayApp.trial.actionShort" : "Activeer de gratis Franz Professional probeerversie",
    "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
    "feature.delayApp.upgrade.action" : "Sponsor Franz",
    "feature.delayApp.upgrade.actionShort" : "Upgrade Account",
@@ -19,15 +19,15 @@
    "feature.shareFranz.text" : "Vertel je vrienden en collega's hoe geweldig Franz is en help ons om bekender te worden.",
    "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
    "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
-   "feature.todos.premium.upgrade" : "Upgrade Account",
+   "feature.todos.premium.upgrade" : "Upgrade account",
    "global.api.unhealthy" : "Kan geen verbinding maken met de Franz-services.",
-   "global.franzProRequired" : "Franz Professional Required",
+   "global.franzProRequired" : "Franz Professional benodigd",
    "global.notConnectedToTheInternet" : "U bent niet verbonden met het internet.",
    "global.spellchecker.useDefault" : "Gebruik systeemstandaard ({default})",
    "global.spellchecking.autodetect" : "Taal automatisch herkennen",
    "global.spellchecking.autodetect.short" : "Automatisch",
    "global.spellchecking.language" : "Taal voor spellingcontrole",
-   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
+   "global.upgradeButton.upgradeToPro" : "Upgrade naar Franz Professional",
    "import.headline" : "Importeer uw Franz 4-services",
    "import.notSupportedHeadline" : "Services die (nog) niet ondersteund worden in Franz 5",
    "import.skip.label" : "Ik wil diensten handmatig toevoegen",
@@ -37,7 +37,7 @@
    "infobar.buttonReloadServices" : "Services opnieuw laden",
    "infobar.requiredRequestsFailed" : "Kan de services en gebruikersinformatie niet laden",
    "infobar.servicesUpdated" : "Je services zijn bijgewerkt.",
-   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
+   "infobar.trialActivated" : "Je probeerversie is met succes geactiveerd. Veel plezier!",
    "infobar.updateAvailable" : "Een nieuwe update voor Franz is beschikbaar.",
    "invite.email.label" : "E-mailadres",
    "invite.headline.friends" : "Nodig 3 vrienden of collega's uit",
@@ -83,7 +83,7 @@
    "menu.help.changelog" : "Wijzigingenlogboek",
    "menu.help.debugInfo" : "Copy Debug Information",
    "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
-   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
+   "menu.help.debugInfoCopiedHeadline" : "Franz debug-informatie",
    "menu.help.learnMore" : "Meer informatie",
    "menu.help.privacy" : "Privacyvoorwaarden",
    "menu.help.support" : "Ondersteuning",
@@ -91,9 +91,10 @@
    "menu.services" : "Services",
    "menu.services.activatePreviousService" : "Activeer vorige service",
    "menu.services.addNewService" : "Nieuwe service toevoegen...",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Activeer volgende service",
-   "menu.todos" : "Todos",
-   "menu.todos.enableTodos" : "Enable Todos",
+   "menu.todos" : "Taken",
+   "menu.todos.enableTodos" : "Todo's inschakelen",
    "menu.view" : "Weergave",
    "menu.view.enterFullScreen" : "Gebruik volledig scherm",
    "menu.view.exitFullScreen" : "Volledig scherm verlaten",
@@ -123,7 +124,7 @@
    "password.successInfo" : "Controleer je e-mail",
    "premiumFeature.button.upgradeAccount" : "Upgrade Account",
    "pricing.features.adFree" : "Forever ad-free",
-   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.appDelays" : "Geen wachtschermen",
    "pricing.features.customWebsites" : "Add Custom Websites",
    "pricing.features.onPremise" : "On-premise & other Hosted Services",
    "pricing.features.serviceProxies" : "Service Proxies",
@@ -160,7 +161,7 @@
    "service.errorHandler.headline" : "Oh nee!",
    "service.errorHandler.message" : "Fout",
    "service.errorHandler.text" : "{name} kon niet geladen worden.",
-   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.action" : "Upgrade account",
    "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
    "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
    "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
@@ -192,7 +193,7 @@
    "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
    "settings.account.tryReloadServices" : "Probeer opnieuw",
    "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
-   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
+   "settings.account.upgradeToPro.label" : "Upgrade naar Franz Professional",
    "settings.account.userInfoRequestFailed" : "Kon gebruikersinformatie niet laden",
    "settings.account.yourLicense" : "Your Franz License",
    "settings.app.buttonClearAllCache" : "Cache legen",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "Minstens één vereist",
    "validation.required" : "{field} is vereist",
    "validation.url" : "{field} is geen geldige URL",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Herladen",
    "welcome.loginButton" : "Log in op je account",
    "welcome.signupButton" : "Maak een gratis account",
    "workspaceDrawer.addNewWorkspaceLabel" : "Voeg een nieuwe werkruimte toe",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 0c5eee9e6..13207f0ef 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -91,6 +91,7 @@
    "menu.services" : "Usługi",
    "menu.services.activatePreviousService" : "Poprzednia usługa",
    "menu.services.addNewService" : "Dodaj nową usługę...",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Następna usługa",
    "menu.todos" : "Lista zadań",
    "menu.todos.enableTodos" : "Enable Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "Przynajmniej jeden jest wymagany",
    "validation.required" : "Pole {field} jest wymagane",
    "validation.url" : "Pole {field} nie jest poprawnym ciągiem URL.",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Reload",
    "welcome.loginButton" : "Zaloguj się na swoje konto",
    "welcome.signupButton" : "Stwórz darmowe konto",
    "workspaceDrawer.addNewWorkspaceLabel" : "Dodaj nowy obszar roboczy",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 11f32c067..dfdaaa1ee 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -91,6 +91,7 @@
    "menu.services" : "Serviços",
    "menu.services.activatePreviousService" : "Pular para serviço anterior",
    "menu.services.addNewService" : "Adicionar Novo Serviço",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Pular para próximo serviço",
    "menu.todos" : "Todos",
    "menu.todos.enableTodos" : "Enable Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "Necessário pelo menos um",
    "validation.required" : "{campo} obrigatório",
    "validation.url" : "{campo} essa URL não é válida",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Recarregar",
    "welcome.loginButton" : "Entrar na sua conta",
    "welcome.signupButton" : "Criar uma conta grátis",
    "workspaceDrawer.addNewWorkspaceLabel" : "Adicionar uma nova área de trabalho",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 5ed8fc70b..07ea5c8a2 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -91,6 +91,7 @@
    "menu.services" : "Serviços",
    "menu.services.activatePreviousService" : "Activar o serviço anterior",
    "menu.services.addNewService" : "Adicionar Novo Serviço...",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Activar o próximo serviço",
    "menu.todos" : "Todos",
    "menu.todos.enableTodos" : "Activar Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} é obrigatório",
    "validation.url" : "{field} não é uma hiperligação válida",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Recarregar",
    "welcome.loginButton" : "Iniciar sessão",
    "welcome.signupButton" : "Criar uma conta gratuita",
    "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index b7e379449..04ed6473c 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -91,6 +91,7 @@
    "menu.services" : "Сервис",
    "menu.services.activatePreviousService" : "Активировать предыдущий сервич",
    "menu.services.addNewService" : "Добавить новый сервис...",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Активировать следующий сервис",
    "menu.todos" : "Задачи",
    "menu.todos.enableTodos" : "Включить Планировщик",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} обязательно",
    "validation.url" : "{field} является недействительной ссылкой",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Перезагрузить",
    "welcome.loginButton" : "Вход",
    "welcome.signupButton" : "Создать бесплатный аккаунт",
    "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index f80680399..c0efc6b0e 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -4,12 +4,12 @@
    "feature.announcements.changelog.headline" : "Zmeny vo Franz {version}",
    "feature.delayApp.headline" : "Prosím, kúp si licenciu Franz Supporter a nebudeš musieť čakať",
    "feature.delayApp.text" : "Franz bude pokračovať v {seconds} sekundách.",
-   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
-   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
-   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.trial.action" : "Áno, chcem bezplatnú 14-dňovú skúšobnú verziu Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Aktivujte bezplatnú skúšobnú verziu Franz Professional",
+   "feature.delayApp.trial.headline" : "Získajte bezplatnú 14 dňovú skúšobnú verziu Franz Professional a preskočte riadok",
    "feature.delayApp.upgrade.action" : "Získajte licenciu pre Franz podporu",
    "feature.delayApp.upgrade.actionShort" : "Upgradovať účet",
-   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
+   "feature.serviceLimit.limitReached" : "Pridali ste {amount} z {limit} služieb, ktoré sú zahrnuté vo vašom pláne. Ak chcete pridať ďalšie služby, inovujte svoj účet.",
    "feature.shareFranz.action.email" : "Odoslať ako e-mail",
    "feature.shareFranz.action.facebook" : "Zdielať na Facebook-u",
    "feature.shareFranz.action.twitter" : "Zdieľať na Twitter-i",
@@ -17,8 +17,8 @@
    "feature.shareFranz.shareText.email" : "Pridali sme {count} služieb do Franz! Získajte zadarmo aplikáciu pre WhatsApp, Messenger, Slack, Skype a iné na www.meetfranz.com",
    "feature.shareFranz.shareText.twitter" : "Pridal som {count} služieb do Franz! Získajte zadarmo aplikáciu pre WhatsApp, Messenger, Slack, Skype a iné na www.meetfranz.com \/cc @FranzMessenger",
    "feature.shareFranz.text" : "Povedzte vašim priateľom a známym aký je Franz skvelý a pomôžte nám rozšíriť sa do sveta.",
-   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
-   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.info" : "Franz Todos sú teraz k dispozícii pre prémiových používateľov!",
+   "feature.todos.premium.rollout" : "Všetci ostatní budú musieť počkať trochu dlhšie.",
    "feature.todos.premium.upgrade" : "Upgrade Account",
    "global.api.unhealthy" : "Nedá sa pripojiť k online službám Franz",
    "global.franzProRequired" : "Franz Professional Required",
@@ -91,6 +91,7 @@
    "menu.services" : "Služby",
    "menu.services.activatePreviousService" : "Aktivovať predchádzajúcu službu",
    "menu.services.addNewService" : "Pridať novú službu...",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Aktivujte ďalšiu službu",
    "menu.todos" : "Todos",
    "menu.todos.enableTodos" : "Enable Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "Je nutné zadať aspoň jeden",
    "validation.required" : "{field} je povinné",
    "validation.url" : "{field} nie je platné URL",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Obnoviť",
    "welcome.loginButton" : "Prihlásiť sa do vášho účtu",
    "welcome.signupButton" : "Vytvoriť účet zdarma",
    "workspaceDrawer.addNewWorkspaceLabel" : "Pridať nový workspace",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index c35ebc3fb..3cd8127f0 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -91,6 +91,7 @@
    "menu.services" : "Usluge",
    "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Додај нову услугу",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Activate next service",
    "menu.todos" : "Todos",
    "menu.todos.enableTodos" : "Enable Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "At least one is required",
    "validation.required" : "{поље} је неопходно",
    "validation.url" : "{field} није валидан УРЛ",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Ponovno učitavanje",
    "welcome.loginButton" : "Prijavite se na račun",
    "welcome.signupButton" : "Stvorite novi korisnički račun",
    "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 27dabd54d..56f1e1643 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -91,6 +91,7 @@
    "menu.services" : "Hizmetler",
    "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Yeni servis ekle...",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Activate next service",
    "menu.todos" : "Todos",
    "menu.todos.enableTodos" : "Enable Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} gereklidir",
    "validation.url" : "{field} geçerli bir URL değil",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Reload",
    "welcome.loginButton" : "Hesabına giriş yap",
    "welcome.signupButton" : "Ücretsiz hesap oluştur",
    "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 0c3a54b07..3a9ef73c4 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -91,6 +91,7 @@
    "menu.services" : "Служби",
    "menu.services.activatePreviousService" : "Активуйте попередню послугу",
    "menu.services.addNewService" : "Додати сервіс",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "Активуйте наступний сервіс",
    "menu.todos" : "Завдання",
    "menu.todos.enableTodos" : "Увімкнути завдання",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} обов'язвоке",
    "validation.url" : "{field} не валідний URL",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Перезавантажити",
    "welcome.loginButton" : "Увійдіть до свого акаунту",
    "welcome.signupButton" : "Створити безплатний акаунт",
    "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index f2b836505..89b684fea 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -91,6 +91,7 @@
    "menu.services" : "服務",
    "menu.services.activatePreviousService" : "啟動前一個服務",
    "menu.services.addNewService" : "新增服務",
+   "menu.services.goHome" : "Home",
    "menu.services.setNextServiceActive" : "啟動下一個服務",
    "menu.todos" : "Todos",
    "menu.todos.enableTodos" : "Enable Todos",
@@ -370,6 +371,11 @@
    "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field}為必填",
    "validation.url" : "{field}不是個有效的網址",
+   "webControls.back" : "Back",
+   "webControls.forward" : "Forward",
+   "webControls.goHome" : "Home",
+   "webControls.openInBrowser" : "Open in Browser",
+   "webControls.reload" : "Reload",
    "welcome.loginButton" : "登入您的帳戶",
    "welcome.signupButton" : "建立免費帳號",
    "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index 26850c5b3..08c8da77d 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Edit",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 17,
+      "line": 18,
       "column": 8
     },
     "end": {
-      "line": 20,
+      "line": 21,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Undo",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 21,
+      "line": 22,
       "column": 8
     },
     "end": {
-      "line": 24,
+      "line": 25,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Redo",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 25,
+      "line": 26,
       "column": 8
     },
     "end": {
-      "line": 28,
+      "line": 29,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Cut",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 29,
+      "line": 30,
       "column": 7
     },
     "end": {
-      "line": 32,
+      "line": 33,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Copy",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 33,
+      "line": 34,
       "column": 8
     },
     "end": {
-      "line": 36,
+      "line": 37,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Paste",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 37,
+      "line": 38,
       "column": 9
     },
     "end": {
-      "line": 40,
+      "line": 41,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Paste And Match Style",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 41,
+      "line": 42,
       "column": 22
     },
     "end": {
-      "line": 44,
+      "line": 45,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Delete",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 45,
+      "line": 46,
       "column": 10
     },
     "end": {
-      "line": 48,
+      "line": 49,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Select All",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 49,
+      "line": 50,
       "column": 13
     },
     "end": {
-      "line": 52,
+      "line": 53,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Speech",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 53,
+      "line": 54,
       "column": 10
     },
     "end": {
-      "line": 56,
+      "line": 57,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Start Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 57,
+      "line": 58,
       "column": 17
     },
     "end": {
-      "line": 60,
+      "line": 61,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Stop Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 61,
+      "line": 62,
       "column": 16
     },
     "end": {
-      "line": 64,
+      "line": 65,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Start Dictation",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 65,
+      "line": 66,
       "column": 18
     },
     "end": {
-      "line": 68,
+      "line": 69,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Emoji & Symbols",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 69,
+      "line": 70,
       "column": 16
     },
     "end": {
-      "line": 72,
+      "line": 73,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!Actual Size",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 73,
+      "line": 74,
       "column": 13
     },
     "end": {
-      "line": 76,
+      "line": 77,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Zoom In",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 77,
+      "line": 78,
       "column": 10
     },
     "end": {
-      "line": 80,
+      "line": 81,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!Zoom Out",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 81,
+      "line": 82,
       "column": 11
     },
     "end": {
-      "line": 84,
+      "line": 85,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!Enter Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 85,
+      "line": 86,
       "column": 19
     },
     "end": {
-      "line": 88,
+      "line": 89,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Exit Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 89,
+      "line": 90,
       "column": 18
     },
     "end": {
-      "line": 92,
+      "line": 93,
       "column": 3
     }
   },
@@ -251,11 +251,11 @@
     "defaultMessage": "!!!Toggle Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 93,
+      "line": 94,
       "column": 20
     },
     "end": {
-      "line": 96,
+      "line": 97,
       "column": 3
     }
   },
@@ -264,11 +264,11 @@
     "defaultMessage": "!!!Toggle Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 97,
+      "line": 98,
       "column": 18
     },
     "end": {
-      "line": 100,
+      "line": 101,
       "column": 3
     }
   },
@@ -277,11 +277,11 @@
     "defaultMessage": "!!!Toggle Todos Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 101,
+      "line": 102,
       "column": 23
     },
     "end": {
-      "line": 104,
+      "line": 105,
       "column": 3
     }
   },
@@ -290,11 +290,11 @@
     "defaultMessage": "!!!Toggle Service Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 105,
+      "line": 106,
       "column": 25
     },
     "end": {
-      "line": 108,
+      "line": 109,
       "column": 3
     }
   },
@@ -303,11 +303,11 @@
     "defaultMessage": "!!!Reload Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 109,
+      "line": 110,
       "column": 17
     },
     "end": {
-      "line": 112,
+      "line": 113,
       "column": 3
     }
   },
@@ -316,11 +316,11 @@
     "defaultMessage": "!!!Reload Franz",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 113,
+      "line": 114,
       "column": 15
     },
     "end": {
-      "line": 116,
+      "line": 117,
       "column": 3
     }
   },
@@ -329,11 +329,11 @@
     "defaultMessage": "!!!Minimize",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 117,
+      "line": 118,
       "column": 12
     },
     "end": {
-      "line": 120,
+      "line": 121,
       "column": 3
     }
   },
@@ -342,11 +342,11 @@
     "defaultMessage": "!!!Close",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 121,
+      "line": 122,
       "column": 9
     },
     "end": {
-      "line": 124,
+      "line": 125,
       "column": 3
     }
   },
@@ -355,11 +355,11 @@
     "defaultMessage": "!!!Learn More",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 125,
+      "line": 126,
       "column": 13
     },
     "end": {
-      "line": 128,
+      "line": 129,
       "column": 3
     }
   },
@@ -368,11 +368,11 @@
     "defaultMessage": "!!!Changelog",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 129,
+      "line": 130,
       "column": 13
     },
     "end": {
-      "line": 132,
+      "line": 133,
       "column": 3
     }
   },
@@ -381,11 +381,11 @@
     "defaultMessage": "!!!Support",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 133,
+      "line": 134,
       "column": 11
     },
     "end": {
-      "line": 136,
+      "line": 137,
       "column": 3
     }
   },
@@ -394,11 +394,11 @@
     "defaultMessage": "!!!Copy Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 137,
+      "line": 138,
       "column": 13
     },
     "end": {
-      "line": 140,
+      "line": 141,
       "column": 3
     }
   },
@@ -407,11 +407,11 @@
     "defaultMessage": "!!!Franz Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 141,
+      "line": 142,
       "column": 27
     },
     "end": {
-      "line": 144,
+      "line": 145,
       "column": 3
     }
   },
@@ -420,11 +420,11 @@
     "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 145,
+      "line": 146,
       "column": 23
     },
     "end": {
-      "line": 148,
+      "line": 149,
       "column": 3
     }
   },
@@ -433,11 +433,11 @@
     "defaultMessage": "!!!Terms of Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 149,
+      "line": 150,
       "column": 7
     },
     "end": {
-      "line": 152,
+      "line": 153,
       "column": 3
     }
   },
@@ -446,11 +446,11 @@
     "defaultMessage": "!!!Privacy Statement",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 153,
+      "line": 154,
       "column": 11
     },
     "end": {
-      "line": 156,
+      "line": 157,
       "column": 3
     }
   },
@@ -459,11 +459,11 @@
     "defaultMessage": "!!!File",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 157,
+      "line": 158,
       "column": 8
     },
     "end": {
-      "line": 160,
+      "line": 161,
       "column": 3
     }
   },
@@ -472,11 +472,11 @@
     "defaultMessage": "!!!View",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 161,
+      "line": 162,
       "column": 8
     },
     "end": {
-      "line": 164,
+      "line": 165,
       "column": 3
     }
   },
@@ -485,11 +485,11 @@
     "defaultMessage": "!!!Services",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 165,
+      "line": 166,
       "column": 12
     },
     "end": {
-      "line": 168,
+      "line": 169,
       "column": 3
     }
   },
@@ -498,11 +498,11 @@
     "defaultMessage": "!!!Window",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 169,
+      "line": 170,
       "column": 10
     },
     "end": {
-      "line": 172,
+      "line": 173,
       "column": 3
     }
   },
@@ -511,11 +511,11 @@
     "defaultMessage": "!!!Help",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 173,
+      "line": 174,
       "column": 8
     },
     "end": {
-      "line": 176,
+      "line": 177,
       "column": 3
     }
   },
@@ -524,11 +524,11 @@
     "defaultMessage": "!!!About Franz",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 177,
+      "line": 178,
       "column": 9
     },
     "end": {
-      "line": 180,
+      "line": 181,
       "column": 3
     }
   },
@@ -537,11 +537,11 @@
     "defaultMessage": "!!!What's new?",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 181,
+      "line": 182,
       "column": 16
     },
     "end": {
-      "line": 184,
+      "line": 185,
       "column": 3
     }
   },
@@ -550,11 +550,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 185,
+      "line": 186,
       "column": 12
     },
     "end": {
-      "line": 188,
+      "line": 189,
       "column": 3
     }
   },
@@ -563,11 +563,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 189,
+      "line": 190,
       "column": 19
     },
     "end": {
-      "line": 192,
+      "line": 193,
       "column": 3
     }
   },
@@ -576,11 +576,11 @@
     "defaultMessage": "!!!Hide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 193,
+      "line": 194,
       "column": 8
     },
     "end": {
-      "line": 196,
+      "line": 197,
       "column": 3
     }
   },
@@ -589,11 +589,11 @@
     "defaultMessage": "!!!Hide Others",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 197,
+      "line": 198,
       "column": 14
     },
     "end": {
-      "line": 200,
+      "line": 201,
       "column": 3
     }
   },
@@ -602,11 +602,11 @@
     "defaultMessage": "!!!Unhide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 201,
+      "line": 202,
       "column": 10
     },
     "end": {
-      "line": 204,
+      "line": 205,
       "column": 3
     }
   },
@@ -615,11 +615,11 @@
     "defaultMessage": "!!!Quit",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 205,
+      "line": 206,
       "column": 8
     },
     "end": {
-      "line": 208,
+      "line": 209,
       "column": 3
     }
   },
@@ -628,11 +628,11 @@
     "defaultMessage": "!!!Add New Service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 209,
+      "line": 210,
       "column": 17
     },
     "end": {
-      "line": 212,
+      "line": 213,
       "column": 3
     }
   },
@@ -641,11 +641,11 @@
     "defaultMessage": "!!!Add New Workspace...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 213,
+      "line": 214,
       "column": 19
     },
     "end": {
-      "line": 216,
+      "line": 217,
       "column": 3
     }
   },
@@ -654,11 +654,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 217,
+      "line": 218,
       "column": 23
     },
     "end": {
-      "line": 220,
+      "line": 221,
       "column": 3
     }
   },
@@ -667,11 +667,11 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 221,
+      "line": 222,
       "column": 24
     },
     "end": {
-      "line": 224,
+      "line": 225,
       "column": 3
     }
   },
@@ -680,11 +680,11 @@
     "defaultMessage": "!!!Activate next service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 225,
+      "line": 226,
       "column": 23
     },
     "end": {
-      "line": 228,
+      "line": 229,
       "column": 3
     }
   },
@@ -693,11 +693,11 @@
     "defaultMessage": "!!!Activate previous service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 229,
+      "line": 230,
       "column": 27
     },
     "end": {
-      "line": 232,
+      "line": 233,
       "column": 3
     }
   },
@@ -706,11 +706,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 233,
+      "line": 234,
       "column": 11
     },
     "end": {
-      "line": 236,
+      "line": 237,
       "column": 3
     }
   },
@@ -719,11 +719,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 237,
+      "line": 238,
       "column": 13
     },
     "end": {
-      "line": 240,
+      "line": 241,
       "column": 3
     }
   },
@@ -732,11 +732,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 241,
+      "line": 242,
       "column": 14
     },
     "end": {
-      "line": 244,
+      "line": 245,
       "column": 3
     }
   },
@@ -745,11 +745,11 @@
     "defaultMessage": "!!!Default",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 245,
+      "line": 246,
       "column": 20
     },
     "end": {
-      "line": 248,
+      "line": 249,
       "column": 3
     }
   },
@@ -758,11 +758,11 @@
     "defaultMessage": "!!!Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 249,
+      "line": 250,
       "column": 9
     },
     "end": {
-      "line": 252,
+      "line": 253,
       "column": 3
     }
   },
@@ -771,11 +771,11 @@
     "defaultMessage": "!!!Open Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 253,
+      "line": 254,
       "column": 19
     },
     "end": {
-      "line": 256,
+      "line": 257,
       "column": 3
     }
   },
@@ -784,11 +784,11 @@
     "defaultMessage": "!!!Close Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 257,
+      "line": 258,
       "column": 20
     },
     "end": {
-      "line": 260,
+      "line": 261,
       "column": 3
     }
   },
@@ -797,11 +797,24 @@
     "defaultMessage": "!!!Enable Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 261,
+      "line": 262,
       "column": 15
     },
     "end": {
-      "line": 264,
+      "line": 265,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.services.goHome",
+    "defaultMessage": "!!!Home",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 266,
+      "column": 17
+    },
+    "end": {
+      "line": 269,
       "column": 3
     }
   }
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 32bd1644b..cda33baef 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -10,6 +10,7 @@ import { announcementActions } from '../features/announcements/actions';
 import { announcementsStore } from '../features/announcements';
 import { GA_CATEGORY_TODOS, todosStore } from '../features/todos';
 import { todoActions } from '../features/todos/actions';
+import { CUSTOM_WEBSITE_ID } from '../features/webControls/constants';
 
 const { app, Menu, dialog } = remote;
 
@@ -262,6 +263,10 @@ const menuItems = defineMessages({
     id: 'menu.todos.enableTodos',
     defaultMessage: '!!!Enable Todos',
   },
+  serviceGoHome: {
+    id: 'menu.services.goHome',
+    defaultMessage: '!!!Home',
+  },
 });
 
 function getActiveWebview() {
@@ -672,8 +677,12 @@ export default class FranzMenu {
       accelerator: `${cmdKey}+R`,
       click: () => {
         if (this.stores.user.isLoggedIn
-          && this.stores.services.enabled.length > 0) {
-          this.actions.service.reloadActive();
+        && this.stores.services.enabled.length > 0) {
+          if (this.stores.services.active.recipe.id === CUSTOM_WEBSITE_ID) {
+            this.stores.services.active.webview.reload();
+          } else {
+            this.actions.service.reloadActive();
+          }
         } else {
           window.location.reload();
         }
@@ -877,6 +886,16 @@ export default class FranzMenu {
       },
     })));
 
+    if (services.active && services.active.recipe.id === CUSTOM_WEBSITE_ID) {
+      menu.push({
+        type: 'separator',
+      }, {
+        label: intl.formatMessage(menuItems.serviceGoHome),
+        accelerator: `${cmdKey}+shift+H`,
+        click: () => this.actions.service.reloadActive(),
+      });
+    }
+
     return menu;
   }
 
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 0398b7533..4a00cb294 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -27,7 +27,9 @@ import { sleep } from '../helpers/async-helpers';
 
 const debug = require('debug')('Franz:AppStore');
 
-const { app, systemPreferences, screen } = remote;
+const {
+  app, systemPreferences, screen, powerMonitor,
+} = remote;
 
 const mainWindow = remote.getCurrentWindow();
 
@@ -55,6 +57,8 @@ export default class AppStore extends Store {
 
   @observable isOnline = navigator.onLine;
 
+  @observable timeSuspensionStart;
+
   @observable timeOfflineStart;
 
   @observable updateStatus = null;
@@ -180,6 +184,27 @@ export default class AppStore extends Store {
       gaPage(pathname);
     });
 
+    powerMonitor.on('suspend', () => {
+      debug('System suspended starting timer');
+
+      this.timeSuspensionStart = moment();
+    });
+
+    powerMonitor.on('resume', () => {
+      debug('System resumed, last suspended on', this.timeSuspensionStart.toString());
+
+      if (this.timeSuspensionStart.add(10, 'm').isBefore(moment())) {
+        debug('Reloading services, user info and features');
+
+        this.actions.service.reloadAll();
+
+        this.stores.user.getUserInfoRequest.invalidate({ immediately: true });
+        this.stores.features.featuresRequest.invalidate({ immediately: true });
+
+        statsEvent('resumed-app');
+      }
+    });
+
     statsEvent('app-start');
   }
 
@@ -279,8 +304,6 @@ export default class AppStore extends Store {
     if (isValidExternalURL(url)) {
       shell.openExternal(url);
     }
-
-    gaEvent('External URL', 'open', parsedUrl.host);
   }
 
   @action _checkForUpdates() {