133 files changed, 1903 insertions, 795 deletions

diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 164419951..2871769a9 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -42,6 +42,7 @@ const API_VERSION = 'v1';
 
 export default class ServerApi {
   recipePreviews = [];
+
   recipes = [];
 
   // User
@@ -522,8 +523,7 @@ export default class ServerApi {
           const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/recipes/${s.service}`,
             this._prepareAuthRequest({
               method: 'GET',
-            }),
-          );
+            }));
 
           if (request.status === 200) {
             const data = await request.json();
@@ -549,9 +549,9 @@ export default class ServerApi {
 
     await this._bulkRecipeCheck(recipes);
 
-    return Promise.all(services
-      .map(async service => await this._prepareServiceModel(service)) // eslint-disable-line
-    );
+    /* eslint-disable no-return-await */
+    return Promise.all(services.map(async service => await this._prepareServiceModel(service)));
+    /* eslint-enable no-return-await */
   }
 
   async _prepareServiceModel(service) {
@@ -596,8 +596,7 @@ export default class ServerApi {
         }
 
         return recipe;
-      }),
-    ).catch(err => console.error('Can\'t load recipe', err));
+      })).catch(err => console.error('Can\'t load recipe', err));
   }
 
   _mapRecipePreviewModel(recipes) {
diff --git a/src/app.js b/src/app.js
index 43d0cf018..831dd93ce 100644
--- a/src/app.js
+++ b/src/app.js
@@ -4,7 +4,9 @@ import React from 'react';
 import { render } from 'react-dom';
 import { Provider } from 'mobx-react';
 import { syncHistoryWithStore, RouterStore } from 'mobx-react-router';
-import { Router, Route, hashHistory, IndexRedirect } from 'react-router';
+import {
+  Router, Route, hashHistory, IndexRedirect,
+} from 'react-router';
 
 import '@babel/polyfill';
 import smoothScroll from 'smoothscroll-polyfill';
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js
index 4fb0e6a59..ac8fdbe5b 100644
--- a/src/components/auth/AuthLayout.js
+++ b/src/components/auth/AuthLayout.js
@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { RouteTransition } from 'react-router-transition';
 import { intlShape } from 'react-intl';
 import { TitleBar } from 'electron-react-titlebar';
 
@@ -16,7 +15,6 @@ import { isWindows } from '../../environment';
 export default @observer class AuthLayout extends Component {
   static propTypes = {
     children: oneOrManyChildElements.isRequired,
-    pathname: PropTypes.string.isRequired,
     error: globalErrorPropType.isRequired,
     isOnline: PropTypes.bool.isRequired,
     isAPIHealthy: PropTypes.bool.isRequired,
@@ -33,7 +31,6 @@ export default @observer class AuthLayout extends Component {
   render() {
     const {
       children,
-      pathname,
       error,
       isOnline,
       isAPIHealthy,
@@ -46,8 +43,8 @@ export default @observer class AuthLayout extends Component {
 
     return (
       <div className={darkMode ? 'theme__dark' : ''}>
-        {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />}
-        <div className={'auth'}>
+        {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon="assets/images/logo.svg" />}
+        <div className="auth">
           {!isOnline && (
             <InfoBar
               type="warning"
@@ -69,22 +66,10 @@ export default @observer class AuthLayout extends Component {
             </InfoBar>
           )}
           <div className="auth__layout">
-            <RouteTransition
-              pathname={pathname}
-              atEnter={{ opacity: 0 }}
-              atLeave={{ opacity: 0 }}
-              atActive={{ opacity: 1 }}
-              mapStyles={styles => ({
-                transform: `translateX(${styles.translateX}%)`,
-                opacity: styles.opacity,
-              })}
-              component="span"
-            >
-              {/* Inject globalError into children  */}
-              {React.cloneElement(children, {
-                error,
-              })}
-            </RouteTransition>
+            {/* Inject globalError into children  */}
+            {React.cloneElement(children, {
+              error,
+            })}
           </div>
           {/* </div> */}
           <Link to="https://adlk.io" className="auth__adlk" target="_blank">
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index 96821a61a..fd957ee73 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
@@ -127,7 +127,7 @@ export default @observer class Invite extends Component {
     });
 
     const renderForm = (
-      <div>
+      <Fragment>
         {this.state.showSuccessInfo && isInviteSuccessful && (
           <Appear>
             <Infobox
@@ -141,11 +141,13 @@ export default @observer class Invite extends Component {
         )}
 
         <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
-          {!embed && (<img
-            src="./assets/images/logo.svg"
-            className="auth__logo"
-            alt=""
-          />)}
+          {!embed && (
+            <img
+              src="./assets/images/logo.svg"
+              className="auth__logo"
+              alt=""
+            />
+          )}
           <h1 className={embed && 'invite__embed'}>
             {intl.formatMessage(messages.headline)}
           </h1>
@@ -164,14 +166,16 @@ export default @observer class Invite extends Component {
             label={intl.formatMessage(messages.submitButtonLabel)}
             loaded={!isLoadingInvite}
           />
-          {!embed && (<Link
-            to="/"
-            className="franz-form__button franz-form__button--secondary auth__button auth__button--skip"
-          >
-            {intl.formatMessage(messages.skipButtonLabel)}
-          </Link>)}
+          {!embed && (
+            <Link
+              to="/"
+              className="franz-form__button franz-form__button--secondary auth__button auth__button--skip"
+            >
+              {intl.formatMessage(messages.skipButtonLabel)}
+            </Link>
+          )}
         </form>
-      </div>
+      </Fragment>
     );
 
     return (
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index f465b35a5..5d21f8b60 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -11,11 +11,8 @@ import Button from '../ui/Button';
 import Link from '../ui/Link';
 import Infobox from '../ui/Infobox';
 
-
 import { globalError as globalErrorPropType } from '../../prop-types';
 
-// import Appear from '../ui/effects/Appear';
-
 const messages = defineMessages({
   headline: {
     id: 'login.headline',
@@ -86,18 +83,18 @@ export default @observer class Login extends Component {
     },
   }, this.context.intl);
 
+  emailField = null;
+
   submit(e) {
     e.preventDefault();
     this.form.submit({
       onSuccess: (form) => {
         this.props.onSubmit(form.values());
       },
-      onError: () => {},
+      onError: () => { },
     });
   }
 
-  emailField = null;
-
   render() {
     const { form } = this;
     const { intl } = this.context;
diff --git a/src/components/auth/Pricing.js b/src/components/auth/Pricing.js
index f08129568..7ab14f429 100644
--- a/src/components/auth/Pricing.js
+++ b/src/components/auth/Pricing.js
@@ -69,18 +69,29 @@ export default @observer class Signup extends Component {
                 donor.amount ? (
                   <span>
                     <p>
-                      Thank you so much for your previous donation of <strong>$ {donor.amount}</strong>.
+                      Thank you so much for your previous donation of
+                      {' '}
+                      <strong>
+                        $
+                        {donor.amount}
+                      </strong>
+                      .
                       <br />
                       Your support allowed us to get where we are today.
                       <br />
                     </p>
                     <p>
-                      As an early supporter, you get <strong>a lifetime premium supporter license</strong> without any
+                      As an early supporter, you get
+                      {' '}
+                      <strong>a lifetime premium supporter license</strong>
+                      {' '}
+                      without any
                       additional charges.
                     </p>
                     <p>
                       However, If you want to keep supporting us, you are more than welcome to subscribe to a plan.
-                      <br /><br />
+                      <br />
+                      <br />
                     </p>
                   </span>
                 ) : (
@@ -113,12 +124,6 @@ export default @observer class Signup extends Component {
                   hideInfo={Boolean(donor.amount)}
                   skipButtonLabel={intl.formatMessage(messages.skipPayment)}
                 />
-                {/* <Link
-                  to={inviteRoute}
-                  className="franz-form__button franz-form__button--secondary auth__button auth__button--skip"
-                >
-                  {intl.formatMessage(messages.skipPayment)}
-                </Link> */}
               </Appear>
             </Loader>
           </form>
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index bbcad8b67..d9b83eeb8 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -199,7 +199,8 @@ export default @observer class Signup extends Component {
                 className="link"
               >
                 {intl.formatMessage(messages.privacy)}
-              </Link>.
+              </Link>
+              .
             </p>
           </form>
           <div className="auth__links">
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 3ababe54a..dbe0bb4b6 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -6,6 +6,8 @@ import { TitleBar } from 'electron-react-titlebar';
 
 import InfoBar from '../ui/InfoBar';
 import { Component as DelayApp } from '../../features/delayApp';
+import ErrorBoundary from '../util/ErrorBoundary';
+
 import globalMessages from '../../i18n/globalMessages';
 
 import { isWindows } from '../../environment';
@@ -94,74 +96,78 @@ export default @observer class AppLayout extends Component {
     const { intl } = this.context;
 
     return (
-      <div className={(darkMode ? 'theme__dark' : '')}>
-        <div className="app">
-          {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />}
-          <div className="app__content">
-            {sidebar}
-            <div className="app__service">
-              {news.length > 0 && news.map(item => (
-                <InfoBar
-                  key={item.id}
-                  position="top"
-                  type={item.type}
-                  sticky={item.sticky}
-                  onHide={() => removeNewsItem({ newsId: item.id })}
-                >
-                  <span dangerouslySetInnerHTML={createMarkup(item.message)} />
-                </InfoBar>
-              ))}
-              {!isOnline && (
-                <InfoBar
-                  type="danger"
-                >
-                  <span className="mdi mdi-flash" />
-                  {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
-                </InfoBar>
-              )}
-              {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
-                <InfoBar
-                  type="danger"
-                  ctaLabel="Try again"
-                  ctaLoading={areRequiredRequestsLoading}
-                  sticky
-                  onClick={retryRequiredRequests}
-                >
-                  <span className="mdi mdi-flash" />
-                  {intl.formatMessage(messages.requiredRequestsFailed)}
-                </InfoBar>
-              )}
-              {showServicesUpdatedInfoBar && (
-                <InfoBar
-                  type="primary"
-                  ctaLabel={intl.formatMessage(messages.buttonReloadServices)}
-                  onClick={reloadServicesAfterUpdate}
-                  sticky
-                >
-                  <span className="mdi mdi-power-plug" />
-                  {intl.formatMessage(messages.servicesUpdated)}
-                </InfoBar>
-              )}
-              {appUpdateIsDownloaded && (
-                <InfoBar
-                  type="primary"
-                  ctaLabel={intl.formatMessage(messages.buttonInstallUpdate)}
-                  onClick={installAppUpdate}
-                  sticky
-                >
-                  <span className="mdi mdi-information" />
-                  {intl.formatMessage(messages.updateAvailable)} <a href="https://meetfranz.com/changelog" target="_blank">
-                    <u>{intl.formatMessage(messages.changelog)}</u>
-                  </a>
-                </InfoBar>
-              )}
-              {isDelayAppScreenVisible && (<DelayApp />)}
-              {services}
+      <ErrorBoundary>
+        <div className={(darkMode ? 'theme__dark' : '')}>
+          <div className="app">
+            {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon="assets/images/logo.svg" />}
+            <div className="app__content">
+              {sidebar}
+              <div className="app__service">
+                {news.length > 0 && news.map(item => (
+                  <InfoBar
+                    key={item.id}
+                    position="top"
+                    type={item.type}
+                    sticky={item.sticky}
+                    onHide={() => removeNewsItem({ newsId: item.id })}
+                  >
+                    <span dangerouslySetInnerHTML={createMarkup(item.message)} />
+                  </InfoBar>
+                ))}
+                {!isOnline && (
+                  <InfoBar
+                    type="danger"
+                  >
+                    <span className="mdi mdi-flash" />
+                    {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
+                  </InfoBar>
+                )}
+                {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
+                  <InfoBar
+                    type="danger"
+                    ctaLabel="Try again"
+                    ctaLoading={areRequiredRequestsLoading}
+                    sticky
+                    onClick={retryRequiredRequests}
+                  >
+                    <span className="mdi mdi-flash" />
+                    {intl.formatMessage(messages.requiredRequestsFailed)}
+                  </InfoBar>
+                )}
+                {showServicesUpdatedInfoBar && (
+                  <InfoBar
+                    type="primary"
+                    ctaLabel={intl.formatMessage(messages.buttonReloadServices)}
+                    onClick={reloadServicesAfterUpdate}
+                    sticky
+                  >
+                    <span className="mdi mdi-power-plug" />
+                    {intl.formatMessage(messages.servicesUpdated)}
+                  </InfoBar>
+                )}
+                {appUpdateIsDownloaded && (
+                  <InfoBar
+                    type="primary"
+                    ctaLabel={intl.formatMessage(messages.buttonInstallUpdate)}
+                    onClick={installAppUpdate}
+                    sticky
+                  >
+                    <span className="mdi mdi-information" />
+                    {intl.formatMessage(messages.updateAvailable)}
+                    {' '}
+                    <a href="https://meetfranz.com/changelog" target="_blank">
+                      <u>{intl.formatMessage(messages.changelog)}</u>
+                    </a>
+                  </InfoBar>
+                )}
+                {isDelayAppScreenVisible && (<DelayApp />)}
+                {services}
+              </div>
             </div>
           </div>
+          {children}
         </div>
-        {children}
-      </div>
+      </ErrorBoundary>
     );
   }
 }
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 6ea95bf88..609a3b604 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -65,6 +65,7 @@ export default @observer class Sidebar extends Component {
           disableToolTip={() => this.disableToolTip()}
         />
         <button
+          type="button"
           onClick={toggleMuteApp}
           className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
           data-tip={`${intl.formatMessage(isAppMuted ? messages.unmute : messages.mute)} (${ctrlKey}+Shift+M)`}
@@ -72,6 +73,7 @@ export default @observer class Sidebar extends Component {
           <i className={`mdi mdi-bell${isAppMuted ? '-off' : ''}`} />
         </button>
         <button
+          type="button"
           onClick={() => openSettings({ path: 'recipes' })}
           className="sidebar__button sidebar__button--new-service"
           data-tip={`${intl.formatMessage(messages.addNewService)} (${ctrlKey}+N)`}
@@ -79,6 +81,7 @@ export default @observer class Sidebar extends Component {
           <i className="mdi mdi-plus-box" />
         </button>
         <button
+          type="button"
           onClick={() => openSettings({ path: 'app' })}
           className="sidebar__button sidebar__button--settings"
           data-tip={`${intl.formatMessage(messages.settings)} (${ctrlKey}+,)`}
diff --git a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
new file mode 100644
index 000000000..415a8d1b5
--- /dev/null
+++ b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
@@ -0,0 +1,84 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import injectSheet from 'react-jss';
+
+import Button from '../../../ui/Button';
+
+import styles from './styles';
+
+const messages = defineMessages({
+  headline: {
+    id: 'service.errorHandler.headline',
+    defaultMessage: '!!!Oh no!',
+  },
+  text: {
+    id: 'service.errorHandler.text',
+    defaultMessage: '!!!{name} has failed to load.',
+  },
+  action: {
+    id: 'service.errorHandler.action',
+    defaultMessage: '!!!Reload {name}',
+  },
+  editAction: {
+    id: 'service.errorHandler.editAction',
+    defaultMessage: '!!!Edit {name}',
+  },
+  errorMessage: {
+    id: 'service.errorHandler.message',
+    defaultMessage: '!!!Error:',
+  },
+});
+
+export default @injectSheet(styles) @observer class WebviewCrashHandler extends Component {
+  static propTypes = {
+    name: PropTypes.string.isRequired,
+    reload: PropTypes.func.isRequired,
+    edit: PropTypes.func.isRequired,
+    errorMessage: PropTypes.string.isRequired,
+    classes: PropTypes.object.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  render() {
+    const {
+      name,
+      reload,
+      edit,
+      errorMessage,
+      classes,
+    } = this.props;
+    const { intl } = this.context;
+
+    return (
+      <div className={classes.component}>
+        <h1>{intl.formatMessage(messages.headline)}</h1>
+        <p>{intl.formatMessage(messages.text, { name })}</p>
+        <p>
+          <strong>
+            {intl.formatMessage(messages.errorMessage)}
+:
+          </strong>
+          {' '}
+          {errorMessage}
+        </p>
+        <div className={classes.buttonContainer}>
+          <Button
+            label={intl.formatMessage(messages.editAction, { name })}
+            buttonType="inverted"
+            onClick={() => edit()}
+          />
+          <Button
+            label={intl.formatMessage(messages.action, { name })}
+            buttonType="inverted"
+            onClick={() => reload()}
+          />
+        </div>
+      </div>
+    );
+  }
+}
diff --git a/src/components/services/content/ErrorHandlers/styles.js b/src/components/services/content/ErrorHandlers/styles.js
new file mode 100644
index 000000000..f11386798
--- /dev/null
+++ b/src/components/services/content/ErrorHandlers/styles.js
@@ -0,0 +1,25 @@
+export default {
+  component: {
+    left: 0,
+    position: 'absolute',
+    top: 0,
+    width: '100%',
+    zIndex: 0,
+    alignItems: 'center',
+    // background: $theme-gray-lighter;
+    display: 'flex',
+    flexDirection: 'column',
+    justifyContent: 'center',
+    textAlign: 'center',
+  },
+  buttonContainer: {
+    display: 'flex',
+    flexDirection: 'row',
+    height: 'auto',
+    margin: [40, 0, 20],
+
+    '& button': {
+      margin: [0, 10, 0, 10],
+    },
+  },
+};
diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js
index 58fb38d8c..d0f12256e 100644
--- a/src/components/services/content/ServiceDisabled.js
+++ b/src/components/services/content/ServiceDisabled.js
@@ -27,6 +27,7 @@ export default @observer class ServiceDisabled extends Component {
   };
 
   countdownInterval = null;
+
   countdownIntervalTimeout = 1000;
 
   render() {
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 7163209ee..b1a2c0207 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { autorun } from 'mobx';
 import { observer } from 'mobx-react';
@@ -7,7 +7,9 @@ import classnames from 'classnames';
 
 import ServiceModel from '../../../models/Service';
 import StatusBarTargetUrl from '../../ui/StatusBarTargetUrl';
+import WebviewLoader from '../../ui/WebviewLoader';
 import WebviewCrashHandler from './WebviewCrashHandler';
+import WebviewErrorHandler from './ErrorHandlers/WebviewErrorHandler';
 import ServiceDisabled from './ServiceDisabled';
 
 export default @observer class ServiceWebview extends Component {
@@ -15,8 +17,10 @@ export default @observer class ServiceWebview extends Component {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     setWebviewReference: PropTypes.func.isRequired,
     reload: PropTypes.func.isRequired,
+    edit: PropTypes.func.isRequired,
     isAppMuted: PropTypes.bool.isRequired,
     enable: PropTypes.func.isRequired,
+    isActive: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -29,8 +33,12 @@ export default @observer class ServiceWebview extends Component {
     statusBarVisible: false,
   };
 
+  autorunDisposer = null;
+
+  webview = null;
+
   componentDidMount() {
-    autorun(() => {
+    this.autorunDisposer = autorun(() => {
       if (this.props.service.isActive) {
         this.setState({ forceRepaint: true });
         setTimeout(() => {
@@ -40,6 +48,10 @@ export default @observer class ServiceWebview extends Component {
     });
   }
 
+  componentWillUnmount() {
+    this.autorunDisposer();
+  }
+
   updateTargetUrl = (event) => {
     let visible = true;
     if (event.url === '' || event.url === '#') {
@@ -51,13 +63,12 @@ export default @observer class ServiceWebview extends Component {
     });
   }
 
-  webview = null;
-
   render() {
     const {
       service,
       setWebviewReference,
       reload,
+      edit,
       isAppMuted,
       enable,
     } = this.props;
@@ -78,25 +89,47 @@ export default @observer class ServiceWebview extends Component {
 
     return (
       <div className={webviewClasses}>
-        {service.hasCrashed && (
-          <WebviewCrashHandler
-            name={service.recipe.name}
-            webview={service.webview}
-            reload={reload}
-          />
+        {service.isActive && service.isEnabled && (
+          <Fragment>
+            {service.hasCrashed && (
+              <WebviewCrashHandler
+                name={service.recipe.name}
+                webview={service.webview}
+                reload={reload}
+              />
+            )}
+            {service.isEnabled && service.isLoading && service.isFirstLoad && (
+              <WebviewLoader
+                loaded={false}
+                name={service.name}
+              />
+            )}
+            {service.isError && (
+              <WebviewErrorHandler
+                name={service.recipe.name}
+                errorMessage={service.errorMessage}
+                reload={reload}
+                edit={edit}
+              />
+            )}
+          </Fragment>
         )}
         {!service.isEnabled ? (
-          <ServiceDisabled
-            name={service.recipe.name}
-            webview={service.webview}
-            enable={enable}
-          />
+          <Fragment>
+            {service.isActive && (
+              <ServiceDisabled
+                name={service.recipe.name}
+                webview={service.webview}
+                enable={enable}
+              />
+            )}
+          </Fragment>
         ) : (
           <Webview
             ref={(element) => { this.webview = element; }}
             autosize
             src={service.url}
-            preload="./webview/plugin.js"
+            preload="./webview/recipe.js"
             partition={`persist:service-${service.id}`}
             onDidAttach={() => setWebviewReference({
               serviceId: service.id,
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index 4cbd51043..1aeb17e03 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -20,18 +20,18 @@ const messages = defineMessages({
 
 export default @observer class Services extends Component {
   static propTypes = {
-    services: MobxPropTypes.arrayOrObservableArray.isRequired,
+    services: MobxPropTypes.arrayOrObservableArray,
     setWebviewReference: PropTypes.func.isRequired,
     handleIPCMessage: PropTypes.func.isRequired,
     openWindow: PropTypes.func.isRequired,
     reload: PropTypes.func.isRequired,
+    openSettings: PropTypes.func.isRequired,
     isAppMuted: PropTypes.bool.isRequired,
     update: PropTypes.func.isRequired,
   };
 
   static defaultProps = {
     services: [],
-    activeService: '',
   };
 
   static contextTypes = {
@@ -45,6 +45,7 @@ export default @observer class Services extends Component {
       setWebviewReference,
       openWindow,
       reload,
+      openSettings,
       isAppMuted,
       update,
     } = this.props;
@@ -79,6 +80,7 @@ export default @observer class Services extends Component {
             setWebviewReference={setWebviewReference}
             openWindow={openWindow}
             reload={() => reload({ serviceId: service.id })}
+            edit={() => openSettings({ path: `services/edit/${service.id}` })}
             isAppMuted={isAppMuted}
             enable={() => update({
               serviceId: service.id,
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js
index 3be1fccf4..42bc3c877 100644
--- a/src/components/services/content/WebviewCrashHandler.js
+++ b/src/components/services/content/WebviewCrashHandler.js
@@ -38,13 +38,18 @@ export default @observer class WebviewCrashHandler extends Component {
     countdown: 10000,
   }
 
+  countdownInterval = null;
+
+  countdownIntervalTimeout = 1000;
+
+
   componentDidMount() {
     const { reload } = this.props;
 
     this.countdownInterval = setInterval(() => {
-      this.setState({
-        countdown: this.state.countdown - this.countdownIntervalTimeout,
-      });
+      this.setState(prevState => ({
+        countdown: prevState.countdown - this.countdownIntervalTimeout,
+      }));
 
       if (this.state.countdown <= 0) {
         reload();
@@ -53,9 +58,6 @@ export default @observer class WebviewCrashHandler extends Component {
     }, this.countdownIntervalTimeout);
   }
 
-  countdownInterval = null;
-  countdownIntervalTimeout = 1000;
-
   render() {
     const { name, reload } = this.props;
     const { intl } = this.context;
@@ -70,10 +72,12 @@ export default @observer class WebviewCrashHandler extends Component {
           buttonType="inverted"
           onClick={() => reload()}
         />
-        <p className="footnote">{intl.formatMessage(messages.autoReload, {
-          name,
-          seconds: this.state.countdown / 1000,
-        })}</p>
+        <p className="footnote">
+          {intl.formatMessage(messages.autoReload, {
+            name,
+            seconds: this.state.countdown / 1000,
+          })}
+        </p>
       </div>
     );
   }
diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js
index 3cb08feb1..72ba7b2e3 100644
--- a/src/components/settings/SettingsLayout.js
+++ b/src/components/settings/SettingsLayout.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 
+import ErrorBoundary from '../util/ErrorBoundary';
 import { oneOrManyChildElements } from '../../prop-types';
 import Appear from '../ui/effects/Appear';
 
@@ -36,18 +37,22 @@ export default @observer class SettingsLayout extends Component {
     return (
       <Appear transitionName="fadeIn-fast">
         <div className="settings-wrapper">
-          <button
-            className="settings-wrapper__action"
-            onClick={closeSettings}
-          />
-          <div className="settings franz-form">
-            {navigation}
-            {children}
+          <ErrorBoundary>
             <button
-              className="settings__close mdi mdi-close"
+              type="button"
+              className="settings-wrapper__action"
               onClick={closeSettings}
             />
-          </div>
+            <div className="settings franz-form">
+              {navigation}
+              {children}
+              <button
+                type="button"
+                className="settings__close mdi mdi-close"
+                onClick={closeSettings}
+              />
+            </div>
+          </ErrorBoundary>
         </div>
       </Appear>
     );
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 06c7074dd..9c9543749 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
@@ -132,21 +132,19 @@ export default @observer class AccountDashboard extends Component {
           )}
 
           {!isLoading && userInfoRequestFailed && (
-            <div>
-              <Infobox
-                icon="alert"
-                type="danger"
-                ctaLabel={intl.formatMessage(messages.tryReloadUserInfoRequest)}
-                ctaLoading={isLoading}
-                ctaOnClick={retryUserInfoRequest}
-              >
-                {intl.formatMessage(messages.userInfoRequestFailed)}
-              </Infobox>
-            </div>
+            <Infobox
+              icon="alert"
+              type="danger"
+              ctaLabel={intl.formatMessage(messages.tryReloadUserInfoRequest)}
+              ctaLoading={isLoading}
+              ctaOnClick={retryUserInfoRequest}
+            >
+              {intl.formatMessage(messages.userInfoRequestFailed)}
+            </Infobox>
           )}
 
           {!userInfoRequestFailed && (
-            <div>
+            <Fragment>
               {!isLoading && (
                 <div className="account">
                   <div className="account__box account__box--flex">
@@ -169,7 +167,8 @@ export default @observer class AccountDashboard extends Component {
                         {`${user.firstname} ${user.lastname}`}
                       </h2>
                       {user.organization && `${user.organization}, `}
-                      {user.email}<br />
+                      {user.email}
+                      <br />
                       {!user.isEnterprise && !user.isPremium && (
                         <span className="badge badge">{intl.formatMessage(messages.accountTypeBasic)}</span>
                       )}
@@ -194,7 +193,7 @@ export default @observer class AccountDashboard extends Component {
                 ) : (
                   <div className="account franz-form">
                     {orders.length > 0 && (
-                      <div>
+                      <Fragment>
                         <div className="account__box">
                           <h2>{intl.formatMessage(messages.headlineSubscription)}</h2>
                           <div className="account__subscription">
@@ -219,6 +218,7 @@ export default @observer class AccountDashboard extends Component {
                                   </td>
                                   <td className="invoices__action">
                                     <button
+                                      type="button"
                                       onClick={() => openExternalUrl(order.invoiceUrl)}
                                     >
                                       {intl.formatMessage(messages.invoiceDownload)}
@@ -229,7 +229,7 @@ export default @observer class AccountDashboard extends Component {
                             </tbody>
                           </table>
                         </div>
-                      </div>
+                      </Fragment>
                     )}
                   </div>
                 )
@@ -262,20 +262,6 @@ export default @observer class AccountDashboard extends Component {
                 </div>
               )}
 
-              {user.isMiner && (
-                <div className="account franz-form">
-                  <div className="account__box account__box">
-                    <h2>Miner Info</h2>
-                    <div className="account__subscription">
-                      <div>
-                        <p>To maintain a high security level for all our Franz users, we had to remove the miner. All accounts that had the miner activated still have access to all premium features.</p>
-                        <p>Every financial support is still much appreciated.</p>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              )}
-
               {!user.isEnterprise && !user.isPremium && (
                 isLoadingPlans ? (
                   <Loader />
@@ -312,7 +298,7 @@ export default @observer class AccountDashboard extends Component {
                   </div>
                 </div>
               )}
-            </div>
+            </Fragment>
           )}
         </div>
         <ReactTooltip place="right" type="dark" effect="solid" />
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index b86d94ac7..953f702f8 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -59,7 +59,9 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp
           className="settings-navigation__link"
           activeClassName="is-active"
         >
-          {intl.formatMessage(messages.yourServices)} <span className="badge">{serviceCount}</span>
+          {intl.formatMessage(messages.yourServices)}
+          {' '}
+          <span className="badge">{serviceCount}</span>
         </Link>
         <Link
           to="/settings/user"
@@ -93,4 +95,3 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp
     );
   }
 }
-
diff --git a/src/components/settings/recipes/RecipeItem.js b/src/components/settings/recipes/RecipeItem.js
index dae8891b3..3bb0852b2 100644
--- a/src/components/settings/recipes/RecipeItem.js
+++ b/src/components/settings/recipes/RecipeItem.js
@@ -15,6 +15,7 @@ export default @observer class RecipeItem extends Component {
 
     return (
       <button
+        type="button"
         className="recipe-teaser"
         onClick={onClick}
       >
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index cd783200f..00cd725cf 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -129,11 +129,17 @@ export default @observer class RecipesDashboard extends Component {
                 activeClassName={`${!searchNeedle ? 'badge--primary' : ''}`}
                 onClick={() => resetSearch()}
               >
-                {intl.formatMessage(messages.devRecipes)} ({devRecipesCount})
+                {intl.formatMessage(messages.devRecipes)}
+                {' '}
+(
+                {devRecipesCount}
+)
               </Link>
             )}
             <a href={FRANZ_SERVICE_REQUEST} target="_blank" className="link recipes__service-request">
-              {intl.formatMessage(messages.missingService)} <i className="mdi mdi-open-in-new" />
+              {intl.formatMessage(messages.missingService)}
+              {' '}
+              <i className="mdi mdi-open-in-new" />
             </a>
           </div>
           {/* )} */}
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index d16ec35b8..468d85c45 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { Link } from 'react-router';
@@ -14,6 +14,7 @@ import Input from '../../ui/Input';
 import Toggle from '../../ui/Toggle';
 import Button from '../../ui/Button';
 import ImageUpload from '../../ui/ImageUpload';
+import Select from '../../ui/Select';
 
 import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
 
@@ -96,7 +97,11 @@ const messages = defineMessages({
   },
   headlineProxy: {
     id: 'settings.service.form.proxy.headline',
-    defaultMessage: '!!!Proxy Settings',
+    defaultMessage: '!!!HTTP/HTTPS Proxy Settings',
+  },
+  proxyRestartInfo: {
+    id: 'settings.service.form.proxy.restartInfo',
+    defaultMessage: '!!!Please restart Franz after changing proxy Settings.',
   },
   proxyInfo: {
     id: 'settings.service.form.proxy.info',
@@ -129,6 +134,7 @@ export default @observer class EditServiceForm extends Component {
   static defaultProps = {
     service: {},
   };
+
   static contextTypes = {
     intl: intlShape,
   };
@@ -270,14 +276,14 @@ export default @observer class EditServiceForm extends Component {
                 {recipe.hasCustomUrl && (
                   <TabItem title={intl.formatMessage(messages.tabOnPremise)}>
                     {user.isPremium || recipe.author.find(a => a.email === user.email) ? (
-                      <div>
+                      <Fragment>
                         <Input field={form.$('customUrl')} />
                         {form.error === 'url-validation-error' && (
                           <p className="franz-form__error">
                             {intl.formatMessage(messages.customUrlValidationError, { name: recipe.name })}
                           </p>
                         )}
-                      </div>
+                      </Fragment>
                     ) : (
                       <div className="center premium-info">
                         <p>{intl.formatMessage(messages.customUrlPremiumInfo)}</p>
@@ -307,12 +313,12 @@ export default @observer class EditServiceForm extends Component {
                   <h3>{intl.formatMessage(messages.headlineBadges)}</h3>
                   <Toggle field={form.$('isBadgeEnabled')} />
                   {recipe.hasIndirectMessages && form.$('isBadgeEnabled').value && (
-                    <div>
+                    <Fragment>
                       <Toggle field={form.$('isIndirectMessageBadgeEnabled')} />
                       <p className="settings__help">
                         {intl.formatMessage(messages.indirectMessageInfo)}
                       </p>
-                    </div>
+                    </Fragment>
                   )}
                 </div>
 
@@ -333,6 +339,12 @@ export default @observer class EditServiceForm extends Component {
               </div>
             </div>
 
+            <PremiumFeatureContainer>
+              <div className="settings__settings-group">
+                <Select field={form.$('spellcheckerLanguage')} />
+              </div>
+            </PremiumFeatureContainer>
+
             {isProxyFeatureEnabled && (
               <PremiumFeatureContainer condition={isProxyFeaturePremiumFeature}>
                 <div className="settings__settings-group">
@@ -342,18 +354,31 @@ export default @observer class EditServiceForm extends Component {
                   </h3>
                   <Toggle field={form.$('proxy.isEnabled')} />
                   {form.$('proxy.isEnabled').value && (
-                    <div>
-                      <Input field={form.$('proxy.host')} />
-                      <Input field={form.$('proxy.user')} />
-                      <Input
-                        field={form.$('proxy.password')}
-                        showPasswordToggle
-                      />
+                    <Fragment>
+                      <div className="grid">
+                        <div className="grid__row">
+                          <Input field={form.$('proxy.host')} className="proxyHost" />
+                          <Input field={form.$('proxy.port')} />
+                        </div>
+                      </div>
+                      <div className="grid">
+                        <div className="grid__row">
+                          <Input field={form.$('proxy.user')} />
+                          <Input
+                            field={form.$('proxy.password')}
+                            showPasswordToggle
+                          />
+                        </div>
+                      </div>
+                      <p>
+                        <span className="mdi mdi-information" />
+                        {intl.formatMessage(messages.proxyRestartInfo)}
+                      </p>
                       <p>
                         <span className="mdi mdi-information" />
                         {intl.formatMessage(messages.proxyInfo)}
                       </p>
-                    </div>
+                    </Fragment>
                   )}
                 </div>
               </PremiumFeatureContainer>
diff --git a/src/components/settings/services/ServiceItem.js b/src/components/settings/services/ServiceItem.js
index 84080519b..ebc618a00 100644
--- a/src/components/settings/services/ServiceItem.js
+++ b/src/components/settings/services/ServiceItem.js
@@ -27,6 +27,7 @@ export default @observer class ServiceItem extends Component {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     goToServiceForm: PropTypes.func.isRequired,
   };
+
   static contextTypes = {
     intl: intlShape,
   };
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js
index e7dfaf106..a12df7372 100644
--- a/src/components/settings/services/ServicesDashboard.js
+++ b/src/components/settings/services/ServicesDashboard.js
@@ -101,17 +101,15 @@ export default @observer class ServicesDashboard extends Component {
             />
           )}
           {!isLoading && servicesRequestFailed && (
-            <div>
-              <Infobox
-                icon="alert"
-                type="danger"
-                ctaLabel={intl.formatMessage(messages.tryReloadServices)}
-                ctaLoading={isLoading}
-                ctaOnClick={retryServicesRequest}
-              >
-                {intl.formatMessage(messages.servicesRequestFailed)}
-              </Infobox>
-            </div>
+            <Infobox
+              icon="alert"
+              type="danger"
+              ctaLabel={intl.formatMessage(messages.tryReloadServices)}
+              ctaLoading={isLoading}
+              ctaOnClick={retryServicesRequest}
+            >
+              {intl.formatMessage(messages.servicesRequestFailed)}
+            </Infobox>
           )}
 
           {status.length > 0 && status.includes('updated') && (
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 1ec2ab614..a92e559f3 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -1,5 +1,5 @@
 import { remote } from 'electron';
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
@@ -171,21 +171,23 @@ export default @observer class EditSettingsForm extends Component {
             <PremiumFeatureContainer
               condition={isSpellcheckerPremiumFeature}
             >
-              <div>
+              <Fragment>
                 <Toggle
                   field={form.$('enableSpellchecking')}
                 />
                 {form.$('enableSpellchecking').value && (
                   <Select field={form.$('spellcheckerLanguage')} />
                 )}
-              </div>
+              </Fragment>
             </PremiumFeatureContainer>
             <a
               href={FRANZ_TRANSLATION}
               target="_blank"
               className="link"
             >
-              {intl.formatMessage(messages.translationHelp)} <i className="mdi mdi-open-in-new" />
+              {intl.formatMessage(messages.translationHelp)}
+              {' '}
+              <i className="mdi mdi-open-in-new" />
             </a>
 
             {/* Advanced */}
@@ -233,7 +235,9 @@ export default @observer class EditSettingsForm extends Component {
             )}
             <br />
             <Toggle field={form.$('beta')} />
-            {intl.formatMessage(messages.currentVersion)} {remote.app.getVersion()}
+            {intl.formatMessage(messages.currentVersion)}
+            {' '}
+            {remote.app.getVersion()}
           </form>
         </div>
       </div>
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js
index b825f844a..0e3ac6b10 100644
--- a/src/components/settings/user/EditUserForm.js
+++ b/src/components/settings/user/EditUserForm.js
@@ -48,10 +48,6 @@ export default @observer class EditServiceForm extends Component {
     isEnterprise: PropTypes.bool.isRequired,
   };
 
-  static defaultProps = {
-    service: {},
-  };
-
   static contextTypes = {
     intl: intlShape,
   };
diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js
index 12e8471ff..90da8ddc3 100644
--- a/src/components/subscription/SubscriptionForm.js
+++ b/src/components/subscription/SubscriptionForm.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
@@ -81,8 +81,7 @@ export default @observer class SubscriptionForm extends Component {
     hideInfo: PropTypes.bool.isRequired,
   };
 
-  static defaultProps ={
-    content: '',
+  static defaultProps = {
     showSkipOption: false,
     skipAction: () => null,
     skipButtonLabel: '',
@@ -158,35 +157,33 @@ export default @observer class SubscriptionForm extends Component {
         <Radio field={this.form.$('paymentTier')} showLabel={false} className="paymentTiers" />
         {!hideInfo && (
           <div className="subscription__premium-info">
-            <div>
-              <p>
-                <strong>{intl.formatMessage(messages.includedFeatures)}</strong>
-              </p>
-              <div className="subscription">
-                <ul className="subscription__premium-features">
-                  <li>{intl.formatMessage(messages.features.onpremise)}</li>
-                  <li>
-                    {intl.formatMessage(messages.features.noInterruptions)}
-                  </li>
-                  <li>
-                    {intl.formatMessage(messages.features.spellchecker)}
-                  </li>
-                  <li>
-                    {intl.formatMessage(messages.features.proxy)}
-                  </li>
-                  <li>
-                    {intl.formatMessage(messages.features.ads)}
-                  </li>
-                </ul>
-              </div>
+            <p>
+              <strong>{intl.formatMessage(messages.includedFeatures)}</strong>
+            </p>
+            <div className="subscription">
+              <ul className="subscription__premium-features">
+                <li>{intl.formatMessage(messages.features.onpremise)}</li>
+                <li>
+                  {intl.formatMessage(messages.features.noInterruptions)}
+                </li>
+                <li>
+                  {intl.formatMessage(messages.features.spellchecker)}
+                </li>
+                <li>
+                  {intl.formatMessage(messages.features.proxy)}
+                </li>
+                <li>
+                  {intl.formatMessage(messages.features.ads)}
+                </li>
+              </ul>
             </div>
           </div>
         )}
-        <div>
+        <Fragment>
           {error.code === 'no-payment-session' && (
             <p className="error-message center">{intl.formatMessage(messages.paymentSessionError)}</p>
           )}
-        </div>
+        </Fragment>
         {showSkipOption && this.form.$('paymentTier').value === 'skip' ? (
           <Button
             label={skipButtonLabel}
diff --git a/src/components/subscription/SubscriptionPopup.js b/src/components/subscription/SubscriptionPopup.js
index f3c63e7ee..b5d7c4b2d 100644
--- a/src/components/subscription/SubscriptionPopup.js
+++ b/src/components/subscription/SubscriptionPopup.js
@@ -46,7 +46,9 @@ export default @observer class SubscriptionPopup extends Component {
   }
 
   render() {
-    const { url, closeWindow, completeCheck, isCompleted } = this.props;
+    const {
+      url, closeWindow, completeCheck, isCompleted,
+    } = this.props;
     const { intl } = this.context;
 
     return (
diff --git a/src/components/ui/AppLoader.js b/src/components/ui/AppLoader.js
deleted file mode 100644
index ac3cdcb05..000000000
--- a/src/components/ui/AppLoader.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-
-import Appear from '../../components/ui/effects/Appear';
-import Loader from '../../components/ui/Loader';
-
-export default function () {
-  return (
-    <div className="app-loader">
-      <Appear>
-        <h1 className="app-loader__title">Franz</h1>
-        <Loader color="#FFF" />
-      </Appear>
-    </div>
-  );
-}
diff --git a/src/components/ui/AppLoader/index.js b/src/components/ui/AppLoader/index.js
new file mode 100644
index 000000000..61053f6d1
--- /dev/null
+++ b/src/components/ui/AppLoader/index.js
@@ -0,0 +1,70 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import injectSheet, { withTheme } from 'react-jss';
+import classnames from 'classnames';
+
+import FullscreenLoader from '../FullscreenLoader';
+import { shuffleArray } from '../../../helpers/array-helpers';
+
+import styles from './styles';
+
+const textList = shuffleArray([
+  'Looking for Sisi',
+  'Contacting the herald',
+  'Saddling the unicorn',
+  'Learning the Waltz',
+  'Visiting Horst & Grete',
+  'Twisting my moustache',
+  'Playing the trumpet',
+  'Traveling through space & time',
+]);
+
+export default @injectSheet(styles) @withTheme class AppLoader extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    theme: PropTypes.object.isRequired,
+  }
+
+  state = {
+    step: 0,
+  }
+
+  interval = null;
+
+  componentDidMount() {
+    this.interval = setInterval(() => {
+      this.setState(prevState => ({
+        step: prevState.step === textList.length - 1 ? 0 : prevState.step + 1,
+      }));
+    }, 2500);
+  }
+
+  componentWillUnmount() {
+    clearInterval(this.interval);
+  }
+
+  render() {
+    const { classes, theme } = this.props;
+    const { step } = this.state;
+
+    return (
+      <FullscreenLoader
+        title="Franz"
+        className={classes.component}
+        spinnerColor={theme.colorAppLoaderSpinner}
+      >
+        {textList.map((text, i) => (
+          <span
+            key={text}
+            className={classnames({
+              [`${classes.slogan}`]: true,
+              [`${classes.visible}`]: step === i,
+            })}
+          >
+            {text}
+          </span>
+        ))}
+      </FullscreenLoader>
+    );
+  }
+}
diff --git a/src/components/ui/AppLoader/styles.js b/src/components/ui/AppLoader/styles.js
new file mode 100644
index 000000000..755a56b40
--- /dev/null
+++ b/src/components/ui/AppLoader/styles.js
@@ -0,0 +1,16 @@
+export default {
+  component: {
+    color: '#FFF',
+  },
+  slogan: {
+    display: 'block',
+    opacity: 0,
+    transition: 'opacity 1s ease',
+    position: 'absolute',
+    textAlign: 'center',
+    width: '100%',
+  },
+  visible: {
+    opacity: 1,
+  },
+};
diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js
index 309e05bb4..ffc7f7051 100644
--- a/src/components/ui/Button.js
+++ b/src/components/ui/Button.js
@@ -62,6 +62,8 @@ export default @observer class Button extends Component {
     }
 
     return (
+      // disabling rule as button has type defined in `buttonProps`
+      /* eslint-disable react/button-has-type */
       <button {...buttonProps}>
         <Loader
           loaded={loaded}
@@ -72,6 +74,7 @@ export default @observer class Button extends Component {
         />
         {label}
       </button>
+      /* eslint-enable react/button-has-type */
     );
   }
 }
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js
new file mode 100644
index 000000000..6ecf4d395
--- /dev/null
+++ b/src/components/ui/FullscreenLoader/index.js
@@ -0,0 +1,56 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import injectSheet, { withTheme } from 'react-jss';
+import classnames from 'classnames';
+
+import Loader from '../Loader';
+
+import styles from './styles';
+
+export default @observer @withTheme @injectSheet(styles) class FullscreenLoader extends Component {
+  static propTypes = {
+    className: PropTypes.string,
+    title: PropTypes.string.isRequired,
+    classes: PropTypes.object.isRequired,
+    theme: PropTypes.object.isRequired,
+    spinnerColor: PropTypes.string,
+    children: PropTypes.node,
+  }
+
+  static defaultProps = {
+    className: null,
+    spinnerColor: null,
+    children: null,
+  }
+
+  render() {
+    const {
+      classes,
+      title,
+      children,
+      spinnerColor,
+      className,
+      theme,
+    } = this.props;
+
+    return (
+      <div className={classes.wrapper}>
+        <div
+          className={classnames({
+            [`${classes.component}`]: true,
+            [`${className}`]: className,
+          })}
+        >
+          <h1 className={classes.title}>{title}</h1>
+          <Loader color={spinnerColor || theme.colorFullscreenLoaderSpinner} />
+          {children && (
+            <div className={classes.content}>
+              {children}
+            </div>
+          )}
+        </div>
+      </div>
+    );
+  }
+}
diff --git a/src/components/ui/FullscreenLoader/styles.js b/src/components/ui/FullscreenLoader/styles.js
new file mode 100644
index 000000000..64d24e4ce
--- /dev/null
+++ b/src/components/ui/FullscreenLoader/styles.js
@@ -0,0 +1,23 @@
+export default {
+  wrapper: {
+    display: 'flex',
+    alignItems: 'center',
+    position: 'absolute',
+    width: '100%',
+  },
+  component: {
+    width: '100%',
+    display: 'flex',
+    flexDirection: 'column',
+    alignItems: 'center',
+    textAlign: 'center',
+    height: 'auto',
+  },
+  title: {
+    fontSize: 35,
+  },
+  content: {
+    marginTop: 20,
+    width: '100%',
+  },
+};
diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js
index 76f77d631..83a05554b 100644
--- a/src/components/ui/ImageUpload.js
+++ b/src/components/ui/ImageUpload.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { Field } from 'mobx-react-form';
@@ -23,6 +23,8 @@ export default @observer class ImageUpload extends Component {
     path: null,
   }
 
+  dropzoneRef = null;
+
   onDrop(acceptedFiles) {
     const { field } = this.props;
 
@@ -36,8 +38,6 @@ export default @observer class ImageUpload extends Component {
     field.set('');
   }
 
-  dropzoneRef = null;
-
   render() {
     const {
       field,
@@ -57,7 +57,7 @@ export default @observer class ImageUpload extends Component {
         <label className="franz-form__label" htmlFor="iconUpload">{field.label}</label>
         <div className="image-upload">
           {(field.value && field.value !== 'delete') || this.state.path ? (
-            <div>
+            <Fragment>
               <div
                 className="image-upload__preview"
                 style={({
@@ -84,7 +84,7 @@ export default @observer class ImageUpload extends Component {
                 </button>
                 <div className="image-upload__action-background" />
               </div>
-            </div>
+            </Fragment>
           ) : (
             <Dropzone
               ref={(node) => { this.dropzoneRef = node; }}
diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js
index 94a1ddf76..612399e9f 100644
--- a/src/components/ui/InfoBar.js
+++ b/src/components/ui/InfoBar.js
@@ -5,7 +5,7 @@ import classnames from 'classnames';
 import Loader from 'react-loader';
 
 // import { oneOrManyChildElements } from '../../prop-types';
-import Appear from '../ui/effects/Appear';
+import Appear from './effects/Appear';
 
 export default @observer class InfoBar extends Component {
   static propTypes = {
@@ -64,6 +64,7 @@ export default @observer class InfoBar extends Component {
           {children}
           {ctaLabel && (
             <button
+              type="button"
               className="info-bar__cta"
               onClick={onClick}
             >
@@ -80,6 +81,7 @@ export default @observer class InfoBar extends Component {
         </div>
         {!sticky && (
           <button
+            type="button"
             className="info-bar__close mdi mdi-close"
             onClick={onHide}
           />
diff --git a/src/components/ui/Infobox.js b/src/components/ui/Infobox.js
index 77051f567..a33c6474a 100644
--- a/src/components/ui/Infobox.js
+++ b/src/components/ui/Infobox.js
@@ -61,6 +61,7 @@ export default @observer class Infobox extends Component {
           <button
             className="infobox__cta"
             onClick={ctaOnClick}
+            type="button"
           >
             <Loader
               loaded={!ctaLoading}
@@ -74,6 +75,7 @@ export default @observer class Infobox extends Component {
         )}
         {dismissable && (
           <button
+            type="button"
             onClick={() => this.setState({
               dismissed: true,
             })}
diff --git a/src/components/ui/Input.js b/src/components/ui/Input.js
index 7bf6e1b00..9b070c4df 100644
--- a/src/components/ui/Input.js
+++ b/src/components/ui/Input.js
@@ -33,6 +33,8 @@ export default @observer class Input extends Component {
     passwordScore: 0,
   }
 
+  inputElement = null;
+
   componentDidMount() {
     if (this.props.focus) {
       this.focus();
@@ -53,8 +55,6 @@ export default @observer class Input extends Component {
     this.inputElement.focus();
   }
 
-  inputElement = null;
-
   render() {
     const {
       field,
@@ -110,7 +110,7 @@ export default @observer class Input extends Component {
                 'mdi-eye': !this.state.showPassword,
                 'mdi-eye-off': this.state.showPassword,
               })}
-              onClick={() => this.setState({ showPassword: !this.state.showPassword })}
+              onClick={() => this.setState(prevState => ({ showPassword: !prevState.showPassword }))}
               tabIndex="-1"
             />
           )}
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js
index 0602290f1..b88686d5e 100644
--- a/src/components/ui/Link.js
+++ b/src/components/ui/Link.js
@@ -72,5 +72,4 @@ Link.wrappedComponent.defaultProps = {
   activeClassName: '',
   strictFilter: false,
   target: '',
-  openInBrowser: false,
 };
diff --git a/src/components/ui/PremiumFeatureContainer/index.js b/src/components/ui/PremiumFeatureContainer/index.js
index 73984be94..67cd6af0b 100644
--- a/src/components/ui/PremiumFeatureContainer/index.js
+++ b/src/components/ui/PremiumFeatureContainer/index.js
@@ -73,4 +73,3 @@ PremiumFeatureContainer.wrappedComponent.propTypes = {
     }).isRequired,
   }).isRequired,
 };
-
diff --git a/src/components/ui/PremiumFeatureContainer/styles.js b/src/components/ui/PremiumFeatureContainer/styles.js
index 16c40d0ec..81d6666c6 100644
--- a/src/components/ui/PremiumFeatureContainer/styles.js
+++ b/src/components/ui/PremiumFeatureContainer/styles.js
@@ -5,6 +5,7 @@ export default theme => ({
     margin: [0, 0, 20, -20],
     padding: 20,
     'border-radius': theme.borderRadius,
+    pointerEvents: 'none',
   },
   titleContainer: {
     display: 'flex',
@@ -20,6 +21,7 @@ export default theme => ({
     'border-radius': theme.borderRadiusSmall,
     padding: [2, 4],
     'font-size': 12,
+    pointerEvents: 'initial',
   },
   content: {
     opacity: 0.5,
diff --git a/src/components/ui/Radio.js b/src/components/ui/Radio.js
index 63ca6f9b8..ba13aca63 100644
--- a/src/components/ui/Radio.js
+++ b/src/components/ui/Radio.js
@@ -18,6 +18,8 @@ export default @observer class Radio extends Component {
     showLabel: true,
   };
 
+  inputElement = null;
+
   componentDidMount() {
     if (this.props.focus) {
       this.focus();
@@ -28,8 +30,6 @@ export default @observer class Radio extends Component {
     this.inputElement.focus();
   }
 
-  inputElement = null;
-
   render() {
     const {
       field,
diff --git a/src/components/ui/SearchInput.js b/src/components/ui/SearchInput.js
index 5a9571d27..78d6aae8b 100644
--- a/src/components/ui/SearchInput.js
+++ b/src/components/ui/SearchInput.js
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
-import uuidv1 from 'uuid/v1';
 import { debounce } from 'lodash';
 
 export default @observer class SearchInput extends Component {
@@ -22,7 +21,7 @@ export default @observer class SearchInput extends Component {
     value: '',
     placeholder: '',
     className: '',
-    name: uuidv1(),
+    name: 'searchInput',
     throttle: false,
     throttleDelay: 250,
     onChange: () => null,
@@ -30,6 +29,8 @@ export default @observer class SearchInput extends Component {
     autoFocus: false,
   }
 
+  input = null;
+
   constructor(props) {
     super(props);
 
@@ -74,8 +75,6 @@ export default @observer class SearchInput extends Component {
     onReset();
   }
 
-  input = null;
-
   render() {
     const { className, name, placeholder } = this.props;
     const { value } = this.state;
@@ -90,15 +89,17 @@ export default @observer class SearchInput extends Component {
         <label
           htmlFor={name}
           className="mdi mdi-magnify"
-        />
-        <input
-          name={name}
-          type="text"
-          placeholder={placeholder}
-          value={value}
-          onChange={e => this.onChange(e)}
-          ref={(ref) => { this.input = ref; }}
-        />
+        >
+          <input
+            name={name}
+            id={name}
+            type="text"
+            placeholder={placeholder}
+            value={value}
+            onChange={e => this.onChange(e)}
+            ref={(ref) => { this.input = ref; }}
+          />
+        </label>
         {value.length > 0 && (
           <span
             className="mdi mdi-close-circle-outline"
diff --git a/src/components/ui/Select.js b/src/components/ui/Select.js
index abcad417e..da52243ca 100644
--- a/src/components/ui/Select.js
+++ b/src/components/ui/Select.js
@@ -9,12 +9,13 @@ export default @observer class Select extends Component {
     field: PropTypes.instanceOf(Field).isRequired,
     className: PropTypes.string,
     showLabel: PropTypes.bool,
+    disabled: PropTypes.bool,
   };
 
   static defaultProps = {
     className: null,
-    focus: false,
     showLabel: true,
+    disabled: false,
   };
 
   render() {
@@ -22,6 +23,7 @@ export default @observer class Select extends Component {
       field,
       className,
       showLabel,
+      disabled,
     } = this.props;
 
     return (
@@ -29,6 +31,7 @@ export default @observer class Select extends Component {
         className={classnames({
           'franz-form__field': true,
           'has-error': field.error,
+          'is-disabled': disabled,
           [`${className}`]: className,
         })}
       >
@@ -45,12 +48,13 @@ export default @observer class Select extends Component {
           id={field.id}
           defaultValue={field.value}
           className="franz-form__select"
+          disabled={field.disabled || disabled}
         >
           {field.options.map(type => (
             <option
               key={type.value}
               value={type.value}
-              // selected={field.value === }
+              disabled={type.disabled}
             >
               {type.label}
             </option>
diff --git a/src/components/ui/StatusBarTargetUrl.js b/src/components/ui/StatusBarTargetUrl.js
index 4285a343c..6fc50fe5c 100644
--- a/src/components/ui/StatusBarTargetUrl.js
+++ b/src/components/ui/StatusBarTargetUrl.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
 
-import Appear from '../ui/effects/Appear';
+import Appear from './effects/Appear';
 
 export default @observer class StatusBarTargetUrl extends Component {
   static propTypes = {
@@ -13,7 +13,6 @@ export default @observer class StatusBarTargetUrl extends Component {
 
   static defaultProps = {
     className: '',
-    position: 'bottom',
     text: '',
   };
 
diff --git a/src/components/ui/Tabs/TabItem.js b/src/components/ui/Tabs/TabItem.js
index 9ff9f009e..16881a7f7 100644
--- a/src/components/ui/Tabs/TabItem.js
+++ b/src/components/ui/Tabs/TabItem.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 
 import { oneOrManyChildElements } from '../../../prop-types';
 
@@ -11,7 +11,7 @@ export default class TabItem extends Component {
     const { children } = this.props;
 
     return (
-      <div>{children}</div>
+      <Fragment>{children}</Fragment>
     );
   }
 }
diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js
new file mode 100644
index 000000000..3a3dbbe49
--- /dev/null
+++ b/src/components/ui/WebviewLoader/index.js
@@ -0,0 +1,25 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import injectSheet from 'react-jss';
+
+import FullscreenLoader from '../FullscreenLoader';
+
+import styles from './styles';
+
+export default @observer @injectSheet(styles) class WebviewLoader extends Component {
+  static propTypes = {
+    name: PropTypes.string.isRequired,
+    classes: PropTypes.object.isRequired,
+  }
+
+  render() {
+    const { classes, name } = this.props;
+    return (
+      <FullscreenLoader
+        className={classes.component}
+        title={`Loading ${name}`}
+      />
+    );
+  }
+}
diff --git a/src/components/ui/WebviewLoader/styles.js b/src/components/ui/WebviewLoader/styles.js
new file mode 100644
index 000000000..dbd75db8a
--- /dev/null
+++ b/src/components/ui/WebviewLoader/styles.js
@@ -0,0 +1,9 @@
+export default theme => ({
+  component: {
+    background: theme.colorWebviewLoaderBackground,
+    padding: 20,
+    width: 'auto',
+    margin: [0, 'auto'],
+    borderRadius: 6,
+  },
+});
diff --git a/src/components/util/ErrorBoundary/index.js b/src/components/util/ErrorBoundary/index.js
new file mode 100644
index 000000000..5db0db226
--- /dev/null
+++ b/src/components/util/ErrorBoundary/index.js
@@ -0,0 +1,60 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import injectSheet from 'react-jss';
+import { defineMessages, intlShape } from 'react-intl';
+
+import Button from '../../ui/Button';
+
+import styles from './styles';
+
+const messages = defineMessages({
+  headline: {
+    id: 'app.errorHandler.headline',
+    defaultMessage: '!!!Something went wrong.',
+  },
+  action: {
+    id: 'app.errorHandler.action',
+    defaultMessage: '!!!Reload',
+  },
+});
+
+export default @injectSheet(styles) class ErrorBoundary extends Component {
+  state = {
+    hasError: false,
+  }
+
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    children: PropTypes.node.isRequired,
+  }
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  componentDidCatch() {
+    this.setState({ hasError: true });
+  }
+
+  render() {
+    const { classes } = this.props;
+    const { intl } = this.context;
+
+    if (this.state.hasError) {
+      return (
+        <div className={classes.component}>
+          <h1 className={classes.title}>
+            {intl.formatMessage(messages.headline)}
+          </h1>
+          <Button
+            label={intl.formatMessage(messages.action)}
+            buttonType="inverted"
+            onClick={() => window.location.reload()}
+          />
+        </div>
+      );
+    }
+
+    return this.props.children;
+  }
+}
diff --git a/src/components/util/ErrorBoundary/styles.js b/src/components/util/ErrorBoundary/styles.js
new file mode 100644
index 000000000..0960546ff
--- /dev/null
+++ b/src/components/util/ErrorBoundary/styles.js
@@ -0,0 +1,13 @@
+export default theme => ({
+  component: {
+    display: 'flex',
+    width: '100%',
+    alignItems: 'center',
+    justifyContent: 'center',
+    flexDirection: 'column',
+  },
+  title: {
+    fontSize: 20,
+    color: theme.colorText,
+  },
+});
diff --git a/src/config.js b/src/config.js
index d981f9c6a..789ddd1a0 100644
--- a/src/config.js
+++ b/src/config.js
@@ -56,4 +56,5 @@ export const FILE_SYSTEM_SETTINGS_TYPES = [
 
 export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config');
 
-export const DICTIONARY_PATH = path.join(app.getPath('userData'), 'dicts');
+// Replacing app.asar is not beautiful but unforunately necessary
+export const DICTIONARY_PATH = path.join(__dirname, 'dictionaries').replace('app.asar', 'app.asar.unpacked');
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js
index b73598f3d..762929dc6 100644
--- a/src/containers/auth/AuthLayoutContainer.js
+++ b/src/containers/auth/AuthLayoutContainer.js
@@ -18,7 +18,9 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer
   };
 
   render() {
-    const { stores, actions, children, location } = this.props;
+    const {
+      stores, actions, children, location,
+    } = this.props;
     const { app, features, globalError } = stores;
 
     const isLoadingBaseFeatures = features.defaultFeaturesRequest.isExecuting
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index e1423bdaa..430b49b55 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -75,7 +75,9 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
 
     if (isLoadingFeatures || isLoadingServices) {
       return (
-        <AppLoader />
+        <ThemeProvider theme={ui.theme}>
+          <AppLoader />
+        </ThemeProvider>
       );
     }
 
@@ -105,6 +107,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
         setWebviewReference={setWebviewReference}
         openWindow={openWindow}
         reload={reload}
+        openSettings={openSettings}
         isAppMuted={settings.all.app.isAppMuted}
         update={updateService}
       />
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index 5818af0b1..019b3d7d6 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -9,6 +9,7 @@ import AppStore from '../../stores/AppStore';
 import { gaPage } from '../../lib/analytics';
 
 import AccountDashboard from '../../components/settings/account/AccountDashboard';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
 
 const { BrowserWindow } = remote;
 
@@ -67,22 +68,24 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend
     const isLoadingPlans = payment.plansRequest.isExecuting;
 
     return (
-      <AccountDashboard
-        user={user.data}
-        orders={payment.orders}
-        isLoading={isLoadingUserInfo}
-        isLoadingOrdersInfo={isLoadingOrdersInfo}
-        isLoadingPlans={isLoadingPlans}
-        userInfoRequestFailed={user.getUserInfoRequest.wasExecuted && user.getUserInfoRequest.isError}
-        retryUserInfoRequest={() => this.reloadData()}
-        isCreatingPaymentDashboardUrl={payment.createDashboardUrlRequest.isExecuting}
-        openDashboard={price => this.handlePaymentDashboard(price)}
-        openExternalUrl={url => openExternalUrl({ url })}
-        onCloseSubscriptionWindow={() => this.onCloseWindow()}
-        deleteAccount={userActions.delete}
-        isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
-        isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError}
-      />
+      <ErrorBoundary>
+        <AccountDashboard
+          user={user.data}
+          orders={payment.orders}
+          isLoading={isLoadingUserInfo}
+          isLoadingOrdersInfo={isLoadingOrdersInfo}
+          isLoadingPlans={isLoadingPlans}
+          userInfoRequestFailed={user.getUserInfoRequest.wasExecuted && user.getUserInfoRequest.isError}
+          retryUserInfoRequest={() => this.reloadData()}
+          isCreatingPaymentDashboardUrl={payment.createDashboardUrlRequest.isExecuting}
+          openDashboard={price => this.handlePaymentDashboard(price)}
+          openExternalUrl={url => openExternalUrl({ url })}
+          onCloseSubscriptionWindow={() => this.onCloseWindow()}
+          deleteAccount={userActions.delete}
+          isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
+          isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError}
+        />
+      </ErrorBoundary>
     );
   }
 }
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 639e8b070..b46908344 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -13,10 +13,15 @@ import { gaPage } from '../../lib/analytics';
 
 import ServiceError from '../../components/settings/services/ServiceError';
 import EditServiceForm from '../../components/settings/services/EditServiceForm';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
+
 import { required, url, oneRequired } from '../../helpers/validation-helpers';
+import { getSelectOptions } from '../../helpers/i18n-helpers';
 
 import { config as proxyFeature } from '../../features/serviceProxy';
 
+import { SPELLCHECKER_LOCALES } from '../../i18n/languages';
+
 const messages = defineMessages({
   name: {
     id: 'settings.service.form.name',
@@ -66,6 +71,10 @@ const messages = defineMessages({
     id: 'settings.service.form.proxy.host',
     defaultMessage: '!!!Proxy Host/IP',
   },
+  proxyPort: {
+    id: 'settings.service.form.proxy.port',
+    defaultMessage: '!!!Port',
+  },
   proxyUser: {
     id: 'settings.service.form.proxy.user',
     defaultMessage: '!!!User',
@@ -74,6 +83,14 @@ const messages = defineMessages({
     id: 'settings.service.form.proxy.password',
     defaultMessage: '!!!Password',
   },
+  spellcheckerLanguage: {
+    id: 'settings.service.form.spellcheckerLanguage',
+    defaultMessage: '!!!Spell checking Language',
+  },
+  spellcheckerSystemDefault: {
+    id: 'settings.service.form.spellcheckerLanguage.default',
+    defaultMessage: '!!!Use System Default ({default})',
+  },
 });
 
 export default @inject('stores', 'actions') @observer class EditServiceScreen extends Component {
@@ -101,6 +118,11 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
   }
 
   prepareForm(recipe, service, proxy) {
+    const spellcheckerLanguage = getSelectOptions({
+      locales: SPELLCHECKER_LOCALES,
+      resetToDefaultText: this.context.intl.formatMessage(messages.spellcheckerSystemDefault, { default: SPELLCHECKER_LOCALES[this.props.stores.settings.app.spellcheckerLanguage] }),
+    });
+
     const { intl } = this.context;
     const config = {
       fields: {
@@ -138,7 +160,13 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
         isDarkModeEnabled: {
           label: intl.formatMessage(messages.enableDarkMode),
           value: service.isDarkModeEnabled,
-          default: this.props.stores.settings.all.app.darkMode,
+          default: this.props.stores.settings.app.darkMode,
+        },
+        spellcheckerLanguage: {
+          label: intl.formatMessage(messages.spellcheckerLanguage),
+          value: service.spellcheckerLanguage,
+          options: spellcheckerLanguage,
+          disabled: !this.props.stores.settings.app.enableSpellchecking,
         },
       },
     };
@@ -209,6 +237,11 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
               value: serviceProxyConfig.host,
               default: '',
             },
+            port: {
+              label: intl.formatMessage(messages.proxyPort),
+              value: serviceProxyConfig.port,
+              default: '',
+            },
             user: {
               label: intl.formatMessage(messages.proxyUser),
               value: serviceProxyConfig.user,
@@ -280,20 +313,22 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
     const form = this.prepareForm(recipe, service, proxyFeature);
 
     return (
-      <EditServiceForm
-        action={action}
-        recipe={recipe}
-        service={service}
-        user={user.data}
-        form={form}
-        status={services.actionStatus}
-        isSaving={services.updateServiceRequest.isExecuting || services.createServiceRequest.isExecuting}
-        isDeleting={services.deleteServiceRequest.isExecuting}
-        onSubmit={d => this.onSubmit(d)}
-        onDelete={() => this.deleteService()}
-        isProxyFeatureEnabled={proxyFeature.isEnabled}
-        isProxyFeaturePremiumFeature={proxyFeature.isPremium}
-      />
+      <ErrorBoundary>
+        <EditServiceForm
+          action={action}
+          recipe={recipe}
+          service={service}
+          user={user.data}
+          form={form}
+          status={services.actionStatus}
+          isSaving={services.updateServiceRequest.isExecuting || services.createServiceRequest.isExecuting}
+          isDeleting={services.deleteServiceRequest.isExecuting}
+          onSubmit={d => this.onSubmit(d)}
+          onDelete={() => this.deleteService()}
+          isProxyFeatureEnabled={proxyFeature.isEnabled}
+          isProxyFeaturePremiumFeature={proxyFeature.isPremium}
+        />
+      </ErrorBoundary>
     );
   }
 }
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index ea1d319d9..f1706a721 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -12,8 +12,11 @@ import { gaPage } from '../../lib/analytics';
 import { DEFAULT_APP_SETTINGS } from '../../config';
 import { config as spellcheckerConfig } from '../../features/spellchecker';
 
+import { getSelectOptions } from '../../helpers/i18n-helpers';
+
 
 import EditSettingsForm from '../../components/settings/settings/EditSettingsForm';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
 
 const messages = defineMessages({
   autoLaunchOnStart: {
@@ -116,20 +119,12 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
     const { app, settings, user } = this.props.stores;
     const { intl } = this.context;
 
-    const locales = [];
-    Object.keys(APP_LOCALES).sort(Intl.Collator().compare).forEach((key) => {
-      locales.push({
-        value: key,
-        label: APP_LOCALES[key],
-      });
+    const locales = getSelectOptions({
+      locales: APP_LOCALES,
     });
 
-    const spellcheckingLanguages = [];
-    Object.keys(SPELLCHECKER_LOCALES).sort(Intl.Collator().compare).forEach((key) => {
-      spellcheckingLanguages.push({
-        value: key,
-        label: SPELLCHECKER_LOCALES[key],
-      });
+    const spellcheckingLanguages = getSelectOptions({
+      locales: SPELLCHECKER_LOCALES,
     });
 
     const config = {
@@ -222,20 +217,22 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
     const form = this.prepareForm();
 
     return (
-      <EditSettingsForm
-        form={form}
-        checkForUpdates={checkForUpdates}
-        installUpdate={installUpdate}
-        isCheckingForUpdates={updateStatus === updateStatusTypes.CHECKING}
-        isUpdateAvailable={updateStatus === updateStatusTypes.AVAILABLE}
-        noUpdateAvailable={updateStatus === updateStatusTypes.NOT_AVAILABLE}
-        updateIsReadyToInstall={updateStatus === updateStatusTypes.DOWNLOADED}
-        onSubmit={d => this.onSubmit(d)}
-        cacheSize={cacheSize}
-        isClearingAllCache={isClearingAllCache}
-        onClearAllCache={clearAllCache}
-        isSpellcheckerPremiumFeature={spellcheckerConfig.isPremiumFeature}
-      />
+      <ErrorBoundary>
+        <EditSettingsForm
+          form={form}
+          checkForUpdates={checkForUpdates}
+          installUpdate={installUpdate}
+          isCheckingForUpdates={updateStatus === updateStatusTypes.CHECKING}
+          isUpdateAvailable={updateStatus === updateStatusTypes.AVAILABLE}
+          noUpdateAvailable={updateStatus === updateStatusTypes.NOT_AVAILABLE}
+          updateIsReadyToInstall={updateStatus === updateStatusTypes.DOWNLOADED}
+          onSubmit={d => this.onSubmit(d)}
+          cacheSize={cacheSize}
+          isClearingAllCache={isClearingAllCache}
+          onClearAllCache={clearAllCache}
+          isSpellcheckerPremiumFeature={spellcheckerConfig.isPremiumFeature}
+        />
+      </ErrorBoundary>
     );
   }
 }
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index 3da3e8d2c..3d35effc5 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -6,6 +6,8 @@ import { defineMessages, intlShape } from 'react-intl';
 import UserStore from '../../stores/UserStore';
 import Form from '../../lib/Form';
 import EditUserForm from '../../components/settings/user/EditUserForm';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
+
 import { required, email, minLength } from '../../helpers/validation-helpers';
 import { gaPage } from '../../lib/analytics';
 
@@ -140,14 +142,15 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
     const form = this.prepareForm(user.data);
 
     return (
-      <EditUserForm
-        // user={user.data}
-        status={user.actionStatus}
-        form={form}
-        isEnterprise={user.data.isEnterprise}
-        isSaving={user.updateUserInfoRequest.isExecuting}
-        onSubmit={d => this.onSubmit(d)}
-      />
+      <ErrorBoundary>
+        <EditUserForm
+          // user={user.data}
+          status={user.actionStatus}
+          form={form}
+          isSaving={user.updateUserInfoRequest.isExecuting}
+          onSubmit={d => this.onSubmit(d)}
+        />
+      </ErrorBoundary>
     );
   }
 }
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js
index 38ca6ec74..cd36610e4 100644
--- a/src/containers/settings/InviteScreen.js
+++ b/src/containers/settings/InviteScreen.js
@@ -3,6 +3,8 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 
 import Invite from '../../components/auth/Invite';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
+
 import { gaPage } from '../../lib/analytics';
 
 export default @inject('stores', 'actions') @observer class InviteScreen extends Component {
@@ -19,12 +21,14 @@ export default @inject('stores', 'actions') @observer class InviteScreen extends
     const { user } = this.props.stores;
 
     return (
-      <Invite
-        onSubmit={actions.user.invite}
-        isLoadingInvite={user.inviteRequest.isExecuting}
-        isInviteSuccessful={user.inviteRequest.wasExecuted && !user.inviteRequest.isError}
-        embed
-      />
+      <ErrorBoundary>
+        <Invite
+          onSubmit={actions.user.invite}
+          isLoadingInvite={user.inviteRequest.isExecuting}
+          isInviteSuccessful={user.inviteRequest.wasExecuted && !user.inviteRequest.isError}
+          embed
+        />
+      </ErrorBoundary>
     );
   }
 }
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index 4efe81505..b3d758c87 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -10,12 +10,13 @@ import UserStore from '../../stores/UserStore';
 import { gaPage } from '../../lib/analytics';
 
 import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
 
 export default @inject('stores', 'actions') @observer class RecipesScreen extends Component {
   static propTypes = {
     params: PropTypes.shape({
       filter: PropTypes.string,
-    }).isRequired,
+    }),
   };
 
   static defaultProps = {
@@ -29,10 +30,12 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
     currentFilter: 'featured',
   };
 
+  autorunDisposer = null;
+
   componentDidMount() {
     gaPage('Settings/Recipe Dashboard/Featured');
 
-    autorun(() => {
+    this.autorunDisposer = autorun(() => {
       const { filter } = this.props.params;
       const { currentFilter } = this.state;
 
@@ -51,6 +54,7 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
 
   componentWillUnmount() {
     this.props.stores.services.resetStatus();
+    this.autorunDisposer();
   }
 
   searchRecipes(needle) {
@@ -68,7 +72,9 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
   }
 
   render() {
-    const { recipePreviews, recipes, services, user } = this.props.stores;
+    const {
+      recipePreviews, recipes, services, user,
+    } = this.props.stores;
     const { showAddServiceInterface } = this.props.actions.service;
 
     const { filter } = this.props.params;
@@ -90,19 +96,21 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
       || recipePreviews.searchRecipePreviewsRequest.isExecuting;
 
     return (
-      <RecipesDashboard
-        recipes={allRecipes}
-        isLoading={isLoading}
-        addedServiceCount={services.all.length}
-        isPremium={user.data.isPremium}
-        hasLoadedRecipes={recipePreviews.featuredRecipePreviewsRequest.wasExecuted}
-        showAddServiceInterface={showAddServiceInterface}
-        searchRecipes={e => this.searchRecipes(e)}
-        resetSearch={() => this.resetSearch()}
-        searchNeedle={this.state.needle}
-        serviceStatus={services.actionStatus}
-        devRecipesCount={recipePreviews.dev.length}
-      />
+      <ErrorBoundary>
+        <RecipesDashboard
+          recipes={allRecipes}
+          isLoading={isLoading}
+          addedServiceCount={services.all.length}
+          isPremium={user.data.isPremium}
+          hasLoadedRecipes={recipePreviews.featuredRecipePreviewsRequest.wasExecuted}
+          showAddServiceInterface={showAddServiceInterface}
+          searchRecipes={e => this.searchRecipes(e)}
+          resetSearch={() => this.resetSearch()}
+          searchNeedle={this.state.needle}
+          serviceStatus={services.actionStatus}
+          devRecipesCount={recipePreviews.dev.length}
+        />
+      </ErrorBoundary>
     );
   }
 }
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js
index c1a133ef7..b70a5506e 100644
--- a/src/containers/settings/ServicesScreen.js
+++ b/src/containers/settings/ServicesScreen.js
@@ -9,6 +9,7 @@ import ServiceStore from '../../stores/ServicesStore';
 import { gaPage } from '../../lib/analytics';
 
 import ServicesDashboard from '../../components/settings/services/ServicesDashboard';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
 
 export default @inject('stores', 'actions') @observer class ServicesScreen extends Component {
   componentDidMount() {
@@ -40,20 +41,22 @@ export default @inject('stores', 'actions') @observer class ServicesScreen exten
     }
 
     return (
-      <ServicesDashboard
-        user={user.data}
-        services={allServices}
-        status={services.actionStatus}
-        deleteService={() => this.deleteService()}
-        toggleService={toggleService}
-        isLoading={isLoading}
-        filterServices={filter}
-        resetFilter={resetFilter}
-        goTo={router.push}
-        servicesRequestFailed={services.allServicesRequest.wasExecuted && services.allServicesRequest.isError}
-        retryServicesRequest={() => services.allServicesRequest.reload()}
-        searchNeedle={services.filterNeedle}
-      />
+      <ErrorBoundary>
+        <ServicesDashboard
+          user={user.data}
+          services={allServices}
+          status={services.actionStatus}
+          deleteService={() => this.deleteService()}
+          toggleService={toggleService}
+          isLoading={isLoading}
+          filterServices={filter}
+          resetFilter={resetFilter}
+          goTo={router.push}
+          servicesRequestFailed={services.allServicesRequest.wasExecuted && services.allServicesRequest.isError}
+          retryServicesRequest={() => services.allServicesRequest.reload()}
+          searchNeedle={services.filterNeedle}
+        />
+      </ErrorBoundary>
     );
   }
 }
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js
index 55589d0be..6d9e0ee77 100644
--- a/src/containers/settings/SettingsWindow.js
+++ b/src/containers/settings/SettingsWindow.js
@@ -6,6 +6,7 @@ import ServicesStore from '../../stores/ServicesStore';
 
 import Layout from '../../components/settings/SettingsLayout';
 import Navigation from '../../components/settings/navigation/SettingsNavigation';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
 
 export default @inject('stores', 'actions') @observer class SettingsContainer extends Component {
   render() {
@@ -19,12 +20,14 @@ export default @inject('stores', 'actions') @observer class SettingsContainer ex
     );
 
     return (
-      <Layout
-        navigation={navigation}
-        closeSettings={closeSettings}
-      >
-        {children}
-      </Layout>
+      <ErrorBoundary>
+        <Layout
+          navigation={navigation}
+          closeSettings={closeSettings}
+        >
+          {children}
+        </Layout>
+      </ErrorBoundary>
     );
   }
 }
diff --git a/src/containers/subscription/SubscriptionFormScreen.js b/src/containers/subscription/SubscriptionFormScreen.js
index 50ed19bef..3eb7b6255 100644
--- a/src/containers/subscription/SubscriptionFormScreen.js
+++ b/src/containers/subscription/SubscriptionFormScreen.js
@@ -12,7 +12,7 @@ const { BrowserWindow } = remote;
 export default @inject('stores', 'actions') @observer class SubscriptionFormScreen extends Component {
   static propTypes = {
     onCloseWindow: PropTypes.func,
-    content: PropTypes.oneOrManyChildElements,
+    content: PropTypes.node,
     showSkipOption: PropTypes.bool,
     skipAction: PropTypes.func,
     skipButtonLabel: PropTypes.string,
diff --git a/src/electron/Settings.js b/src/electron/Settings.js
index ed9733bfe..63f43b6b7 100644
--- a/src/electron/Settings.js
+++ b/src/electron/Settings.js
@@ -8,6 +8,7 @@ const debug = require('debug')('Franz:Settings');
 
 export default class Settings {
   type = '';
+
   @observable store = {};
 
   constructor(type, defaultState = {}) {
diff --git a/src/electron/ipc-api/download.js b/src/electron/ipc-api/download.js
index 9e504834d..e6703af2d 100644
--- a/src/electron/ipc-api/download.js
+++ b/src/electron/ipc-api/download.js
@@ -12,7 +12,7 @@ function decodeBase64Image(dataString) {
     return new Error('Invalid input string');
   }
 
-  return new Buffer(matches[2], 'base64');
+  return Buffer.from(matches[2], 'base64');
 }
 
 export default (params) => {
diff --git a/src/features/delayApp/Component.js b/src/features/delayApp/Component.js
index 403340c7b..6e0532c9a 100644
--- a/src/features/delayApp/Component.js
+++ b/src/features/delayApp/Component.js
@@ -6,7 +6,7 @@ import injectSheet from 'react-jss';
 
 import Button from '../../components/ui/Button';
 
-import { config } from './';
+import { config } from '.';
 import styles from './styles';
 
 const messages = defineMessages({
@@ -38,11 +38,15 @@ export default @inject('actions') @injectSheet(styles) @observer class DelayApp
     countdown: config.delayDuration,
   }
 
+  countdownInterval = null;
+
+  countdownIntervalTimeout = 1000;
+
   componentDidMount() {
     this.countdownInterval = setInterval(() => {
-      this.setState({
-        countdown: this.state.countdown - this.countdownIntervalTimeout,
-      });
+      this.setState(prevState => ({
+        countdown: prevState.countdown - this.countdownIntervalTimeout,
+      }));
 
       if (this.state.countdown <= 0) {
         // reload();
@@ -55,9 +59,6 @@ export default @inject('actions') @injectSheet(styles) @observer class DelayApp
     clearInterval(this.countdownInterval);
   }
 
-  countdownInterval = null;
-  countdownIntervalTimeout = 1000;
-
   render() {
     const { classes, actions } = this.props;
     const { intl } = this.context;
@@ -71,9 +72,11 @@ export default @inject('actions') @injectSheet(styles) @observer class DelayApp
           buttonType="inverted"
           onClick={() => actions.ui.openSettings({ path: 'user' })}
         />
-        <p className="footnote">{intl.formatMessage(messages.text, {
-          seconds: this.state.countdown / 1000,
-        })}</p>
+        <p className="footnote">
+          {intl.formatMessage(messages.text, {
+            seconds: this.state.countdown / 1000,
+          })}
+        </p>
       </div>
     );
   }
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
index 9ffa1d2fd..d5c544b78 100644
--- a/src/features/delayApp/index.js
+++ b/src/features/delayApp/index.js
@@ -67,4 +67,3 @@ export default function init(stores) {
 }
 
 export const Component = DelayAppComponent;
-
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
index ee0b4e79c..4bea327ad 100644
--- a/src/features/serviceProxy/index.js
+++ b/src/features/serviceProxy/index.js
@@ -23,15 +23,18 @@ export default function init(stores) {
 
     const services = stores.services.enabled;
     const isPremiumUser = stores.user.data.isPremium;
+    const proxySettings = stores.settings.proxy;
+
+    debug('Service Proxy autorun');
 
     services.forEach((service) => {
       const s = session.fromPartition(`persist:service-${service.id}`);
 
       if (config.isEnabled && (isPremiumUser || !config.isPremium)) {
-        const serviceProxyConfig = stores.settings.proxy[service.id];
+        const serviceProxyConfig = proxySettings[service.id];
 
         if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) {
-          const proxyHost = serviceProxyConfig.host;
+          const proxyHost = `${serviceProxyConfig.host}${serviceProxyConfig.port ? `:${serviceProxyConfig.port}` : ''}`;
           debug(`Setting proxy config from service settings for "${service.name}" (${service.id}) to`, proxyHost);
 
           s.setProxy({ proxyRules: proxyHost }, () => {
@@ -42,4 +45,3 @@ export default function init(stores) {
     });
   });
 }
-
diff --git a/src/helpers/array-helpers.js b/src/helpers/array-helpers.js
new file mode 100644
index 000000000..ffb3b63dc
--- /dev/null
+++ b/src/helpers/array-helpers.js
@@ -0,0 +1,4 @@
+export const shuffleArray = arr => arr
+  .map(a => [Math.random(), a])
+  .sort((a, b) => a[0] - b[0])
+  .map(a => a[1]);
diff --git a/src/helpers/i18n-helpers.js b/src/helpers/i18n-helpers.js
index 00a2061c1..091b86b06 100644
--- a/src/helpers/i18n-helpers.js
+++ b/src/helpers/i18n-helpers.js
@@ -1,4 +1,6 @@
-export function getLocale({ locale, locales, defaultLocale, fallbackLocale }) {
+export function getLocale({
+  locale, locales, defaultLocale, fallbackLocale,
+}) {
   let localeStr = locale;
   if (locales[locale] === undefined) {
     let localeFuzzy;
@@ -25,3 +27,29 @@ export function getLocale({ locale, locales, defaultLocale, fallbackLocale }) {
 
   return localeStr;
 }
+
+export function getSelectOptions({ locales, resetToDefaultText = '' }) {
+  let options = [];
+
+  if (resetToDefaultText) {
+    options = [
+      {
+        value: '',
+        label: resetToDefaultText,
+      }, {
+        value: '───',
+        label: '───',
+        disabled: true,
+      },
+    ];
+  }
+
+  Object.keys(locales).sort(Intl.Collator().compare).forEach((key) => {
+    options.push({
+      value: key,
+      label: locales[key],
+    });
+  });
+
+  return options;
+}
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 117e66d76..ed6f7bacd 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -1,7 +1,9 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.action" : "Recarrega",
+   "app.errorHandler.headline" : "Something went wrong",
+   "feature.delayApp.action" : "Aconsegueix una llicència de suport per a Franz",
+   "feature.delayApp.headline" : "Si us plau, compra una llicència de suport per a Franz per saltar l'espera",
+   "feature.delayApp.text" : "Franz continuarà en {seconds} segons",
    "global.api.unhealthy" : "No es pot connectar amb els serveis en línia de Franz",
    "global.notConnectedToTheInternet" : "No esteu connectat a Internet.",
    "import.headline" : "Importa els teus serveis Franz 4",
@@ -79,7 +81,7 @@
    "password.noUser" : "No s'ha trobat cap usuari amb aquesta adreça de correu electrònic",
    "password.submit.label" : "Enviar",
    "password.successInfo" : "Comproveu el vostre correu electrònic",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Millorar el teu compte",
    "pricing.headline" : "Donar suport a Franz",
    "pricing.link.skipPayment" : "No vull donar suport al desenvolupament de Franz.",
    "pricing.submit.label" : "Vull donar suport al desenvolupament de Franz",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} ha causat un error.",
    "service.disabledHandler.action" : "Activar {name}",
    "service.disabledHandler.headline" : "{name} està desactivat",
+   "service.errorHandler.action" : "Recarrega {name}",
+   "service.errorHandler.editAction" : "Edita {name}",
+   "service.errorHandler.headline" : "Oh no!",
+   "service.errorHandler.message" : "Error",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Introducció",
    "services.welcome" : "Benvingut a Franz",
    "settings.account.account.editButton" : "Editar Compte",
@@ -120,7 +127,7 @@
    "settings.app.form.autoLaunchInBackground" : "Obrir en segon plà",
    "settings.app.form.autoLaunchOnStart" : "Iniciar Franz a l'inici",
    "settings.app.form.beta" : "Inclou versions beta",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Uneix-te al Cantó Fosc",
    "settings.app.form.enableGPUAcceleration" : "Activar acceleració GPU",
    "settings.app.form.enableMenuBar" : "Mostra Franz a la barra de menú",
    "settings.app.form.enableSpellchecking" : "Habilita la comprobació ortogràfica",
@@ -131,7 +138,7 @@
    "settings.app.form.runInBackground" : "Mantén a Franz en segon pla en tancar la finestra",
    "settings.app.form.showDisabledServices" : "Mostra les pestanyes dels serveis desactivats",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Mostra la insígnia de missatges no llegits quan les notificacions estiguin desactivades",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Corrector ortogràfic",
    "settings.app.headline" : "Configuració",
    "settings.app.headlineAdvanced" : "Avançat",
    "settings.app.headlineAppearance" : "Aparença",
@@ -172,7 +179,7 @@
    "settings.service.form.editServiceHeadline" : "Edita {name}",
    "settings.service.form.enableAudio" : "Activa l'àudio",
    "settings.service.form.enableBadge" : "Mostra les insígnies als missatges no llegits.",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Activar el Mode Fosc",
    "settings.service.form.enableNotification" : "Activa les notificacions",
    "settings.service.form.enableService" : "Activa el servei",
    "settings.service.form.headlineBadges" : "Insígnies de missatges no llegits",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Mostra la insígnia de missatge per a tots els missatges nous",
    "settings.service.form.isMutedInfo" : "Quan es desactiva, tots els sons de notificació i reproducció d'àudio es silenciaran",
    "settings.service.form.name" : "Nom",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
-   "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.host" : "Host Proxy \/ IP",
+   "settings.service.form.proxy.info" : "Els ajustaments del Proxy no es sincronitzaran amb els servidors de Franz",
+   "settings.service.form.proxy.isEnabled" : "Utilitzar Proxy",
+   "settings.service.form.proxy.password" : "Contrasenya (opcional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.user" : "Usuari (opcional)",
    "settings.service.form.saveButton" : "Desa el servei",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Allotjat",
    "settings.service.form.tabOnPremise" : "Allotjat per si mateix ⭐️",
    "settings.service.form.team" : "Equip",
@@ -234,11 +245,11 @@
    "subscription.features.ads" : "Sense anuncis, mai!",
    "subscription.features.comingSoon" : "properament",
    "subscription.features.encryptedSync" : "Sincronització de sessió xifrada",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "Sense retards ni molestes actualitzacions de llicències ",
    "subscription.features.onpremise" : "Afegiu serveis en premissa\/allotjats com HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.onpremise.mattermost" : "Afegir serveis allotjats com Mattermost",
+   "subscription.features.proxy" : "Suport de Proxy per a serveis",
+   "subscription.features.spellchecker" : "Suport per corrector ortogràfic",
    "subscription.includedFeatures" : "El compte de pagament Franz Premium Supporter inclou",
    "subscription.paymentSessionError" : "No s'ha pogut inicialitzar el formulari de pagament",
    "subscription.submit.label" : "Vull donar suport al desenvolupament de Franz",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index eb8088e28..b8bfd2526 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Obnovit",
+   "app.errorHandler.headline" : "Something went wrong",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} způsobil chybu.",
    "service.disabledHandler.action" : "Zapnout {name}",
    "service.disabledHandler.headline" : "{name} je vypnutý",
+   "service.errorHandler.action" : "Načíst znovu {name}",
+   "service.errorHandler.editAction" : "Upravit {name}",
+   "service.errorHandler.headline" : "Ale ne!",
+   "service.errorHandler.message" : "Chyba",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Začněme",
    "services.welcome" : "Vítejte v programu Franz",
    "settings.account.account.editButton" : "Upravit účet",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Zobrazovat znak zprávy pro všechny nové zprávy",
    "settings.service.form.isMutedInfo" : "Pokud je vypnuto, všechny zvuky notifikací a jiného audia budou ztišeny",
    "settings.service.form.name" : "Jméno",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
    "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Uložit službu",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostováno",
    "settings.service.form.tabOnPremise" : "Samostatně hostované ⭐️",
    "settings.service.form.team" : "Tým",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 6aa909519..b5abb56d4 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Neuladen",
+   "app.errorHandler.headline" : "Es trat ein Fehler auf",
    "feature.delayApp.action" : "Upgrade deinen Account",
    "feature.delayApp.headline" : "Erspare dir das Warten mit einer Franz Supporter Lizenz",
    "feature.delayApp.text" : "Es geht in {seconds} Sekunden weiter.",
@@ -48,7 +50,7 @@
    "menu.edit.startDictation" : "Diktat starten",
    "menu.edit.startSpeaking" : "Sprachausgabe starten",
    "menu.edit.stopSpeaking" : "Sprachausgabe stoppen",
-   "menu.edit.undo" : "Widerrufen",
+   "menu.edit.undo" : "Rückgängig",
    "menu.file" : "Datei",
    "menu.help" : "Hilfe",
    "menu.help.changelog" : "Changelog",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} hat einen Fehler verursacht.",
    "service.disabledHandler.action" : "{name} aktivieren",
    "service.disabledHandler.headline" : "{name} ist deaktiviert",
+   "service.errorHandler.action" : "{name} neuladen",
+   "service.errorHandler.editAction" : "{name} bearbeiten",
+   "service.errorHandler.headline" : "Oh nein!",
+   "service.errorHandler.message" : "Fehler",
+   "service.errorHandler.text" : "{name} konnte nicht geladen werden.",
    "services.getStarted" : "Loslegen",
    "services.welcome" : "Willkommen bei Franz.",
    "settings.account.account.editButton" : "Konto bearbeiten",
@@ -124,10 +131,10 @@
    "settings.app.form.enableGPUAcceleration" : "Hardwarebeschleunigung aktivieren",
    "settings.app.form.enableMenuBar" : "Franz in Menüleiste anzeigen",
    "settings.app.form.enableSpellchecking" : "Rechtschreibprüfung aktivieren",
-   "settings.app.form.enableSystemTray" : "Franz in der Taskleiste anzeigen",
+   "settings.app.form.enableSystemTray" : "Franz im Infobereich anzeigen",
    "settings.app.form.hideDockIcon" : "Franz Icon im Dock ausblenden",
    "settings.app.form.language" : "Sprache",
-   "settings.app.form.minimizeToSystemTray" : "Franz in die Systemleiste minimieren",
+   "settings.app.form.minimizeToSystemTray" : "Franz in den Infobereich minimieren",
    "settings.app.form.runInBackground" : "Franz im Hintergrund behalten, wenn das Fenster geschlossen wird",
    "settings.app.form.showDisabledServices" : "Deaktivierte Services-Tabs anzeigen",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Ungelesene Nachrichten zeigen, wenn die Benachrichtigungen deaktiviert sind",
@@ -154,11 +161,11 @@
    "settings.recipes.all" : "Alle Dienste",
    "settings.recipes.dev" : "Entwicklung",
    "settings.recipes.headline" : "Verfügbare Dienste",
-   "settings.recipes.missingService" : "Fehlt ein Service?",
+   "settings.recipes.missingService" : "Fehlt ein Dienst?",
    "settings.recipes.mostPopular" : "Am beliebtesten",
    "settings.recipes.nothingFound" : "Entschuldigung, aber der von Dir gesuchte Dienst konnte nicht gefunden werden.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Dienst erfolgreich hinzugefügt",
-   "settings.searchService" : "Service suchen",
+   "settings.searchService" : "Dienst suchen",
    "settings.service.error.goBack" : "Zurück zu den Diensten",
    "settings.service.error.headline" : "Fehler",
    "settings.service.error.message" : "Das Dienst-Rezept konnte nicht geladen werden.",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Nachrichten-Badge für alle neuen Nachrichten anzeigen",
    "settings.service.form.isMutedInfo" : "Sämtliche Wiedergabe von Tönen wird deaktiviert",
    "settings.service.form.name" : "Name",
-   "settings.service.form.proxy.headline" : "Proxy Einstellungen",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Einstellungen",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy Einstellungen werden nicht mit den Franz Servern synchronisiert.",
    "settings.service.form.proxy.isEnabled" : "Proxy Server verwenden",
    "settings.service.form.proxy.password" : "Passwort (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Bitte starte Franz nach dem Ändern der Proxy Einstellungen neu.",
    "settings.service.form.proxy.user" : "Benutzer (optional)",
    "settings.service.form.saveButton" : "Dienst speichern",
+   "settings.service.form.spellcheckerLanguage" : "Sprache für Rechtschreibprüfung",
+   "settings.service.form.spellcheckerLanguage.default" : "Standard benutzen ({default})",
    "settings.service.form.tabHosted" : "Gehostet",
    "settings.service.form.tabOnPremise" : "Selbst gehostet ⭐️",
    "settings.service.form.team" : "Team",
@@ -238,7 +249,7 @@
    "subscription.features.onpremise" : "Integration von gehosteten Diensten, wie HipChat",
    "subscription.features.onpremise.mattermost" : "Integration von gehosteten Diensten, wie Mattermost",
    "subscription.features.proxy" : "Proxy Support für Dienste",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.spellchecker" : "Unterstützung für Rechtschreibprüfung",
    "subscription.includedFeatures" : "Bezahlte Franz Premium Support Konten beinhalten",
    "subscription.paymentSessionError" : "Das Zahlungs-Formular konnte nicht geladen werden.",
    "subscription.submit.label" : "Ich möchte die Entwicklung von Franz unterstützen",
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 31852d20c..671eecd41 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Επαναφόρτωση",
+   "app.errorHandler.headline" : "Something went wrong",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "Το {name} προκάλεσε ένα σφάλμα.",
    "service.disabledHandler.action" : "Ενεργοποίηση {name}",
    "service.disabledHandler.headline" : "{name} είναι απενεργοποιημένο",
+   "service.errorHandler.action" : "Επαναφόρτωση {name}",
+   "service.errorHandler.editAction" : "Επεξεργασία {name}",
+   "service.errorHandler.headline" : "Ω, όχι!",
+   "service.errorHandler.message" : "Σφάλμα",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Ξεκινήστε",
    "services.welcome" : "Καλώς ορίσατε στον Franz",
    "settings.account.account.editButton" : "Επεξεργασία λογαριασμού",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Εμφάνιση ειδοποίησης μηνύματος για όλα τα νέα μηνύματα",
    "settings.service.form.isMutedInfo" : "Όλοι οι ήχοι καθώς και η αναπαραγωγή ήχου θα απενεργοποιηθούν",
    "settings.service.form.name" : "Όνομα",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
    "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Αποθήκευση υπηρεσίας",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Φιλοξενείται",
    "settings.service.form.tabOnPremise" : "Αυτο-φιλοξενείται ⭐️",
    "settings.service.form.team" : "Ομάδα",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index aa55f5dfe..99df6a0ca 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -133,12 +133,16 @@
   "settings.service.form.iconDelete": "Delete",
   "settings.service.form.iconUpload": "Drop your image, or click here",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.proxy.headline": "Proxy Settings",
+  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.host": "Proxy Host/IP",
+  "settings.service.form.proxy.port": "Port",
   "settings.service.form.proxy.user": "User (optional)",
   "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.info": "Proxy settings will not synced with the Franz servers.",
+  "settings.service.form.proxy.restartInfo": "Please restart Franz after changing proxy Settings.",
+  "settings.service.form.spellcheckerLanguage": "Spell checking Language",
+  "settings.service.form.spellcheckerLanguage.default": "Use System Default ({default})",
   "settings.service.error.headline": "Error",
   "settings.service.error.goBack": "Back to services",
   "settings.service.error.message": "Could not load service recipe.",
@@ -210,6 +214,11 @@
   "service.crashHandler.text": "{name} has caused an error.",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
+  "service.errorHandler.headline": "Oh no!",
+  "service.errorHandler.text": "{name} has failed to load.",
+  "service.errorHandler.message": "Error",
+  "service.errorHandler.action": "Reload {name}",
+  "service.errorHandler.editAction": "Edit {name}",
   "service.disabledHandler.headline": "{name} is disabled",
   "service.disabledHandler.action": "Enable {name}",
   "menu.edit": "Edit",
@@ -262,5 +271,7 @@
   "feature.delayApp.headline": "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.action": "Get a Franz Supporter License",
   "feature.delayApp.text": "Franz will continue in {seconds} seconds.",
-  "premiumFeature.button.upgradeAccount": "Upgrade account"
+  "premiumFeature.button.upgradeAccount": "Upgrade account",
+  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.action": "Reload"
 }
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index a5984dd1c..669b4d2dd 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,7 +1,9 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.action" : "Recargar",
+   "app.errorHandler.headline" : "Something went wrong",
+   "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.text" : "Franz continuará en {seconds}  segundos.",
    "global.api.unhealthy" : "No es posible conectarse a los servicios en línea de Franz.",
    "global.notConnectedToTheInternet" : "No estás conectado a Internet",
    "import.headline" : "Importa tus servicios de Franz 4",
@@ -79,7 +81,7 @@
    "password.noUser" : "No se encontró un usuario con esa dirección de correo electrónico",
    "password.submit.label" : "Enviar",
    "password.successInfo" : "Por favor revisa tu correo electrónico",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Mejora tu cuenta",
    "pricing.headline" : "Apoya a Franz",
    "pricing.link.skipPayment" : "No quiero apoyar el desarrollo de Franz.",
    "pricing.submit.label" : "Quiero apoyar el desarrollo de Franz",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} ha causado un error.",
    "service.disabledHandler.action" : "Activar {name}",
    "service.disabledHandler.headline" : "{name} está desactivado",
+   "service.errorHandler.action" : "Recargar {name}",
+   "service.errorHandler.editAction" : "Editar {name}",
+   "service.errorHandler.headline" : "¡Oh, no!",
+   "service.errorHandler.message" : "Error",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Primeros pasos",
    "services.welcome" : "Bienvenido a Franz",
    "settings.account.account.editButton" : "Editar cuenta",
@@ -120,7 +127,7 @@
    "settings.app.form.autoLaunchInBackground" : "Abrir en segundo plano",
    "settings.app.form.autoLaunchOnStart" : "Iniciar Franz al iniciar",
    "settings.app.form.beta" : "Incluir versiones beta",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Únete al Lado Oscuro",
    "settings.app.form.enableGPUAcceleration" : "Habilitar aceleración de GPU",
    "settings.app.form.enableMenuBar" : "Mostrar a Franz en la barra de menús",
    "settings.app.form.enableSpellchecking" : "Activar corrección ortográfica",
@@ -131,7 +138,7 @@
    "settings.app.form.runInBackground" : "Mantener Franz en segundo plano al cerrar la ventana",
    "settings.app.form.showDisabledServices" : "Mostrar pestañas de servicios desactivados",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Corrector de ortografía",
    "settings.app.headline" : "Configuración",
    "settings.app.headlineAdvanced" : "Avanzado",
    "settings.app.headlineAppearance" : "Apariencia",
@@ -172,7 +179,7 @@
    "settings.service.form.editServiceHeadline" : "Editar {name}",
    "settings.service.form.enableAudio" : "Habilitar audio",
    "settings.service.form.enableBadge" : "Mostrar señal de mensajes no leídos",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Habilitar modo oscuro",
    "settings.service.form.enableNotification" : "Activar notificaciones",
    "settings.service.form.enableService" : "Activar servicio",
    "settings.service.form.headlineBadges" : "Insignias de mensaje no leídos",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Mostrar señal de notificación para todos los mensajes nuevos",
    "settings.service.form.isMutedInfo" : "Cuando estén desactivados, todos los sonidos de notificación y la reproducción de audio serán silenciados",
    "settings.service.form.name" : "Nombre",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
+   "settings.service.form.proxy.info" : "Las configuraciones de Proxy no se sincronizarán con los servidores de Franz.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.password" : "Contraseña (opcional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.user" : "Usuario (opcional)",
    "settings.service.form.saveButton" : "Guardar servicio",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Alojado",
    "settings.service.form.tabOnPremise" : "Auto alojado ⭐️",
    "settings.service.form.team" : "Equipo",
@@ -234,11 +245,11 @@
    "subscription.features.ads" : "¡Sin publicidad, para siempre!",
    "subscription.features.comingSoon" : "próximamente",
    "subscription.features.encryptedSync" : "Sincronización de sesión encriptada",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "Sin retrasos en la app ni molestas actualizaciones de licencias",
    "subscription.features.onpremise" : "Añade servicios locales\/autoalojados como HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.onpremise.mattermost" : "Agregar servicios de almacenamiento como Mattermost",
+   "subscription.features.proxy" : "Soporte Proxy para servicios",
+   "subscription.features.spellchecker" : "Soporte para corrector de ortografía",
    "subscription.includedFeatures" : "La Cuenta pagada de Colaborador Premium de Franz incluye",
    "subscription.paymentSessionError" : "No se pudo inicializar el formulario de pago",
    "subscription.submit.label" : "Quiero apoyar el desarrollo de Franz",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 6964d27d2..a83767f1e 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1,7 +1,9 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.action" : "Recharger",
+   "app.errorHandler.headline" : "Une erreur s'est produite.",
+   "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.text" : "Franz continuera dans {seconds} secondes.",
    "global.api.unhealthy" : "Impossible de se connecter aux services en ligne de Franz",
    "global.notConnectedToTheInternet" : "Vous n'êtes pas connecté à Internet.",
    "import.headline" : "Importez vos services depuis la version 4 de Franz.",
@@ -79,7 +81,7 @@
    "password.noUser" : "Aucun utilisateur n'a été trouvé avec cette adresse e-mail",
    "password.submit.label" : "Soumettre",
    "password.successInfo" : "Merci de consulter vos e-mails",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Mettre à niveau 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",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} a causé une erreur.",
    "service.disabledHandler.action" : "Activer {name}",
    "service.disabledHandler.headline" : "{name} est désactivé",
+   "service.errorHandler.action" : "Recharger {name}",
+   "service.errorHandler.editAction" : "Modifier {name}",
+   "service.errorHandler.headline" : "Oh non !",
+   "service.errorHandler.message" : "Erreur",
+   "service.errorHandler.text" : "Le chargement de {name} a échoué.",
    "services.getStarted" : "Commencer",
    "services.welcome" : "Bienvenue dans Franz",
    "settings.account.account.editButton" : "Modifier le compte",
@@ -120,7 +127,7 @@
    "settings.app.form.autoLaunchInBackground" : "Ouvrir en arrière-plan",
    "settings.app.form.autoLaunchOnStart" : "Lancer Franz au démarrage",
    "settings.app.form.beta" : "Accepter les versions bêta",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Rejoins le côté obscur",
    "settings.app.form.enableGPUAcceleration" : "Activer l'accélération GPU",
    "settings.app.form.enableMenuBar" : "Afficher Franz dans la barre des menus",
    "settings.app.form.enableSpellchecking" : "Activer la vérification orthographique",
@@ -131,7 +138,7 @@
    "settings.app.form.runInBackground" : "Garder Franz ouvert en arrière-plan à la fermeture de la fenêtre",
    "settings.app.form.showDisabledServices" : "Afficher les onglets des services désactivés",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Afficher les badges de messages non lus quand les notifications sont désactivées.",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Langue de la vérification orthographique",
    "settings.app.headline" : "Paramètres",
    "settings.app.headlineAdvanced" : "Paramètres avancés",
    "settings.app.headlineAppearance" : "Apparence",
@@ -172,7 +179,7 @@
    "settings.service.form.editServiceHeadline" : "Modifier {name}",
    "settings.service.form.enableAudio" : "Activer l'audio",
    "settings.service.form.enableBadge" : "Afficher le badge des messages non lus",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Activer le mode sombre",
    "settings.service.form.enableNotification" : "Activer les notifications",
    "settings.service.form.enableService" : "Activer le service",
    "settings.service.form.headlineBadges" : "Badge des messages non lus",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Afficher le badge des messages pour tous les nouveaux messages",
    "settings.service.form.isMutedInfo" : "Lorsque désactivé, tous les sons de notifications ainsi que l'audio sont coupés",
    "settings.service.form.name" : "Nom",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
-   "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.headline" : "Paramètres Proxy HTTP\/HTTPS",
+   "settings.service.form.proxy.host" : "Hôte\/IP du proxy",
+   "settings.service.form.proxy.info" : "Les paramètres de proxy ne seront pas synchronisés avec les serveurs de Franz.",
+   "settings.service.form.proxy.isEnabled" : "Utiliser un proxy",
+   "settings.service.form.proxy.password" : "Mot de passe (facultatif)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Veuillez redémarrer Franz après avoir modifier les paramètres proxy.",
+   "settings.service.form.proxy.user" : "Utilisateur (facultatif)",
    "settings.service.form.saveButton" : "Enregistrer le service",
+   "settings.service.form.spellcheckerLanguage" : "Veuillez vérifier l'épellation Langage",
+   "settings.service.form.spellcheckerLanguage.default" : "Par défaut ({default})",
    "settings.service.form.tabHosted" : "Hébergé",
    "settings.service.form.tabOnPremise" : "Auto-hébergé ⭐️",
    "settings.service.form.team" : "Équipe",
@@ -234,11 +245,11 @@
    "subscription.features.ads" : "Plus de pubs !",
    "subscription.features.comingSoon" : "Bientôt disponible",
    "subscription.features.encryptedSync" : "Synchronisation de session cryptée",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "Aucun délai dans l'application ni de harcèlement pour mettre à niveau la licence",
    "subscription.features.onpremise" : "Ajouter des services locaux\/hébergés comme HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.onpremise.mattermost" : "Ajouter des services auto-hébergés comme Mattermost",
+   "subscription.features.proxy" : "Support proxy pour les services",
+   "subscription.features.spellchecker" : "Prise en charge du correcteur orthographique",
    "subscription.includedFeatures" : "Le compte payant Supporter Premium Franz inclut",
    "subscription.paymentSessionError" : "Initialisation du paiement impossible",
    "subscription.submit.label" : "Je souhaite aider au développement de Franz",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 3bb838ba3..0d3d8623e 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Athlódáil",
+   "app.errorHandler.headline" : "Something went wrong",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "Tá {name} tar éis earráid a dhéanamh.",
    "service.disabledHandler.action" : "Cumasaigh {name}",
    "service.disabledHandler.headline" : "Tá {name} díchumasaithe",
+   "service.errorHandler.action" : "Athlódáil {name}",
+   "service.errorHandler.editAction" : "Cuir {name} in eagar",
+   "service.errorHandler.headline" : "Oró, ní hea!",
+   "service.errorHandler.message" : "Earráid",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Cuir tús",
    "services.welcome" : "Fáilte go Franz",
    "settings.account.account.editButton" : "Cuir cuntas in eagar",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Taispeáin comhartha theachtaireachta do gach teachtaireacht nua",
    "settings.service.form.isMutedInfo" : "Tachtar gach fuaim fógraí agus athchasadh fuaime",
    "settings.service.form.name" : "Ainm",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
    "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Sábháil seirbhís",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Óstáilte",
    "settings.service.form.tabOnPremise" : "Féinóstáilte ⭐️",
    "settings.service.form.team" : "Foireann",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index ae9f25695..2ff69755d 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Ponovno učitavanje",
+   "app.errorHandler.headline" : "Something went wrong",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} je izazvalo grešku. ",
    "service.disabledHandler.action" : "Omogući {name}",
    "service.disabledHandler.headline" : "{name} je onemogućen\/o",
+   "service.errorHandler.action" : "Osvježi okvir",
+   "service.errorHandler.editAction" : "Uredite {ime}",
+   "service.errorHandler.headline" : "O, ne! ",
+   "service.errorHandler.message" : "Greška",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Započnimo!",
    "services.welcome" : "Dobrodošli u Franz",
    "settings.account.account.editButton" : "Uredi račun",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Prikaži značku na svim novim porukuama",
    "settings.service.form.isMutedInfo" : "Kada je onemogućeno, sve obavijesti, svi zvukovi i sva pozadinska podrška će biti nečujna. ",
    "settings.service.form.name" : "Ime",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
    "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Sačuvaj uslugu\/e",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostovano",
    "settings.service.form.tabOnPremise" : "Samo-hostovano ⭐️",
    "settings.service.form.team" : "Tim",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 365dec9c6..0b396cf3b 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Újratöltés",
+   "app.errorHandler.headline" : "Something went wrong",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} hibát okozott.",
    "service.disabledHandler.action" : "{name} engedélyezése",
    "service.disabledHandler.headline" : "{name} letiltva",
+   "service.errorHandler.action" : "{name} újratöltése",
+   "service.errorHandler.editAction" : "{name} szerkesztése",
+   "service.errorHandler.headline" : "Jajj ne!",
+   "service.errorHandler.message" : "Hiba",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Kezdj hozzá",
    "services.welcome" : "Üdvözöl a Franz",
    "settings.account.account.editButton" : "Fiók szerkesztése",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Üzenet kitűző megjelenítése minden üzenethez",
    "settings.service.form.isMutedInfo" : "Ha kikapcsolod, minden értesítési és lejátszott hang némításra kerül.",
    "settings.service.form.name" : "Név",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
    "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Szolgáltatás mentése",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Üzemeltetett",
    "settings.service.form.tabOnPremise" : "Egyénileg üzemeltetett",
    "settings.service.form.team" : "Csapat",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 437c1304f..11596d142 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -1,9 +1,11 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.action" : "Muat Ulang",
+   "app.errorHandler.headline" : "Something went wrong",
+   "feature.delayApp.action" : "Dapatkan Franz Supporter License",
+   "feature.delayApp.headline" : "Beli Franz Supporter License agar tidak perlu menunggu",
+   "feature.delayApp.text" : "Franz akan melanjutkan dalam {seconds} detik.",
    "global.api.unhealthy" : "Tidak dapat tersambung ke layanan Franz",
-   "global.notConnectedToTheInternet" : "Anda tidak mempunyai koneksi internet",
+   "global.notConnectedToTheInternet" : "Anda tidak tersambung ke internet.",
    "import.headline" : "Impor layanan Franz 4 Anda",
    "import.notSupportedHeadline" : "Layanan belum didukung di Franz 5",
    "import.skip.label" : "Saya ingin menambahkan layanan secara manual",
@@ -79,7 +81,7 @@
    "password.noUser" : "Tidak ditemukan pengguna dengan email tersebut",
    "password.submit.label" : "Kirim",
    "password.successInfo" : "Periksa email Anda",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Tingkatkan akun",
    "pricing.headline" : "Dukung Franz",
    "pricing.link.skipPayment" : "Saya tidak ingin mendukung pengembangan Franz.",
    "pricing.submit.label" : "Saya ingin mendukung pengembangan Franz",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} menyebabkan kesalahan.",
    "service.disabledHandler.action" : "Aktifkan {name}",
    "service.disabledHandler.headline" : "{name} dinonaktifkan",
+   "service.errorHandler.action" : "Muat Ulang {name}",
+   "service.errorHandler.editAction" : "Edit {nama}",
+   "service.errorHandler.headline" : "Ya Ampun!",
+   "service.errorHandler.message" : "Kesalahan",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Ayo mulai!",
    "services.welcome" : "Selamat datang di Franz",
    "settings.account.account.editButton" : "Edit akun",
@@ -120,7 +127,7 @@
    "settings.app.form.autoLaunchInBackground" : "Buka di latar belakang",
    "settings.app.form.autoLaunchOnStart" : "Jalankan Franz saat komputer dimulai",
    "settings.app.form.beta" : "Sertakan versi beta",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Sisi Kelam menunggu Anda (Mode Gelap)",
    "settings.app.form.enableGPUAcceleration" : "Aktifkan Akselerasi GPU",
    "settings.app.form.enableMenuBar" : "Tampilkan Franz di Bilah Menu",
    "settings.app.form.enableSpellchecking" : "Aktifkan pemeriksaan ejaan",
@@ -131,7 +138,7 @@
    "settings.app.form.runInBackground" : "Tetap jalankan Franz di latar belakang saat menutup jendela",
    "settings.app.form.showDisabledServices" : "Tampilkan tab layanan yang dinonaktifkan",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Tampilkan lencana pesan belum dibaca saat pemberitahuan dinonaktifkan",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Periksa ejaan",
    "settings.app.headline" : "Pengaturan",
    "settings.app.headlineAdvanced" : "Tingkat Lanjut",
    "settings.app.headlineAppearance" : "Tampilan",
@@ -172,7 +179,7 @@
    "settings.service.form.editServiceHeadline" : "Edit {nama}",
    "settings.service.form.enableAudio" : "Aktifkan audio",
    "settings.service.form.enableBadge" : "Tampilkan lencana pesan belum dibaca",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Aktifkan Mode Gelap",
    "settings.service.form.enableNotification" : "Aktifkan pemberitahuan",
    "settings.service.form.enableService" : "Aktifkan layanan",
    "settings.service.form.headlineBadges" : "Lencana pesan belum dibaca",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Tampilkan lencana pesan untuk semua pesan baru",
    "settings.service.form.isMutedInfo" : "Saat dinonaktifkan, semua suara pemberitahuan dan pemutaran audio akan dibisukan",
    "settings.service.form.name" : "Nama",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
-   "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.host" : "Host\/IP Proksi",
+   "settings.service.form.proxy.info" : "Pengaturan proksi tidak akan disinkronkan dengan server Franz.",
+   "settings.service.form.proxy.isEnabled" : "Gunakan Proksi",
+   "settings.service.form.proxy.password" : "Sandi (opsional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.user" : "Pengguna (opsional)",
    "settings.service.form.saveButton" : "Simpan layanan",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hosted",
    "settings.service.form.tabOnPremise" : "Hosted mandiri",
    "settings.service.form.team" : "Tim",
@@ -234,11 +245,11 @@
    "subscription.features.ads" : "Tanpa iklan, selamanya!",
    "subscription.features.comingSoon" : "segera hadir",
    "subscription.features.encryptedSync" : "Sinkronisasi sesi terenkripsi",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Layanan add-on premise\/hosted seperti HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.noInterruptions" : "Tanpa menunggu dan ditanya untuk meningkatkan lisensi",
+   "subscription.features.onpremise" : "Integrasi layanan hosted, misalnya HipChat",
+   "subscription.features.onpremise.mattermost" : "Integrasi layanan hosted, misalnya Mattermost",
+   "subscription.features.proxy" : "Dukungan proksi untuk layanan",
+   "subscription.features.spellchecker" : "Dukungan pengecek ejaan",
    "subscription.includedFeatures" : "Franz Premium Supporter Account berbayar menyertakan",
    "subscription.paymentSessionError" : "Tidak bisa menginisialisasi formulir pembayaran",
    "subscription.submit.label" : "Saya ingin mendukung pengembangan Franz",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 958d1470d..47cbd8f1e 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -1,7 +1,9 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.action" : "Ricarica",
+   "app.errorHandler.headline" : "Something went wrong",
+   "feature.delayApp.action" : "Ricevi una Licenza Supporter di Franz",
+   "feature.delayApp.headline" : "Per favore, compra una Licenza Supporter di Franz per saltare l'attesa",
+   "feature.delayApp.text" : "Franz continuerà a funzionare tra {seconds} secondi.",
    "global.api.unhealthy" : "Impossibile connettersi ai servizi online di Franz",
    "global.notConnectedToTheInternet" : "Non sei connesso a Internet.",
    "import.headline" : "Importa i servizi di Franz 4",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} ha causato un errore.",
    "service.disabledHandler.action" : "Attiva {name}",
    "service.disabledHandler.headline" : "{name} è disattivato",
+   "service.errorHandler.action" : "Ricarica {name}",
+   "service.errorHandler.editAction" : "Modifica {name}",
+   "service.errorHandler.headline" : "Oh no!",
+   "service.errorHandler.message" : "Errore",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Iniziamo",
    "services.welcome" : "Benvenuto su Franz",
    "settings.account.account.editButton" : "Modifica account",
@@ -120,7 +127,7 @@
    "settings.app.form.autoLaunchInBackground" : "Apri in background",
    "settings.app.form.autoLaunchOnStart" : "Esegui Franz all'avvio",
    "settings.app.form.beta" : "Includi versioni beta",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Unisciti al Lato Oscuro.",
    "settings.app.form.enableGPUAcceleration" : "Attiva Accelerazione GPU",
    "settings.app.form.enableMenuBar" : "Mostra Franz nella Barra del Menu",
    "settings.app.form.enableSpellchecking" : "Attiva controllo ortografico",
@@ -172,7 +179,7 @@
    "settings.service.form.editServiceHeadline" : "Modifica {name}",
    "settings.service.form.enableAudio" : "Attiva audio",
    "settings.service.form.enableBadge" : "Mostra l'etichetta dei messaggi non letti",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Attiva la modalità scura.",
    "settings.service.form.enableNotification" : "Attiva le notifiche",
    "settings.service.form.enableService" : "Attiva il servizio",
    "settings.service.form.headlineBadges" : "Etichetta dei messaggi non letti",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Mostra l'etichetta per tutti i nuovi messaggi",
    "settings.service.form.isMutedInfo" : "Se disattivato, tutte le notifiche sonore e le riproduzioni audio saranno mutate",
    "settings.service.form.name" : "Nome",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
    "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Salva servizio",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hosted",
    "settings.service.form.tabOnPremise" : "Self hosted ⭐️",
    "settings.service.form.team" : "Gruppo",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 57b767ef1..6eea64c3a 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -1,7 +1,9 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.action" : "再読み込み",
+   "app.errorHandler.headline" : "Something went wrong",
+   "feature.delayApp.action" : "Franz サポーターライセンスを購入する",
+   "feature.delayApp.headline" : "Franz をすぐに起動するには、Franz サポーターライセンスを購入してください。",
+   "feature.delayApp.text" : "Franz はあと{seconds}秒後に起動します。",
    "global.api.unhealthy" : "Franzのオンラインサービスに接続できません。",
    "global.notConnectedToTheInternet" : "インターネットに接続されていません。",
    "import.headline" : "Franz 4のサービスをインポートして下さい",
@@ -79,7 +81,7 @@
    "password.noUser" : "このメールアドレスはまだ登録されていません",
    "password.submit.label" : "送信",
    "password.successInfo" : "メールを確認して下さい",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "アカウントをアップグレード",
    "pricing.headline" : "Franzを支援する",
    "pricing.link.skipPayment" : "Franzの開発を支援したくない。",
    "pricing.submit.label" : "Franzの開発を支援したい。",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name}はエラーを起こしました。",
    "service.disabledHandler.action" : "{name}を有効にする",
    "service.disabledHandler.headline" : "{name}は無効です",
+   "service.errorHandler.action" : "{name}を再読み込み",
+   "service.errorHandler.editAction" : "{name}を編集",
+   "service.errorHandler.headline" : "しまった！",
+   "service.errorHandler.message" : "エラー",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "はじめる",
    "services.welcome" : "Franzにようこそ",
    "settings.account.account.editButton" : "アカウントの編集",
@@ -120,7 +127,7 @@
    "settings.app.form.autoLaunchInBackground" : "バックグラウンドで開く",
    "settings.app.form.autoLaunchOnStart" : "システム起動時にFranzを開く",
    "settings.app.form.beta" : "Betaバージョンを含める",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "ダークモードを有効にする",
    "settings.app.form.enableGPUAcceleration" : "GPUアクセラレーションを有効にする",
    "settings.app.form.enableMenuBar" : "メニューバーにFranzを表示する",
    "settings.app.form.enableSpellchecking" : "スペルチェックを有効にする",
@@ -131,7 +138,7 @@
    "settings.app.form.runInBackground" : "ウインドウを閉じた際にFranzをバックグラウンドで実行させておく",
    "settings.app.form.showDisabledServices" : "無効化されたサービスのタブを表示する",
    "settings.app.form.showMessagesBadgesWhenMuted" : "通知の無効時に未読メッセージ件数を表示する",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "スペルチェックする言語",
    "settings.app.headline" : "設定",
    "settings.app.headlineAdvanced" : "詳細",
    "settings.app.headlineAppearance" : "表示スタイル",
@@ -172,7 +179,7 @@
    "settings.service.form.editServiceHeadline" : "{name}を編集",
    "settings.service.form.enableAudio" : "オーディオを有効にする",
    "settings.service.form.enableBadge" : "未読件数の通知バッジを表示する",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "ダークモードを有効にする",
    "settings.service.form.enableNotification" : "通知を有効にする",
    "settings.service.form.enableService" : "サービスを有効にする",
    "settings.service.form.headlineBadges" : "未読件数の通知バッジ",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "すべての新規メッセージについてバッジを表示する",
    "settings.service.form.isMutedInfo" : "無効化されている場合、全ての通知音やオーディオ再生は無音になります",
    "settings.service.form.name" : "サービス名",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
-   "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.host" : "プロキシサーバー\/IP",
+   "settings.service.form.proxy.info" : "プロキシ設定はFranz アカウントで同期されません。",
+   "settings.service.form.proxy.isEnabled" : "プロキシ設定を有効にする",
+   "settings.service.form.proxy.password" : "パスワード（任意）",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.user" : "ユーザー名（任意）",
    "settings.service.form.saveButton" : "サービスの保存",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "ホスト",
    "settings.service.form.tabOnPremise" : "セルフホスト ⭐️",
    "settings.service.form.team" : "チーム",
@@ -234,11 +245,11 @@
    "subscription.features.ads" : "広告は一切ありません!",
    "subscription.features.comingSoon" : "まもなく登場",
    "subscription.features.encryptedSync" : "暗号化されたセッションの同期",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "待ち時間なしでFranz をお使いいただけます",
    "subscription.features.onpremise" : "HipChatのようなオンプレミス\/ホスト型サービスの追加",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.onpremise.mattermost" : "Mattermost のようなオンプレミス（自社運用）型のサービスを追加できるようになります",
+   "subscription.features.proxy" : "プロキシ設定が利用可能",
+   "subscription.features.spellchecker" : "スペルチェック機能をお使いいただけます",
    "subscription.includedFeatures" : "Franz Premium Supporter有料アカウントには以下が含まれます",
    "subscription.paymentSessionError" : "支払いフォームを初期化出来ません",
    "subscription.submit.label" : "Franzの開発を支援したい",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index d521c838a..632ca618e 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "ჩატვირთვა",
+   "app.errorHandler.headline" : "Something went wrong",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} has caused an error.",
    "service.disabledHandler.action" : "Enable {name}",
    "service.disabledHandler.headline" : "{name} is disabled",
+   "service.errorHandler.action" : "Reload {name}",
+   "service.errorHandler.editAction" : "შეასწორე {name}",
+   "service.errorHandler.headline" : "Oh no!",
+   "service.errorHandler.message" : "შეცდომა",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "დაწყება",
    "services.welcome" : "მოგესალმებით Franz-ზე",
    "settings.account.account.editButton" : "ანგარიშის მართვა",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "აჩვენე შეტყობინებების ნიშანი ყოველი ახალი შეტყობინებისთვის",
    "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
    "settings.service.form.name" : "სახელი",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
    "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "სერვისის შენახვა",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "დაჰოსტილი",
    "settings.service.form.tabOnPremise" : "თვით დაჰოსტილი ⭐️",
    "settings.service.form.team" : "გუნდი",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 5807f11f6..c38a7f024 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Herladen",
+   "app.errorHandler.headline" : "Something went wrong",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} heeft een probleem veroorzaakt.",
    "service.disabledHandler.action" : "Activeer {name}",
    "service.disabledHandler.headline" : "{name} is uitgeschakeld",
+   "service.errorHandler.action" : "{naam} herladen",
+   "service.errorHandler.editAction" : "{name} aanpassen",
+   "service.errorHandler.headline" : "Oh nee!",
+   "service.errorHandler.message" : "Fout",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Beginnen",
    "services.welcome" : "Welkom bij Franz",
    "settings.account.account.editButton" : "Bewerk account",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Toon berichten-badge voor alle nieuwe berichten",
    "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
    "settings.service.form.name" : "Naam",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
    "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Service bewaren",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Gehost",
    "settings.service.form.tabOnPremise" : "Intern gehost ⭐️",
    "settings.service.form.team" : "Team",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index a6db3d773..940f24b0b 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -1,7 +1,9 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.action" : "Laad opnieuw",
+   "app.errorHandler.headline" : "Something went wrong",
+   "feature.delayApp.action" : "Sponsor Franz",
+   "feature.delayApp.headline" : "Sponsor Franz om wachten over te slaan",
+   "feature.delayApp.text" : "Franz gaat over {seconds} seconden verder.",
    "global.api.unhealthy" : "Kan geen verbinding maken met de Franz-services",
    "global.notConnectedToTheInternet" : "U bent niet verbonden met het internet.",
    "import.headline" : "Importeer uw Franz 4-services",
@@ -79,7 +81,7 @@
    "password.noUser" : "Geen gebruiker bekend met dat e-mailadres",
    "password.submit.label" : "Verzenden",
    "password.successInfo" : "Controleer alsjeblieft je e-mail",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Upgrade Account",
    "pricing.headline" : "Steun Franz",
    "pricing.link.skipPayment" : "Ik wil de ontwikkeling van Franz niet ondersteunen.",
    "pricing.submit.label" : "Ik wil de ontwikkeling van Franz steunen",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} heeft een fout veroorzaakt.",
    "service.disabledHandler.action" : "Activeer {name}",
    "service.disabledHandler.headline" : "{name} is uitgeschakeld",
+   "service.errorHandler.action" : "Laad {name} opnieuw",
+   "service.errorHandler.editAction" : "Bewerk {name}",
+   "service.errorHandler.headline" : "Oh nee!",
+   "service.errorHandler.message" : "Fout",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Begin",
    "services.welcome" : "Welkom bij Franz",
    "settings.account.account.editButton" : "Bewerk account",
@@ -120,7 +127,7 @@
    "settings.app.form.autoLaunchInBackground" : "Open op de achtergrond",
    "settings.app.form.autoLaunchOnStart" : "Open Franz bij opstarten",
    "settings.app.form.beta" : "Inclusief bètaversies",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Stap over naar de donkere kant",
    "settings.app.form.enableGPUAcceleration" : "Schakel videokaart acceleratie in ",
    "settings.app.form.enableMenuBar" : "Toon Franz in menubalk",
    "settings.app.form.enableSpellchecking" : "Zet spellingcontrole aan",
@@ -131,7 +138,7 @@
    "settings.app.form.runInBackground" : "Houd Franz op de achtergrond wanneer het venster gesloten wordt",
    "settings.app.form.showDisabledServices" : "Toon uitgeschakelde services",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Spelling checken",
    "settings.app.headline" : "Instellingen",
    "settings.app.headlineAdvanced" : "Geavanceerd",
    "settings.app.headlineAppearance" : "Weergave",
@@ -172,7 +179,7 @@
    "settings.service.form.editServiceHeadline" : "Bewerk {name}",
    "settings.service.form.enableAudio" : "Audio inschakelen",
    "settings.service.form.enableBadge" : "Toon badges met ongelezen berichten",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Dark mode aanzetten",
    "settings.service.form.enableNotification" : "Meldingen inschakelen",
    "settings.service.form.enableService" : "Service inschakelen",
    "settings.service.form.headlineBadges" : "Ongelezen berichten badges",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Toon berichtenbadge voor alle nieuwe berichten",
    "settings.service.form.isMutedInfo" : "Indien uitgeschakeld zullen alle meldinggeluiden en afgespeelde audio uitgeschakeld zijn",
    "settings.service.form.name" : "Naam",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.info" : "Proxy instellingen worden niet gesynchroniseerd met de Franz servers",
+   "settings.service.form.proxy.isEnabled" : "Proxy gebruiken",
+   "settings.service.form.proxy.password" : "Wachtwoord (optioneel)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.user" : "Gebruiker (optioneel)",
    "settings.service.form.saveButton" : "Service opslaan",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Gehost",
    "settings.service.form.tabOnPremise" : "Zelf-gehost ⭐️",
    "settings.service.form.team" : "Team",
@@ -234,11 +245,11 @@
    "subscription.features.ads" : "Geen advertenties, nooit!",
    "subscription.features.comingSoon" : "komt binnenkort",
    "subscription.features.encryptedSync" : "Beveiligde sessie synchronisatie",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "Geen haperingen & pop ups over upgrades",
    "subscription.features.onpremise" : "Add on-geschikt\/gehoste services zoals HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.proxy" : "Proxy understeuning voor diensten",
+   "subscription.features.spellchecker" : "Ondersteuning voor spellingscheck",
    "subscription.includedFeatures" : "Betaald Franz Premium Supporter Account bevat",
    "subscription.paymentSessionError" : "Kan betaalformulier niet initialiseren",
    "subscription.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 60ced5933..d45e5ce24 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -1,7 +1,9 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.action" : "Przeładuj",
+   "app.errorHandler.headline" : "Something went wrong",
+   "feature.delayApp.action" : "Uzyskaj licencję Franz Supporter",
+   "feature.delayApp.headline" : "Kup licencję Franz Supporter , aby nie czekać",
+   "feature.delayApp.text" : "Franz będzie kontynuował za {seconds} sekund.",
    "global.api.unhealthy" : "Nie można połączyć się z usługami Franz online",
    "global.notConnectedToTheInternet" : "Nie masz połączenia z Internetem.",
    "import.headline" : "Importuj usługi Franz 4",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} spowodował problem.",
    "service.disabledHandler.action" : "Włącz {name}",
    "service.disabledHandler.headline" : "{name} jest wyłączony",
+   "service.errorHandler.action" : "Przeładuj {name}",
+   "service.errorHandler.editAction" : "Edytuj {name}",
+   "service.errorHandler.headline" : "O nie!",
+   "service.errorHandler.message" : "Błąd",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Zacznij",
    "services.welcome" : "Witaj w programie Franz",
    "settings.account.account.editButton" : "Modyfikuj konta",
@@ -120,7 +127,7 @@
    "settings.app.form.autoLaunchInBackground" : "Otwórz w tle",
    "settings.app.form.autoLaunchOnStart" : "Uruchom Franz na początku",
    "settings.app.form.beta" : "Uwzględnij wersje beta",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Przejdź na Ciemną Stronę",
    "settings.app.form.enableGPUAcceleration" : "Włącz akcelerację GPU",
    "settings.app.form.enableMenuBar" : "Pokaż Franz na pasku menu",
    "settings.app.form.enableSpellchecking" : "Włącz sprawdzanie pisowni",
@@ -131,7 +138,7 @@
    "settings.app.form.runInBackground" : "Zachowaj aplikację Franz w tle po zamknięciu okna",
    "settings.app.form.showDisabledServices" : "Wyłącz wyświetlanie zakładek z usługami",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Język słownika",
    "settings.app.headline" : "Ustawienia",
    "settings.app.headlineAdvanced" : "Zaawansowane",
    "settings.app.headlineAppearance" : "Wygląd",
@@ -172,7 +179,7 @@
    "settings.service.form.editServiceHeadline" : "Edytuj {name}",
    "settings.service.form.enableAudio" : "Włącz dźwięk",
    "settings.service.form.enableBadge" : "Pokaż znacznik nieprzeczytanych wiadomości",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Włącz Ciemny motyw",
    "settings.service.form.enableNotification" : "Aktywuj powiadomienia",
    "settings.service.form.enableService" : "Aktywuj usługę",
    "settings.service.form.headlineBadges" : "Znaczniki nieprzeczytanych wiadomości",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Pokaż ikonę wiadomości dla wszystkich nowych wiadomości",
    "settings.service.form.isMutedInfo" : "Kiedy nieaktywne, wszystkie dźwięki powiadomień są wyciszone",
    "settings.service.form.name" : "Nazwa",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
-   "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.host" : "Host Proxy\/IP",
+   "settings.service.form.proxy.info" : "Ustawienia proxy nie będą zsynchronizowane z serwerami Franza.",
+   "settings.service.form.proxy.isEnabled" : "Użyj Proxy",
+   "settings.service.form.proxy.password" : "Hasło (opcjonalnie)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.user" : "Użytkownik (opcjonalnie)",
    "settings.service.form.saveButton" : "Zapisz usługę",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostowane",
    "settings.service.form.tabOnPremise" : "Hostowane lokalnie ⭐️",
    "settings.service.form.team" : "Zespół",
@@ -237,7 +248,7 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Dodawanie lokalnych\/hostowanych usług takich jak HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.features.proxy" : "Obsługa proxy dla usług",
    "subscription.features.spellchecker" : "Support for spellchecker",
    "subscription.includedFeatures" : "Płatne konto Franz Premium obejmuje",
    "subscription.paymentSessionError" : "Nie można wczytać formularza płatności\"",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 70f6431df..c0cf0039f 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,7 +1,9 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.action" : "Recarregar",
+   "app.errorHandler.headline" : "Something went wrong",
+   "feature.delayApp.action" : "Adquira uma licença Franz Supporter",
+   "feature.delayApp.headline" : "Por favor, adquira uma licença Franz Supporter para pular o tempo de espera",
+   "feature.delayApp.text" : "Franz continuará em {seconds} segundos.",
    "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",
    "import.headline" : "Importe seus serviços do Franz 4 ",
@@ -79,7 +81,7 @@
    "password.noUser" : "Nenhum usuário com este e-mail foi encontrado",
    "password.submit.label" : "Enviar",
    "password.successInfo" : "Por favor, verifique o seu e-mail",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Atualizar conta",
    "pricing.headline" : "Apoie o Franz",
    "pricing.link.skipPayment" : "Eu não quero apoiar o desenvolvimento do Franz.",
    "pricing.submit.label" : "Eu quero apoiar o desenvolvimento do Franz",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} causou um erro.",
    "service.disabledHandler.action" : "Ativar {name}",
    "service.disabledHandler.headline" : "{name} está desativado",
+   "service.errorHandler.action" : "Recarregar {name}",
+   "service.errorHandler.editAction" : "Editar {name}",
+   "service.errorHandler.headline" : "Ah, não!",
+   "service.errorHandler.message" : "Erro",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Iniciar",
    "services.welcome" : "Bem-vindo ao Franz!",
    "settings.account.account.editButton" : "Editar conta",
@@ -120,7 +127,7 @@
    "settings.app.form.autoLaunchInBackground" : "Abrir em segundo plano",
    "settings.app.form.autoLaunchOnStart" : "Abrir o Franz ao iniciar o sistema",
    "settings.app.form.beta" : "Incluir versões beta",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Venha para o Lado Negro da força",
    "settings.app.form.enableGPUAcceleration" : "Ativar Aceleração de GPU",
    "settings.app.form.enableMenuBar" : "Mostrar Franz na Barra de Menu",
    "settings.app.form.enableSpellchecking" : "Ativar correção ortográfica",
@@ -131,7 +138,7 @@
    "settings.app.form.runInBackground" : "Manter o Franz no fundo quando fechar a janela",
    "settings.app.form.showDisabledServices" : "Mostrar abas de serviços desativados",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Mostrar ícone de mensagem não lida quando as notificações estiverem desativadas",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Idioma de verificação ortográfica",
    "settings.app.headline" : "Configurações",
    "settings.app.headlineAdvanced" : "Avançado",
    "settings.app.headlineAppearance" : "Aparência",
@@ -172,7 +179,7 @@
    "settings.service.form.editServiceHeadline" : "Editar {name}",
    "settings.service.form.enableAudio" : "Ativar áudio",
    "settings.service.form.enableBadge" : "Mostrar aviso de mensagens não lidas",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Ativar modo noturno",
    "settings.service.form.enableNotification" : "Ativar notificações",
    "settings.service.form.enableService" : "Ativar serviço",
    "settings.service.form.headlineBadges" : "Mensagens não lidas",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Mostrar avisos para todas as mensagens",
    "settings.service.form.isMutedInfo" : "Quando desativado, as notificações sonoras e áudios ficarão em silêncio",
    "settings.service.form.name" : "Nome",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.info" : "As configurações de proxy não serão sincronizadas com os servidores do Franz.",
+   "settings.service.form.proxy.isEnabled" : "Usar o Proxy",
+   "settings.service.form.proxy.password" : "Senha (opcional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.user" : "Usuário (opcional)",
    "settings.service.form.saveButton" : "Salvar serviço",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hospedado",
    "settings.service.form.tabOnPremise" : "Auto-hospedado ⭐️",
    "settings.service.form.team" : "Equipe",
@@ -237,8 +248,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Adicionar serviços locais\/hospedados como o HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.proxy" : "Suporte de proxy para serviços",
+   "subscription.features.spellchecker" : "Suporte para corretor ortográfico",
    "subscription.includedFeatures" : "A conta Apoiador Franz Premium inclui",
    "subscription.paymentSessionError" : "Não foi possível abrir o formulário de pagamento",
    "subscription.submit.label" : "Eu quero apoiar o desenvolvimento do Franz",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 71978ed6b..80e8094f5 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Recarregar",
+   "app.errorHandler.headline" : "Something went wrong",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} causou um erro.",
    "service.disabledHandler.action" : "Ativar {name}",
    "service.disabledHandler.headline" : "{name} está desativado",
+   "service.errorHandler.action" : "Recarregar {name}",
+   "service.errorHandler.editAction" : "Editar {name}",
+   "service.errorHandler.headline" : "Oh não!",
+   "service.errorHandler.message" : "Erro",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Vamos começar",
    "services.welcome" : "Bem-vindo ao Franz",
    "settings.account.account.editButton" : "Editar conta",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Mostrar o emblema da mensagem para todas as novas mensagens",
    "settings.service.form.isMutedInfo" : "Quando desativado, todos sons e reproduções de áudio serão silenciados",
    "settings.service.form.name" : "Nome",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
    "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Guardar serviço",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Com domínio",
    "settings.service.form.tabOnPremise" : "Com domínio próprio ⭐️",
    "settings.service.form.team" : "Equipa",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 78030dc15..b605afc4d 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Перезагрузить",
+   "app.errorHandler.headline" : "Something went wrong",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} вызвало ошибку.",
    "service.disabledHandler.action" : "Включить {name}",
    "service.disabledHandler.headline" : "{name} выключено",
+   "service.errorHandler.action" : "Перезагрузить {name}",
+   "service.errorHandler.editAction" : "Редактирование {name}",
+   "service.errorHandler.headline" : "О, нет!",
+   "service.errorHandler.message" : "Ошибка",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Начать работу",
    "services.welcome" : "Добро пожаловать во Franz",
    "settings.account.account.editButton" : "Редактировать аккаунт",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Показывать значок уведомлений для всех новых сообщений",
    "settings.service.form.isMutedInfo" : "Когда выключено, все звуковые уведомления будут отключены",
    "settings.service.form.name" : "Название",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
    "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Сохранить сервис",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Размещено",
    "settings.service.form.tabOnPremise" : "Свой хостинг ⭐️",
    "settings.service.form.team" : "Команда",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 70e3e7f2d..ca7335fe9 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Obnoviť",
+   "app.errorHandler.headline" : "Something went wrong",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} spôsobil chybu.",
    "service.disabledHandler.action" : "Zapnúť {name}",
    "service.disabledHandler.headline" : "{name} je vypnuté",
+   "service.errorHandler.action" : "Znovu načítať {name}",
+   "service.errorHandler.editAction" : "Upraviť {name}",
+   "service.errorHandler.headline" : "Ale nie!",
+   "service.errorHandler.message" : "Chyba",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Začíname",
    "services.welcome" : "Vítajte v aplikácii Franz",
    "settings.account.account.editButton" : "Upraviť účet",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Zobraziť symbol správy pre všetky nové správy",
    "settings.service.form.isMutedInfo" : "Ak je vypnuté, všetky zvuky oznámení a iné prehrávania budú stíšené",
    "settings.service.form.name" : "Meno",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
    "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Uložiť službu",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostované",
    "settings.service.form.tabOnPremise" : "Vlastné hostovanie ⭐️",
    "settings.service.form.team" : "Tím",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index dd4c74277..df0b849c4 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Ponovno učitavanje",
+   "app.errorHandler.headline" : "Something went wrong",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{ime} je izazvalo grešku. ",
    "service.disabledHandler.action" : "Omogući {ime} ",
    "service.disabledHandler.headline" : "{ime} je onemogućen\/o",
+   "service.errorHandler.action" : "Osvježi {ime}",
+   "service.errorHandler.editAction" : "Uredite {ime}",
+   "service.errorHandler.headline" : "O, ne! ",
+   "service.errorHandler.message" : "Greška ",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Započnimo! ",
    "services.welcome" : "Dobrodošli u Franz",
    "settings.account.account.editButton" : "Uredi račun",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Prikaži značku na svim novim porukuama",
    "settings.service.form.isMutedInfo" : "Kada je onemogućeno, sve obavijesti, svi zvukovi i sva pozadinska podrška će biti nečujna.",
    "settings.service.form.name" : "Ime",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
    "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Sačuvaj uslugu\/e",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostovano",
    "settings.service.form.tabOnPremise" : "Samo-hostovano ⭐️",
    "settings.service.form.team" : "Tim",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 130b51ddf..9e7619454 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -1,11 +1,13 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.action" : "Yeniden Yükle",
+   "app.errorHandler.headline" : "Something went wrong",
+   "feature.delayApp.action" : "Franz Destek Lisansı'nı alın.",
+   "feature.delayApp.headline" : "Beklememek için Franz Destek Lisansı'nı satın alın.",
+   "feature.delayApp.text" : "Franz {seconds} saniye sonra devam edecek.",
    "global.api.unhealthy" : "Franz hizmetlerine şu anda erişilemiyor.",
    "global.notConnectedToTheInternet" : "İnternete bağlı değilsiniz.",
    "import.headline" : "Franz 4 servislerinizi ekleyin.",
-   "import.notSupportedHeadline" : "Servisler henüz Franz 5'de desteklenmiyor.",
+   "import.notSupportedHeadline" : "Servisler henüz Franz 5'te desteklenmiyor.",
    "import.skip.label" : "Servisleri kendim eklemek istiyorum",
    "import.submit.label" : "Servisleri içe aktar",
    "infobar.buttonChangelog" : "Yeni ne var?",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} bir hataya neden oldu.",
    "service.disabledHandler.action" : "{name} aktif",
    "service.disabledHandler.headline" : "{name} devredışı",
+   "service.errorHandler.action" : "{name} yeniden yükle",
+   "service.errorHandler.editAction" : "{name} düzenle",
+   "service.errorHandler.headline" : "Aman Tanrım hayır!",
+   "service.errorHandler.message" : "Hata",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Haydi başlayalım",
    "services.welcome" : "Franz'a Hoşgeldiniz",
    "settings.account.account.editButton" : "Hesabı düzenle",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Mesaj rozetini tüm yeni mesajlar için göster",
    "settings.service.form.isMutedInfo" : "Devre dışı bırakıldığında, tüm bildirim sesleri sessize alınır",
    "settings.service.form.name" : "İsim",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
    "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Servisi kaydet",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Barındırılan",
    "settings.service.form.tabOnPremise" : "Kendi barındırılan",
    "settings.service.form.team" : "Takım",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 94c6f7e54..7d51b380e 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Перезавантажити",
+   "app.errorHandler.headline" : "Something went wrong",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name} призвів до помилки.",
    "service.disabledHandler.action" : "Увімкнути {name} ",
    "service.disabledHandler.headline" : "{name} вимкнено",
+   "service.errorHandler.action" : "Перезавантажити {name}",
+   "service.errorHandler.editAction" : "Редагувати {name}",
+   "service.errorHandler.headline" : "О, ні!",
+   "service.errorHandler.message" : "Помилка",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "Почати",
    "services.welcome" : "Ласкаво просимо в Franz",
    "settings.account.account.editButton" : "Редагувати акаунт",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "Показувати значок повідомлення для всіх нових повідомлень",
    "settings.service.form.isMutedInfo" : "Коли вимкнено, всі сповищення та відтворення ігноруються",
    "settings.service.form.name" : "Ім'я",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
    "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Зберегти сервіс",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Розміщений",
    "settings.service.form.tabOnPremise" : "Самостійно розміщений ⭐️",
    "settings.service.form.team" : "Команда",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index 23bff247d..cfb1d3dce 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -1,11 +1,13 @@
 {
+   "app.errorHandler.action" : "重新載入",
+   "app.errorHandler.headline" : "有些東西出錯了",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
    "global.api.unhealthy" : "無法連線至Franz的伺服器。",
    "global.notConnectedToTheInternet" : "你沒有連上網路。",
-   "import.headline" : "匯入Franz 4的服務",
-   "import.notSupportedHeadline" : "Franz 5尚未支援此服務",
+   "import.headline" : "匯入 Franz 4 的服務",
+   "import.notSupportedHeadline" : "Franz 5 尚未支援此服務",
    "import.skip.label" : "手動添加服務",
    "import.submit.label" : "匯入服務",
    "infobar.buttonChangelog" : "有什麼新功能呢?",
@@ -79,7 +81,7 @@
    "password.noUser" : "找不到該電子郵件地址的用戶",
    "password.submit.label" : "送出",
    "password.successInfo" : "請檢查您的電子郵件",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "升級帳號",
    "pricing.headline" : "支持Franz",
    "pricing.link.skipPayment" : "我不想支持Franz的開發。",
    "pricing.submit.label" : "我想支持Franz的開發。",
@@ -90,6 +92,11 @@
    "service.crashHandler.text" : "{name}導致了一個錯誤。",
    "service.disabledHandler.action" : "啟用{name}",
    "service.disabledHandler.headline" : "{name}已停用",
+   "service.errorHandler.action" : "重新載入{name}",
+   "service.errorHandler.editAction" : "編輯{名稱}",
+   "service.errorHandler.headline" : "噢不!",
+   "service.errorHandler.message" : "錯誤",
+   "service.errorHandler.text" : "{name} has failed to load.",
    "services.getStarted" : "開始",
    "services.welcome" : "歡迎使用Franz",
    "settings.account.account.editButton" : "編輯帳號",
@@ -131,7 +138,7 @@
    "settings.app.form.runInBackground" : "當關閉視窗時保持Franz在背景運作",
    "settings.app.form.showDisabledServices" : "顯示停用的服務標籤",
    "settings.app.form.showMessagesBadgesWhenMuted" : "當通知關閉時，標記未讀的訊息",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "拼字檢查語言",
    "settings.app.headline" : "設定",
    "settings.app.headlineAdvanced" : "進階",
    "settings.app.headlineAppearance" : "外觀",
@@ -172,7 +179,7 @@
    "settings.service.form.editServiceHeadline" : "編輯{名稱}",
    "settings.service.form.enableAudio" : "啟用音訊",
    "settings.service.form.enableBadge" : "顯示未讀訊息圖示",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "開啟深色模式",
    "settings.service.form.enableNotification" : "啟用通知",
    "settings.service.form.enableService" : "啟用服務",
    "settings.service.form.headlineBadges" : "未讀訊息圖示",
@@ -185,13 +192,17 @@
    "settings.service.form.indirectMessages" : "顯示所有新消息的消息標誌",
    "settings.service.form.isMutedInfo" : "停用時，所有通知聲和聲音播放都將靜音",
    "settings.service.form.name" : "名稱",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.info" : "Proxy 設定不會與 Franz 伺服器同步",
+   "settings.service.form.proxy.isEnabled" : "使用 Proxy",
+   "settings.service.form.proxy.password" : "密碼 (選填)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.user" : "使用者 (選填)",
    "settings.service.form.saveButton" : "保存服務",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "託管",
    "settings.service.form.tabOnPremise" : "自我託管⭐️",
    "settings.service.form.team" : "團隊",
@@ -238,7 +249,7 @@
    "subscription.features.onpremise" : "添加本地\/託管服務如HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.spellchecker" : "支援拼字檢查",
    "subscription.includedFeatures" : "包含高級Franz付費帳戶",
    "subscription.paymentSessionError" : "無法初始化付款表單",
    "subscription.submit.label" : "我想支持Franz的開發",
diff --git a/src/index.js b/src/index.js
index 7f3fe5b44..830166dcf 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,10 +1,14 @@
-import { app, BrowserWindow, shell, ipcMain } from 'electron';
+import {
+  app, BrowserWindow, shell, ipcMain,
+} from 'electron';
 
 import fs from 'fs-extra';
 import path from 'path';
 import windowStateKeeper from 'electron-window-state';
 
-import { isDevMode, isMac, isWindows, isLinux } from './environment';
+import {
+  isDevMode, isMac, isWindows, isLinux,
+} from './environment';
 
 // DEV MODE: Save user data into FranzDev
 if (isDevMode) {
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 588fa75bf..669b02709 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -1,4 +1,6 @@
-import { app, Tray, Menu, systemPreferences, nativeImage } from 'electron';
+import {
+  app, Tray, Menu, systemPreferences, nativeImage,
+} from 'electron';
 import path from 'path';
 
 const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png';
@@ -7,7 +9,9 @@ const INDICATOR_TRAY_UNREAD = 'tray-unread';
 
 export default class TrayIcon {
   trayIcon = null;
+
   indicator = 0;
+
   themeChangeSubscriberId = null;
 
   show() {
@@ -79,7 +83,7 @@ export default class TrayIcon {
     }
 
     return nativeImage.createFromPath(path.join(
-      __dirname, '..', 'assets', 'images', type, platform, `${asset}.${FILE_EXTENSION}`),
-    );
+      __dirname, '..', 'assets', 'images', type, platform, `${asset}.${FILE_EXTENSION}`,
+    ));
   }
 }
diff --git a/src/models/News.js b/src/models/News.js
index caf1d70e5..acacb97dd 100644
--- a/src/models/News.js
+++ b/src/models/News.js
@@ -2,8 +2,11 @@
 
 export default class News {
   id = '';
+
   message = '';
+
   type = 'primary';
+
   sticky = false;
 
   constructor(data) {
diff --git a/src/models/Order.js b/src/models/Order.js
index 0e10b01d6..f7624c627 100644
--- a/src/models/Order.js
+++ b/src/models/Order.js
@@ -1,9 +1,14 @@
 export default class Order {
   id = '';
+
   subscriptionId = '';
+
   name = '';
+
   invoiceUrl = '';
+
   price = '';
+
   date = '';
 
   constructor(data) {
diff --git a/src/models/Plan.js b/src/models/Plan.js
index c7b4a0962..3dedf0d5e 100644
--- a/src/models/Plan.js
+++ b/src/models/Plan.js
@@ -5,6 +5,7 @@ export default class Plan {
     id: '',
     price: 0,
   }
+
   year = {
     id: '',
     price: 0,
diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index 43c44514c..b0d60e75e 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -5,21 +5,33 @@ import path from 'path';
 
 export default class Recipe {
   id = '';
+
   name = '';
+
   description = '';
+
   version = '';
+
   path = '';
 
   serviceURL = '';
 
   hasDirectMessages = true;
+
   hasIndirectMessages = false;
+
   hasNotificationSound = false;
+
   hasTeamId = false;
+
   hasPredefinedUrl = false;
+
   hasCustomUrl = false;
+
   hasHostedOption = false;
+
   urlInputPrefix = '';
+
   urlInputSuffix = '';
 
   message = '';
diff --git a/src/models/RecipePreview.js b/src/models/RecipePreview.js
index 7470d757a..cfb22f860 100644
--- a/src/models/RecipePreview.js
+++ b/src/models/RecipePreview.js
@@ -2,8 +2,12 @@
 
 export default class RecipePreview {
   id = '';
+
   name = '';
-  icon = ''; // TODO: check if this isn't replaced by `icons`
+
+  icon = '';
+
+  // TODO: check if this isn't replaced by `icons`
   featured = false;
 
   constructor(data) {
diff --git a/src/models/Service.js b/src/models/Service.js
index 41180dd76..4cc6102ff 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -2,11 +2,17 @@ import { computed, observable, autorun } from 'mobx';
 import path from 'path';
 import normalizeUrl from 'normalize-url';
 
+const debug = require('debug')('Franz:Service');
+
 export default class Service {
   id = '';
+
   recipe = '';
+
   webview = null;
+
   timer = null;
+
   events = {};
 
   isAttached = false;
@@ -14,22 +20,45 @@ export default class Service {
   @observable isActive = false; // Is current webview active
 
   @observable name = '';
+
   @observable unreadDirectMessageCount = 0;
+
   @observable unreadIndirectMessageCount = 0;
 
   @observable order = 99;
+
   @observable isEnabled = true;
+
   @observable isMuted = false;
+
   @observable team = '';
+
   @observable customUrl = '';
+
   @observable isNotificationEnabled = true;
+
   @observable isBadgeEnabled = true;
+
   @observable isIndirectMessageBadgeEnabled = true;
+
   @observable iconUrl = '';
+
   @observable hasCustomUploadedIcon = false;
+
   @observable hasCrashed = false;
+
   @observable isDarkModeEnabled = false;
 
+  @observable spellcheckerLanguage = null;
+
+  @observable isFirstLoad = true;
+
+  @observable isLoading = true;
+
+  @observable isError = false;
+
+  @observable errorMessage = '';
+
   constructor(data, recipe) {
     if (!data) {
       console.error('Service config not valid');
@@ -71,6 +100,8 @@ export default class Service {
 
     this.proxy = data.proxy !== undefined ? data.proxy : this.proxy;
 
+    this.spellcheckerLanguage = data.spellcheckerLanguage !== undefined ? data.spellcheckerLanguage : this.spellcheckerLanguage;
+
     this.recipe = recipe;
 
     autorun(() => {
@@ -147,9 +178,29 @@ export default class Service {
 
     this.webview.addEventListener('did-start-loading', () => {
       this.hasCrashed = false;
+      this.isLoading = true;
+      this.isError = false;
+    });
+
+    this.webview.addEventListener('did-frame-finish-load', () => {
+      this.isLoading = false;
+
+      if (!this.isError) {
+        this.isFirstLoad = false;
+      }
+    });
+
+    this.webview.addEventListener('did-fail-load', (event) => {
+      debug('Service failed to load', this.name, event);
+      if (event.isMainFrame) {
+        this.isError = true;
+        this.errorMessage = event.errorDescription;
+        this.isLoading = false;
+      }
     });
 
     this.webview.addEventListener('crashed', () => {
+      debug('Service crashed', this.name);
       this.hasCrashed = true;
     });
   }
diff --git a/src/models/User.js b/src/models/User.js
index 3e4aa187d..bec78fc16 100644
--- a/src/models/User.js
+++ b/src/models/User.js
@@ -2,19 +2,34 @@ import { observable } from 'mobx';
 
 export default class User {
   id = null;
+
   @observable email = null;
+
   @observable firstname = null;
+
   @observable lastname = null;
+
   @observable organization = null;
+
   @observable accountType = null;
-  @observable emailIsConfirmed = true; // better assume it's confirmed to avoid noise
+
+  @observable emailIsConfirmed = true;
+
+  // better assume it's confirmed to avoid noise
   @observable subscription = {};
+
   @observable isSubscriptionOwner = false;
+
   @observable isPremium = false;
+
   @observable beta = false;
+
   @observable donor = {};
+
   @observable isDonor = false;
+
   @observable isMiner = false;
+
   @observable locale = false;
 
   constructor(data) {
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 6f156a96d..dd4642d70 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -38,12 +38,15 @@ export default class AppStore extends Store {
   };
 
   @observable healthCheckRequest = new Request(this.api.app, 'health');
+
   @observable getAppCacheSizeRequest = new Request(this.api.local, 'getAppCacheSize');
+
   @observable clearAppCacheRequest = new Request(this.api.local, 'clearAppCache');
 
   @observable autoLaunchOnStart = true;
 
   @observable isOnline = navigator.onLine;
+
   @observable timeOfflineStart;
 
   @observable updateStatus = null;
@@ -150,19 +153,22 @@ export default class AppStore extends Store {
     key(
       '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => {
         this.actions.service.setActiveNext();
-      });
+      },
+    );
 
     // Set active the prev service
     key(
       '⌘+pageup, ctrl+pageup, ⌘+alt+left, ctrl+shift+tab', () => {
         this.actions.service.setActivePrev();
-      });
+      },
+    );
 
     // Global Mute
     key(
       '⌘+shift+m ctrl+shift+m', () => {
         this.actions.app.toggleMuteApp();
-      });
+      },
+    );
 
     this.locale = this._getDefaultLocale();
 
@@ -182,7 +188,9 @@ export default class AppStore extends Store {
   }
 
   // Actions
-  @action _notify({ title, options, notificationId, serviceId = null }) {
+  @action _notify({
+    title, options, notificationId, serviceId = null,
+  }) {
     if (this.stores.settings.all.app.isAppMuted) return;
 
     const notification = new window.Notification(title, options);
diff --git a/src/stores/DictionaryStore.js b/src/stores/DictionaryStore.js
deleted file mode 100644
index b9c5f2abf..000000000
--- a/src/stores/DictionaryStore.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import { observable } from 'mobx';
-import { createDownloader } from 'hunspell-dict-downloader';
-
-import Store from './lib/Store';
-
-import { DICTIONARY_PATH } from '../config';
-
-const debug = require('debug')('Franz:DictionaryStore');
-
-export default class DictionaryStore extends Store {
-  @observable available = []
-  @observable installed = []
-
-  _dictDownloader = null
-
-  constructor(...args) {
-    super(...args);
-
-    this.registerReactions([
-      this._downloadDictForUserLocale.bind(this),
-    ]);
-  }
-
-  async setup() {
-    this._dictDownloader = await createDownloader(DICTIONARY_PATH);
-    debug('dicts', this._dictDownloader);
-
-    this.available = this._dictDownloader.availableDictionaries;
-    this.installed = this._dictDownloader.installedDictionaries;
-
-    if (!this.installed.includes('en-us')) {
-      this._dictDownloader.installDictionary('en-us');
-    }
-  }
-
-  _downloadDictForUserLocale() {
-    const spellcheckerLanguage = this.stores.settings.app.spellcheckerLanguage;
-
-    debug('trying to Downloading dict for', spellcheckerLanguage);
-    if (!this.installed.includes(spellcheckerLanguage) && this.available.includes(spellcheckerLanguage) && spellcheckerLanguage !== 'en-us') {
-      debug('Downloading dict for', spellcheckerLanguage);
-      this._dictDownloader.installDictionary(spellcheckerLanguage);
-    }
-  }
-}
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 10c893d3f..2a0713b6f 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -11,6 +11,7 @@ import { DEFAULT_FEATURES_CONFIG } from '../config';
 
 export default class FeaturesStore extends Store {
   @observable defaultFeaturesRequest = new CachedRequest(this.api.features, 'default');
+
   @observable featuresRequest = new CachedRequest(this.api.features, 'features');
 
   async setup() {
diff --git a/src/stores/GlobalErrorStore.js b/src/stores/GlobalErrorStore.js
index f4b9d7838..90bf751c3 100644
--- a/src/stores/GlobalErrorStore.js
+++ b/src/stores/GlobalErrorStore.js
@@ -4,6 +4,7 @@ import Request from './lib/Request';
 
 export default class GlobalErrorStore extends Store {
   @observable error = null;
+
   @observable response = {};
 
   constructor(...args) {
diff --git a/src/stores/NewsStore.js b/src/stores/NewsStore.js
index e5091834f..6984425df 100644
--- a/src/stores/NewsStore.js
+++ b/src/stores/NewsStore.js
@@ -8,6 +8,7 @@ import { CHECK_INTERVAL } from '../config';
 
 export default class NewsStore extends Store {
   @observable latestNewsRequest = new CachedRequest(this.api.news, 'latest');
+
   @observable hideNewsRequest = new Request(this.api.news, 'hide');
 
   constructor(...args) {
diff --git a/src/stores/PaymentStore.js b/src/stores/PaymentStore.js
index 9e348d14e..4cabee194 100644
--- a/src/stores/PaymentStore.js
+++ b/src/stores/PaymentStore.js
@@ -7,8 +7,11 @@ import { gaEvent } from '../lib/analytics';
 
 export default class PaymentStore extends Store {
   @observable plansRequest = new CachedRequest(this.api.payment, 'plans');
+
   @observable createHostedPageRequest = new Request(this.api.payment, 'getHostedPage');
+
   @observable createDashboardUrlRequest = new Request(this.api.payment, 'getDashboardUrl');
+
   @observable ordersDataRequest = new CachedRequest(this.api.payment, 'getOrders');
 
   constructor(...args) {
diff --git a/src/stores/RecipePreviewsStore.js b/src/stores/RecipePreviewsStore.js
index e25936f15..10b2928e3 100644
--- a/src/stores/RecipePreviewsStore.js
+++ b/src/stores/RecipePreviewsStore.js
@@ -8,7 +8,9 @@ import { gaEvent } from '../lib/analytics';
 
 export default class RecipePreviewsStore extends Store {
   @observable allRecipePreviewsRequest = new CachedRequest(this.api.recipePreviews, 'all');
+
   @observable featuredRecipePreviewsRequest = new CachedRequest(this.api.recipePreviews, 'featured');
+
   @observable searchRecipePreviewsRequest = new Request(this.api.recipePreviews, 'search');
 
   constructor(...args) {
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index f2480bc8e..ab64bf79c 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -9,7 +9,9 @@ const debug = require('debug')('Franz:RecipeStore');
 
 export default class RecipesStore extends Store {
   @observable allRecipesRequest = new CachedRequest(this.api.recipes, 'all');
+
   @observable installRecipeRequest = new Request(this.api.recipes, 'install');
+
   @observable getRecipeUpdatesRequest = new Request(this.api.recipes, 'update');
 
   constructor(...args) {
diff --git a/src/stores/RequestStore.js b/src/stores/RequestStore.js
index bbfe6f6df..2629e0a38 100644
--- a/src/stores/RequestStore.js
+++ b/src/stores/RequestStore.js
@@ -6,10 +6,13 @@ const debug = require('debug')('Franz:RequestsStore');
 
 export default class RequestStore extends Store {
   @observable userInfoRequest;
+
   @observable servicesRequest;
+
   @observable showRequiredRequestsError = false;
 
   retries = 0;
+
   retryDelay = 2000;
 
   constructor(...args) {
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 99b091589..5b70ca271 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -1,4 +1,6 @@
-import { action, reaction, computed, observable } from 'mobx';
+import {
+  action, reaction, computed, observable,
+} from 'mobx';
 import { debounce, remove } from 'lodash';
 
 import Store from './lib/Store';
@@ -11,10 +13,15 @@ const debug = require('debug')('Franz:ServiceStore');
 
 export default class ServicesStore extends Store {
   @observable allServicesRequest = new CachedRequest(this.api.services, 'all');
+
   @observable createServiceRequest = new Request(this.api.services, 'create');
+
   @observable updateServiceRequest = new Request(this.api.services, 'update');
+
   @observable reorderServicesRequest = new Request(this.api.services, 'reorder');
+
   @observable deleteServiceRequest = new Request(this.api.services, 'delete');
+
   @observable clearCacheRequest = new Request(this.api.services, 'clearCache');
 
   @observable filterNeedle = null;
@@ -400,6 +407,18 @@ export default class ServicesStore extends Store {
       const url = args[0];
 
       this.actions.app.openExternalUrl({ url });
+    } else if (channel === 'set-service-spellchecker-language') {
+      if (!args) {
+        console.warn('Did not receive locale');
+      } else {
+        this.actions.service.updateService({
+          serviceId,
+          serviceData: {
+            spellcheckerLanguage: args[0] === 'reset' ? '' : args[0],
+          },
+          redirect: false,
+        });
+      }
     }
   }
 
@@ -625,7 +644,7 @@ export default class ServicesStore extends Store {
     const service = this.one(serviceId);
 
     if (service.webview) {
-      service.webview.send('initializeRecipe', service);
+      service.webview.send('initialize-recipe', service);
     }
   }
 
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 4c01e9910..a456195bf 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,5 +1,7 @@
 import { ipcRenderer } from 'electron';
-import { action, computed, observable } from 'mobx';
+import {
+  action, computed, observable, set,
+} from 'mobx';
 import localStorage from 'mobx-localstorage';
 
 import Store from './lib/Store';
@@ -14,11 +16,13 @@ const debug = require('debug')('Franz:SettingsStore');
 
 export default class SettingsStore extends Store {
   @observable appSettingsRequest = new CachedRequest(this.api.local, 'getAppSettings');
+
   @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings');
 
-  @observable fileSystemSettingsRequests = [];
+  fileSystemSettingsRequests = [];
 
   fileSystemSettingsTypes = FILE_SYSTEM_SETTINGS_TYPES;
+
   @observable _fileSystemSettingsCache = {
     app: DEFAULT_APP_SETTINGS,
     proxy: {},
@@ -57,6 +61,21 @@ export default class SettingsStore extends Store {
   }
 
   @computed get proxy() {
+    // // We need to provide the final data structure as mobx autoruns won't work
+    // const proxySettings = observable({});
+    // this.stores.services.all.forEach((service) => {
+    //   proxySettings[service.id] = {
+    //     isEnabled: false,
+    //     host: null,
+    //     user: null,
+    //     password: null,
+    //   };
+    // });
+
+    // debug('this._fileSystemSettingsCache.proxy', this._fileSystemSettingsCache.proxy, proxySettings);
+
+    // return Object.assign(proxySettings, this._fileSystemSettingsCache.proxy);
+
     return this._fileSystemSettingsCache.proxy || {};
   }
 
@@ -98,7 +117,7 @@ export default class SettingsStore extends Store {
         data,
       });
 
-      Object.assign(this._fileSystemSettingsCache[type], data);
+      set(this._fileSystemSettingsCache[type], data);
     }
   }
 
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 26ac2c60e..7addb5760 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -14,29 +14,47 @@ const debug = require('debug')('Franz:UserStore');
 // TODO: split stores into UserStore and AuthStore
 export default class UserStore extends Store {
   BASE_ROUTE = '/auth';
+
   WELCOME_ROUTE = `${this.BASE_ROUTE}/welcome`;
+
   LOGIN_ROUTE = `${this.BASE_ROUTE}/login`;
+
   LOGOUT_ROUTE = `${this.BASE_ROUTE}/logout`;
+
   SIGNUP_ROUTE = `${this.BASE_ROUTE}/signup`;
+
   PRICING_ROUTE = `${this.BASE_ROUTE}/signup/pricing`;
+
   IMPORT_ROUTE = `${this.BASE_ROUTE}/signup/import`;
+
   INVITE_ROUTE = `${this.BASE_ROUTE}/signup/invite`;
+
   PASSWORD_ROUTE = `${this.BASE_ROUTE}/password`;
 
   @observable loginRequest = new Request(this.api.user, 'login');
+
   @observable signupRequest = new Request(this.api.user, 'signup');
+
   @observable passwordRequest = new Request(this.api.user, 'password');
+
   @observable inviteRequest = new Request(this.api.user, 'invite');
+
   @observable getUserInfoRequest = new CachedRequest(this.api.user, 'getInfo');
+
   @observable updateUserInfoRequest = new Request(this.api.user, 'updateInfo');
+
   @observable getLegacyServicesRequest = new CachedRequest(this.api.user, 'getLegacyServices');
+
   @observable deleteAccountRequest = new CachedRequest(this.api.user, 'delete');
 
   @observable isImportLegacyServicesExecuting = false;
+
   @observable isImportLegacyServicesCompleted = false;
 
   @observable id;
+
   @observable authToken = localStorage.getItem('authToken') || null;
+
   @observable accountType;
 
   @observable hasCompletedSignup = null;
@@ -48,6 +66,7 @@ export default class UserStore extends Store {
   logoutReasonTypes = {
     SERVER: 'SERVER',
   };
+
   @observable logoutReason = null;
 
   constructor(...args) {
@@ -141,7 +160,9 @@ export default class UserStore extends Store {
     gaEvent('User', 'login');
   }
 
-  @action async _signup({ firstname, lastname, email, password, accountType, company }) {
+  @action async _signup({
+    firstname, lastname, email, password, accountType, company,
+  }) {
     const authToken = await this.signupRequest.execute({
       firstname,
       lastname,
@@ -198,10 +219,11 @@ export default class UserStore extends Store {
   }
 
   @action _logout() {
+    // workaround mobx issue
     localStorage.removeItem('authToken');
+    window.localStorage.removeItem('authToken');
     this.getUserInfoRequest.invalidate().reset();
     this.authToken = null;
-    // this.data = {};
   }
 
   @action async _importLegacyServices({ services }) {
diff --git a/src/stores/index.js b/src/stores/index.js
index f547d0a7a..96b844c95 100644
--- a/src/stores/index.js
+++ b/src/stores/index.js
@@ -9,7 +9,6 @@ import UIStore from './UIStore';
 import PaymentStore from './PaymentStore';
 import NewsStore from './NewsStore';
 import RequestStore from './RequestStore';
-import DictionaryStore from './DictionaryStore';
 import GlobalErrorStore from './GlobalErrorStore';
 
 export default (api, actions, router) => {
@@ -27,7 +26,6 @@ export default (api, actions, router) => {
     payment: new PaymentStore(stores, api, actions),
     news: new NewsStore(stores, api, actions),
     requests: new RequestStore(stores, api, actions),
-    dictionary: new DictionaryStore(stores, api, actions),
     globalError: new GlobalErrorStore(stores, api, actions),
   });
   // Initialize all stores
diff --git a/src/stores/lib/CachedRequest.js b/src/stores/lib/CachedRequest.js
index c0c3d40a1..ac8b2bd81 100644
--- a/src/stores/lib/CachedRequest.js
+++ b/src/stores/lib/CachedRequest.js
@@ -5,6 +5,7 @@ import Request from './Request';
 
 export default class CachedRequest extends Request {
   _apiCalls = [];
+
   _isInvalidated = true;
 
   execute(...callArgs) {
diff --git a/src/stores/lib/Reaction.js b/src/stores/lib/Reaction.js
index e9bc26d81..46aa4dae6 100644
--- a/src/stores/lib/Reaction.js
+++ b/src/stores/lib/Reaction.js
@@ -3,7 +3,9 @@ import { autorun } from 'mobx';
 
 export default class Reaction {
   reaction;
+
   hasBeenStarted;
+
   dispose;
 
   constructor(reaction) {
diff --git a/src/stores/lib/Request.js b/src/stores/lib/Request.js
index 4a6925cc5..04f528156 100644
--- a/src/stores/lib/Request.js
+++ b/src/stores/lib/Request.js
@@ -9,15 +9,23 @@ export default class Request {
   }
 
   @observable result = null;
+
   @observable error = null;
+
   @observable isExecuting = false;
+
   @observable isError = false;
+
   @observable wasExecuted = false;
 
   _promise = Promise;
+
   _api = {};
+
   _method = '';
+
   _isWaitingForResponse = false;
+
   _currentApiCall = null;
 
   constructor(api, method) {
diff --git a/src/stores/lib/Store.js b/src/stores/lib/Store.js
index 873da7b37..8d2fb4066 100644
--- a/src/stores/lib/Store.js
+++ b/src/stores/lib/Store.js
@@ -3,16 +3,20 @@ import Reaction from './Reaction';
 
 export default class Store {
   stores = {};
+
   api = {};
+
   actions = {};
 
   _reactions = [];
 
   // status implementation
   @observable _status = null;
+
   @computed get actionStatus() {
     return this._status || [];
   }
+
   set actionStatus(status) {
     this._status = status;
   }
diff --git a/src/styles/auth.scss b/src/styles/auth.scss
index 54e264dc6..817801982 100644
--- a/src/styles/auth.scss
+++ b/src/styles/auth.scss
@@ -33,17 +33,9 @@
 
   .auth__layout {
     width: 100%;
-
-    & > div {
-      align-items: center;
-      display: flex;
-      justify-content: center;
-
-      & > span {
-        position: absolute;
-        width: 100%;
-      }
-    }
+    display: flex;
+    align-items: center;
+    justify-content: center;
   }
 
   .auth__container {
diff --git a/src/styles/content-tabs.scss b/src/styles/content-tabs.scss
index ca3820fb4..03befedcb 100644
--- a/src/styles/content-tabs.scss
+++ b/src/styles/content-tabs.scss
@@ -1,5 +1,21 @@
 @import './config.scss';
 
+.theme__dark {
+  .content-tabs {
+    .content-tabs__content {
+      background: $dark-theme-gray-darker;
+    }
+
+    .content-tabs__tabs {
+      .content-tabs__item {
+        background: $dark-theme-gray;
+        color: #FFF;
+        border: 0;
+      }
+    }
+  }
+}
+
 .content-tabs {
   .content-tabs__tabs {
     border-top-left-radius: $theme-border-radius-small;
diff --git a/src/styles/searchInput.scss b/src/styles/searchInput.scss
index 32b9da065..91453c600 100644
--- a/src/styles/searchInput.scss
+++ b/src/styles/searchInput.scss
@@ -22,6 +22,10 @@
   padding: 5px 10px;
   width: 100%;
 
+  label {
+    width: 100%;
+  }
+
   input {
     background: none;
     border: 0;
diff --git a/src/styles/select.scss b/src/styles/select.scss
index ed0fc0fc2..513975f9c 100644
--- a/src/styles/select.scss
+++ b/src/styles/select.scss
@@ -20,4 +20,8 @@ $toggle: "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj
   min-width: 200px;
   padding: 10px;
   -webkit-appearance: none;
+
+  &[disabled] {
+    opacity: 0.5;
+  }
 }
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index f94ca114d..750b6bedd 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -216,6 +216,10 @@
         letter-spacing: -0.1px;
       }
     }
+
+    .proxyHost {
+      flex-basis: 70%;
+    }
   }
 
   .settings__close {
diff --git a/src/styles/welcome.scss b/src/styles/welcome.scss
index b3d6515b1..b517431f0 100644
--- a/src/styles/welcome.scss
+++ b/src/styles/welcome.scss
@@ -1,9 +1,12 @@
 .auth .welcome {
+  height: auto;
+  
   &__content {
     align-items: center;
     color: #FFF;
     display: flex;
     justify-content: center;
+    height: auto;
   }
 
   &__logo { width: 100px; }
@@ -37,6 +40,7 @@
     display: block;
     margin-top: 100px;
     text-align: center;
+    height: auto;
 
     .button:first-of-type { margin-right: 25px; }
   }
@@ -71,6 +75,7 @@
     padding: 20px 20px 5px;
     text-align: center;
     width: 480px;
+    height: auto;
   }
 
   &__featured-service {
diff --git a/src/theme/dark/index.js b/src/theme/dark/index.js
index 496a51119..fb1713184 100644
--- a/src/theme/dark/index.js
+++ b/src/theme/dark/index.js
@@ -1,6 +1,13 @@
+import hexToRgba from 'hex-to-rgba';
+
 import * as legacyStyles from '../default/legacy';
 
 export const colorBackground = legacyStyles.darkThemeGrayDarkest;
 export const colorBackgroundSubscriptionContainer = legacyStyles.themeBrandInfo;
 
 export const colorHeadline = legacyStyles.darkThemeTextColor;
+export const colorText = legacyStyles.darkThemeTextColor;
+
+// Loader
+export const colorFullscreenLoaderSpinner = '#FFF';
+export const colorWebviewLoaderBackground = hexToRgba(legacyStyles.darkThemeGrayDarkest, 0.5);
diff --git a/src/theme/default/index.js b/src/theme/default/index.js
index 8766fb609..37827621c 100644
--- a/src/theme/default/index.js
+++ b/src/theme/default/index.js
@@ -1,3 +1,5 @@
+import hexToRgba from 'hex-to-rgba';
+
 import * as legacyStyles from './legacy';
 
 export const brandPrimary = '#3498db';
@@ -12,6 +14,8 @@ export const borderRadiusSmall = legacyStyles.themeBorderRadiusSmall;
 export const colorBackground = legacyStyles.themeGrayLighter;
 export const colorHeadline = legacyStyles.themeGrayDark;
 
+export const colorText = legacyStyles.themeTextColor;
+
 // Subscription Container Component
 export const colorSubscriptionContainerBackground = 'none';
 export const colorSubscriptionContainerBorder = [1, 'solid', brandPrimary];
@@ -19,3 +23,7 @@ export const colorSubscriptionContainerTitle = brandPrimary;
 export const colorSubscriptionContainerActionButtonBackground = brandPrimary;
 export const colorSubscriptionContainerActionButtonColor = '#FFF';
 
+// Loader
+export const colorAppLoaderSpinner = '#FFF';
+export const colorFullscreenLoaderSpinner = legacyStyles.themeGrayDark;
+export const colorWebviewLoaderBackground = hexToRgba(legacyStyles.themeGrayLighter, 0.8);
diff --git a/src/webview/contextMenu.js b/src/webview/contextMenu.js
index ad156128c..bd099987d 100644
--- a/src/webview/contextMenu.js
+++ b/src/webview/contextMenu.js
@@ -1,9 +1,12 @@
 // This is heavily based on https://github.com/sindresorhus/electron-context-menu
 // ❤ @sindresorhus
 
-import { clipboard, remote, ipcRenderer, shell } from 'electron';
+import {
+  clipboard, remote, ipcRenderer, shell,
+} from 'electron';
 
 import { isDevMode, isMac } from '../environment';
+import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 
 const debug = require('debug')('Franz:contextMenu');
 
@@ -21,7 +24,7 @@ function delUnusedElements(menuTpl) {
   });
 }
 
-const buildMenuTpl = (props, suggestions) => {
+const buildMenuTpl = (props, suggestions, isSpellcheckEnabled, defaultSpellcheckerLanguage, spellcheckerLanguage) => {
   const { editFlags } = props;
   const textSelection = props.selectionText.trim();
   const hasText = textSelection.length > 0;
@@ -190,6 +193,54 @@ const buildMenuTpl = (props, suggestions) => {
     });
   }
 
+  const spellcheckingLanguages = [];
+  Object.keys(SPELLCHECKER_LOCALES).sort(Intl.Collator().compare).forEach((key) => {
+    spellcheckingLanguages.push({
+      id: `lang-${key}`,
+      label: SPELLCHECKER_LOCALES[key],
+      type: 'radio',
+      checked: spellcheckerLanguage === key,
+      click() {
+        debug('Setting service spellchecker to', key);
+        ipcRenderer.sendToHost('set-service-spellchecker-language', key);
+      },
+    });
+  });
+
+  console.log('isSpellcheckEnabled', isSpellcheckEnabled);
+
+  menuTpl.push({
+    type: 'separator',
+  }, {
+    id: 'spellchecker',
+    label: 'Spell Checking',
+    visible: isSpellcheckEnabled,
+    submenu: [
+      {
+        id: 'spellchecker',
+        label: 'Available Languages',
+        enabled: false,
+      }, {
+        type: 'separator',
+      },
+      {
+        id: 'resetToDefault',
+        label: `Reset to system default (${SPELLCHECKER_LOCALES[defaultSpellcheckerLanguage]})`,
+        type: 'radio',
+        visible: defaultSpellcheckerLanguage !== spellcheckerLanguage,
+        click() {
+          debug('Resetting service spellchecker to system default');
+          ipcRenderer.sendToHost('set-service-spellchecker-language', 'reset');
+        },
+      },
+      {
+        type: 'separator',
+        visible: defaultSpellcheckerLanguage !== spellcheckerLanguage,
+      },
+      ...spellcheckingLanguages],
+  });
+
+
   if (isDevMode) {
     menuTpl.push({
       type: 'separator',
@@ -205,7 +256,7 @@ const buildMenuTpl = (props, suggestions) => {
   return delUnusedElements(menuTpl);
 };
 
-export default function contextMenu(spellcheckProvider) {
+export default function contextMenu(spellcheckProvider, isSpellcheckEnabled, getDefaultSpellcheckerLanguage, getSpellcheckerLanguage) {
   webContents.on('context-menu', (e, props) => {
     e.preventDefault();
 
@@ -216,7 +267,15 @@ export default function contextMenu(spellcheckProvider) {
       debug('Suggestions', suggestions);
     }
 
-    const menu = Menu.buildFromTemplate(buildMenuTpl(props, suggestions.slice(0, 5)));
+    const menu = Menu.buildFromTemplate(
+      buildMenuTpl(
+        props,
+        suggestions.slice(0, 5),
+        isSpellcheckEnabled(),
+        getDefaultSpellcheckerLanguage(),
+        getSpellcheckerLanguage(),
+      ),
+    );
 
     menu.popup(remote.getCurrentWindow());
   });
diff --git a/src/webview/darkmode.js b/src/webview/darkmode.js
index 9830ef33c..73c7007c6 100644
--- a/src/webview/darkmode.js
+++ b/src/webview/darkmode.js
@@ -1,7 +1,13 @@
+/* eslint no-bitwise: ["error", { "int32Hint": true }] */
+
 import path from 'path';
 import fs from 'fs-extra';
 
-const ID = 'franz-theme-dark-mode';
+const debug = require('debug')('Franz:DarkMode');
+
+const chars = [...'abcdefghijklmnopqrstuvwxyz'];
+
+const ID = [...Array(20)].map(() => chars[Math.random() * chars.length | 0]).join``;
 
 export function injectDarkModeStyle(recipePath) {
   const darkModeStyle = path.join(recipePath, 'darkmode.css');
@@ -12,6 +18,8 @@ export function injectDarkModeStyle(recipePath) {
     styles.innerHTML = data.toString();
 
     document.querySelector('head').appendChild(styles);
+
+    debug('Injected Dark Mode style with ID', ID);
   }
 }
 
@@ -20,6 +28,8 @@ export function removeDarkModeStyle() {
 
   if (style) {
     style.remove();
+
+    debug('Removed Dark Mode Style with ID', ID);
   }
 }
 
diff --git a/src/webview/notifications.js b/src/webview/notifications.js
index 2020bbdc6..f8fe53e1b 100644
--- a/src/webview/notifications.js
+++ b/src/webview/notifications.js
@@ -1,10 +1,13 @@
-const { ipcRenderer } = require('electron');
-const uuidV1 = require('uuid/v1');
+import { ipcRenderer } from 'electron';
+import uuidV1 from 'uuid/v1';
+
+const debug = require('debug')('Franz:Notifications');
 
 class Notification {
   static permission = 'granted';
 
   constructor(title = '', options = {}) {
+    debug('New notification', title, options);
     this.title = title;
     this.options = options;
     this.notificationId = uuidV1();
diff --git a/src/webview/plugin.js b/src/webview/plugin.js
deleted file mode 100644
index 72530733d..000000000
--- a/src/webview/plugin.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import { ipcRenderer } from 'electron';
-import path from 'path';
-
-import RecipeWebview from './lib/RecipeWebview';
-
-import spellchecker, { switchDict, disable as disableSpellchecker } from './spellchecker';
-import { injectDarkModeStyle, isDarkModeStyleInjected, removeDarkModeStyle } from './darkmode';
-import contextMenu from './contextMenu';
-import './notifications';
-
-const debug = require('debug')('Franz:Plugin');
-
-window.franzSettings = {};
-let serviceData;
-
-ipcRenderer.on('initializeRecipe', (e, data) => {
-  const modulePath = path.join(data.recipe.path, 'webview.js');
-  // Delete module from cache
-  delete require.cache[require.resolve(modulePath)];
-  try {
-    // eslint-disable-next-line
-    require(modulePath)(new RecipeWebview(), data);
-    debug('Initialize Recipe', data);
-
-    serviceData = data;
-
-    if (data.isDarkModeEnabled) {
-      injectDarkModeStyle(data.recipe.path);
-      debug('Add dark theme styles');
-    }
-  } catch (err) {
-    debug('Recipe initialization failed', err);
-  }
-});
-
-// Needs to run asap to intialize dictionaries
-(async () => {
-  const spellcheckingProvider = await spellchecker();
-  contextMenu(spellcheckingProvider);
-})();
-
-ipcRenderer.on('settings-update', async (e, data) => {
-  debug('Settings update received', data);
-
-  if (data.enableSpellchecking) {
-    switchDict(data.spellcheckerLanguage);
-  } else {
-    disableSpellchecker();
-  }
-
-  window.franzSettings = data;
-});
-
-ipcRenderer.on('service-settings-update', (e, data) => {
-  debug('Service settings update received', data);
-
-  if (data.isDarkModeEnabled && !isDarkModeStyleInjected()) {
-    injectDarkModeStyle(serviceData.recipe.path);
-
-    debug('Enable service dark mode');
-  } else if (!data.isDarkModeEnabled && isDarkModeStyleInjected()) {
-    removeDarkModeStyle();
-
-    debug('Disable service dark mode');
-  }
-});
-
-// Needed for current implementation of electrons 'login' event 🤦‍
-ipcRenderer.on('get-service-id', (event) => {
-  debug('Asking for service id', event);
-
-  event.sender.send('service-id', serviceData.id);
-});
-
-
-document.addEventListener('DOMContentLoaded', () => {
-  ipcRenderer.sendToHost('hello');
-}, false);
-
-// Patching window.open
-const originalWindowOpen = window.open;
-
-window.open = (url, frameName, features) => {
-  // We need to differentiate if the link should be opened in a popup or in the systems default browser
-  if (!frameName && !features) {
-    return ipcRenderer.sendToHost('new-window', url);
-  }
-
-  return originalWindowOpen(url, frameName, features);
-};
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
new file mode 100644
index 000000000..944883899
--- /dev/null
+++ b/src/webview/recipe.js
@@ -0,0 +1,131 @@
+import { ipcRenderer } from 'electron';
+import path from 'path';
+import { autorun, computed, observable } from 'mobx';
+
+import RecipeWebview from './lib/RecipeWebview';
+
+import spellchecker, { switchDict, disable as disableSpellchecker } from './spellchecker';
+import { injectDarkModeStyle, isDarkModeStyleInjected, removeDarkModeStyle } from './darkmode';
+import contextMenu from './contextMenu';
+import './notifications';
+
+import { DEFAULT_APP_SETTINGS } from '../config';
+
+const debug = require('debug')('Franz:Plugin');
+
+class RecipeController {
+  @observable settings = {
+    overrideSpellcheckerLanguage: false,
+    app: DEFAULT_APP_SETTINGS,
+    service: {
+      isDarkModeEnabled: false,
+      spellcheckerLanguage: '',
+    },
+  };
+
+  spellcheckProvider = null;
+
+  ipcEvents = {
+    'initialize-recipe': 'loadRecipeModule',
+    'settings-update': 'updateAppSettings',
+    'service-settings-update': 'updateServiceSettings',
+    'get-service-id': 'serviceIdEcho',
+  }
+
+  constructor() {
+    this.initialize();
+  }
+
+  @computed get spellcheckerLanguage() {
+    return this.settings.service.spellcheckerLanguage || this.settings.app.spellcheckerLanguage;
+  }
+
+  async initialize() {
+    Object.keys(this.ipcEvents).forEach((channel) => {
+      ipcRenderer.on(channel, (event, data) => {
+        debug('Received IPC event for channel', channel, 'with', data);
+        this[this.ipcEvents[channel]](event, data);
+      });
+    });
+
+    debug('Send "hello" to host');
+    setTimeout(() => ipcRenderer.sendToHost('hello'), 100);
+
+    this.spellcheckingProvider = await spellchecker();
+    contextMenu(
+      this.spellcheckingProvider,
+      () => this.settings.app.enableSpellchecking,
+      () => this.settings.app.spellcheckerLanguage,
+      () => this.spellcheckerLanguage,
+    );
+
+    autorun(() => this.update());
+  }
+
+  loadRecipeModule(event, data) {
+    debug('loadRecipeModule');
+    const modulePath = path.join(data.recipe.path, 'webview.js');
+    // Delete module from cache
+    delete require.cache[require.resolve(modulePath)];
+    try {
+      // eslint-disable-next-line
+      require(modulePath)(new RecipeWebview(), data);
+      debug('Initialize Recipe', data);
+
+      this.settings.service = data;
+    } catch (err) {
+      console.error('Recipe initialization failed', err);
+    }
+  }
+
+  update() {
+    debug('enableSpellchecking', this.settings.app.enableSpellchecking);
+    debug('isDarkModeEnabled', this.settings.service.isDarkModeEnabled);
+    debug('System spellcheckerLanguage', this.settings.app.spellcheckerLanguage);
+    debug('Service spellcheckerLanguage', this.settings.service.spellcheckerLanguage);
+
+    if (this.settings.app.enableSpellchecking) {
+      debug('Setting spellchecker language to', this.spellcheckerLanguage);
+      switchDict(this.spellcheckerLanguage);
+    } else {
+      debug('Disable spellchecker');
+      disableSpellchecker();
+    }
+
+    if (this.settings.service.isDarkModeEnabled) {
+      debug('Enable dark mode');
+      injectDarkModeStyle(this.settings.service.recipe.path);
+    } else if (isDarkModeStyleInjected()) {
+      debug('Remove dark mode');
+      removeDarkModeStyle();
+    }
+  }
+
+  updateAppSettings(event, data) {
+    this.settings.app = Object.assign(this.settings.app, data);
+  }
+
+  updateServiceSettings(event, data) {
+    this.settings.service = Object.assign(this.settings.service, data);
+  }
+
+  serviceIdEcho(event) {
+    event.sender.send('service-id', this.settings.service.id);
+  }
+}
+
+/* eslint-disable no-new */
+new RecipeController();
+/* eslint-enable no-new */
+
+// Patching window.open
+const originalWindowOpen = window.open;
+
+window.open = (url, frameName, features) => {
+  // We need to differentiate if the link should be opened in a popup or in the systems default browser
+  if (!frameName && !features) {
+    return ipcRenderer.sendToHost('new-window', url);
+  }
+
+  return originalWindowOpen(url, frameName, features);
+};
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index b0192b7ef..becaed449 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -1,7 +1,6 @@
 import { webFrame } from 'electron';
-import fs from 'fs';
-import path from 'path';
 import { SpellCheckerProvider } from 'electron-hunspell';
+import path from 'path';
 
 import { DICTIONARY_PATH } from '../config';
 
@@ -11,18 +10,13 @@ let provider;
 let currentDict;
 let _isEnabled = false;
 
-async function loadDictionaries() {
-  const rawList = fs.readdirSync(DICTIONARY_PATH);
-
-  const dicts = rawList.filter(item => !item.startsWith('.') && fs.lstatSync(path.join(DICTIONARY_PATH, item)).isDirectory());
-
-  debug('Found dictionaries', dicts);
-
-  for (let i = 0; i < dicts.length; i += 1) {
-    const fileLocation = `${DICTIONARY_PATH}/${dicts[i]}/${dicts[i]}`;
-    debug('Trying to load', fileLocation);
-    // eslint-disable-next-line
-    await provider.loadDictionary(dicts[i], `${fileLocation}.dic`, `${fileLocation}.aff`);
+async function loadDictionary(locale) {
+  try {
+    const fileLocation = path.join(DICTIONARY_PATH, `hunspell-dict-${locale}/${locale}`);
+    await provider.loadDictionary(locale, `${fileLocation}.dic`, `${fileLocation}.aff`);
+    debug('Loaded dictionary', locale, 'from', fileLocation);
+  } catch (err) {
+    console.error('Could not load dictionary', err);
   }
 }
 
@@ -30,12 +24,6 @@ export async function switchDict(locale) {
   try {
     debug('Trying to load dictionary', locale);
 
-    if (!provider.availableDictionaries.includes(locale)) {
-      console.warn('Dict not available', locale);
-
-      return;
-    }
-
     if (!provider) {
       console.warn('SpellcheckProvider not initialized');
 
@@ -48,6 +36,10 @@ export async function switchDict(locale) {
       return;
     }
 
+    if (currentDict) {
+      provider.unloadDictionary(locale);
+    }
+    loadDictionary(locale);
     provider.switchDictionary(locale);
 
     debug('Switched dictionary to', locale);
@@ -66,7 +58,7 @@ export default async function initialize(languageCode = 'en-us') {
 
     debug('Init spellchecker');
     await provider.initialize();
-    await loadDictionaries();
+    // await loadDictionaries();
 
     debug('Available spellchecker dictionaries', provider.availableDictionaries);