28 files changed, 355 insertions, 298 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1fe2ab45..e5af4ccfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,46 @@
+# [5.2.0](https://github.com/meetfranz/franz/compare/v5.2.0-beta.4...v5.2.0) (2019-07-19)
+### Features
+* **Service:** You can now add any custom website 🥳
+### Bug Fixes
+* **Notifications:** Don't show notification badges when app is muted ([e844a64](https://github.com/meetfranz/franz/commit/e844a64))
+* **Settings:** Fix position of settings window
+* **Recipes:** Fix recipe install when directly accessing recipe e.g. via url ([eba50bc](https://github.com/meetfranz/franz/commit/eba50bc))
+* **Proxy:** Fix issue with service proxy authentication ([b9e5b23](https://github.com/meetfranz/franz/commit/b9e5b23))
+* **Announcements:** Fix issue with rendering announcements in workspaces ([1e38ec5](https://github.com/meetfranz/franz/commit/1e38ec5))
+* **Windows:** Add Workspaces menu & fix Window menu ([92a61d4](https://github.com/meetfranz/franz/commit/92a61d4))
+* **Windows:** Replace tray icon with high-res version ([a5eb399](https://github.com/meetfranz/franz/commit/a5eb399))
+* **Workspaces:** Fix service reordering within workspaces ([17f3a22](https://github.com/meetfranz/franz/commit/17f3a22))
+* **Workspaces:** Fix issue with service visibility after downgrade ([05294](https://github.com/meetfranz/franz/commit/05294))
+### General
+* **App:** Improved email validation ([dd8ddcc](https://github.com/meetfranz/franz/commit/dd8ddcc)) ([@Snuggle](https://github.com/Snuggle))
+* **App:** Update electron to 4.2.4 ([404c87a](https://github.com/meetfranz/franz/commit/404c87a))
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+# [5.2.0-beta.4](https://github.com/meetfranz/franz/compare/v5.2.0-beta.3...v5.2.0-beta.4) (2019-07-01)
+### Bug Fixes
+* **Notifications:** Don't show notification badges when app is muted ([e844a64](https://github.com/meetfranz/franz/commit/e844a64))
+* **Settings:** Fix position of settings window
+### General
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+# [5.2.0-beta.3](https://github.com/meetfranz/franz/compare/v5.2.0-beta.2...v5.2.0-beta.3) (2019-06-24)
+### General
+* **App:** Downgraded electron to 4.2.4 ([404c87a](https://github.com/meetfranz/franz/commit/404c87a))
 # [5.2.0-beta.2](https://github.com/meetfranz/franz/compare/v5.2.0-beta.1...v5.2.0-beta.2) (2019-06-12)
diff --git a/package-lock.json b/package-lock.json
index 9e3579e88..17513869a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "franz",
-  "version": "5.2.0-beta.2",
+  "version": "5.2.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -2179,7 +2179,7 @@
      },
      "dependencies": {
        "@meetfranz/theme": {
-          "version": "1.0.13",
+          "version": "1.0.14",
          "bundled": true,
          "requires": {
            "color": "^3.1.0"
@@ -2203,7 +2203,7 @@
      },
      "dependencies": {
        "@meetfranz/theme": {
-          "version": "1.0.13",
+          "version": "1.0.14",
          "bundled": true,
          "requires": {
            "color": "^3.1.0"
@@ -6803,9 +6803,9 @@
      "dev": true
    },
    "electron": {
-      "version": "5.0.2",
+      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-5.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-4.2.4.tgz",
-      "integrity": "sha512-bUHKQhyuOen/q8iHTkrnzqB9CAwBDI+vHbeu21kpq2bqAD+t25yfrmUEcYHaPL4fZOAhk6nnRqskF6/Xd+aZxg==",
+      "integrity": "sha512-d4wEwJluMsRyRgbukLmFVTb6l1J+mc3RLB1ctbpMlSWDFvs+zknPWa+cHBzTWwrdgwINLddr69qsAW1ku6FqYw==",
      "dev": true,
      "requires": {
        "@types/node": "^10.12.18",
@@ -6814,9 +6814,9 @@
      },
      "dependencies": {
        "@types/node": {
-          "version": "10.14.4",
+          "version": "10.14.9",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.4.tgz",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.9.tgz",
-          "integrity": "sha512-DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg==",
+          "integrity": "sha512-NelG/dSahlXYtSoVPErrp06tYFrvzj8XLWmKA+X8x0W//4MqbUyZu++giUG/v0bjAT6/Qxa8IjodrfdACyb0Fg==",
          "dev": true
        }
      }
@@ -7043,12 +7043,14 @@
      }
    },
    "electron-hunspell": {
-      "version": "1.0.0-beta.7",
+      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/electron-hunspell/-/electron-hunspell-1.0.0-beta.7.tgz",
+      "resolved": "https://registry.npmjs.org/electron-hunspell/-/electron-hunspell-0.1.1.tgz",
-      "integrity": "sha512-BByCXqU8sZbuzyoxKcBYjycp8ORiqjeYZd2OT8RNjVW+XGPmZkHewXUu4tUa1IXW6ij6IqojV5kr+xhYKLN1DA==",
+      "integrity": "sha512-B3nOQqHexIX+8bz72FZkNk+iFBrdqS9DpV2SaH+t7T9SLbONBVBRLJ2Jj2ytXFUzvw81q7vz2dfxPCddh/E3ww==",
      "requires": {
-        "hunspell-asm": "^2.0.0",
+        "hunspell-asm": "1.0.2",
-        "tslib": "1.9.3"
+        "lodash": "^4.17.11",
+        "tslib": "1.9.3",
+        "unixify": "1.0.0"
      }
    },
    "electron-is-dev": {
@@ -11379,34 +11381,14 @@
      }
    },
    "hunspell-asm": {
-      "version": "2.0.0",
+      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hunspell-asm/-/hunspell-asm-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/hunspell-asm/-/hunspell-asm-1.0.2.tgz",
-      "integrity": "sha512-FMIUBpy+bRREFAvC63RcYEK9U6+FdlEojGSVsvMTpuZ2CekYyUBwEfG4+ExIQOQyEN0U6f1MoVgrFqvgPNSA2g==",
+      "integrity": "sha512-UTLBvc0yZiIcHl9qrgxnFTZbX3zF4CprzEY+u+N0iXlUKZnUJRIgvgppTdgiQTsucm5b0aN/rHsgXz2q/0kBRA==",
      "requires": {
-        "emscripten-wasm-loader": "^2.2.3",
+        "emscripten-wasm-loader": "^1.0.0",
-        "nanoid": "^2.0.1",
+        "nanoid": "^1.0.2",
-        "tslib": "^1.9.3",
+        "tslib": "^1.9.0",
        "unixify": "^1.0.0"
-      },
-      "dependencies": {
-        "emscripten-wasm-loader": {
-          "version": "2.2.3",
-          "resolved": "https://registry.npmjs.org/emscripten-wasm-loader/-/emscripten-wasm-loader-2.2.3.tgz",
-          "integrity": "sha512-//gI0afvtVnY7smttrPOW/BM+pTJLmdIcXAQV3fgRdQ0o6wm2vdSI0kjLYVOeo/rbtRsGgVuMLu6fT+O//EfaA==",
-          "requires": {
-            "getroot": "^1.0.0",
-            "nanoid": "^1.3.4",
-            "tslib": "^1.9.3",
-            "unixify": "^1.0.0"
-          },
-          "dependencies": {
-            "nanoid": {
-              "version": "1.3.4",
-              "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-1.3.4.tgz",
-              "integrity": "sha512-4ug4BsuHxiVHoRUe1ud6rUFT3WUMmjXt1W0quL0CviZQANdan7D8kqN5/maw53hmAApY/jfzMRkC57BNNs60ZQ=="
-            }
-          }
-        }
      }
    },
    "husky": {
@@ -14385,9 +14367,9 @@
      "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw=="
    },
    "nanoid": {
-      "version": "2.0.3",
+      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-1.3.4.tgz",
-      "integrity": "sha512-NbaoqdhIYmY6FXDRB4eYtDVC9Z9eCbn8TyaiC16LNKtpPv/aqa0tOPD8y6gNE4yUNnaZ7LLhYtXOev/6+cBtfw=="
+      "integrity": "sha512-4ug4BsuHxiVHoRUe1ud6rUFT3WUMmjXt1W0quL0CviZQANdan7D8kqN5/maw53hmAApY/jfzMRkC57BNNs60ZQ=="
    },
    "nanomatch": {
      "version": "1.2.13",
diff --git a/package.json b/package.json
index 9060c32db..bc5079084 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "franz",
  "productName": "Franz",
  "appId": "com.meetfranz.franz",
-  "version": "5.2.0-beta.2",
+  "version": "5.2.0",
  "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
  "copyright": "adlk x franz - Stefan Malzner",
  "main": "index.js",
@@ -47,7 +47,7 @@
    "du": "^0.1.0",
    "electron-dl": "1.12.0",
    "electron-fetch": "1.3.0",
-    "electron-hunspell": "1.0.0-beta.7",
+    "electron-hunspell": "0.1.1",
    "electron-is-dev": "1.0.1",
    "electron-react-titlebar": "0.8.1",
    "electron-updater": "4.0.6",
@@ -118,7 +118,7 @@
    "cross-env": "^5.0.5",
    "cz-conventional-changelog": "2.1.0",
    "dotenv": "^4.0.0",
-    "electron": "5.0.2",
+    "electron": "4.2.4",
    "electron-builder": "20.40.2",
    "electron-rebuild": "1.8.4",
    "eslint": "5.10.0",
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js
index 3d43d4e5c..75a8cfc61 100644
--- a/src/components/auth/AuthLayout.js
+++ b/src/components/auth/AuthLayout.js
@@ -22,7 +22,6 @@ export default @observer class AuthLayout extends Component {
    retryHealthCheck: PropTypes.func.isRequired,
    isHealthCheckLoading: PropTypes.bool.isRequired,
    isFullScreen: PropTypes.bool.isRequired,
-    darkMode: PropTypes.bool.isRequired,
    nextAppReleaseVersion: PropTypes.string,
    installAppUpdate: PropTypes.func.isRequired,
    appUpdateIsDownloaded: PropTypes.bool.isRequired,
@@ -45,7 +44,6 @@ export default @observer class AuthLayout extends Component {
      retryHealthCheck,
      isHealthCheckLoading,
      isFullScreen,
-      darkMode,
      nextAppReleaseVersion,
      installAppUpdate,
      appUpdateIsDownloaded,
@@ -53,7 +51,7 @@ export default @observer class AuthLayout extends Component {
    const { intl } = this.context;
    return (
-      <div className={darkMode ? 'theme__dark' : ''}>
+      <>
        {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon="assets/images/logo.svg" />}
        <div className="auth">
          {!isOnline && (
@@ -93,7 +91,7 @@ export default @observer class AuthLayout extends Component {
            <img src="./assets/images/adlk.svg" alt="" />
          </Link>
        </div>
-      </div>
+      </>
    );
  }
 }
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 797db6eb5..7f2f707fb 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -71,7 +71,6 @@ class AppLayout extends Component {
    areRequiredRequestsSuccessful: PropTypes.bool.isRequired,
    retryRequiredRequests: PropTypes.func.isRequired,
    areRequiredRequestsLoading: PropTypes.bool.isRequired,
-    darkMode: PropTypes.bool.isRequired,
    isDelayAppScreenVisible: PropTypes.bool.isRequired,
  };
@@ -105,7 +104,6 @@ class AppLayout extends Component {
      areRequiredRequestsSuccessful,
      retryRequiredRequests,
      areRequiredRequestsLoading,
-      darkMode,
      isDelayAppScreenVisible,
    } = this.props;
@@ -113,69 +111,67 @@ class AppLayout extends Component {
    return (
      <ErrorBoundary>
-        <div className={(darkMode ? 'theme__dark' : '')}>
+        <div className="app">
-          <div className="app">
+          {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon="assets/images/logo.svg" />}
-            {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon="assets/images/logo.svg" />}
+          <div className={`app__content ${classes.appContent}`}>
-            <div className={`app__content ${classes.appContent}`}>
+            {workspacesDrawer}
-              {workspacesDrawer}
+            {sidebar}
-              {sidebar}
+            <div className="app__service">
-              <div className="app__service">
+              <WorkspaceSwitchingIndicator />
-                <WorkspaceSwitchingIndicator />
+              {news.length > 0 && news.map(item => (
-                {news.length > 0 && news.map(item => (
+                <InfoBar
-                  <InfoBar
+                  key={item.id}
-                    key={item.id}
+                  position="top"
-                    position="top"
+                  type={item.type}
-                    type={item.type}
+                  sticky={item.sticky}
-                    sticky={item.sticky}
+                  onHide={() => removeNewsItem({ newsId: item.id })}
-                    onHide={() => removeNewsItem({ newsId: item.id })}
+                >
-                  >
+                  <span dangerouslySetInnerHTML={createMarkup(item.message)} />
-                    <span dangerouslySetInnerHTML={createMarkup(item.message)} />
+                </InfoBar>
-                  </InfoBar>
+              ))}
-                ))}
+              {/* {!isOnline && (
-                {/* {!isOnline && (
+                <InfoBar
-                  <InfoBar
+                  type="danger"
-                    type="danger"
+                  sticky
-                    sticky
+                >
-                  >
+                  <span className="mdi mdi-flash" />
-                    <span className="mdi mdi-flash" />
+                  {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
-                    {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
+                </InfoBar>
-                  </InfoBar>
+              )} */}
-                )} */}
+              {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
-                {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
+                <InfoBar
-                  <InfoBar
+                  type="danger"
-                    type="danger"
+                  ctaLabel="Try again"
-                    ctaLabel="Try again"
+                  ctaLoading={areRequiredRequestsLoading}
-                    ctaLoading={areRequiredRequestsLoading}
+                  sticky
-                    sticky
+                  onClick={retryRequiredRequests}
-                    onClick={retryRequiredRequests}
+                >
-                  >
+                  <span className="mdi mdi-flash" />
-                    <span className="mdi mdi-flash" />
+                  {intl.formatMessage(messages.requiredRequestsFailed)}
-                    {intl.formatMessage(messages.requiredRequestsFailed)}
+                </InfoBar>
-                  </InfoBar>
+              )}
-                )}
+              {showServicesUpdatedInfoBar && (
-                {showServicesUpdatedInfoBar && (
+                <InfoBar
-                  <InfoBar
+                  type="primary"
-                    type="primary"
+                  ctaLabel={intl.formatMessage(messages.buttonReloadServices)}
-                    ctaLabel={intl.formatMessage(messages.buttonReloadServices)}
+                  onClick={reloadServicesAfterUpdate}
-                    onClick={reloadServicesAfterUpdate}
+                  sticky
-                    sticky
+                >
-                  >
+                  <span className="mdi mdi-power-plug" />
-                    <span className="mdi mdi-power-plug" />
+                  {intl.formatMessage(messages.servicesUpdated)}
-                    {intl.formatMessage(messages.servicesUpdated)}
+                </InfoBar>
-                  </InfoBar>
+              )}
-                )}
+              {appUpdateIsDownloaded && (
-                {appUpdateIsDownloaded && (
+                <AppUpdateInfoBar
-                  <AppUpdateInfoBar
+                  nextAppReleaseVersion={nextAppReleaseVersion}
-                    nextAppReleaseVersion={nextAppReleaseVersion}
+                  onInstallUpdate={installAppUpdate}
-                    onInstallUpdate={installAppUpdate}
+                />
-                  />
+              )}
-                )}
+              {isDelayAppScreenVisible && (<DelayApp />)}
-                {isDelayAppScreenVisible && (<DelayApp />)}
+              <BasicAuth />
-                <BasicAuth />
+              <ShareFranz />
-                <ShareFranz />
+              {services}
-                {services}
+              {children}
-                {children}
-              </div>
            </div>
            <TodosWebview authToken={authToken} />
          </div>
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js
index 1f9c1ea61..427054d3d 100644
--- a/src/containers/auth/AuthLayoutContainer.js
+++ b/src/containers/auth/AuthLayoutContainer.js
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import { ThemeProvider } from 'react-jss';
-import { theme } from '@meetfranz/theme';
 import AuthLayout from '../../components/auth/AuthLayout';
 import AppStore from '../../stores/AppStore';
@@ -24,24 +23,22 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer
      stores, actions, children, location,
    } = this.props;
    const {
-      app, features, globalError, settings,
+      app, features, globalError,
    } = stores;
    const isLoadingBaseFeatures = features.defaultFeaturesRequest.isExecuting
      && !features.defaultFeaturesRequest.wasExecuted;
-    const themeType = theme(settings.app.darkMode ? 'dark' : 'default');
    if (isLoadingBaseFeatures) {
      return (
-        <ThemeProvider theme={theme(themeType)}>
+        <ThemeProvider theme={stores.ui.theme}>
          <AppLoader />
        </ThemeProvider>
      );
    }
    return (
-      <ThemeProvider theme={theme(themeType)}>
+      <ThemeProvider theme={stores.ui.theme}>
        <AuthLayout
          error={globalError.response}
          pathname={location.pathname}
@@ -50,7 +47,6 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer
          retryHealthCheck={actions.app.healthCheck}
          isHealthCheckLoading={app.healthCheckRequest.isExecuting}
          isFullScreen={app.isFullScreen}
-          darkMode={app.isSystemDarkModeEnabled}
          installAppUpdate={actions.app.installUpdate}
          nextAppReleaseVersion={app.nextAppReleaseVersion}
          appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED}
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 473280c54..8a48f4924 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -151,7 +151,6 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
          areRequiredRequestsSuccessful={requests.areRequiredRequestsSuccessful}
          retryRequiredRequests={retryRequiredRequests}
          areRequiredRequestsLoading={requests.areRequiredRequestsLoading}
-          darkMode={settings.all.app.darkMode}
          isDelayAppScreenVisible={delayAppState.isDelayAppScreenVisible}
        >
          {React.Children.count(children) > 0 ? children : null}
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js
index 663b9e2e4..440d32a46 100644
--- a/src/containers/settings/SettingsWindow.js
+++ b/src/containers/settings/SettingsWindow.js
@@ -1,4 +1,5 @@
 import React, { Component } from 'react';
+import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
@@ -10,10 +11,23 @@ import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { workspaceStore } from '../../features/workspaces';
 export default @inject('stores', 'actions') @observer class SettingsContainer extends Component {
+  portalRoot = document.querySelector('#portalContainer');
+  el = document.createElement('div');
+  componentDidMount() {
+    this.portalRoot.appendChild(this.el);
+  }
+  componentWillUnmount() {
+    this.portalRoot.removeChild(this.el);
+  }
  render() {
    const { children, stores } = this.props;
    const { closeSettings } = this.props.actions.ui;
    const navigation = (
      <Navigation
        serviceCount={stores.services.all.length}
@@ -21,15 +35,18 @@ export default @inject('stores', 'actions') @observer class SettingsContainer ex
      />
    );
-    return (
+    return ReactDOM.createPortal(
-      <ErrorBoundary>
+      (
-        <Layout
+        <ErrorBoundary>
-          navigation={navigation}
+          <Layout
-          closeSettings={closeSettings}
+            navigation={navigation}
-        >
+            closeSettings={closeSettings}
-          {children}
+          >
-        </Layout>
+            {children}
-      </ErrorBoundary>
+          </Layout>
+        </ErrorBoundary>
+      ),
+      this.el,
    );
  }
 }
diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js
index e7c5fe395..03bd5ba41 100644
--- a/src/features/announcements/components/AnnouncementScreen.js
+++ b/src/features/announcements/components/AnnouncementScreen.js
@@ -28,7 +28,7 @@ const smallScreen = '1000px';
 const styles = theme => ({
  container: {
    background: theme.colorBackground,
-    position: 'absolute',
+    position: 'relative',
    top: 0,
    zIndex: 140,
    width: '100%',
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
index 67f0fc5e6..39fae3b20 100644
--- a/src/features/delayApp/index.js
+++ b/src/features/delayApp/index.js
@@ -33,7 +33,7 @@ export default function init(stores) {
  };
  reaction(
-    () => stores.user.isLoggedIn && stores.features.features.needToWaitToProceed && !stores.user.data.isPremium,
+    () => stores.user.isLoggedIn && stores.services.allServicesRequest.wasExecuted && stores.features.features.needToWaitToProceed && !stores.user.data.isPremium,
    (isEnabled) => {
      if (isEnabled) {
        debug('Enabling `delayApp` feature');
@@ -45,6 +45,7 @@ export default function init(stores) {
        autorun(() => {
          if (stores.services.all.length === 0) {
+            debug('seas', stores.services.all.length);
            shownAfterLaunch = true;
            return;
          }
@@ -64,7 +65,7 @@ export default function init(stores) {
              debug('Resetting app delay');
              setVisibility(false);
-            }, DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.wait + 1000); // timer needs to be able to hit 0
+            }, config.delayDuration + 1000); // timer needs to be able to hit 0
          }
        });
      } else {
diff --git a/src/features/delayApp/styles.js b/src/features/delayApp/styles.js
index 5c214cfdf..69c3c7a27 100644
--- a/src/features/delayApp/styles.js
+++ b/src/features/delayApp/styles.js
@@ -1,7 +1,6 @@
 export default theme => ({
  container: {
    background: theme.colorBackground,
-    position: 'absolute',
    top: 0,
    width: '100%',
    display: 'flex',
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 07b16ff23..a82f6895c 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -79,7 +79,7 @@ export default class WorkspacesStore extends FeatureStore {
  // ========== PUBLIC API ========= //
-  start(stores, actions) {
+  @action start(stores, actions) {
    debug('WorkspacesStore::start');
    this.stores = stores;
    this.actions = actions;
@@ -104,7 +104,7 @@ export default class WorkspacesStore extends FeatureStore {
    // REACTIONS
    this._freeUserReactions = createReactions([
-      this._stopPremiumActionsAndReactions,
+      this._disablePremiumFeatures,
      this._openDrawerWithSettingsReaction,
      this._setFeatureEnabledReaction,
      this._setIsPremiumFeatureReaction,
@@ -123,10 +123,7 @@ export default class WorkspacesStore extends FeatureStore {
    this.isFeatureActive = true;
  }
-  stop() {
+  @action reset() {
-    super.stop();
-    debug('WorkspacesStore::stop');
-    this.isFeatureActive = false;
    this.activeWorkspace = null;
    this.nextWorkspace = null;
    this.workspaceBeingEdited = null;
@@ -134,6 +131,13 @@ export default class WorkspacesStore extends FeatureStore {
    this.isWorkspaceDrawerOpen = false;
  }
+  @action stop() {
+    super.stop();
+    debug('WorkspacesStore::stop');
+    this.reset();
+    this.isFeatureActive = false;
+  }
  filterServicesByActiveWorkspace = (services) => {
    const { activeWorkspace, isFeatureActive } = this;
    if (isFeatureActive && activeWorkspace) {
@@ -281,6 +285,7 @@ export default class WorkspacesStore extends FeatureStore {
  };
  _activateLastUsedWorkspaceReaction = () => {
+    debug('_activateLastUsedWorkspaceReaction');
    if (!this.activeWorkspace && this.userHasWorkspaces) {
      const { lastActiveWorkspace } = this.settings;
      if (lastActiveWorkspace) {
@@ -324,10 +329,12 @@ export default class WorkspacesStore extends FeatureStore {
    });
  };
-  _stopPremiumActionsAndReactions = () => {
+  _disablePremiumFeatures = () => {
    if (!this.isUserAllowedToUseFeature) {
+      debug('_disablePremiumFeatures');
      this._stopActions(this._premiumUserActions);
      this._stopReactions(this._premiumUserReactions);
+      this.reset();
    } else {
      this._startActions(this._premiumUserActions);
      this._startReactions(this._premiumUserReactions);
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 27f4c7d88..15ade7941 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,11 +1,11 @@
 {
-   "app.errorHandler.action" : "Recargar",
+   "app.errorHandler.action" : "Actualizar",
-   "app.errorHandler.headline" : "Ha surgido un error",
+   "app.errorHandler.headline" : "Algo salió mal",
   "feature.announcements.changelog.headline" : "Cambios en Franz {version}",
   "feature.delayApp.action" : "Consigue una Licencia de Soporte de Franz",
-   "feature.delayApp.headline" : "Por favor, compra una Licencia de Soporte de Franz para saltar la espera",
+   "feature.delayApp.headline" : "Por favor compra una Licencia de Soporte de Franz para omitir la espera",
   "feature.delayApp.text" : "Franz continuará en {seconds} segundos.",
-   "feature.shareFranz.action.email" : "Envía como correo",
+   "feature.shareFranz.action.email" : "Enviar como correo",
   "feature.shareFranz.action.facebook" : "Compartir en Facebook",
   "feature.shareFranz.action.twitter" : "Compartir en Twitter",
   "feature.shareFranz.headline" : "¡Juntos mejoramos Franz!",
@@ -19,7 +19,7 @@
   "global.spellchecking.autodetect.short" : "Automático",
   "global.spellchecking.language" : "Corrector de ortografía",
   "import.headline" : "Importa tus servicios de Franz 4",
-   "import.notSupportedHeadline" : "Servicios no admitidos aún en Franz 5",
+   "import.notSupportedHeadline" : "Servicios aún no admitidos en Franz 5",
   "import.skip.label" : "Quiero agregar servicios manualmente",
   "import.submit.label" : "Importar servicios",
   "infobar.buttonChangelog" : "¿Qué hay de nuevo?",
@@ -43,7 +43,7 @@
   "login.serverLogout" : "Tu sesión ha expirado, por favor inicia la sesión de nuevo.",
   "login.submit.label" : "Iniciar sesión",
   "login.tokenExpired" : "Tu sesión ha expirado, por favor inicia sesión de nuevo.",
-   "menu.app.about" : "Sobre Franz",
+   "menu.app.about" : "Acerca de Franz",
   "menu.app.announcement" : "¿Qué hay de nuevo?",
   "menu.app.checkForUpdates" : "Comprobar actualizaciones",
   "menu.app.hide" : "Ocultar",
@@ -70,7 +70,7 @@
   "menu.help.changelog" : "Registro de cambios",
   "menu.help.learnMore" : "Conocer más",
   "menu.help.privacy" : "Declaración de privacidad",
-   "menu.help.support" : "Ayuda técnica",
+   "menu.help.support" : "Soporte",
   "menu.help.tos" : "Términos del Servicio",
   "menu.services" : "Servicios",
   "menu.services.activatePreviousService" : "Activa el servicio previo",
@@ -144,7 +144,7 @@
   "settings.account.userInfoRequestFailed" : "No se pudo cargar la información de usuario",
   "settings.app.buttonClearAllCache" : "Limpiar caché",
   "settings.app.buttonInstallUpdate" : "Reiniciar e instalar actualizaciones",
-   "settings.app.buttonSearchForUpdate" : "Comprobar actualizaciones",
+   "settings.app.buttonSearchForUpdate" : "Buscar actualizaciones",
   "settings.app.cacheInfo" : "El cache de Franz actualmente usa {size} de espacio en disco.",
   "settings.app.currentVersion" : "Versión actual:",
   "settings.app.form.autoLaunchInBackground" : "Abrir en segundo plano",
@@ -165,7 +165,7 @@
   "settings.app.headlineGeneral" : "General",
   "settings.app.headlineLanguage" : "Idioma",
   "settings.app.headlineUpdates" : "Actualizaciones",
-   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
+   "settings.app.languageDisclaimer" : "Las traducciones oficiales son en inglés y alemán. Todos los demás idiomas son traducciones basadas en la comunidad.",
   "settings.app.restartRequired" : "Los cambios requieren reiniciar",
   "settings.app.subheadlineCache" : "Caché",
   "settings.app.translationHelp" : "Ayúdanos a traducir Franz a tu idioma.",
@@ -265,7 +265,7 @@
   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
   "settings.workspaces.tryReloadWorkspaces" : "Inténtalo de nuevo",
   "settings.workspaces.updatedInfo" : "Tus cambios han sido guardados",
-   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureHeadline" : "Menos es más: Presentación de Franz Workspaces",
   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Añadir nuevo servicio",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 90072f2b7..9227ff28f 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -3,7 +3,7 @@
   "app.errorHandler.headline" : "Une erreur s'est produite",
   "feature.announcements.changelog.headline" : "Changements dans Franz {version}",
   "feature.delayApp.action" : "Obtenez une licence de Supporter Franz",
-   "feature.delayApp.headline" : "Veuillez acheter une licence de Supporter Franz pour sauter le temps d'attente",
+   "feature.delayApp.headline" : "Achetez une licence de Supporter Franz pour ne plus avoir de temps d'attente",
   "feature.delayApp.text" : "Franz reprendra dans {seconds} secondes.",
   "feature.shareFranz.action.email" : "Envoyer par mail",
   "feature.shareFranz.action.facebook" : "Partager sur Facebook",
@@ -11,7 +11,7 @@
   "feature.shareFranz.headline" : "Franz est meilleur quand on est tous ensemble !",
   "feature.shareFranz.shareText.email" : "J'ai ajouté {count} services à Franz ! Télécharger l'appli gratuite pour WhatsApp, Messenger, Skype et cie sur www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "J'ai ajouté {count} services à Franz! Télécharge l'application gratuite pour WhatsApp, Messenger, Slack, Skype et compagnie sur www.meetfranz.com \/cc @FranzMessenger",
-   "feature.shareFranz.text" : "Dites à vos amis et collègues combien Franz est super et aidez nous à faire passer le mot.",
+   "feature.shareFranz.text" : "Dites à vos amis et collègues a quel point Franz est super et aidez nous à faire passer le mot.",
   "global.api.unhealthy" : "Impossible de se connecter aux services en ligne de Franz",
   "global.notConnectedToTheInternet" : "Vous n'êtes pas connecté à Internet.",
   "global.spellchecker.useDefault" : "Par défaut ({default})",
@@ -19,7 +19,7 @@
   "global.spellchecking.autodetect.short" : "Automatiquement",
   "global.spellchecking.language" : "Langue de la vérification orthographique",
   "import.headline" : "Importez vos services depuis la version 4 de Franz.",
-   "import.notSupportedHeadline" : "Ces services ne sont pas encore supportés par Franz 5",
+   "import.notSupportedHeadline" : "Ces services ne sont pas encore supportés par la version 5 de Franz",
   "import.skip.label" : "Je veux ajouter des services manuellement",
   "import.submit.label" : "Importer des services",
   "infobar.buttonChangelog" : "Nouveautés",
@@ -27,7 +27,7 @@
   "infobar.buttonReloadServices" : "Recharger les services",
   "infobar.requiredRequestsFailed" : "Impossible d'accéder aux services et informations de l'utilisateur",
   "infobar.servicesUpdated" : "Vos services ont été mis à jour.",
-   "infobar.updateAvailable" : "Une nouvelle mise à jour pour Franz est disponible.",
+   "infobar.updateAvailable" : "Une nouvelle mise à jour de Franz est disponible.",
   "invite.email.label" : "Adresse Email",
   "invite.headline.friends" : "Invitez 3 amis ou collègues",
   "invite.name.label" : "Nom",
@@ -44,7 +44,7 @@
   "login.submit.label" : "Se connecter",
   "login.tokenExpired" : "Votre session a expiré, veuillez vous reconnecter.",
   "menu.app.about" : "À propos de Franz",
-   "menu.app.announcement" : "Quoi de neuf? ",
+   "menu.app.announcement" : "Quoi de neuf ? ",
   "menu.app.checkForUpdates" : "Vérifier les mises à jour",
   "menu.app.hide" : "Masquer",
   "menu.app.hideOthers" : "Masquer les autres",
@@ -70,7 +70,7 @@
   "menu.help.changelog" : "Liste des modifications",
   "menu.help.learnMore" : "En savoir plus",
   "menu.help.privacy" : "Déclaration de confidentialité",
-   "menu.help.support" : "Support",
+   "menu.help.support" : "Assistance",
   "menu.help.tos" : "Conditions d'utilisation",
   "menu.services" : "Services",
   "menu.services.activatePreviousService" : "Activer le service précédent",
@@ -79,9 +79,9 @@
   "menu.view" : "Aperçu",
   "menu.view.enterFullScreen" : "Entrer en mode plein écran",
   "menu.view.exitFullScreen" : "Sortir du mode plein écran",
-   "menu.view.reloadFranz" : "Actualiser Franz",
+   "menu.view.reloadFranz" : "Recharger Franz",
   "menu.view.reloadService" : "Redémarrer le service",
-   "menu.view.resetZoom" : "Taille réelle",
+   "menu.view.resetZoom" : "Taille actuelle",
   "menu.view.toggleDevTools" : "Activer les outils développeur",
   "menu.view.toggleFullScreen" : "Activer \/ désactiver le mode plein écran",
   "menu.view.toggleServiceDevTools" : "Activer les outils de développement WebKit",
@@ -102,7 +102,7 @@
   "password.noUser" : "Aucun utilisateur n'a été trouvé avec cette adresse email",
   "password.submit.label" : "Soumettre",
   "password.successInfo" : "Merci de consulter vos emails",
-   "premiumFeature.button.upgradeAccount" : "Mettre à niveau mon compte",
+   "premiumFeature.button.upgradeAccount" : "Augmenter le niveau de mon compte",
   "pricing.headline" : "Soutenez Franz",
   "pricing.link.skipPayment" : "Je ne veux pas soutenir le développement de Franz.",
   "pricing.submit.label" : "Je veux soutenir le développement de Franz",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 701568b1c..43e0da91a 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -8,7 +8,7 @@
   "feature.shareFranz.action.email" : "Küldés email-ben",
   "feature.shareFranz.action.facebook" : "Megosztás Facebook-on",
   "feature.shareFranz.action.twitter" : "Megosztás Twitter-en",
-   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.headline" : "A Franz barátokkal együtt mégjobb!",
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
@@ -44,7 +44,7 @@
   "login.submit.label" : "Bejelentkezés",
   "login.tokenExpired" : "A munkamenet lejárt, kérlek lépj be újra.",
   "menu.app.about" : "Névjegy",
-   "menu.app.announcement" : "What's new?",
+   "menu.app.announcement" : "Mi újság?",
   "menu.app.checkForUpdates" : "Frissítések keresése",
   "menu.app.hide" : "Elrejt",
   "menu.app.hideOthers" : "Többi elrejtése",
@@ -233,17 +233,17 @@
   "settings.services.discoverServices" : "Szolgáltatások felfedezése",
   "settings.services.headline" : "Szolgáltatásaid",
   "settings.services.noServicesAdded" : "Még nem adtál hozzá egyetlen szolgáltatást sem eddig.",
-   "settings.services.servicesRequestFailed" : "Could not load your services",
+   "settings.services.servicesRequestFailed" : "Szolgáltatásaid betöltése sikertelen",
   "settings.services.tooltip.isDisabled" : "A szolgáltatás le van tiltva",
   "settings.services.tooltip.isMuted" : "Minden hang lenémítva",
   "settings.services.tooltip.notificationsDisabled" : "Értesítések letiltva",
   "settings.services.updatedInfo" : "A módosításokat elmentettük",
   "settings.team.contentHeadline" : "Franz for Teams",
-   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.copy" : "A Franz for Teams lehetőséget teremt arra, hogy meghívd munkatársaidat a csapatodba email-en keresztül, és kezelhesd a Franz előfizetéseiket és fiókbeállításaikat. Ne fecséreld az idődet minden egyes csapattag regisztrációjára, felejtsd el a sok-sok egyéni számlát és különböző lejárati időt - egy mindenek felett!",
   "settings.team.headline" : "Csapat",
-   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.intro" : "Te és a csapatod Franz-ot használtok? Egy fiókból kezelheted kollégáid, barátaid vagy családtagjaid Prémium előfizetéseit.",
-   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.manageAction" : "Csapat kezelése a meetfranz.com-on",
-   "settings.team.upgradeAction" : "Upgrade your Account",
+   "settings.team.upgradeAction" : "Előfizetés",
   "settings.user.form.accountType.company" : "Cég",
   "settings.user.form.accountType.individual" : "Egyén",
   "settings.user.form.accountType.label" : "Fiók típusa",
@@ -293,7 +293,7 @@
   "subscription.features.onpremise.mattermost" : "Saját kiszolgálós szolgáltatások hozzáadása, pl.: Mattermost",
   "subscription.features.proxy" : "Proxy támogatás a szolgáltatásokhoz",
   "subscription.features.spellchecker" : "Támogatás a Helyesírás-ellenőrzőhöz",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
+   "subscription.features.workspaces" : "Rendezd szolgáltatásaidat Munkaterületekbe",
   "subscription.includedFeatures" : "Az előfizetett Franz Prémium Támogató Fiók tartalmazza",
   "subscription.paymentSessionError" : "Nem sikerült a fizetési felületet betölteni",
   "subscription.submit.label" : "Szeretném támogatni a Franz fejlesztését",
@@ -313,12 +313,12 @@
   "tabs.item.reload" : "Újratöltés",
   "validation.email" : "{field} nem érvényes",
   "validation.minLength" : "{field} mezőnek legalább {length} karakter hosszúnak kell lennie",
-   "validation.oneRequired" : "At least one is required",
+   "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",
   "welcome.loginButton" : "Jelentkezz be a fiókodba",
   "welcome.signupButton" : "Új fiók létrehozása",
-   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Munkaterület hozzáadása",
   "workspaceDrawer.allServices" : "Összes szolgáltatás",
   "workspaceDrawer.headline" : "Munkaterületek",
   "workspaceDrawer.item.contextMenuEdit" : "szerkeszt",
@@ -326,7 +326,7 @@
   "workspaceDrawer.premiumCtaButtonLabel" : "Készítsd el az első munkaterületedet",
   "workspaceDrawer.proFeatureBadge" : "Prémium funkció",
   "workspaceDrawer.reactivatePremiumAccountLabel" : "Prémium fiók reaktiválása",
-   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>A Franz Munkaterületek lehetővé teszik, hogy összpontosíts a jelenleg fontos dolgokra. Állítsd be a különböző szolgáltatáskészleteket és könnyedén válthatsz közöttük bármikor.<\/p><p>Te döntöd el, hogy mely szolgáltatásokra van szükséged, mikor és hol, így segíthetünk abban, hogy a teljesítményed csúcsán maradhass, vagy ha csak akarod, egyszerűen kikapcsold a munkával kapcsolatos dolgokat.<\/p>",
   "workspaceDrawer.workspacesSettingsTooltip" : "Munkaterület beállítások szerkesztése",
-   "workspaces.switchingIndicator.switchingTo" : "Switching to"
+   "workspaces.switchingIndicator.switchingTo" : "Váltás"
 }
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 819aca177..fb6434869 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -10,7 +10,7 @@
   "feature.shareFranz.action.twitter" : "Bagikan di Twitter",
   "feature.shareFranz.headline" : "Franz lebih baik bersama!",
   "feature.shareFranz.shareText.email" : "Saya telah menambahkan layanan {count} ke Franz! Dapatkan aplikasi gratis untuk WhatsApp, Messenger, Slack, Skype dan co di www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.shareText.twitter" : "Saya telah menambahkan {count} layanan di Franz! Dapatkan aplikasi gratis untuk WhatsApp, Messenger, Slack, Skype dan lainnya di www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Beri tahu teman dan kolega Anda betapa hebatnya Franz dan bantu kami menyebarkan berita.",
   "global.api.unhealthy" : "Tidak dapat tersambung ke layanan Franz",
   "global.notConnectedToTheInternet" : "Anda tidak tersambung ke internet.",
@@ -144,7 +144,7 @@
   "settings.account.userInfoRequestFailed" : "Gagal memuat informasi pengguna",
   "settings.app.buttonClearAllCache" : "Bersihkan singgahan",
   "settings.app.buttonInstallUpdate" : "Mulai ulang dan instal versi baru",
-   "settings.app.buttonSearchForUpdate" : "Periksa versi baru",
+   "settings.app.buttonSearchForUpdate" : "Periksa pembaruan",
   "settings.app.cacheInfo" : "Singgahan Franz sedang menggunakan ruang disk {size}.",
   "settings.app.currentVersion" : "Versi saat ini:",
   "settings.app.form.autoLaunchInBackground" : "Buka di latar belakang",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 1eda8856f..83e207542 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -1,22 +1,22 @@
 {
   "app.errorHandler.action" : "Herladen",
   "app.errorHandler.headline" : "Er ging iets mis",
-   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "feature.announcements.changelog.headline" : "Wijzigingen in Franz {versie}",
   "feature.delayApp.action" : "Neem een Franz Supporter Licentie ",
   "feature.delayApp.headline" : "Neem een Franz Supporter Licentie om niet meer te hoeven wachten",
   "feature.delayApp.text" : "Franz gaat over {seconds} seconden verder.",
-   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.email" : "Verstuur als e-mail",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.facebook" : "Deel op Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.action.twitter" : "Deel op Twitter",
-   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.headline" : "Franz is beter samen!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.email" : "Ik heb {telling} diensten toegevoegd aan Franz! Download de gratis app voor WhatsApp, Messenger, Slack, Skype, en anderen op www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.shareText.twitter" : "Ik heb {tel} diensten toegevoegd aan Franz! Download de gratis app voor WhatsApp, Messenger, Slack, Skype, en anderen op www.meetfranz.com \/cc @FranzMessenger",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.text" : "Vertel je vrienden en collega's hoe geweldig Franz is en help ons het woord te verspreiden.",
   "global.api.unhealthy" : "Kan geen verbinding maken met de Franz services",
   "global.notConnectedToTheInternet" : "Je hebt geen internet verbinding.",
   "global.spellchecker.useDefault" : "Gebruik Systeemstandaard ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect" : "Taal automatisch herkennen",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect.short" : "Automatisch",
   "global.spellchecking.language" : "Taal spellingscontrole",
   "import.headline" : "Importeer je Franz 4 services",
   "import.notSupportedHeadline" : "De volgende services worden nog niet ondersteund in Franz 5",
@@ -44,7 +44,7 @@
   "login.submit.label" : "Inloggen",
   "login.tokenExpired" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
   "menu.app.about" : "Over Franz",
-   "menu.app.announcement" : "What's new?",
+   "menu.app.announcement" : "Wat is er nieuw?",
   "menu.app.checkForUpdates" : "Controleer op updates",
   "menu.app.hide" : "Verbergen",
   "menu.app.hideOthers" : "Andere Verbergen",
@@ -73,9 +73,9 @@
   "menu.help.support" : "Ondersteuning",
   "menu.help.tos" : "Servicevoorwaarden",
   "menu.services" : "Services",
-   "menu.services.activatePreviousService" : "Activate previous service",
+   "menu.services.activatePreviousService" : "Vorige dienst activeren",
   "menu.services.addNewService" : "Nieuwe service toevoegen...",
-   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.services.setNextServiceActive" : "Volgende dienst activeren",
   "menu.view" : "Weergave",
   "menu.view.enterFullScreen" : "Volledig scherm openen",
   "menu.view.exitFullScreen" : "Volledig scherm verlaten",
@@ -90,11 +90,11 @@
   "menu.window" : "Venster",
   "menu.window.close" : "Sluiten",
   "menu.window.minimize" : "Minimaliseren",
-   "menu.workspaces" : "Workspaces",
+   "menu.workspaces" : "Werkruimten",
-   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.addNewWorkspace" : "Voeg nieuwe werkruimte toe...",
-   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.closeWorkspaceDrawer" : "Werkruimtepagina sluiten",
   "menu.workspaces.defaultWorkspace" : "Alle services",
-   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
+   "menu.workspaces.openWorkspaceDrawer" : "Werkruimtepagina openen",
   "password.email.label" : "E-mailadres",
   "password.headline" : "Wachtwoord resetten",
   "password.link.login" : "Log in op je account",
@@ -118,7 +118,7 @@
   "service.errorHandler.headline" : "Oh nee!",
   "service.errorHandler.message" : "Fout",
   "service.errorHandler.text" : "{name} kon niet geladen worden.",
-   "service.webviewLoader.loading" : "Loading",
+   "service.webviewLoader.loading" : "Aan het laden",
   "services.getStarted" : "Beginnen",
   "services.welcome" : "Welkom bij Franz",
   "settings.account.account.editButton" : "Account bewerken",
@@ -165,7 +165,7 @@
   "settings.app.headlineGeneral" : "Algemeen",
   "settings.app.headlineLanguage" : "Taal",
   "settings.app.headlineUpdates" : "Updates",
-   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
+   "settings.app.languageDisclaimer" : "Officiële vertalingen zijn in het Engels en Duits. Alle andere tallen zijn op de gemeenschap gebaseerde vertalingen.",
   "settings.app.restartRequired" : "Deze wijziging heeft een herstart nodig",
   "settings.app.subheadlineCache" : "Cache",
   "settings.app.translationHelp" : "Help ons om Franz te vertalen naar uw taal.",
@@ -178,10 +178,10 @@
   "settings.navigation.inviteFriends" : "Nodig vrienden uit",
   "settings.navigation.logout" : "Uitloggen",
   "settings.navigation.settings" : "Instellingen",
-   "settings.navigation.team" : "Manage Team",
+   "settings.navigation.team" : "Beheer Team",
   "settings.navigation.yourServices" : "Jouw services",
-   "settings.navigation.yourWorkspaces" : "Your workspaces",
+   "settings.navigation.yourWorkspaces" : "Jouw werkruimtes",
-   "settings.recipes.all" : "Alle services",
+   "settings.recipes.all" : "Alle diensten",
   "settings.recipes.dev" : "Ontwikkeling",
   "settings.recipes.headline" : "Beschikbare services",
   "settings.recipes.missingService" : "Mist er een service?",
@@ -233,17 +233,17 @@
   "settings.services.discoverServices" : "Services ontdekken",
   "settings.services.headline" : "Jouw services",
   "settings.services.noServicesAdded" : "Je hebt nog geen services toegevoegd.",
-   "settings.services.servicesRequestFailed" : "Could not load your services",
+   "settings.services.servicesRequestFailed" : "Kan je diensten niet laden",
   "settings.services.tooltip.isDisabled" : "Service is uitgeschakeld",
   "settings.services.tooltip.isMuted" : "Alle geluiden zijn uitgeschakeld",
   "settings.services.tooltip.notificationsDisabled" : "Notificaties staan uit",
   "settings.services.updatedInfo" : "Je wijzigingen zijn opgeslagen",
-   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.contentHeadline" : "Frans voor Teams",
-   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.copy" : "Franz voor Teams geeft je de mogelijkheid om collega's uit te nodigen voor je team door hen een e-mail te sturen en hun inschrijvingen te beheren in je accountvoorkeuren. Verspil geen tijd met het instellen van inschrijvingen voor elk teamlid apart, vergeet meerdere facturen en verschillende afrekeningsperiodes - één team regeert alles!",
   "settings.team.headline" : "Team",
-   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.intro" : "Gebruiken jij en je team Franz? Je kunt nu Premium inschrijvingen beheren voor zoveel collega's, vrienden, of familieleden als je wilt, allemaal vanaf één account.",
-   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.manageAction" : "Beheer je Team op meetfranz.com",
-   "settings.team.upgradeAction" : "Upgrade your Account",
+   "settings.team.upgradeAction" : "Upgrade je Account",
   "settings.user.form.accountType.company" : "Bedrijf",
   "settings.user.form.accountType.individual" : "Particulier",
   "settings.user.form.accountType.label" : "Account type",
@@ -254,24 +254,24 @@
   "settings.user.form.lastname" : "Achternaam",
   "settings.user.form.newPassword" : "Nieuw wachtwoord",
   "settings.workspace.add.form.name" : "Naam",
-   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.add.form.submitButton" : "Maak werkruimte aan",
-   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonDelete" : "Verwijder werkruimte",
-   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.buttonSave" : "Bewaar werkruimte",
   "settings.workspace.form.name" : "Naam",
-   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Diensten in deze Werkruimte",
-   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspace.form.yourWorkspaces" : "Jouw werkruimtes",
-   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.deletedInfo" : "Werkruimte is verwijderd",
-   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.headline" : "Je werkruimtes",
-   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.noWorkspacesAdded" : "Je hebt nog geen werkruimtes toegevoegd.",
   "settings.workspaces.tryReloadWorkspaces" : "Probeer opnieuw",
   "settings.workspaces.updatedInfo" : "Je wijzigingen zijn opgeslagen",
-   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureHeadline" : "Minder is meer: we presenteren Franz Werkruimtes",
   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
-   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
+   "settings.workspaces.workspacesRequestFailed" : "Kan je werkruimtes niet laden",
   "sidebar.addNewService" : "Nieuw service toevoegen",
-   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
+   "sidebar.closeWorkspaceDrawer" : "Werkruimtelade sluiten",
   "sidebar.muteApp" : "Berichten & geluid uitschakelen",
-   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
+   "sidebar.openWorkspaceDrawer" : "Werkruimtelade openen",
   "sidebar.settings" : "Instellingen",
   "sidebar.unmuteApp" : "Berichten & geluid inschakelen",
   "signup.company.label" : "Bedrijf",
@@ -293,7 +293,7 @@
   "subscription.features.onpremise.mattermost" : "Voeg op-locatie\/gehoste diensten zoals Mattermost toe",
   "subscription.features.proxy" : "Proxy ondersteuning voor services",
   "subscription.features.spellchecker" : "Ondersteuning voor spellingscheck",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
+   "subscription.features.workspaces" : "Organiseer je diensten in werkruimtes",
   "subscription.includedFeatures" : "Een betalend account voor Franz omvat",
   "subscription.paymentSessionError" : "Betalingsformulier kon niet geladen worden",
   "subscription.submit.label" : "Ik wil de ontwikkeling van Franz steunen",
@@ -313,20 +313,20 @@
   "tabs.item.reload" : "Herladen",
   "validation.email" : "{field} is niet geldig",
   "validation.minLength" : "{field} moet minimaal {length} karakters lang zijn",
-   "validation.oneRequired" : "At least one is required",
+   "validation.oneRequired" : "Ten minste één is vereist",
   "validation.required" : "{field} is vereist",
   "validation.url" : "{field} is niet een geldige URL",
   "welcome.loginButton" : "Inloggen op je account",
   "welcome.signupButton" : "Maak een gratis account aan",
-   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Voeg een nieuwe werkruimte toe",
-   "workspaceDrawer.allServices" : "Alle services",
+   "workspaceDrawer.allServices" : "Alle diensten",
-   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.headline" : "Werkruimtes",
-   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.contextMenuEdit" : "bewerken",
-   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.item.noServicesAddedYet" : "Nog geen diensten toegevoegd",
-   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Maak je eerste werkruimte aan",
   "workspaceDrawer.proFeatureBadge" : "Premium feature",
-   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Heractiveer premium account",
   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
-   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Pas werkruimte instellingen aan",
-   "workspaces.switchingIndicator.switchingTo" : "Switching to"
+   "workspaces.switchingIndicator.switchingTo" : "Overschakelen naar"
 }
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index fdb96a7db..a05297a64 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -165,7 +165,7 @@
   "settings.app.headlineGeneral" : "Algemeen",
   "settings.app.headlineLanguage" : "Taal",
   "settings.app.headlineUpdates" : "Updates",
-   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
+   "settings.app.languageDisclaimer" : "Officiële vertalingen zijn in het Engels en Duits. Alle andere talen zijn beheerd door de community.",
   "settings.app.restartRequired" : "Deze wijziging heeft een herstart nodig",
   "settings.app.subheadlineCache" : "Cache",
   "settings.app.translationHelp" : "Help ons om Franz te vertalen naar uw taal.",
@@ -178,9 +178,9 @@
   "settings.navigation.inviteFriends" : "Nodig vrienden uit",
   "settings.navigation.logout" : "Uitloggen",
   "settings.navigation.settings" : "Instellingen",
-   "settings.navigation.team" : "Manage Team",
+   "settings.navigation.team" : "Beheer Team",
   "settings.navigation.yourServices" : "Jouw services",
-   "settings.navigation.yourWorkspaces" : "Your workspaces",
+   "settings.navigation.yourWorkspaces" : "Jouw werkruimtes",
   "settings.recipes.all" : "Alle services",
   "settings.recipes.dev" : "Ontwikkeling",
   "settings.recipes.headline" : "Beschikbare services",
@@ -233,17 +233,17 @@
   "settings.services.discoverServices" : "Ontdek services",
   "settings.services.headline" : "Jouw services",
   "settings.services.noServicesAdded" : "Je hebt nog geen services toegevoegd.",
-   "settings.services.servicesRequestFailed" : "Could not load your services",
+   "settings.services.servicesRequestFailed" : "Kan jouw diensten niet laden",
   "settings.services.tooltip.isDisabled" : "Service is uitgeschakeld",
   "settings.services.tooltip.isMuted" : "Alle geluiden zijn uitgeschakeld",
   "settings.services.tooltip.notificationsDisabled" : "Meldingen zijn uitgeschakeld",
   "settings.services.updatedInfo" : "Je wijzigingen zijn opgeslagen",
   "settings.team.contentHeadline" : "Franz voor groepen",
-   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.copy" : "Franz voor Teams geeft je de mogelijkheid om collega's uit te nodigen voor je team door hen een e-mail te sturen en hun inschrijvingen te beheren in je accountvoorkeuren. Verspil geen tijd met het instellen van inschrijvingen voor elk teamlid apart, vergeet meerdere facturen en verschillende afrekeningsperiodes - één team regeert alles!",
   "settings.team.headline" : "Team",
-   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.intro" : "Gebruiken jij en je team Franz? Je kunt nu Premium inschrijvingen beheren voor zoveel collega's, vrienden, of familieleden als je wilt, allemaal vanaf één account.",
-   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.manageAction" : "Beheer je Team op meetfranz.com",
-   "settings.team.upgradeAction" : "Upgrade your Account",
+   "settings.team.upgradeAction" : "Jouw Account opwaarderen",
   "settings.user.form.accountType.company" : "Bedrijf",
   "settings.user.form.accountType.individual" : "Individueel",
   "settings.user.form.accountType.label" : "Accounttype",
@@ -254,24 +254,24 @@
   "settings.user.form.lastname" : "Achternaam",
   "settings.user.form.newPassword" : "Nieuw wachtwoord",
   "settings.workspace.add.form.name" : "Naam",
-   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.add.form.submitButton" : "Maak werkruimte aan",
-   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonDelete" : "Verwijder werkruimte",
-   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.buttonSave" : "Sla werkruimte op",
   "settings.workspace.form.name" : "Naam",
-   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Diensten in deze werkruimte",
   "settings.workspace.form.yourWorkspaces" : "Jouw werkruimtes",
   "settings.workspaces.deletedInfo" : "Werkruimte is verwijderd",
   "settings.workspaces.headline" : "Jouw werkplaatsen",
-   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.noWorkspacesAdded" : "Je hebt nog geen werkruimtes toegevoegd.",
   "settings.workspaces.tryReloadWorkspaces" : "Probeer opnieuw",
   "settings.workspaces.updatedInfo" : "Je wijzigingen zijn opgeslagen",
-   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Zie hier Franz Werkruimtes",
-   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz werkruimtes laat je aandacht geven aan wat nu belangrijk is. Maak verschillende sets van diensten aan en schakel gelijk wanneer tussen de verschillende sets.Jij beslist welke diensten je wanneer en waar nodig hebt, enkel zo kunnen wij jou helpen je focus te behouden. Of net makkelijk de switch te maken van werk naar ontspanning.",
-   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
+   "settings.workspaces.workspacesRequestFailed" : "Kan jouw werkruimtes niet laden",
   "sidebar.addNewService" : "Voeg service toe",
-   "sidebar.closeWorkspaceDrawer" : "Werkruimtepagina sluiten",
+   "sidebar.closeWorkspaceDrawer" : "Werkruimte pagina sluiten",
   "sidebar.muteApp" : "Schakel berichten & geluid uit",
-   "sidebar.openWorkspaceDrawer" : "Werkruimtepagina openen",
+   "sidebar.openWorkspaceDrawer" : "Werkruimte pagina openen",
   "sidebar.settings" : "Instellingen",
   "sidebar.unmuteApp" : "Berichten & geluid inschakelen",
   "signup.company.label" : "Bedrijf",
@@ -293,7 +293,7 @@
   "subscription.features.onpremise.mattermost" : "Voeg op-locatie\/gehoste diensten zoals Mattermost toe",
   "subscription.features.proxy" : "Proxy understeuning voor diensten",
   "subscription.features.spellchecker" : "Ondersteuning voor spellingscheck",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
+   "subscription.features.workspaces" : "Beheer je diensten in de werkruimtes",
   "subscription.includedFeatures" : "Betaald Franz Premium Supporter Account bevat",
   "subscription.paymentSessionError" : "Kan betaalformulier niet initialiseren",
   "subscription.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
@@ -313,20 +313,20 @@
   "tabs.item.reload" : "Herladen",
   "validation.email" : "{field} is niet geldig",
   "validation.minLength" : "{field} moet minimaal {length} karakters lang zijn",
-   "validation.oneRequired" : "At least one is required",
+   "validation.oneRequired" : "Er is op zijn minst één vereist",
   "validation.required" : "{field} is vereist",
   "validation.url" : "{field} is niet een geldige URL",
   "welcome.loginButton" : "Log in op je account",
   "welcome.signupButton" : "Maak een gratis account",
-   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Voeg een nieuwe werkruimte toe",
-   "workspaceDrawer.allServices" : "Alle services",
+   "workspaceDrawer.allServices" : "Alle diensten",
   "workspaceDrawer.headline" : "Werkruimtes",
-   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.contextMenuEdit" : "bewerken",
-   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.item.noServicesAddedYet" : "Nog geen diensten toegevoegd",
   "workspaceDrawer.premiumCtaButtonLabel" : "Maak je eerste werkruimte",
   "workspaceDrawer.proFeatureBadge" : "Premium feature",
   "workspaceDrawer.reactivatePremiumAccountLabel" : "Heractiveer premium account",
-   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz werkruimtes laat je aandacht geven aan wat nu belangrijk is. Maak verschillende sets van diensten aan en schakel gelijk wanneer tussen de verschillende sets.<\/p><p>Jij beslist welke diensten je wanneer en waar nodig hebt, enkel zo kunnen wij jou helpen je focus te behouden. Of net makkelijk de switch te maken van werk naar ontspanning.<\/p>",
-   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Pas werkruimte instellingen aan",
-   "workspaces.switchingIndicator.switchingTo" : "Switching to"
+   "workspaces.switchingIndicator.switchingTo" : "Overschakelen naar"
 }
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index a5d1ea377..5ade8a5a9 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -1,35 +1,35 @@
 {
-   "app.errorHandler.action" : "Prze��aduj",
+   "app.errorHandler.action" : "Odświe��",
-   "app.errorHandler.headline" : "Coś poszło nie tak",
+   "app.errorHandler.headline" : "Coś poszło nie tak.",
   "feature.announcements.changelog.headline" : "Zmiany we Franzie {version}",
   "feature.delayApp.action" : "Uzyskaj licencję Franz Supporter",
-   "feature.delayApp.headline" : "Aby nie czekać kup licencję Franz Supporter",
+   "feature.delayApp.headline" : "Aby nie czekać, kup licencję Franz Supporter",
   "feature.delayApp.text" : "Franz będzie kontynuował za {seconds} sekund.",
   "feature.shareFranz.action.email" : "Wyślij jako email",
   "feature.shareFranz.action.facebook" : "Udostępnij na Facebooku",
   "feature.shareFranz.action.twitter" : "Udostępnij na Twitterze",
   "feature.shareFranz.headline" : "Franz jest lepszy, gdy tworzymy go razem!",
-   "feature.shareFranz.shareText.email" : "Dodałem {count} serwisów do Franza! Pobierz darmową aplikacją WhatsApp, Messenger, Slack, Skype i inne na www.meetfranz.com",
+   "feature.shareFranz.shareText.email" : "Dodałem {count} serwisów do Franza! Pobierz darmową aplikację z WhatsApp, Messenger, Slack, Skype i innymi na www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "Dodałem {count} serwisów do Franza! Pobierz darmową aplikacją WhatsApp, Messenger, Slack, Skype i inne na www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.shareText.twitter" : "Dodałem {count} serwisów do Franza! Pobierz darmową aplikację z WhatsApp, Messenger, Slack, Skype i innymi na www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Powiedz znajomym i kolegom o tym, jak odlotowy jest Franz i pomóż nam go spopularyzować.",
   "global.api.unhealthy" : "Nie można połączyć się z usługami Franz online",
   "global.notConnectedToTheInternet" : "Nie masz połączenia z Internetem.",
   "global.spellchecker.useDefault" : "Użyj domyślnego dla systemu ({default})",
   "global.spellchecking.autodetect" : "Automatycznie wykryj język",
   "global.spellchecking.autodetect.short" : "Automatycznie",
-   "global.spellchecking.language" : "Język słownika",
+   "global.spellchecking.language" : "Język sprawdzania pisowni",
   "import.headline" : "Importuj usługi Franz 4",
   "import.notSupportedHeadline" : "Usługi, które nie są jeszcze obsługiwane w Franz 5",
   "import.skip.label" : "Chcę dodać usługi samodzielnie",
   "import.submit.label" : "Zaimportuj usługi",
   "infobar.buttonChangelog" : "Co nowego?",
   "infobar.buttonInstallUpdate" : "Uruchom ponownie i zainstaluj aktualizację",
-   "infobar.buttonReloadServices" : "Załaduj ponownie usługi",
+   "infobar.buttonReloadServices" : "Odśwież usługi",
   "infobar.requiredRequestsFailed" : "Nie można załadować usług i informacji użytkownika",
   "infobar.servicesUpdated" : "Usługi zostały zaktualizowane.",
   "infobar.updateAvailable" : "Dostępna jest nowa wersja Franza.",
   "invite.email.label" : "Adres email",
-   "invite.headline.friends" : "Zaproś 3 znajomych lub współpracowników",
+   "invite.headline.friends" : "Zaproś 3 znajomych lub kolegów",
   "invite.name.label" : "Imię",
   "invite.skip.label" : "Chcę to zrobić później",
   "invite.submit.label" : "Wyślij zaproszenia",
@@ -37,7 +37,7 @@
   "login.email.label" : "Adres email",
   "login.headline" : "Zaloguj się",
   "login.invalidCredentials" : "Adres email lub hasło są błędne",
-   "login.link.password" : "Przypomnij hasło",
+   "login.link.password" : "Zresetuj hasło",
   "login.link.signup" : "Załóż darmowe konto",
   "login.password.label" : "Hasło",
   "login.serverLogout" : "Twoja sesja wygasła, zaloguj się ponownie.",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 27fd796a4..60d74495e 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,23 +1,23 @@
 {
-   "app.errorHandler.action" : "Atualizar",
+   "app.errorHandler.action" : "Recarregar",
-   "app.errorHandler.headline" : "Alguma coisa deu errado",
+   "app.errorHandler.headline" : "Opa! Algo deu errado.",
   "feature.announcements.changelog.headline" : "Mudanças no Franz {version}",
-   "feature.delayApp.action" : "Adquira uma licença Franz Supporter",
+   "feature.delayApp.action" : "Adquira uma licença de suporte Franz",
-   "feature.delayApp.headline" : "Por favor, adquira uma licença Franz Supporter para pular o tempo de espera",
+   "feature.delayApp.headline" : "Por favor, adquira uma licença para pular o tempo de espera",
   "feature.delayApp.text" : "Franz continuará em {seconds} segundos.",
-   "feature.shareFranz.action.email" : "Enviar como e-mail",
+   "feature.shareFranz.action.email" : "Enviar por e-mail",
   "feature.shareFranz.action.facebook" : "Compartilhar no Facebook",
   "feature.shareFranz.action.twitter" : "Compartilhar no Twitter",
   "feature.shareFranz.headline" : "Franz é melhor em grupo!",
   "feature.shareFranz.shareText.email" : "Eu adicionei {count} serviços ao Franz! Adquira o aplicativo gratuito para WhatsApp, Messenger, Slack, Skype e mais em www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "Eu adicionei uma contagem de serviços para o Franz! Baixe gratuitamente o aplicativo para WhatsApp, Messenger, Slack, Skype e outros em www.meetfranz.com \/cc @FranzMessenger",
-   "feature.shareFranz.text" : "Conte aos seus amigos e colegas o quão incrível Franz é e nos ajude a espalhar a mensagem.  ",
+   "feature.shareFranz.text" : "Conte aos seus amigos e colegas o quanto incrível o Franz é e nos ajude a espalhar a mensagem.  ",
   "global.api.unhealthy" : "Não foi possível conectar-se aos serviços on-line do Franz.",
   "global.notConnectedToTheInternet" : "Você não está conectado à internet",
   "global.spellchecker.useDefault" : "Use o padrão do sistema ({default})",
-   "global.spellchecking.autodetect" : "Detectar linguagem automaticamente.",
+   "global.spellchecking.autodetect" : "Detectar idioma automaticamente.",
   "global.spellchecking.autodetect.short" : "Automático",
-   "global.spellchecking.language" : "Idioma de verificação ortográfica",
+   "global.spellchecking.language" : "Idioma para verificação ortográfica",
   "import.headline" : "Importe seus serviços do Franz 4 ",
   "import.notSupportedHeadline" : "Serviços ainda não suportados pelo Franz 5 ",
   "import.skip.label" : "Quero adicionar serviços manualmente",
@@ -50,7 +50,7 @@
   "menu.app.hideOthers" : "Ocultar Outros",
   "menu.app.quit" : "Sair",
   "menu.app.settings" : "Configurações",
-   "menu.app.unhide" : "Reexibir",
+   "menu.app.unhide" : "Mostrar",
   "menu.edit" : "Editar",
   "menu.edit.copy" : "Copiar",
   "menu.edit.cut" : "Cortar",
@@ -60,7 +60,7 @@
   "menu.edit.pasteAndMatchStyle" : "Colar e Corresponder ao Estilo",
   "menu.edit.redo" : "Refazer",
   "menu.edit.selectAll" : "Selecionar Tudo",
-   "menu.edit.speech" : "Discurso",
+   "menu.edit.speech" : "Falar",
   "menu.edit.startDictation" : "Iniciar Digitação",
   "menu.edit.startSpeaking" : "Começar a Falar",
   "menu.edit.stopSpeaking" : "Parar de Falar",
@@ -144,7 +144,7 @@
   "settings.account.userInfoRequestFailed" : "Não foi possível carregar as informações do usuário",
   "settings.app.buttonClearAllCache" : "Limpar cache",
   "settings.app.buttonInstallUpdate" : "Reiniciar e instalar atualização",
-   "settings.app.buttonSearchForUpdate" : "Verificar se há atualizações",
+   "settings.app.buttonSearchForUpdate" : "Verificar por atualizações",
   "settings.app.cacheInfo" : "O cache do Franz está usando {size} de espaço em disco atualmente.",
   "settings.app.currentVersion" : "Versão atual:",
   "settings.app.form.autoLaunchInBackground" : "Abrir em segundo plano",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index d8200b4f3..1dc5ce838 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -118,7 +118,7 @@
   "service.errorHandler.headline" : "Hayııırrr!",
   "service.errorHandler.message" : "Hata",
   "service.errorHandler.text" : "{name} yüklenemedi.",
-   "service.webviewLoader.loading" : "Loading",
+   "service.webviewLoader.loading" : "Yükleniyor",
   "services.getStarted" : "Haydi başlayalım",
   "services.welcome" : "Franz'a Hoşgeldiniz",
   "settings.account.account.editButton" : "Hesabı düzenle",
@@ -233,7 +233,7 @@
   "settings.services.discoverServices" : "Servisleri keşfet",
   "settings.services.headline" : "Servislerin",
   "settings.services.noServicesAdded" : "Henüz hiç servis eklemedin.",
-   "settings.services.servicesRequestFailed" : "Could not load your services",
+   "settings.services.servicesRequestFailed" : "Hizmetiniz yüklenemedi",
   "settings.services.tooltip.isDisabled" : "Servis devre dışı",
   "settings.services.tooltip.isMuted" : "Tüm sesler kapalı",
   "settings.services.tooltip.notificationsDisabled" : "Bildirimler devre dışı",
diff --git a/src/index.html b/src/index.html
index bf15e2d4e..f29aa2686 100644
--- a/src/index.html
+++ b/src/index.html
@@ -10,6 +10,7 @@
  <div class="window-draggable"></div>
  <div class="dev-warning">DEV MODE</div>
  <div id="root"></div>
+  <div id="portalContainer"></div>
  <script>
    document.querySelector('body').classList.add(process.env.OS_PLATFORM ? process.env.OS_PLATFORM : process.platform);
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index a95a8e1e0..9680c5bcc 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -1,4 +1,9 @@
-import { action, observable, computed } from 'mobx';
+import {
+  action,
+  observable,
+  computed,
+  reaction,
+} from 'mobx';
 import { theme } from '@meetfranz/theme';
 import Store from './lib/Store';
@@ -15,10 +20,18 @@ export default class UIStore extends Store {
    this.actions.ui.toggleServiceUpdatedInfoBar.listen(this._toggleServiceUpdatedInfoBar.bind(this));
  }
+  setup() {
+    reaction(
+      () => this.isDarkThemeActive,
+      () => this._setupThemeInDOM(),
+      { fireImmediately: true },
+    );
+  }
  @computed get showMessageBadgesEvenWhenMuted() {
    const settings = this.stores.settings.all;
-    return (settings.app.isAppMuted && settings.app.showMessageBadgeWhenMuted) || !settings.isAppMuted;
+    return (settings.app.isAppMuted && settings.app.showMessageBadgeWhenMuted) || !settings.app.isAppMuted;
  }
  @computed get isDarkThemeActive() {
@@ -26,7 +39,7 @@ export default class UIStore extends Store {
  }
  @computed get theme() {
-    if (this.isDarkThemeActive) return theme('dark');
+    if (this.isDarkThemeActive || this.stores.settings.app.darkMode) return theme('dark');
    return theme('default');
  }
@@ -47,4 +60,15 @@ export default class UIStore extends Store {
    }
    this.showServicesUpdatedInfoBar = visibility;
  }
+  // Reactions
+  _setupThemeInDOM() {
+    const body = document.querySelector('body');
+    if (!this.isDarkThemeActive) {
+      body.classList.remove('theme__dark');
+    } else {
+      body.classList.add('theme__dark');
+    }
+  }
 }
diff --git a/src/stores/lib/Reaction.js b/src/stores/lib/Reaction.js
index f2642908f..f8009b7f6 100644
--- a/src/stores/lib/Reaction.js
+++ b/src/stores/lib/Reaction.js
@@ -13,15 +13,15 @@ export default class Reaction {
  start() {
    if (!this.isRunning) {
-      this.dispose = autorun(() => this.reaction());
+      this.dispose = autorun(this.reaction);
-      this.isActive = true;
+      this.isRunning = true;
    }
  }
  stop() {
    if (this.isRunning) {
      this.dispose();
-      this.isActive = false;
+      this.isRunning = false;
    }
  }
 }
diff --git a/src/styles/layout.scss b/src/styles/layout.scss
index c9cc94e15..739082445 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -40,7 +40,7 @@ html { overflow: hidden; }
  }
  .app__service {
-    position: relative;
+    // position: relative;
    display: flex;
    flex: 1;
    flex-direction: column;
diff --git a/src/styles/reset.scss b/src/styles/reset.scss
index 80328dcef..f46ede4a2 100644
--- a/src/styles/reset.scss
+++ b/src/styles/reset.scss
@@ -64,7 +64,7 @@ body {
  font-size: 1.4rem;
  line-height: 1;
-  .theme__dark { color: $dark-theme-gray-smoke; }
+  &.theme__dark { color: $dark-theme-gray-smoke; }
 }
 * {
diff --git a/src/webview/contextMenu.js b/src/webview/contextMenu.js
index 967e8e667..a4a6ab899 100644
--- a/src/webview/contextMenu.js
+++ b/src/webview/contextMenu.js
@@ -280,13 +280,12 @@ const buildMenuTpl = (props, suggestions, isSpellcheckEnabled, defaultSpellcheck
 };
 export default function contextMenu(spellcheckProvider, isSpellcheckEnabled, getDefaultSpellcheckerLanguage, getSpellcheckerLanguage) {
-  webContents.on('context-menu', async (e, props) => {
+  webContents.on('context-menu', (e, props) => {
    e.preventDefault();
    let suggestions = [];
    if (spellcheckProvider && props.misspelledWord) {
-      debug('Mispelled word', props.misspelledWord);
+      suggestions = spellcheckProvider.getSuggestion(props.misspelledWord);
-      suggestions = await spellcheckProvider.getSuggestion(props.misspelledWord);
      debug('Suggestions', suggestions);
    }
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index 417d1ea1a..9158b3b94 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -1,8 +1,6 @@
 import { webFrame } from 'electron';
-import { attachSpellCheckProvider, SpellCheckerProvider } from 'electron-hunspell';
+import { SpellCheckerProvider } from 'electron-hunspell';
-import { ENVIRONMENT } from 'hunspell-asm';
 import path from 'path';
-import { readFileSync } from 'fs';
 import { DICTIONARY_PATH } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
@@ -12,12 +10,11 @@ const debug = require('debug')('Franz:spellchecker');
 let provider;
 let currentDict;
 let _isEnabled = false;
-let attached;
 async function loadDictionary(locale) {
  try {
    const fileLocation = path.join(DICTIONARY_PATH, `hunspell-dict-${locale}/${locale}`);
-    await provider.loadDictionary(locale, readFileSync(`${fileLocation}.dic`), readFileSync(`${fileLocation}.aff`));
+    await provider.loadDictionary(locale, `${fileLocation}.dic`, `${fileLocation}.aff`);
    debug('Loaded dictionary', locale, 'from', fileLocation);
  } catch (err) {
    console.error('Could not load dictionary', err);
@@ -44,7 +41,7 @@ export async function switchDict(locale) {
      provider.unloadDictionary(locale);
    }
    loadDictionary(locale);
-    attached.switchLanguage(locale);
+    provider.switchDictionary(locale);
    debug('Switched dictionary to', locale);
@@ -61,14 +58,12 @@ export default async function initialize(languageCode = 'en-us') {
    const locale = languageCode.toLowerCase();
    debug('Init spellchecker');
-    await provider.initialize({ environment: ENVIRONMENT.NODE });
+    await provider.initialize();
+    // await loadDictionaries();
-    debug('Attaching spellcheck provider');
-    attached = await attachSpellCheckProvider(provider);
    debug('Available spellchecker dictionaries', provider.availableDictionaries);
-    attached.switchLanguage(locale);
+    switchDict(locale);
    return provider;
  } catch (err) {