Merge branch 'release/5.0.0-beta.19'

168 files changed, 4219 insertions, 2405 deletions

diff --git a/src/I18n.js b/src/I18n.js
index 4ee34157c..e33141576 100644
--- a/src/I18n.js
+++ b/src/I18n.js
@@ -7,8 +7,7 @@ import { oneOrManyChildElements } from './prop-types';
 import translations from './i18n/translations';
 import UserStore from './stores/UserStore';
 
-@inject('stores') @observer
-export default class I18N extends Component {
+export default @inject('stores') @observer class I18N extends Component {
   componentDidUpdate() {
     window.franz.menu.rebuild();
   }
diff --git a/src/api/FeaturesApi.js b/src/api/FeaturesApi.js
new file mode 100644
index 000000000..c66f28f5b
--- /dev/null
+++ b/src/api/FeaturesApi.js
@@ -0,0 +1,13 @@
+export default class FeaturesApi {
+  constructor(server) {
+    this.server = server;
+  }
+
+  default() {
+    return this.server.getDefaultFeatures();
+  }
+
+  features() {
+    return this.server.getFeatures();
+  }
+}
diff --git a/src/api/LocalApi.js b/src/api/LocalApi.js
index 741917104..e2a46874a 100644
--- a/src/api/LocalApi.js
+++ b/src/api/LocalApi.js
@@ -4,12 +4,12 @@ export default class LocalApi {
     this.local = local;
   }
 
-  getAppSettings() {
-    return this.local.getAppSettings();
+  getAppSettings(type) {
+    return this.local.getAppSettings(type);
   }
 
-  updateAppSettings(data) {
-    return this.local.updateAppSettings(data);
+  updateAppSettings(type, data) {
+    return this.local.updateAppSettings(type, data);
   }
 
   getAppCacheSize() {
diff --git a/src/api/RecipesApi.js b/src/api/RecipesApi.js
index 0573dacaf..800888b00 100644
--- a/src/api/RecipesApi.js
+++ b/src/api/RecipesApi.js
@@ -1,4 +1,4 @@
-export default class ServicesApi {
+export default class RecipesApi {
   constructor(server) {
     this.server = server;
   }
diff --git a/src/api/index.js b/src/api/index.js
index 3fc18c4b5..3c87cc087 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -6,12 +6,14 @@ import UserApi from './UserApi';
 import LocalApi from './LocalApi';
 import PaymentApi from './PaymentApi';
 import NewsApi from './NewsApi';
+import FeaturesApi from './FeaturesApi';
 
 export default (server, local) => ({
   app: new AppApi(server, local),
   services: new ServicesApi(server, local),
   recipePreviews: new RecipePreviewsApi(server, local),
   recipes: new RecipesApi(server, local),
+  features: new FeaturesApi(server, local),
   user: new UserApi(server, local),
   local: new LocalApi(server, local),
   payment: new PaymentApi(server, local),
diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js
index 78deb7aa5..ab1604a27 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.js
@@ -3,26 +3,29 @@ import du from 'du';
 
 import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js';
 
-const debug = require('debug')('LocalApi');
+const debug = require('debug')('Franz:LocalApi');
 
 const { session } = remote;
 
 export default class LocalApi {
   // Settings
-  getAppSettings() {
+  getAppSettings(type) {
     return new Promise((resolve) => {
-      ipcRenderer.once('appSettings', (event, data) => {
-        debug('LocalApi::getAppSettings resolves', data);
-        resolve(data);
+      ipcRenderer.once('appSettings', (event, resp) => {
+        debug('LocalApi::getAppSettings resolves', resp.type, resp.data);
+        resolve(resp);
       });
 
-      ipcRenderer.send('getAppSettings');
+      ipcRenderer.send('getAppSettings', type);
     });
   }
 
-  async updateAppSettings(data) {
-    debug('LocalApi::updateAppSettings resolves', data);
-    ipcRenderer.send('updateAppSettings', data);
+  async updateAppSettings(type, data) {
+    debug('LocalApi::updateAppSettings resolves', type, data);
+    ipcRenderer.send('updateAppSettings', {
+      type,
+      data,
+    });
   }
 
   // Services
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 353faa7f4..164419951 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -27,7 +27,7 @@ import {
   removeServicePartitionDirectory,
 } from '../../helpers/service-helpers.js';
 
-const debug = require('debug')('ServerApi');
+const debug = require('debug')('Franz:ServerApi');
 
 module.paths.unshift(
   getDevRecipeDirectory(),
@@ -35,7 +35,7 @@ module.paths.unshift(
 );
 
 const { app } = remote;
-const fetch = remote.require('electron-fetch');
+const { default: fetch } = remote.require('electron-fetch');
 
 const SERVER_URL = API;
 const API_VERSION = 'v1';
@@ -261,6 +261,35 @@ export default class ServerApi {
     return data;
   }
 
+  // Features
+  async getDefaultFeatures() {
+    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/features/default`, this._prepareAuthRequest({
+      method: 'GET',
+    }));
+    if (!request.ok) {
+      throw request;
+    }
+    const data = await request.json();
+
+    const features = data;
+    console.debug('ServerApi::getDefaultFeatures resolves', features);
+    return features;
+  }
+
+  async getFeatures() {
+    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/features`, this._prepareAuthRequest({
+      method: 'GET',
+    }));
+    if (!request.ok) {
+      throw request;
+    }
+    const data = await request.json();
+
+    const features = data;
+    console.debug('ServerApi::getFeatures resolves', features);
+    return features;
+  }
+
   // Recipes
   async getInstalledRecipes() {
     const recipesDirectory = getRecipeDirectory();
diff --git a/src/app.js b/src/app.js
index 814bfacf1..43d0cf018 100644
--- a/src/app.js
+++ b/src/app.js
@@ -6,7 +6,7 @@ import { Provider } from 'mobx-react';
 import { syncHistoryWithStore, RouterStore } from 'mobx-react-router';
 import { Router, Route, hashHistory, IndexRedirect } from 'react-router';
 
-import 'babel-polyfill';
+import '@babel/polyfill';
 import smoothScroll from 'smoothscroll-polyfill';
 
 import ServerApi from './api/server/ServerApi';
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js
index 2741b8a15..4fb0e6a59 100644
--- a/src/components/auth/AuthLayout.js
+++ b/src/components/auth/AuthLayout.js
@@ -3,6 +3,7 @@ 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';
 
 import Link from '../ui/Link';
 import InfoBar from '../ui/InfoBar';
@@ -10,8 +11,9 @@ import InfoBar from '../ui/InfoBar';
 import { oneOrManyChildElements, globalError as globalErrorPropType } from '../../prop-types';
 import globalMessages from '../../i18n/globalMessages';
 
-@observer
-export default class AuthLayout extends Component {
+import { isWindows } from '../../environment';
+
+export default @observer class AuthLayout extends Component {
   static propTypes = {
     children: oneOrManyChildElements.isRequired,
     pathname: PropTypes.string.isRequired,
@@ -20,6 +22,8 @@ export default class AuthLayout extends Component {
     isAPIHealthy: PropTypes.bool.isRequired,
     retryHealthCheck: PropTypes.func.isRequired,
     isHealthCheckLoading: PropTypes.bool.isRequired,
+    isFullScreen: PropTypes.bool.isRequired,
+    darkMode: PropTypes.bool.isRequired,
   };
 
   static contextTypes = {
@@ -35,53 +39,58 @@ export default class AuthLayout extends Component {
       isAPIHealthy,
       retryHealthCheck,
       isHealthCheckLoading,
+      isFullScreen,
+      darkMode,
     } = this.props;
     const { intl } = this.context;
 
     return (
-      <div className="auth">
-        {!isOnline && (
-          <InfoBar
-            type="warning"
-          >
-            <span className="mdi mdi-flash" />
-            {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
-          </InfoBar>
-        )}
-        {isOnline && !isAPIHealthy && (
-          <InfoBar
-            type="danger"
-            ctaLabel="Try again"
-            ctaLoading={isHealthCheckLoading}
-            sticky
-            onClick={retryHealthCheck}
-          >
-            <span className="mdi mdi-flash" />
-            {intl.formatMessage(globalMessages.APIUnhealthy)}
-          </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>
+      <div className={darkMode ? 'theme__dark' : ''}>
+        {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />}
+        <div className={'auth'}>
+          {!isOnline && (
+            <InfoBar
+              type="warning"
+            >
+              <span className="mdi mdi-flash" />
+              {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
+            </InfoBar>
+          )}
+          {isOnline && !isAPIHealthy && (
+            <InfoBar
+              type="danger"
+              ctaLabel="Try again"
+              ctaLoading={isHealthCheckLoading}
+              sticky
+              onClick={retryHealthCheck}
+            >
+              <span className="mdi mdi-flash" />
+              {intl.formatMessage(globalMessages.APIUnhealthy)}
+            </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>
+          </div>
+          {/* </div> */}
+          <Link to="https://adlk.io" className="auth__adlk" target="_blank">
+            <img src="./assets/images/adlk.svg" alt="" />
+          </Link>
         </div>
-        {/* </div> */}
-        <Link to="https://adlk.io" className="auth__adlk" target="_blank">
-          <img src="./assets/images/adlk.svg" alt="" />
-        </Link>
       </div>
     );
   }
diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js
index 9ba14e768..0d5feb274 100644
--- a/src/components/auth/Import.js
+++ b/src/components/auth/Import.js
@@ -28,8 +28,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class Import extends Component {
+export default @observer class Import extends Component {
   static propTypes = {
     services: MobxPropTypes.arrayOrObservableArray.isRequired,
     onSubmit: PropTypes.func.isRequired,
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index f1c16986b..96821a61a 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -43,8 +43,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class Invite extends Component {
+export default @observer class Invite extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     embed: PropTypes.bool,
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index 4a3cd6776..f465b35a5 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -55,8 +55,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class Login extends Component {
+export default @observer class Login extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     isSubmitting: PropTypes.bool.isRequired,
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js
index 5bcc80b6e..ad34e39af 100644
--- a/src/components/auth/Password.js
+++ b/src/components/auth/Password.js
@@ -41,8 +41,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class Password extends Component {
+export default @observer class Password extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     isSubmitting: PropTypes.bool.isRequired,
diff --git a/src/components/auth/Pricing.js b/src/components/auth/Pricing.js
index 3cc8d5f6b..f08129568 100644
--- a/src/components/auth/Pricing.js
+++ b/src/components/auth/Pricing.js
@@ -28,8 +28,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class Signup extends Component {
+export default @observer class Signup extends Component {
   static propTypes = {
     donor: MobxPropTypes.objectOrObservableObject.isRequired,
     isLoading: PropTypes.bool.isRequired,
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 219948274..bbcad8b67 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -65,8 +65,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class Signup extends Component {
+export default @observer class Signup extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     isSubmitting: PropTypes.bool.isRequired,
@@ -187,7 +186,7 @@ export default class Signup extends Component {
               {intl.formatMessage(messages.legalInfo)}
               <br />
               <Link
-                to="http://meetfranz.com/terms"
+                to="https://meetfranz.com/terms"
                 target="_blank"
                 className="link"
               >
@@ -195,7 +194,7 @@ export default class Signup extends Component {
               </Link>
               &nbsp;&amp;&nbsp;
               <Link
-                to="http://meetfranz.com/privacy"
+                to="https://meetfranz.com/privacy"
                 target="_blank"
                 className="link"
               >
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js
index 9e1c762a5..f6d77f70f 100644
--- a/src/components/auth/Welcome.js
+++ b/src/components/auth/Welcome.js
@@ -16,8 +16,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class Login extends Component {
+export default @observer class Login extends Component {
   static propTypes = {
     loginRoute: PropTypes.string.isRequired,
     signupRoute: PropTypes.string.isRequired,
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 746775a7f..3ababe54a 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -5,6 +5,7 @@ import { defineMessages, intlShape } from 'react-intl';
 import { TitleBar } from 'electron-react-titlebar';
 
 import InfoBar from '../ui/InfoBar';
+import { Component as DelayApp } from '../../features/delayApp';
 import globalMessages from '../../i18n/globalMessages';
 
 import { isWindows } from '../../environment';
@@ -40,8 +41,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class AppLayout extends Component {
+export default @observer class AppLayout extends Component {
   static propTypes = {
     isFullScreen: PropTypes.bool.isRequired,
     sidebar: PropTypes.element.isRequired,
@@ -58,6 +58,8 @@ export default class AppLayout extends Component {
     areRequiredRequestsSuccessful: PropTypes.bool.isRequired,
     retryRequiredRequests: PropTypes.func.isRequired,
     areRequiredRequestsLoading: PropTypes.bool.isRequired,
+    darkMode: PropTypes.bool.isRequired,
+    isDelayAppScreenVisible: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {
@@ -85,12 +87,14 @@ export default class AppLayout extends Component {
       areRequiredRequestsSuccessful,
       retryRequiredRequests,
       areRequiredRequestsLoading,
+      darkMode,
+      isDelayAppScreenVisible,
     } = this.props;
 
     const { intl } = this.context;
 
     return (
-      <div>
+      <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">
@@ -151,6 +155,7 @@ export default class AppLayout extends Component {
                   </a>
                 </InfoBar>
               )}
+              {isDelayAppScreenVisible && (<DelayApp />)}
               {services}
             </div>
           </div>
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index fa269f216..6ea95bf88 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -26,8 +26,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class Sidebar extends Component {
+export default @observer class Sidebar extends Component {
   static propTypes = {
     openSettings: PropTypes.func.isRequired,
     toggleMuteApp: PropTypes.func.isRequired,
diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js
index b5af3743d..58fb38d8c 100644
--- a/src/components/services/content/ServiceDisabled.js
+++ b/src/components/services/content/ServiceDisabled.js
@@ -16,8 +16,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class ServiceDisabled extends Component {
+export default @observer class ServiceDisabled extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     enable: PropTypes.func.isRequired,
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index c146abf4e..7163209ee 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -10,8 +10,7 @@ import StatusBarTargetUrl from '../../ui/StatusBarTargetUrl';
 import WebviewCrashHandler from './WebviewCrashHandler';
 import ServiceDisabled from './ServiceDisabled';
 
-@observer
-export default class ServiceWebview extends Component {
+export default @observer class ServiceWebview extends Component {
   static propTypes = {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     setWebviewReference: PropTypes.func.isRequired,
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index b1322afc2..4cbd51043 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -18,8 +18,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class Services extends Component {
+export default @observer class Services extends Component {
   static propTypes = {
     services: MobxPropTypes.arrayOrObservableArray.isRequired,
     setWebviewReference: PropTypes.func.isRequired,
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js
index d3e6951f3..3be1fccf4 100644
--- a/src/components/services/content/WebviewCrashHandler.js
+++ b/src/components/services/content/WebviewCrashHandler.js
@@ -24,8 +24,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class WebviewCrashHandler extends Component {
+export default @observer class WebviewCrashHandler extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     reload: PropTypes.func.isRequired,
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index 638262f7f..8de7dc438 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -141,10 +141,10 @@ class TabItem extends Component {
           {service.unreadIndirectMessageCount > 0
             && service.unreadDirectMessageCount === 0
             && service.isIndirectMessageBadgeEnabled && (
-              <span className="tab-item__message-count is-indirect">
+            <span className="tab-item__message-count is-indirect">
                 •
-              </span>
-            )}
+            </span>
+          )}
         </span>
       );
     }
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js
index ceb88c51c..dd5c2140f 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -4,8 +4,7 @@ import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 
 import TabBarSortableList from './TabBarSortableList';
 
-@observer
-export default class TabBar extends Component {
+export default @observer class TabBar extends Component {
   static propTypes = {
     services: MobxPropTypes.arrayOrObservableArray.isRequired,
     setActive: PropTypes.func.isRequired,
diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js
index d5392ddba..3cb08feb1 100644
--- a/src/components/settings/SettingsLayout.js
+++ b/src/components/settings/SettingsLayout.js
@@ -5,8 +5,7 @@ import { observer } from 'mobx-react';
 import { oneOrManyChildElements } from '../../prop-types';
 import Appear from '../ui/effects/Appear';
 
-@observer
-export default class SettingsLayout extends Component {
+export default @observer class SettingsLayout extends Component {
   static propTypes = {
     navigation: PropTypes.element.isRequired,
     children: oneOrManyChildElements.isRequired,
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 4992f0913..06c7074dd 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -44,6 +44,10 @@ const messages = defineMessages({
     id: 'settings.account.accountType.premium',
     defaultMessage: '!!!Premium Supporter Account',
   },
+  accountTypeEnterprise: {
+    id: 'settings.account.accountType.enterprise',
+    defaultMessage: '!!!Enterprise Account',
+  },
   accountEditButton: {
     id: 'settings.account.account.editButton',
     defaultMessage: '!!!Edit Account',
@@ -74,8 +78,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class AccountDashboard extends Component {
+export default @observer class AccountDashboard extends Component {
   static propTypes = {
     user: MobxPropTypes.observableObject.isRequired,
     orders: MobxPropTypes.arrayOrObservableArray.isRequired,
@@ -167,17 +170,19 @@ export default class AccountDashboard extends Component {
                       </h2>
                       {user.organization && `${user.organization}, `}
                       {user.email}<br />
-                      {!user.isPremium && (
+                      {!user.isEnterprise && !user.isPremium && (
                         <span className="badge badge">{intl.formatMessage(messages.accountTypeBasic)}</span>
                       )}
                       {user.isPremium && (
                         <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span>
                       )}
+                      {user.isEnterprise && (
+                        <span className="badge badge--success">{intl.formatMessage(messages.accountTypeEnterprise)}</span>
+                      )}
                     </div>
                     <Link to="/settings/user/edit" className="button">
                       {intl.formatMessage(messages.accountEditButton)}
                     </Link>
-
                     {user.emailValidated}
                   </div>
                 </div>
@@ -230,6 +235,33 @@ export default class AccountDashboard extends Component {
                 )
               )}
 
+              {user.isEnterprise && (
+                <div className="account">
+                  <div className="account__box">
+                    <h2>{user.company.name}</h2>
+                    <p>
+                      Technical contact:&nbsp;
+                      <Link
+                        className="link"
+                        target="_blank"
+                        to={`mailto:${user.company.contact.technical}?subject=Franz`}
+                      >
+                        {user.company.contact.technical}
+                      </Link>
+                      <br />
+                      General contact:&nbsp;
+                      <Link
+                        className="link"
+                        target="_blank"
+                        to={`mailto:${user.company.contact.default}?subject=Franz`}
+                      >
+                        {user.company.contact.default}
+                      </Link>
+                    </p>
+                  </div>
+                </div>
+              )}
+
               {user.isMiner && (
                 <div className="account franz-form">
                   <div className="account__box account__box">
@@ -244,7 +276,7 @@ export default class AccountDashboard extends Component {
                 </div>
               )}
 
-              {!user.isPremium && (
+              {!user.isEnterprise && !user.isPremium && (
                 isLoadingPlans ? (
                   <Loader />
                 ) : (
@@ -259,28 +291,29 @@ export default class AccountDashboard extends Component {
                 )
               )}
 
-              <div className="account franz-form">
-                <div className="account__box">
-                  <h2>{intl.formatMessage(messages.headlineDangerZone)}</h2>
-                  {!isDeleteAccountSuccessful && (
-                    <div className="account__subscription">
-                      <p>{intl.formatMessage(messages.deleteInfo)}</p>
-                      <Button
-                        label={intl.formatMessage(messages.deleteAccount)}
-                        buttonType="danger"
-                        onClick={() => deleteAccount()}
-                        loaded={!isLoadingDeleteAccount}
-                      />
-                    </div>
-                  )}
-                  {isDeleteAccountSuccessful && (
-                    <p>{intl.formatMessage(messages.deleteEmailSent)}</p>
-                  )}
+              {!user.isEnterprise && (
+                <div className="account franz-form">
+                  <div className="account__box">
+                    <h2>{intl.formatMessage(messages.headlineDangerZone)}</h2>
+                    {!isDeleteAccountSuccessful && (
+                      <div className="account__subscription">
+                        <p>{intl.formatMessage(messages.deleteInfo)}</p>
+                        <Button
+                          label={intl.formatMessage(messages.deleteAccount)}
+                          buttonType="danger"
+                          onClick={() => deleteAccount()}
+                          loaded={!isLoadingDeleteAccount}
+                        />
+                      </div>
+                    )}
+                    {isDeleteAccountSuccessful && (
+                      <p>{intl.formatMessage(messages.deleteEmailSent)}</p>
+                    )}
+                  </div>
                 </div>
-              </div>
+              )}
             </div>
           )}
-
         </div>
         <ReactTooltip place="right" type="dark" effect="solid" />
       </div>
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 66539f324..b86d94ac7 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { defineMessages, intlShape } from 'react-intl';
+import { inject, observer } from 'mobx-react';
 
 import Link from '../../ui/Link';
 
@@ -31,7 +32,7 @@ const messages = defineMessages({
   },
 });
 
-export default class SettingsNavigation extends Component {
+export default @inject('stores') @observer class SettingsNavigation extends Component {
   static propTypes = {
     serviceCount: PropTypes.number.isRequired,
   };
@@ -92,3 +93,4 @@ export default class SettingsNavigation extends Component {
     );
   }
 }
+
diff --git a/src/components/settings/recipes/RecipeItem.js b/src/components/settings/recipes/RecipeItem.js
index 7b2f64d26..dae8891b3 100644
--- a/src/components/settings/recipes/RecipeItem.js
+++ b/src/components/settings/recipes/RecipeItem.js
@@ -4,8 +4,7 @@ import { observer } from 'mobx-react';
 
 import RecipePreviewModel from '../../../models/RecipePreview';
 
-@observer
-export default class RecipeItem extends Component {
+export default @observer class RecipeItem extends Component {
   static propTypes = {
     recipe: PropTypes.instanceOf(RecipePreviewModel).isRequired,
     onClick: PropTypes.func.isRequired,
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index 4610c69a5..cd783200f 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -46,8 +46,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class RecipesDashboard extends Component {
+export default @observer class RecipesDashboard extends Component {
   static propTypes = {
     recipes: MobxPropTypes.arrayOrObservableArray.isRequired,
     isLoading: PropTypes.bool.isRequired,
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index f6f2df2f3..d16ec35b8 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -15,6 +15,8 @@ import Toggle from '../../ui/Toggle';
 import Button from '../../ui/Button';
 import ImageUpload from '../../ui/ImageUpload';
 
+import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
+
 const messages = defineMessages({
   saveService: {
     id: 'settings.service.form.saveButton',
@@ -92,10 +94,17 @@ const messages = defineMessages({
     id: 'settings.service.form.iconUpload',
     defaultMessage: '!!!Drop your image, or click here',
   },
+  headlineProxy: {
+    id: 'settings.service.form.proxy.headline',
+    defaultMessage: '!!!Proxy Settings',
+  },
+  proxyInfo: {
+    id: 'settings.service.form.proxy.info',
+    defaultMessage: '!!!Proxy settings will not be synchronized with the Franz servers.',
+  },
 });
 
-@observer
-export default class EditServiceForm extends Component {
+export default @observer class EditServiceForm extends Component {
   static propTypes = {
     recipe: PropTypes.instanceOf(Recipe).isRequired,
     service(props, propName) {
@@ -113,6 +122,8 @@ export default class EditServiceForm extends Component {
     onDelete: PropTypes.func.isRequired,
     isSaving: PropTypes.bool.isRequired,
     isDeleting: PropTypes.bool.isRequired,
+    isProxyFeatureEnabled: PropTypes.bool.isRequired,
+    isProxyFeaturePremiumFeature: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {
@@ -173,6 +184,8 @@ export default class EditServiceForm extends Component {
       isSaving,
       isDeleting,
       onDelete,
+      isProxyFeatureEnabled,
+      isProxyFeaturePremiumFeature,
     } = this.props;
     const { intl } = this.context;
 
@@ -202,6 +215,8 @@ export default class EditServiceForm extends Component {
       activeTabIndex = 2;
     }
 
+    const requiresUserInput = !recipe.hasHostedOption && (recipe.hasTeamId || recipe.hasCustomUrl);
+
     return (
       <div className="settings__main">
         <div className="settings__header">
@@ -303,6 +318,9 @@ export default class EditServiceForm extends Component {
 
                 <div className="settings__settings-group">
                   <h3>{intl.formatMessage(messages.headlineGeneral)}</h3>
+                  {recipe.hasDarkMode && (
+                    <Toggle field={form.$('isDarkModeEnabled')} />
+                  )}
                   <Toggle field={form.$('isEnabled')} />
                 </div>
               </div>
@@ -314,6 +332,33 @@ export default class EditServiceForm extends Component {
                 />
               </div>
             </div>
+
+            {isProxyFeatureEnabled && (
+              <PremiumFeatureContainer condition={isProxyFeaturePremiumFeature}>
+                <div className="settings__settings-group">
+                  <h3>
+                    {intl.formatMessage(messages.headlineProxy)}
+                    <span className="badge badge--success">beta</span>
+                  </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
+                      />
+                      <p>
+                        <span className="mdi mdi-information" />
+                        {intl.formatMessage(messages.proxyInfo)}
+                      </p>
+                    </div>
+                  )}
+                </div>
+              </PremiumFeatureContainer>
+            )}
+
             {recipe.message && (
               <p className="settings__message">
                 <span className="mdi mdi-information" />
@@ -340,6 +385,7 @@ export default class EditServiceForm extends Component {
               type="submit"
               label={intl.formatMessage(messages.saveService)}
               htmlForm="form"
+              disabled={action !== 'edit' && form.isPristine && requiresUserInput}
             />
           )}
         </div>
diff --git a/src/components/settings/services/ServiceError.js b/src/components/settings/services/ServiceError.js
index 1f1512927..3cfc080d6 100644
--- a/src/components/settings/services/ServiceError.js
+++ b/src/components/settings/services/ServiceError.js
@@ -25,8 +25,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class ServiceError extends Component {
+export default @observer class ServiceError extends Component {
   static contextTypes = {
     intl: intlShape,
   };
diff --git a/src/components/settings/services/ServiceItem.js b/src/components/settings/services/ServiceItem.js
index 9743315b0..84080519b 100644
--- a/src/components/settings/services/ServiceItem.js
+++ b/src/components/settings/services/ServiceItem.js
@@ -22,8 +22,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class ServiceItem extends Component {
+export default @observer class ServiceItem extends Component {
   static propTypes = {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     goToServiceForm: PropTypes.func.isRequired,
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js
index 20e451f01..e7dfaf106 100644
--- a/src/components/settings/services/ServicesDashboard.js
+++ b/src/components/settings/services/ServicesDashboard.js
@@ -49,8 +49,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class ServicesDashboard extends Component {
+export default @observer class ServicesDashboard extends Component {
   static propTypes = {
     services: MobxPropTypes.arrayOrObservableArray.isRequired,
     isLoading: PropTypes.bool.isRequired,
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 97f535594..1ec2ab614 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -8,6 +8,7 @@ import Form from '../../../lib/Form';
 import Button from '../../ui/Button';
 import Toggle from '../../ui/Toggle';
 import Select from '../../ui/Select';
+import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
 
 import { FRANZ_TRANSLATION } from '../../../config';
 
@@ -82,8 +83,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class EditSettingsForm extends Component {
+export default @observer class EditSettingsForm extends Component {
   static propTypes = {
     checkForUpdates: PropTypes.func.isRequired,
     installUpdate: PropTypes.func.isRequired,
@@ -96,6 +96,7 @@ export default class EditSettingsForm extends Component {
     isClearingAllCache: PropTypes.bool.isRequired,
     onClearAllCache: PropTypes.func.isRequired,
     cacheSize: PropTypes.string.isRequired,
+    isSpellcheckerPremiumFeature: PropTypes.bool.isRequired,
   };
 
   static contextTypes = {
@@ -125,6 +126,7 @@ export default class EditSettingsForm extends Component {
       isClearingAllCache,
       onClearAllCache,
       cacheSize,
+      isSpellcheckerPremiumFeature,
     } = this.props;
     const { intl } = this.context;
 
@@ -161,10 +163,23 @@ export default class EditSettingsForm extends Component {
             <h2 id="apperance">{intl.formatMessage(messages.headlineAppearance)}</h2>
             <Toggle field={form.$('showDisabledServices')} />
             <Toggle field={form.$('showMessageBadgeWhenMuted')} />
+            <Toggle field={form.$('darkMode')} />
 
             {/* Language */}
             <h2 id="language">{intl.formatMessage(messages.headlineLanguage)}</h2>
             <Select field={form.$('locale')} showLabel={false} />
+            <PremiumFeatureContainer
+              condition={isSpellcheckerPremiumFeature}
+            >
+              <div>
+                <Toggle
+                  field={form.$('enableSpellchecking')}
+                />
+                {form.$('enableSpellchecking').value && (
+                  <Select field={form.$('spellcheckerLanguage')} />
+                )}
+              </div>
+            </PremiumFeatureContainer>
             <a
               href={FRANZ_TRANSLATION}
               target="_blank"
@@ -175,10 +190,8 @@ export default class EditSettingsForm extends Component {
 
             {/* Advanced */}
             <h2 id="advanced">{intl.formatMessage(messages.headlineAdvanced)}</h2>
-            <Toggle field={form.$('enableSpellchecking')} />
             <Toggle field={form.$('enableGPUAcceleration')} />
             <p className="settings__help">{intl.formatMessage(messages.enableGPUAccelerationInfo)}</p>
-            {/* <Select field={form.$('spellcheckingLanguage')} /> */}
             <div className="settings__settings-group">
               <h3>
                 {intl.formatMessage(messages.subheadlineCache)}
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js
index f36887fc2..b825f844a 100644
--- a/src/components/settings/user/EditUserForm.js
+++ b/src/components/settings/user/EditUserForm.js
@@ -39,13 +39,13 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class EditServiceForm extends Component {
+export default @observer class EditServiceForm extends Component {
   static propTypes = {
     status: MobxPropTypes.observableArray.isRequired,
     form: PropTypes.instanceOf(Form).isRequired,
     onSubmit: PropTypes.func.isRequired,
     isSaving: PropTypes.bool.isRequired,
+    isEnterprise: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {
@@ -72,6 +72,7 @@ export default class EditServiceForm extends Component {
       // user,
       status,
       form,
+      isEnterprise,
       isSaving,
     } = this.props;
     const { intl } = this.context;
@@ -105,8 +106,10 @@ export default class EditServiceForm extends Component {
               <Input field={form.$('lastname')} />
             </div>
             <Input field={form.$('email')} />
-            <Radio field={form.$('accountType')} />
-            {form.$('accountType').value === 'company' && (
+            {!isEnterprise && (
+              <Radio field={form.$('accountType')} />
+            )}
+            {!isEnterprise && form.$('accountType').value === 'company' && (
               <Input field={form.$('organization')} />
             )}
             <h2>{intl.formatMessage(messages.headlinePassword)}</h2>
diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js
index dd350479d..12e8471ff 100644
--- a/src/components/subscription/SubscriptionForm.js
+++ b/src/components/subscription/SubscriptionForm.js
@@ -36,25 +36,21 @@ const messages = defineMessages({
     defaultMessage: '!!!The Franz Premium Supporter Account includes',
   },
   features: {
-    unlimitedServices: {
-      id: 'subscription.features.unlimitedServices',
-      defaultMessage: '!!!Add unlimited services',
-    },
     onpremise: {
-      id: 'subscription.features.onpremise',
-      defaultMessage: '!!!Add on-premise/hosted services like HipChat',
+      id: 'subscription.features.onpremise.mattermost',
+      defaultMessage: '!!!Add on-premise/hosted services like Mattermost',
     },
-    customServices: {
-      id: 'subscription.features.customServices',
-      defaultMessage: '!!!Add your custom services',
+    noInterruptions: {
+      id: 'subscription.features.noInterruptions',
+      defaultMessage: '!!!No app delays & nagging to upgrade license',
     },
-    encryptedSync: {
-      id: 'subscription.features.encryptedSync',
-      defaultMessage: '!!!Encrypted session synchronization',
+    proxy: {
+      id: 'subscription.features.proxy',
+      defaultMessage: '!!!Proxy support for services',
     },
-    vpn: {
-      id: 'subscription.features.vpn',
-      defaultMessage: '!!!Proxy & VPN support',
+    spellchecker: {
+      id: 'subscription.features.spellchecker',
+      defaultMessage: '!!!Support for Spellchecker',
     },
     ads: {
       id: 'subscription.features.ads',
@@ -71,8 +67,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class SubscriptionForm extends Component {
+export default @observer class SubscriptionForm extends Component {
   static propTypes = {
     plan: MobxPropTypes.objectOrObservableObject.isRequired,
     isLoading: PropTypes.bool.isRequired,
@@ -171,16 +166,13 @@ export default class SubscriptionForm extends Component {
                 <ul className="subscription__premium-features">
                   <li>{intl.formatMessage(messages.features.onpremise)}</li>
                   <li>
-                    {intl.formatMessage(messages.features.encryptedSync)}
-                    <span className="badge">{intl.formatMessage(messages.features.comingSoon)}</span>
+                    {intl.formatMessage(messages.features.noInterruptions)}
                   </li>
                   <li>
-                    {intl.formatMessage(messages.features.customServices)}
-                    <span className="badge">{intl.formatMessage(messages.features.comingSoon)}</span>
+                    {intl.formatMessage(messages.features.spellchecker)}
                   </li>
                   <li>
-                    {intl.formatMessage(messages.features.vpn)}
-                    <span className="badge">{intl.formatMessage(messages.features.comingSoon)}</span>
+                    {intl.formatMessage(messages.features.proxy)}
                   </li>
                   <li>
                     {intl.formatMessage(messages.features.ads)}
diff --git a/src/components/subscription/SubscriptionPopup.js b/src/components/subscription/SubscriptionPopup.js
index 528d02907..f3c63e7ee 100644
--- a/src/components/subscription/SubscriptionPopup.js
+++ b/src/components/subscription/SubscriptionPopup.js
@@ -17,8 +17,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class SubscriptionPopup extends Component {
+export default @observer class SubscriptionPopup extends Component {
   static propTypes = {
     url: PropTypes.string.isRequired,
     closeWindow: PropTypes.func.isRequired,
diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js
index 554206cb7..309e05bb4 100644
--- a/src/components/ui/Button.js
+++ b/src/components/ui/Button.js
@@ -4,8 +4,7 @@ import { observer } from 'mobx-react';
 import Loader from 'react-loader';
 import classnames from 'classnames';
 
-@observer
-export default class Button extends Component {
+export default @observer class Button extends Component {
   static propTypes = {
     className: PropTypes.string,
     label: PropTypes.string.isRequired,
diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js
index 81c3b8da6..76f77d631 100644
--- a/src/components/ui/ImageUpload.js
+++ b/src/components/ui/ImageUpload.js
@@ -2,12 +2,10 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { Field } from 'mobx-react-form';
-// import Loader from 'react-loader';
 import classnames from 'classnames';
 import Dropzone from 'react-dropzone';
 
-@observer
-export default class ImageUpload extends Component {
+export default @observer class ImageUpload extends Component {
   static propTypes = {
     field: PropTypes.instanceOf(Field).isRequired,
     className: PropTypes.string,
diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js
index 84a5f1446..94a1ddf76 100644
--- a/src/components/ui/InfoBar.js
+++ b/src/components/ui/InfoBar.js
@@ -7,8 +7,7 @@ import Loader from 'react-loader';
 // import { oneOrManyChildElements } from '../../prop-types';
 import Appear from '../ui/effects/Appear';
 
-@observer
-export default class InfoBar extends Component {
+export default @observer class InfoBar extends Component {
   static propTypes = {
     // eslint-disable-next-line
     children: PropTypes.any.isRequired,
diff --git a/src/components/ui/Infobox.js b/src/components/ui/Infobox.js
index 2d063c7ef..77051f567 100644
--- a/src/components/ui/Infobox.js
+++ b/src/components/ui/Infobox.js
@@ -4,8 +4,7 @@ import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import Loader from 'react-loader';
 
-@observer
-export default class Infobox extends Component {
+export default @observer class Infobox extends Component {
   static propTypes = {
     children: PropTypes.any.isRequired, // eslint-disable-line
     icon: PropTypes.string,
diff --git a/src/components/ui/Input.js b/src/components/ui/Input.js
index 0bb9f23bf..7bf6e1b00 100644
--- a/src/components/ui/Input.js
+++ b/src/components/ui/Input.js
@@ -6,8 +6,7 @@ import classnames from 'classnames';
 
 import { scorePassword as scorePasswordFunc } from '../../helpers/password-helpers';
 
-@observer
-export default class Input extends Component {
+export default @observer class Input extends Component {
   static propTypes = {
     field: PropTypes.instanceOf(Field).isRequired,
     className: PropTypes.string,
@@ -97,6 +96,7 @@ export default class Input extends Component {
             onBlur={field.onBlur}
             onFocus={field.onFocus}
             ref={(element) => { this.inputElement = element; }}
+            disabled={field.disabled}
           />
           {suffix && (
             <span className="franz-form__input-suffix">{suffix}</span>
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js
index f5da921fa..0602290f1 100644
--- a/src/components/ui/Link.js
+++ b/src/components/ui/Link.js
@@ -9,9 +9,7 @@ import { oneOrManyChildElements } from '../../prop-types';
 import { matchRoute } from '../../helpers/routing-helpers';
 
 // TODO: create container component for this component
-
-@inject('stores') @observer
-export default class Link extends Component {
+export default @inject('stores') @observer class Link extends Component {
   onClick(e) {
     if (this.props.target === '_blank') {
       e.preventDefault();
diff --git a/src/components/ui/PremiumFeatureContainer/index.js b/src/components/ui/PremiumFeatureContainer/index.js
new file mode 100644
index 000000000..73984be94
--- /dev/null
+++ b/src/components/ui/PremiumFeatureContainer/index.js
@@ -0,0 +1,76 @@
+import React, { Component } from 'react';
+import { inject, observer } from 'mobx-react';
+import PropTypes from 'prop-types';
+import { defineMessages, intlShape } from 'react-intl';
+import injectSheet from 'react-jss';
+
+import { oneOrManyChildElements } from '../../../prop-types';
+
+import UserStore from '../../../stores/UserStore';
+
+import styles from './styles';
+
+const messages = defineMessages({
+  action: {
+    id: 'premiumFeature.button.upgradeAccount',
+    defaultMessage: '!!!Upgrade account',
+  },
+});
+
+export default @inject('stores', 'actions') @injectSheet(styles) @observer class PremiumFeatureContainer extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    condition: PropTypes.bool,
+  };
+
+  static defaultProps = {
+    condition: true,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  render() {
+    const {
+      classes,
+      children,
+      actions,
+      condition,
+      stores,
+    } = this.props;
+
+    const { intl } = this.context;
+
+    return !stores.user.data.isPremium && !!condition ? (
+      <div className={classes.container}>
+        <div className={classes.titleContainer}>
+          <p className={classes.title}>Premium Feature</p>
+          <button
+            className={classes.actionButton}
+            type="button"
+            onClick={() => actions.ui.openSettings({ path: 'user' })}
+          >
+            {intl.formatMessage(messages.action)}
+          </button>
+        </div>
+        <div className={classes.content}>
+          {children}
+        </div>
+      </div>
+    ) : children;
+  }
+}
+
+PremiumFeatureContainer.wrappedComponent.propTypes = {
+  children: oneOrManyChildElements.isRequired,
+  stores: PropTypes.shape({
+    user: PropTypes.instanceOf(UserStore).isRequired,
+  }).isRequired,
+  actions: PropTypes.shape({
+    ui: PropTypes.shape({
+      openSettings: PropTypes.func.isRequired,
+    }).isRequired,
+  }).isRequired,
+};
+
diff --git a/src/components/ui/PremiumFeatureContainer/styles.js b/src/components/ui/PremiumFeatureContainer/styles.js
new file mode 100644
index 000000000..16c40d0ec
--- /dev/null
+++ b/src/components/ui/PremiumFeatureContainer/styles.js
@@ -0,0 +1,31 @@
+export default theme => ({
+  container: {
+    background: theme.colorSubscriptionContainerBackground,
+    border: theme.colorSubscriptionContainerBorder,
+    margin: [0, 0, 20, -20],
+    padding: 20,
+    'border-radius': theme.borderRadius,
+  },
+  titleContainer: {
+    display: 'flex',
+  },
+  title: {
+    'font-weight': 'bold',
+    color: theme.colorSubscriptionContainerTitle,
+  },
+  actionButton: {
+    background: theme.colorSubscriptionContainerActionButtonBackground,
+    color: theme.colorSubscriptionContainerActionButtonColor,
+    'margin-left': 'auto',
+    'border-radius': theme.borderRadiusSmall,
+    padding: [2, 4],
+    'font-size': 12,
+  },
+  content: {
+    opacity: 0.5,
+    'margin-top': 20,
+    '& :last-child': {
+      'margin-bottom': 0,
+    },
+  },
+});
diff --git a/src/components/ui/Radio.js b/src/components/ui/Radio.js
index b54cfc820..63ca6f9b8 100644
--- a/src/components/ui/Radio.js
+++ b/src/components/ui/Radio.js
@@ -4,8 +4,7 @@ import { observer } from 'mobx-react';
 import { Field } from 'mobx-react-form';
 import classnames from 'classnames';
 
-@observer
-export default class Radio extends Component {
+export default @observer class Radio extends Component {
   static propTypes = {
     field: PropTypes.instanceOf(Field).isRequired,
     className: PropTypes.string,
diff --git a/src/components/ui/SearchInput.js b/src/components/ui/SearchInput.js
index a94cde201..5a9571d27 100644
--- a/src/components/ui/SearchInput.js
+++ b/src/components/ui/SearchInput.js
@@ -5,8 +5,7 @@ import classnames from 'classnames';
 import uuidv1 from 'uuid/v1';
 import { debounce } from 'lodash';
 
-@observer
-export default class SearchInput extends Component {
+export default @observer class SearchInput extends Component {
   static propTypes = {
     value: PropTypes.string,
     placeholder: PropTypes.string,
diff --git a/src/components/ui/Select.js b/src/components/ui/Select.js
index 2a877af3e..abcad417e 100644
--- a/src/components/ui/Select.js
+++ b/src/components/ui/Select.js
@@ -4,8 +4,7 @@ import { observer } from 'mobx-react';
 import { Field } from 'mobx-react-form';
 import classnames from 'classnames';
 
-@observer
-export default class Select extends Component {
+export default @observer class Select extends Component {
   static propTypes = {
     field: PropTypes.instanceOf(Field).isRequired,
     className: PropTypes.string,
diff --git a/src/components/ui/StatusBarTargetUrl.js b/src/components/ui/StatusBarTargetUrl.js
index b7b198f42..4285a343c 100644
--- a/src/components/ui/StatusBarTargetUrl.js
+++ b/src/components/ui/StatusBarTargetUrl.js
@@ -5,8 +5,7 @@ import classnames from 'classnames';
 
 import Appear from '../ui/effects/Appear';
 
-@observer
-export default class StatusBarTargetUrl extends Component {
+export default @observer class StatusBarTargetUrl extends Component {
   static propTypes = {
     className: PropTypes.string,
     text: PropTypes.string,
diff --git a/src/components/ui/Tabs/Tabs.js b/src/components/ui/Tabs/Tabs.js
index 50397f9bb..12f650ffd 100644
--- a/src/components/ui/Tabs/Tabs.js
+++ b/src/components/ui/Tabs/Tabs.js
@@ -5,8 +5,7 @@ import classnames from 'classnames';
 
 import { oneOrManyChildElements } from '../../../prop-types';
 
-@observer
-export default class Tab extends Component {
+export default @observer class Tab extends Component {
   static propTypes = {
     children: oneOrManyChildElements.isRequired,
     active: PropTypes.number,
diff --git a/src/components/ui/Toggle.js b/src/components/ui/Toggle.js
index 62d46393e..78fb77cbe 100644
--- a/src/components/ui/Toggle.js
+++ b/src/components/ui/Toggle.js
@@ -4,17 +4,18 @@ import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import { Field } from 'mobx-react-form';
 
-@observer
-export default class Toggle extends Component {
+export default @observer class Toggle extends Component {
   static propTypes = {
     field: PropTypes.instanceOf(Field).isRequired,
     className: PropTypes.string,
     showLabel: PropTypes.bool,
+    disabled: PropTypes.bool,
   };
 
   static defaultProps = {
     className: '',
     showLabel: true,
+    disabled: false,
   };
 
   onChange(e) {
@@ -28,6 +29,7 @@ export default class Toggle extends Component {
       field,
       className,
       showLabel,
+      disabled,
     } = this.props;
 
     if (field.value === '' && field.default !== '') {
@@ -39,6 +41,7 @@ export default class Toggle extends Component {
         className={classnames([
           'franz-form__field',
           'franz-form__toggle-wrapper',
+          'franz-form__toggle-disabled',
           className,
         ])}
       >
@@ -56,7 +59,7 @@ export default class Toggle extends Component {
             name={field.name}
             value={field.name}
             checked={field.value}
-            onChange={e => this.onChange(e)}
+            onChange={e => (!disabled ? this.onChange(e) : null)}
           />
         </label>
         {field.error && <div className={field.error}>{field.error}</div>}
diff --git a/src/config.js b/src/config.js
index 77fa92eca..08dbb85f3 100644
--- a/src/config.js
+++ b/src/config.js
@@ -7,7 +7,7 @@ export const CHECK_INTERVAL = 1000 * 3600; // How often should we perform checks
 export const LOCAL_API = 'http://localhost:3000';
 export const DEV_API = 'https://dev.franzinfra.com';
 export const LIVE_API = 'https://api.franzinfra.com';
-export const GA_ID = 'UA-74126766-6';
+export const GA_ID = 'UA-74126766-10';
 
 export const DEFAULT_APP_SETTINGS = {
   autoLaunchInBackground: false,
@@ -17,14 +17,35 @@ export const DEFAULT_APP_SETTINGS = {
   showDisabledServices: true,
   showMessageBadgeWhenMuted: true,
   enableSpellchecking: true,
+  spellcheckerLanguage: 'en-us',
+  darkMode: false,
   locale: '',
   fallbackLocale: 'en-US',
   beta: false,
   isAppMuted: false,
   enableGPUAcceleration: true,
+  serviceLimit: 5,
 };
 
-export const FRANZ_SERVICE_REQUEST = 'http://bit.ly/franz-service-request';
-export const FRANZ_TRANSLATION = 'http://bit.ly/franz-translate';
+export const DEFAULT_FEATURES_CONFIG = {
+  isSpellcheckerPremiumFeature: false,
+  needToWaitToProceed: false,
+  needToWaitToProceedConfig: {
+    delayOffset: 3600000,
+    wait: 10000,
+  },
+  isServiceProxyEnabled: false,
+  isServiceProxyPremiumFeature: true,
+};
+
+export const FRANZ_SERVICE_REQUEST = 'hhttp://bit.ly/franz-plugin-docs';
+export const FRANZ_TRANSLATION = 'https://bit.ly/franz-translate';
+
+export const FILE_SYSTEM_SETTINGS_TYPES = [
+  'app',
+  'proxy',
+];
+
+export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config');
 
-export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config', 'settings.json');
+export const DICTIONARY_PATH = path.join(app.getPath('userData'), 'dicts');
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js
index 004054fdd..b73598f3d 100644
--- a/src/containers/auth/AuthLayoutContainer.js
+++ b/src/containers/auth/AuthLayoutContainer.js
@@ -5,11 +5,11 @@ import { inject, observer } from 'mobx-react';
 import AuthLayout from '../../components/auth/AuthLayout';
 import AppStore from '../../stores/AppStore';
 import GlobalErrorStore from '../../stores/GlobalErrorStore';
+import AppLoader from '../../components/ui/AppLoader';
 
 import { oneOrManyChildElements } from '../../prop-types';
 
-@inject('stores', 'actions') @observer
-export default class AuthLayoutContainer extends Component {
+export default @inject('stores', 'actions') @observer class AuthLayoutContainer extends Component {
   static propTypes = {
     children: oneOrManyChildElements.isRequired,
     location: PropTypes.shape({
@@ -19,14 +19,27 @@ export default class AuthLayoutContainer extends Component {
 
   render() {
     const { stores, actions, children, location } = this.props;
+    const { app, features, globalError } = stores;
+
+    const isLoadingBaseFeatures = features.defaultFeaturesRequest.isExecuting
+      && !features.defaultFeaturesRequest.wasExecuted;
+
+    if (isLoadingBaseFeatures) {
+      return (
+        <AppLoader />
+      );
+    }
+
     return (
       <AuthLayout
-        error={stores.globalError.response}
+        error={globalError.response}
         pathname={location.pathname}
-        isOnline={stores.app.isOnline}
-        isAPIHealthy={!stores.app.healthCheckRequest.isError}
+        isOnline={app.isOnline}
+        isAPIHealthy={!app.healthCheckRequest.isError}
         retryHealthCheck={actions.app.healthCheck}
-        isHealthCheckLoading={stores.app.healthCheckRequest.isExecuting}
+        isHealthCheckLoading={app.healthCheckRequest.isExecuting}
+        isFullScreen={app.isFullScreen}
+        darkMode={app.isSystemDarkModeEnabled}
       >
         {children}
       </AuthLayout>
diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js
index ddd56ffb6..fc46f8b54 100644
--- a/src/containers/auth/ImportScreen.js
+++ b/src/containers/auth/ImportScreen.js
@@ -5,8 +5,7 @@ import Import from '../../components/auth/Import';
 import UserStore from '../../stores/UserStore';
 import { gaPage } from '../../lib/analytics';
 
-@inject('stores', 'actions') @observer
-export default class ImportScreen extends Component {
+export default @inject('stores', 'actions') @observer class ImportScreen extends Component {
   componentDidMount() {
     gaPage('Auth/Import');
   }
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js
index 059888c99..26bf97038 100644
--- a/src/containers/auth/InviteScreen.js
+++ b/src/containers/auth/InviteScreen.js
@@ -4,8 +4,7 @@ import { inject, observer } from 'mobx-react';
 import Invite from '../../components/auth/Invite';
 import { gaPage } from '../../lib/analytics';
 
-@inject('stores', 'actions') @observer
-export default class InviteScreen extends Component {
+export default @inject('stores', 'actions') @observer class InviteScreen extends Component {
   componentDidMount() {
     gaPage('Auth/Invite');
   }
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js
index 9e22c5141..865bd38f8 100644
--- a/src/containers/auth/LoginScreen.js
+++ b/src/containers/auth/LoginScreen.js
@@ -7,8 +7,7 @@ import { gaPage } from '../../lib/analytics';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
-@inject('stores', 'actions') @observer
-export default class LoginScreen extends Component {
+export default @inject('stores', 'actions') @observer class LoginScreen extends Component {
   static propTypes = {
     error: globalErrorPropType.isRequired,
   };
diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js
index d88cb08e6..236fd2031 100644
--- a/src/containers/auth/PasswordScreen.js
+++ b/src/containers/auth/PasswordScreen.js
@@ -5,8 +5,7 @@ import Password from '../../components/auth/Password';
 import UserStore from '../../stores/UserStore';
 import { gaPage } from '../../lib/analytics';
 
-@inject('stores', 'actions') @observer
-export default class PasswordScreen extends Component {
+export default @inject('stores', 'actions') @observer class PasswordScreen extends Component {
   componentDidMount() {
     gaPage('Auth/Password Retrieve');
   }
diff --git a/src/containers/auth/PricingScreen.js b/src/containers/auth/PricingScreen.js
index 7e1586535..34b512e15 100644
--- a/src/containers/auth/PricingScreen.js
+++ b/src/containers/auth/PricingScreen.js
@@ -10,8 +10,7 @@ import { gaPage } from '../../lib/analytics';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
-@inject('stores', 'actions') @observer
-export default class PricingScreen extends Component {
+export default @inject('stores', 'actions') @observer class PricingScreen extends Component {
   static propTypes = {
     error: globalErrorPropType.isRequired,
   };
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js
index 3b86ab138..caf75de90 100644
--- a/src/containers/auth/SignupScreen.js
+++ b/src/containers/auth/SignupScreen.js
@@ -8,8 +8,7 @@ import { gaPage } from '../../lib/analytics';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
-@inject('stores', 'actions') @observer
-export default class SignupScreen extends Component {
+export default @inject('stores', 'actions') @observer class SignupScreen extends Component {
   static propTypes = {
     error: globalErrorPropType.isRequired,
   };
diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js
index e413264a6..2c120f81c 100644
--- a/src/containers/auth/WelcomeScreen.js
+++ b/src/containers/auth/WelcomeScreen.js
@@ -7,8 +7,7 @@ import UserStore from '../../stores/UserStore';
 import RecipePreviewsStore from '../../stores/RecipePreviewsStore';
 import { gaPage } from '../../lib/analytics';
 
-@inject('stores', 'actions') @observer
-export default class LoginScreen extends Component {
+export default @inject('stores', 'actions') @observer class LoginScreen extends Component {
   componentDidMount() {
     gaPage('Auth/Welcome');
   }
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 9212f809f..e1423bdaa 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -1,10 +1,12 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
+import { ThemeProvider } from 'react-jss';
 
 import AppStore from '../../stores/AppStore';
 import RecipesStore from '../../stores/RecipesStore';
 import ServicesStore from '../../stores/ServicesStore';
+import FeaturesStore from '../../stores/FeaturesStore';
 import UIStore from '../../stores/UIStore';
 import NewsStore from '../../stores/NewsStore';
 import SettingsStore from '../../stores/SettingsStore';
@@ -17,8 +19,9 @@ import Sidebar from '../../components/layout/Sidebar';
 import Services from '../../components/services/content/Services';
 import AppLoader from '../../components/ui/AppLoader';
 
-@inject('stores', 'actions') @observer
-export default class AppLayoutContainer extends Component {
+import { state as delayAppState } from '../../features/delayApp';
+
+export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component {
   static defaultProps = {
     children: null,
   };
@@ -26,6 +29,7 @@ export default class AppLayoutContainer extends Component {
   render() {
     const {
       app,
+      features,
       services,
       ui,
       news,
@@ -39,7 +43,6 @@ export default class AppLayoutContainer extends Component {
       handleIPCMessage,
       setWebviewReference,
       openWindow,
-      reloadUpdatedServices,
       reorder,
       reload,
       toggleNotifications,
@@ -64,10 +67,13 @@ export default class AppLayoutContainer extends Component {
 
     const { children } = this.props;
 
+    const isLoadingFeatures = features.featuresRequest.isExecuting
+      && !features.featuresRequest.wasExecuted;
+
     const isLoadingServices = services.allServicesRequest.isExecuting
       && services.allServicesRequest.isExecutingFirstTime;
 
-    if (isLoadingServices) {
+    if (isLoadingFeatures || isLoadingServices) {
       return (
         <AppLoader />
       );
@@ -105,25 +111,29 @@ export default class AppLayoutContainer extends Component {
     );
 
     return (
-      <AppLayout
-        isFullScreen={app.isFullScreen}
-        isOnline={app.isOnline}
-        showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar}
-        appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED}
-        sidebar={sidebar}
-        services={servicesContainer}
-        news={news.latest}
-        removeNewsItem={hide}
-        reloadServicesAfterUpdate={reloadUpdatedServices}
-        installAppUpdate={installUpdate}
-        globalError={globalError.error}
-        showRequiredRequestsError={requests.showRequiredRequestsError}
-        areRequiredRequestsSuccessful={requests.areRequiredRequestsSuccessful}
-        retryRequiredRequests={retryRequiredRequests}
-        areRequiredRequestsLoading={requests.areRequiredRequestsLoading}
-      >
-        {React.Children.count(children) > 0 ? children : null}
-      </AppLayout>
+      <ThemeProvider theme={ui.theme}>
+        <AppLayout
+          isFullScreen={app.isFullScreen}
+          isOnline={app.isOnline}
+          showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar}
+          appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED}
+          sidebar={sidebar}
+          services={servicesContainer}
+          news={news.latest}
+          removeNewsItem={hide}
+          reloadServicesAfterUpdate={() => window.location.reload()}
+          installAppUpdate={installUpdate}
+          globalError={globalError.error}
+          showRequiredRequestsError={requests.showRequiredRequestsError}
+          areRequiredRequestsSuccessful={requests.areRequiredRequestsSuccessful}
+          retryRequiredRequests={retryRequiredRequests}
+          areRequiredRequestsLoading={requests.areRequiredRequestsLoading}
+          darkMode={settings.all.app.darkMode}
+          isDelayAppScreenVisible={delayAppState.isDelayAppScreenVisible}
+        >
+          {React.Children.count(children) > 0 ? children : null}
+        </AppLayout>
+      </ThemeProvider>
     );
   }
 }
@@ -131,6 +141,7 @@ export default class AppLayoutContainer extends Component {
 AppLayoutContainer.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
     services: PropTypes.instanceOf(ServicesStore).isRequired,
+    features: PropTypes.instanceOf(FeaturesStore).isRequired,
     recipes: PropTypes.instanceOf(RecipesStore).isRequired,
     app: PropTypes.instanceOf(AppStore).isRequired,
     ui: PropTypes.instanceOf(UIStore).isRequired,
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index c5c2982b0..5818af0b1 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -12,8 +12,7 @@ import AccountDashboard from '../../components/settings/account/AccountDashboard
 
 const { BrowserWindow } = remote;
 
-@inject('stores', 'actions') @observer
-export default class AccountScreen extends Component {
+export default @inject('stores', 'actions') @observer class AccountScreen extends Component {
   componentDidMount() {
     gaPage('Settings/Account Dashboard');
   }
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 67c2731fc..639e8b070 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -6,6 +6,8 @@ import { defineMessages, intlShape } from 'react-intl';
 import UserStore from '../../stores/UserStore';
 import RecipesStore from '../../stores/RecipesStore';
 import ServicesStore from '../../stores/ServicesStore';
+import SettingsStore from '../../stores/SettingsStore';
+import FeaturesStore from '../../stores/FeaturesStore';
 import Form from '../../lib/Form';
 import { gaPage } from '../../lib/analytics';
 
@@ -13,6 +15,8 @@ import ServiceError from '../../components/settings/services/ServiceError';
 import EditServiceForm from '../../components/settings/services/EditServiceForm';
 import { required, url, oneRequired } from '../../helpers/validation-helpers';
 
+import { config as proxyFeature } from '../../features/serviceProxy';
+
 const messages = defineMessages({
   name: {
     id: 'settings.service.form.name',
@@ -50,10 +54,29 @@ const messages = defineMessages({
     id: 'settings.service.form.icon',
     defaultMessage: '!!!Custom icon',
   },
+  enableDarkMode: {
+    id: 'settings.service.form.enableDarkMode',
+    defaultMessage: '!!!Enable Dark Mode',
+  },
+  enableProxy: {
+    id: 'settings.service.form.proxy.isEnabled',
+    defaultMessage: '!!!Use Proxy',
+  },
+  proxyHost: {
+    id: 'settings.service.form.proxy.host',
+    defaultMessage: '!!!Proxy Host/IP',
+  },
+  proxyUser: {
+    id: 'settings.service.form.proxy.user',
+    defaultMessage: '!!!User',
+  },
+  proxyPassword: {
+    id: 'settings.service.form.proxy.password',
+    defaultMessage: '!!!Password',
+  },
 });
 
-@inject('stores', 'actions') @observer
-export default class EditServiceScreen extends Component {
+export default @inject('stores', 'actions') @observer class EditServiceScreen extends Component {
   static contextTypes = {
     intl: intlShape,
   };
@@ -77,7 +100,7 @@ export default class EditServiceScreen extends Component {
     }
   }
 
-  prepareForm(recipe, service) {
+  prepareForm(recipe, service, proxy) {
     const { intl } = this.context;
     const config = {
       fields: {
@@ -112,6 +135,11 @@ export default class EditServiceScreen extends Component {
           default: null,
           type: 'file',
         },
+        isDarkModeEnabled: {
+          label: intl.formatMessage(messages.enableDarkMode),
+          value: service.isDarkModeEnabled,
+          default: this.props.stores.settings.all.app.darkMode,
+        },
       },
     };
 
@@ -163,6 +191,40 @@ export default class EditServiceScreen extends Component {
       });
     }
 
+    if (proxy.isEnabled) {
+      const serviceProxyConfig = this.props.stores.settings.proxy[service.id] || {};
+
+      Object.assign(config.fields, {
+        proxy: {
+          name: 'proxy',
+          label: 'proxy',
+          fields: {
+            isEnabled: {
+              label: intl.formatMessage(messages.enableProxy),
+              value: serviceProxyConfig.isEnabled,
+              default: false,
+            },
+            host: {
+              label: intl.formatMessage(messages.proxyHost),
+              value: serviceProxyConfig.host,
+              default: '',
+            },
+            user: {
+              label: intl.formatMessage(messages.proxyUser),
+              value: serviceProxyConfig.user,
+              default: '',
+            },
+            password: {
+              label: intl.formatMessage(messages.proxyPassword),
+              value: serviceProxyConfig.password,
+              default: '',
+              type: 'password',
+            },
+          },
+        },
+      });
+    }
+
     return new Form(config);
   }
 
@@ -215,7 +277,7 @@ export default class EditServiceScreen extends Component {
       );
     }
 
-    const form = this.prepareForm(recipe, service);
+    const form = this.prepareForm(recipe, service, proxyFeature);
 
     return (
       <EditServiceForm
@@ -229,6 +291,8 @@ export default class EditServiceScreen extends Component {
         isDeleting={services.deleteServiceRequest.isExecuting}
         onSubmit={d => this.onSubmit(d)}
         onDelete={() => this.deleteService()}
+        isProxyFeatureEnabled={proxyFeature.isEnabled}
+        isProxyFeaturePremiumFeature={proxyFeature.isPremium}
       />
     );
   }
@@ -239,6 +303,8 @@ EditServiceScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
     recipes: PropTypes.instanceOf(RecipesStore).isRequired,
     services: PropTypes.instanceOf(ServicesStore).isRequired,
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
+    features: PropTypes.instanceOf(FeaturesStore).isRequired,
   }).isRequired,
   router: PropTypes.shape({
     params: PropTypes.shape({
@@ -251,5 +317,8 @@ EditServiceScreen.wrappedComponent.propTypes = {
       updateService: PropTypes.func.isRequired,
       deleteService: PropTypes.func.isRequired,
     }).isRequired,
+    // settings: PropTypes.shape({
+    //   update: PropTypes.func.isRequred,
+    // }).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 018ce663f..ea1d319d9 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -7,9 +7,10 @@ import AppStore from '../../stores/AppStore';
 import SettingsStore from '../../stores/SettingsStore';
 import UserStore from '../../stores/UserStore';
 import Form from '../../lib/Form';
-import { APP_LOCALES } from '../../i18n/languages';
+import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
 import { gaPage } from '../../lib/analytics';
 import { DEFAULT_APP_SETTINGS } from '../../config';
+import { config as spellcheckerConfig } from '../../features/spellchecker';
 
 
 import EditSettingsForm from '../../components/settings/settings/EditSettingsForm';
@@ -39,6 +40,10 @@ const messages = defineMessages({
     id: 'settings.app.form.language',
     defaultMessage: '!!!Language',
   },
+  darkMode: {
+    id: 'settings.app.form.darkMode',
+    defaultMessage: '!!!Dark Mode',
+  },
   showDisabledServices: {
     id: 'settings.app.form.showDisabledServices',
     defaultMessage: '!!!Display disabled services tabs',
@@ -55,8 +60,8 @@ const messages = defineMessages({
     id: 'settings.app.form.enableGPUAcceleration',
     defaultMessage: '!!!Enable GPU Acceleration',
   },
-  spellcheckingLanguage: {
-    id: 'settings.app.form.spellcheckingLanguage',
+  spellcheckerLanguage: {
+    id: 'settings.app.form.spellcheckerLanguage',
     defaultMessage: '!!!Language for spell checking',
   },
   beta: {
@@ -65,8 +70,7 @@ const messages = defineMessages({
   },
 });
 
-@inject('stores', 'actions') @observer
-export default class EditSettingsScreen extends Component {
+export default @inject('stores', 'actions') @observer class EditSettingsScreen extends Component {
   static contextTypes = {
     intl: intlShape,
   };
@@ -91,8 +95,10 @@ export default class EditSettingsScreen extends Component {
         minimizeToSystemTray: settingsData.minimizeToSystemTray,
         enableGPUAcceleration: settingsData.enableGPUAcceleration,
         showDisabledServices: settingsData.showDisabledServices,
+        darkMode: settingsData.darkMode,
         showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted,
         enableSpellchecking: settingsData.enableSpellchecking,
+        spellcheckerLanguage: settingsData.spellcheckerLanguage,
         beta: settingsData.beta, // we need this info in the main process as well
         locale: settingsData.locale, // we need this info in the main process as well
       },
@@ -118,6 +124,14 @@ export default class EditSettingsScreen extends Component {
       });
     });
 
+    const spellcheckingLanguages = [];
+    Object.keys(SPELLCHECKER_LOCALES).sort(Intl.Collator().compare).forEach((key) => {
+      spellcheckingLanguages.push({
+        value: key,
+        label: SPELLCHECKER_LOCALES[key],
+      });
+    });
+
     const config = {
       fields: {
         autoLaunchOnStart: {
@@ -157,8 +171,19 @@ export default class EditSettingsScreen extends Component {
         },
         enableSpellchecking: {
           label: intl.formatMessage(messages.enableSpellchecking),
-          value: settings.all.app.enableSpellchecking,
-          default: DEFAULT_APP_SETTINGS.enableSpellchecking,
+          value: !this.props.stores.user.data.isPremium && spellcheckerConfig.isPremiumFeature ? false : settings.all.app.enableSpellchecking,
+          default: !this.props.stores.user.data.isPremium && spellcheckerConfig.isPremiumFeature ? false : DEFAULT_APP_SETTINGS.enableSpellchecking,
+        },
+        spellcheckerLanguage: {
+          label: intl.formatMessage(messages.spellcheckerLanguage),
+          value: settings.all.app.spellcheckerLanguage,
+          options: spellcheckingLanguages,
+          default: DEFAULT_APP_SETTINGS.spellcheckerLanguage,
+        },
+        darkMode: {
+          label: intl.formatMessage(messages.darkMode),
+          value: settings.all.app.darkMode,
+          default: DEFAULT_APP_SETTINGS.darkMode,
         },
         enableGPUAcceleration: {
           label: intl.formatMessage(messages.enableGPUAcceleration),
@@ -209,6 +234,7 @@ export default class EditSettingsScreen extends Component {
         cacheSize={cacheSize}
         isClearingAllCache={isClearingAllCache}
         onClearAllCache={clearAllCache}
+        isSpellcheckerPremiumFeature={spellcheckerConfig.isPremiumFeature}
       />
     );
   }
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index dda8ce513..3da3e8d2c 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -50,8 +50,7 @@ const messages = defineMessages({
   },
 });
 
-@inject('stores', 'actions') @observer
-export default class EditUserScreen extends Component {
+export default @inject('stores', 'actions') @observer class EditUserScreen extends Component {
   static contextTypes = {
     intl: intlShape,
   };
@@ -145,6 +144,7 @@ export default class EditUserScreen extends Component {
         // user={user.data}
         status={user.actionStatus}
         form={form}
+        isEnterprise={user.data.isEnterprise}
         isSaving={user.updateUserInfoRequest.isExecuting}
         onSubmit={d => this.onSubmit(d)}
       />
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js
index 5f341b1b3..38ca6ec74 100644
--- a/src/containers/settings/InviteScreen.js
+++ b/src/containers/settings/InviteScreen.js
@@ -5,8 +5,7 @@ import { inject, observer } from 'mobx-react';
 import Invite from '../../components/auth/Invite';
 import { gaPage } from '../../lib/analytics';
 
-@inject('stores', 'actions') @observer
-export default class InviteScreen extends Component {
+export default @inject('stores', 'actions') @observer class InviteScreen extends Component {
   componentDidMount() {
     gaPage('Settings/Invite');
   }
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index 65341e9e3..4efe81505 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -11,8 +11,7 @@ import { gaPage } from '../../lib/analytics';
 
 import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard';
 
-@inject('stores', 'actions') @observer
-export default class RecipesScreen extends Component {
+export default @inject('stores', 'actions') @observer class RecipesScreen extends Component {
   static propTypes = {
     params: PropTypes.shape({
       filter: PropTypes.string,
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js
index 12db1bcd3..c1a133ef7 100644
--- a/src/containers/settings/ServicesScreen.js
+++ b/src/containers/settings/ServicesScreen.js
@@ -10,8 +10,7 @@ import { gaPage } from '../../lib/analytics';
 
 import ServicesDashboard from '../../components/settings/services/ServicesDashboard';
 
-@inject('stores', 'actions') @observer
-export default class ServicesScreen extends Component {
+export default @inject('stores', 'actions') @observer class ServicesScreen extends Component {
   componentDidMount() {
     gaPage('Settings/Service Dashboard');
   }
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js
index 13ca96f72..55589d0be 100644
--- a/src/containers/settings/SettingsWindow.js
+++ b/src/containers/settings/SettingsWindow.js
@@ -7,8 +7,7 @@ import ServicesStore from '../../stores/ServicesStore';
 import Layout from '../../components/settings/SettingsLayout';
 import Navigation from '../../components/settings/navigation/SettingsNavigation';
 
-@inject('stores', 'actions') @observer
-export default class SettingsContainer extends Component {
+export default @inject('stores', 'actions') @observer class SettingsContainer extends Component {
   render() {
     const { children, stores } = this.props;
     const { closeSettings } = this.props.actions.ui;
diff --git a/src/containers/subscription/SubscriptionFormScreen.js b/src/containers/subscription/SubscriptionFormScreen.js
index fc6e3c4be..50ed19bef 100644
--- a/src/containers/subscription/SubscriptionFormScreen.js
+++ b/src/containers/subscription/SubscriptionFormScreen.js
@@ -9,8 +9,7 @@ import SubscriptionForm from '../../components/subscription/SubscriptionForm';
 
 const { BrowserWindow } = remote;
 
-@inject('stores', 'actions') @observer
-export default class SubscriptionFormScreen extends Component {
+export default @inject('stores', 'actions') @observer class SubscriptionFormScreen extends Component {
   static propTypes = {
     onCloseWindow: PropTypes.func,
     content: PropTypes.oneOrManyChildElements,
@@ -80,7 +79,6 @@ export default class SubscriptionFormScreen extends Component {
     return (
       <SubscriptionForm
         plan={stores.payment.plan}
-        // form={this.prepareForm(stores.payment.plan)}
         isLoading={stores.payment.plansRequest.isExecuting}
         retryPlanRequest={() => stores.payment.plansRequest.reload()}
         isCreatingHostedPage={stores.payment.createHostedPageRequest.isExecuting}
diff --git a/src/containers/subscription/SubscriptionPopupScreen.js b/src/containers/subscription/SubscriptionPopupScreen.js
index bb0603170..6641f236d 100644
--- a/src/containers/subscription/SubscriptionPopupScreen.js
+++ b/src/containers/subscription/SubscriptionPopupScreen.js
@@ -5,8 +5,7 @@ import { inject, observer } from 'mobx-react';
 import SubscriptionPopup from '../../components/subscription/SubscriptionPopup';
 
 
-@inject('stores', 'actions') @observer
-export default class SubscriptionPopupScreen extends Component {
+export default @inject('stores', 'actions') @observer class SubscriptionPopupScreen extends Component {
   state = {
     complete: false,
   };
diff --git a/src/electron/Settings.js b/src/electron/Settings.js
index b3138e948..6ac3b9177 100644
--- a/src/electron/Settings.js
+++ b/src/electron/Settings.js
@@ -1,15 +1,21 @@
 import { observable, toJS } from 'mobx';
 import { pathExistsSync, outputJsonSync, readJsonSync } from 'fs-extra';
+import path from 'path';
 
-import { SETTINGS_PATH, DEFAULT_APP_SETTINGS } from '../config';
+import { SETTINGS_PATH } from '../config';
 
-const debug = require('debug')('Settings');
+const debug = require('debug')('Franz:Settings');
 
 export default class Settings {
-  @observable store = DEFAULT_APP_SETTINGS;
+  type = '';
+  @observable store = {};
 
-  constructor() {
-    if (!pathExistsSync(SETTINGS_PATH)) {
+  constructor(type, defaultState = {}) {
+    this.type = type;
+    this.store = defaultState;
+    this.defaultState = defaultState;
+
+    if (!pathExistsSync(this.settingsFile)) {
       this._writeFile();
     } else {
       this._hydrate();
@@ -17,7 +23,7 @@ export default class Settings {
   }
 
   set(settings) {
-    this.store = Object.assign(this.store, settings);
+    this.store = this._merge(settings);
 
     this._writeFile();
   }
@@ -30,13 +36,21 @@ export default class Settings {
     return this.store[key];
   }
 
+  _merge(settings) {
+    return Object.assign(this.defaultState, this.store, settings);
+  }
+
   _hydrate() {
-    this.store = readJsonSync(SETTINGS_PATH);
+    this.store = this._merge(readJsonSync(this.settingsFile));
     debug('Hydrate store', toJS(this.store));
   }
 
   _writeFile() {
-    outputJsonSync(SETTINGS_PATH, this.store);
+    outputJsonSync(this.settingsFile, this.store);
     debug('Write settings file', toJS(this.store));
   }
+
+  get settingsFile() {
+    return path.join(SETTINGS_PATH, `${this.type === 'app' ? 'settings' : this.type}.json`);
+  }
 }
diff --git a/src/electron/ipc-api/appIndicator.js b/src/electron/ipc-api/appIndicator.js
index d31819068..e568bf35d 100644
--- a/src/electron/ipc-api/appIndicator.js
+++ b/src/electron/ipc-api/appIndicator.js
@@ -15,7 +15,7 @@ function getAsset(type, asset) {
 
 export default (params) => {
   autorun(() => {
-    isTrayIconEnabled = params.settings.get('enableSystemTray');
+    isTrayIconEnabled = params.settings.app.get('enableSystemTray');
 
     if (!isTrayIconEnabled) {
       params.trayIcon.hide();
diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js
index ba49a2f97..9ccc89ea2 100644
--- a/src/electron/ipc-api/autoUpdate.js
+++ b/src/electron/ipc-api/autoUpdate.js
@@ -1,17 +1,17 @@
 import { app, ipcMain } from 'electron';
 import { autoUpdater } from 'electron-updater';
-import { isDevMode } from '../../environment.js';
+
+const debug = require('debug')('Franz:ipcApi:autoUpdate');
 
 export default (params) => {
-  if (!isDevMode && (process.platform === 'darwin' || process.platform === 'win32')) {
-    // autoUpdater.setFeedURL(updateUrl);
+  if (process.platform === 'darwin' || process.platform === 'win32') {
     ipcMain.on('autoUpdate', (event, args) => {
       try {
-        autoUpdater.allowPrerelease = Boolean(params.settings.get('beta'));
+        autoUpdater.allowPrerelease = Boolean(params.settings.app.get('beta'));
         if (args.action === 'check') {
           autoUpdater.checkForUpdates();
         } else if (args.action === 'install') {
-          console.log('install update');
+          debug('install update');
           autoUpdater.quitAndInstall();
           // we need to send a quit event
           setTimeout(() => {
@@ -25,12 +25,12 @@ export default (params) => {
     });
 
     autoUpdater.on('update-not-available', () => {
-      console.log('update-not-available');
+      debug('update-not-available');
       params.mainWindow.webContents.send('autoUpdate', { available: false });
     });
 
     autoUpdater.on('update-available', () => {
-      console.log('update-available');
+      debug('update-available');
       params.mainWindow.webContents.send('autoUpdate', { available: true });
     });
 
@@ -39,16 +39,16 @@ export default (params) => {
       logMessage = `${logMessage} - Downloaded ${progressObj.percent}%`;
       logMessage = `${logMessage} (${progressObj.transferred}/${progressObj.total})`;
 
-      console.log(logMessage);
+      debug(logMessage);
     });
 
     autoUpdater.on('update-downloaded', () => {
-      console.log('update-downloaded');
+      debug('update-downloaded');
       params.mainWindow.webContents.send('autoUpdate', { downloaded: true });
     });
 
     autoUpdater.on('error', () => {
-      console.log('update-error');
+      debug('update-error');
       params.mainWindow.webContents.send('autoUpdate', { error: true });
     });
   }
diff --git a/src/electron/ipc-api/download.js b/src/electron/ipc-api/download.js
new file mode 100644
index 000000000..9e504834d
--- /dev/null
+++ b/src/electron/ipc-api/download.js
@@ -0,0 +1,43 @@
+import { ipcMain, dialog } from 'electron';
+import { download } from 'electron-dl';
+import mime from 'mime-types';
+import fs from 'fs-extra';
+
+const debug = require('debug')('Franz:ipcApi:download');
+
+function decodeBase64Image(dataString) {
+  const matches = dataString.match(/^data:([A-Za-z-+/]+);base64,(.+)$/);
+
+  if (matches.length !== 3) {
+    return new Error('Invalid input string');
+  }
+
+  return new Buffer(matches[2], 'base64');
+}
+
+export default (params) => {
+  ipcMain.on('download-file', async (event, { url, content, fileOptions = {} }) => {
+    try {
+      if (!content) {
+        const dl = await download(params.mainWindow, url, {
+          saveAs: true,
+        });
+        debug('File saved to', dl.getSavePath());
+      } else {
+        const extension = mime.extension(fileOptions.mime);
+        const filename = `${fileOptions.name}.${extension}`;
+
+        dialog.showSaveDialog(params.mainWindow, {
+          defaultPath: filename,
+        }, (name) => {
+          const binaryImage = decodeBase64Image(content);
+          fs.writeFileSync(name, binaryImage, 'binary');
+
+          debug('File blob saved to', name);
+        });
+      }
+    } catch (e) {
+      console.error(e);
+    }
+  });
+};
diff --git a/src/electron/ipc-api/index.js b/src/electron/ipc-api/index.js
index 4ea6d1475..be8e0815a 100644
--- a/src/electron/ipc-api/index.js
+++ b/src/electron/ipc-api/index.js
@@ -1,9 +1,11 @@
 import autoUpdate from './autoUpdate';
 import settings from './settings';
 import appIndicator from './appIndicator';
+import download from './download';
 
 export default (params) => {
   settings(params);
   autoUpdate(params);
   appIndicator(params);
+  download(params);
 };
diff --git a/src/electron/ipc-api/settings.js b/src/electron/ipc-api/settings.js
index 3eab68a91..ce006bb92 100644
--- a/src/electron/ipc-api/settings.js
+++ b/src/electron/ipc-api/settings.js
@@ -1,11 +1,15 @@
 import { ipcMain } from 'electron';
 
 export default (params) => {
-  ipcMain.on('getAppSettings', () => {
-    params.mainWindow.webContents.send('appSettings', params.settings.all);
+  ipcMain.on('getAppSettings', (event, type) => {
+    console.log('getAppSettings', type, params.settings[type].all);
+    params.mainWindow.webContents.send('appSettings', {
+      type,
+      data: params.settings[type].all,
+    });
   });
 
   ipcMain.on('updateAppSettings', (event, args) => {
-    params.settings.set(args);
+    params.settings[args.type].set(args.data);
   });
 };
diff --git a/src/features/delayApp/Component.js b/src/features/delayApp/Component.js
new file mode 100644
index 000000000..403340c7b
--- /dev/null
+++ b/src/features/delayApp/Component.js
@@ -0,0 +1,88 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { inject, observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import injectSheet from 'react-jss';
+
+import Button from '../../components/ui/Button';
+
+import { config } from './';
+import styles from './styles';
+
+const messages = defineMessages({
+  headline: {
+    id: 'feature.delayApp.headline',
+    defaultMessage: '!!!Please purchase license to skip waiting',
+  },
+  action: {
+    id: 'feature.delayApp.action',
+    defaultMessage: '!!!Get a Franz Supporter License',
+  },
+  text: {
+    id: 'feature.delayApp.text',
+    defaultMessage: '!!!Franz will continue in {seconds} seconds.',
+  },
+});
+
+export default @inject('actions') @injectSheet(styles) @observer class DelayApp extends Component {
+  static propTypes = {
+    // eslint-disable-next-line
+    classes: PropTypes.object.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  state = {
+    countdown: config.delayDuration,
+  }
+
+  componentDidMount() {
+    this.countdownInterval = setInterval(() => {
+      this.setState({
+        countdown: this.state.countdown - this.countdownIntervalTimeout,
+      });
+
+      if (this.state.countdown <= 0) {
+        // reload();
+        clearInterval(this.countdownInterval);
+      }
+    }, this.countdownIntervalTimeout);
+  }
+
+  componentWillUnmount() {
+    clearInterval(this.countdownInterval);
+  }
+
+  countdownInterval = null;
+  countdownIntervalTimeout = 1000;
+
+  render() {
+    const { classes, actions } = this.props;
+    const { intl } = this.context;
+
+    return (
+      <div className={`${classes.container}`}>
+        <h1 className={classes.headline}>{intl.formatMessage(messages.headline)}</h1>
+        <Button
+          label={intl.formatMessage(messages.action)}
+          className={classes.button}
+          buttonType="inverted"
+          onClick={() => actions.ui.openSettings({ path: 'user' })}
+        />
+        <p className="footnote">{intl.formatMessage(messages.text, {
+          seconds: this.state.countdown / 1000,
+        })}</p>
+      </div>
+    );
+  }
+}
+
+DelayApp.wrappedComponent.propTypes = {
+  actions: PropTypes.shape({
+    ui: PropTypes.shape({
+      openSettings: PropTypes.func.isRequired,
+    }).isRequired,
+  }).isRequired,
+};
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
new file mode 100644
index 000000000..9ffa1d2fd
--- /dev/null
+++ b/src/features/delayApp/index.js
@@ -0,0 +1,70 @@
+import { autorun, observable, reaction } from 'mobx';
+import moment from 'moment';
+import DelayAppComponent from './Component';
+
+import { DEFAULT_FEATURES_CONFIG } from '../../config';
+
+const debug = require('debug')('Franz:feature:delayApp');
+
+export const config = {
+  delayOffset: DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.delayOffset,
+  delayDuration: DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.wait,
+};
+
+export const state = observable({
+  isDelayAppScreenVisible: DEFAULT_FEATURES_CONFIG.needToWaitToProceed,
+});
+
+function setVisibility(value) {
+  Object.assign(state, {
+    isDelayAppScreenVisible: value,
+  });
+}
+
+export default function init(stores) {
+  reaction(
+    () => stores.features.features.needToWaitToProceed,
+    (enabled, r) => {
+      if (enabled) {
+        debug('Initializing `delayApp` feature');
+
+        // Dispose the reaction to run this only once
+        r.dispose();
+
+        const { needToWaitToProceedConfig: globalConfig } = stores.features.features;
+
+        let shownAfterLaunch = false;
+        let timeLastDelay = moment();
+
+        config.delayOffset = globalConfig.delayOffset !== undefined ? globalConfig.delayOffset : DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.delayOffset;
+        config.delayDuration = globalConfig.wait !== undefined ? globalConfig.wait : DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.wait;
+
+        autorun(() => {
+          if (stores.services.all.length === 0) {
+            shownAfterLaunch = true;
+            return;
+          }
+
+          const diff = moment().diff(timeLastDelay);
+          if ((stores.app.isFocused && diff >= config.delayOffset) || !shownAfterLaunch) {
+            debug(`App will be delayed for ${config.delayDuration / 1000}s`);
+
+            setVisibility(true);
+
+            timeLastDelay = moment();
+            shownAfterLaunch = true;
+
+            setTimeout(() => {
+              debug('Resetting app delay');
+
+              setVisibility(false);
+            }, DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.wait + 1000); // timer needs to be able to hit 0
+          }
+        });
+      }
+    },
+  );
+}
+
+export const Component = DelayAppComponent;
+
diff --git a/src/features/delayApp/styles.js b/src/features/delayApp/styles.js
new file mode 100644
index 000000000..5c214cfdf
--- /dev/null
+++ b/src/features/delayApp/styles.js
@@ -0,0 +1,23 @@
+export default theme => ({
+  container: {
+    background: theme.colorBackground,
+    position: 'absolute',
+    top: 0,
+    width: '100%',
+    display: 'flex',
+    'flex-direction': 'column',
+    'align-items': 'center',
+    'justify-content': 'center',
+    'z-index': 150,
+  },
+  headline: {
+    color: theme.colorHeadline,
+    margin: [25, 0, 40],
+    'max-width': 500,
+    'text-align': 'center',
+    'line-height': '1.3em',
+  },
+  button: {
+    margin: [40, 0, 20],
+  },
+});
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
new file mode 100644
index 000000000..cad9844fd
--- /dev/null
+++ b/src/features/serviceProxy/index.js
@@ -0,0 +1,45 @@
+import { autorun, observable } from 'mobx';
+import { remote } from 'electron';
+
+import { DEFAULT_FEATURES_CONFIG } from '../../config';
+
+const { session } = remote;
+
+const debug = require('debug')('Franz:feature:serviceProxy');
+
+export const config = observable({
+  isEnabled: DEFAULT_FEATURES_CONFIG.isServiceProxyEnabled,
+  isPremium: DEFAULT_FEATURES_CONFIG.isServiceProxyPremiumFeature,
+});
+
+export default function init(stores) {
+  debug('Initializing `serviceProxy` feature');
+
+  autorun(() => {
+    const { isServiceProxyEnabled, isServiceProxyPremiumFeature } = stores.features.features;
+
+    config.isEnabled = isServiceProxyEnabled !== undefined ? isServiceProxyEnabled : DEFAULT_FEATURES_CONFIG.isServiceProxyEnabled;
+    config.isPremium = isServiceProxyPremiumFeature !== undefined ? isServiceProxyPremiumFeature : DEFAULT_FEATURES_CONFIG.isServiceProxyPremiumFeature;
+
+    const services = stores.services.all;
+    const isPremiumUser = stores.user.data.isPremium;
+
+    services.forEach((service) => {
+      const s = session.fromPartition(`persist:service-${service.id}`);
+      let proxyHost = 'direct://';
+
+      if (config.isEnabled && (isPremiumUser || !config.isPremium)) {
+        const serviceProxyConfig = stores.settings.proxy[service.id];
+
+        if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) {
+          proxyHost = serviceProxyConfig.host;
+        }
+      }
+
+      s.setProxy({ proxyRules: proxyHost }, (e) => {
+        debug(`Using proxy "${proxyHost}" for "${service.name}" (${service.id})`, e);
+      });
+    });
+  });
+}
+
diff --git a/src/features/spellchecker/index.js b/src/features/spellchecker/index.js
new file mode 100644
index 000000000..63506103c
--- /dev/null
+++ b/src/features/spellchecker/index.js
@@ -0,0 +1,27 @@
+import { autorun, observable } from 'mobx';
+
+import { DEFAULT_FEATURES_CONFIG } from '../../config';
+
+const debug = require('debug')('Franz:feature:spellchecker');
+
+export const config = observable({
+  isPremiumFeature: DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature,
+});
+
+export default function init(stores) {
+  debug('Initializing `spellchecker` feature');
+
+  autorun(() => {
+    const { isSpellcheckerPremiumFeature } = stores.features.features;
+
+    config.isPremiumFeature = isSpellcheckerPremiumFeature !== undefined ? isSpellcheckerPremiumFeature : DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature;
+
+    if (!stores.user.data.isPremium && config.isPremiumFeature && stores.settings.app.enableSpellchecking) {
+      debug('Override settings.spellcheckerEnabled flag to false');
+
+      Object.assign(stores.settings.app, {
+        enableSpellchecking: false,
+      });
+    }
+  });
+}
diff --git a/src/helpers/i18n-helpers.js b/src/helpers/i18n-helpers.js
new file mode 100644
index 000000000..00a2061c1
--- /dev/null
+++ b/src/helpers/i18n-helpers.js
@@ -0,0 +1,27 @@
+export function getLocale({ locale, locales, defaultLocale, fallbackLocale }) {
+  let localeStr = locale;
+  if (locales[locale] === undefined) {
+    let localeFuzzy;
+    Object.keys(locales).forEach((localStr) => {
+      if (locales && Object.hasOwnProperty.call(locales, localStr)) {
+        if (locale.substring(0, 2) === localStr.substring(0, 2)) {
+          localeFuzzy = localStr;
+        }
+      }
+    });
+
+    if (localeFuzzy !== undefined) {
+      localeStr = localeFuzzy;
+    }
+  }
+
+  if (locales[localeStr] === undefined) {
+    localeStr = defaultLocale;
+  }
+
+  if (!localeStr) {
+    localeStr = fallbackLocale;
+  }
+
+  return localeStr;
+}
diff --git a/src/helpers/visibility-helper.js b/src/helpers/visibility-helper.js
new file mode 100644
index 000000000..8456c4ecf
--- /dev/null
+++ b/src/helpers/visibility-helper.js
@@ -0,0 +1,27 @@
+export function onVisibilityChange(cb) {
+  let isVisible = true;
+
+  if (!cb) {
+    throw new Error('no callback given');
+  }
+
+  function focused() {
+    if (!isVisible) {
+      cb(isVisible = true);
+    }
+  }
+
+  function unfocused() {
+    if (isVisible) {
+      cb(isVisible = false);
+    }
+  }
+
+  document.addEventListener('visibilitychange', () => { (document.hidden ? unfocused : focused)(); });
+
+  window.onpageshow = focused;
+  window.onfocus = focused;
+
+  window.onpagehid = unfocused;
+  window.onblur = unfocused;
+}
diff --git a/src/i18n/languages.js b/src/i18n/languages.js
index 34b369da7..b262df01e 100644
--- a/src/i18n/languages.js
+++ b/src/i18n/languages.js
@@ -27,45 +27,43 @@ export const APP_LOCALES = {
   es: 'Español',
 };
 
-export default APP_LOCALES;
+// Hunspell compatible keys
+export const SPELLCHECKER_LOCALES = {
+  'bg-bg': 'българ�ки език',
+  'ca-es': 'Català',
+  'cs-cz': 'Čeština',
+  'da-dk': 'Dansk',
+  'de-de': 'Deutsch',
+  'el-gr': 'λληνικά (Greek)',
+  'en-us': 'English',
+  'es-es': 'Español',
+  'et-ee': 'Estonian',
+  'fa-ir': '�ارسی (Persian)',
+  'fo-fo': 'Faroese',
+  'fr-fr': 'Français',
+  'he-il': 'עברית (Hebrew)',
+  'hr-hr': 'Hrvatski jezik',
+  'hu-hu': 'Magyar',
+  'it-it': 'Italiano',
+  ko: 'Korean',
+  'lt-lt': 'Lietuvių kalba',
+  'lv-lv': 'Latviešu valoda',
+  'nb-no': 'Norsk bokmål',
+  'nl-nl': 'Nederlands',
+  'pl-pl': 'Język polski',
+  'pt-br': 'Português (Brazil)',
+  'pt-pt': 'Português',
+  'ro-ro': 'Limba română',
+  'ru-ru': 'Ру��кий (Russian)',
+  'sk-sk': 'Sloven�ina',
+  'sl-si': 'Slovenski jezik',
+  sr: 'Срп�ки језик (Serbian)',
+  'sv-se': 'Svenska',
+  'ta-in': 'தமிழ� (Tamil)',
+  'tg-tg': 'Тоҷикӣ (Tajik)',
+  tr: 'Türkçe',
+  'uk-ua': 'Україн�ька (Ukrainian)',
+  vi: 'Tiếng Việt',
+};
 
-// export const SPELLCHECKER_LOCALES = {
-//   af: 'Afrikaans',
-//   sq: 'Albanian',
-//   ar: 'Arabic',
-//   bg: 'Bulgarian',
-//   zh: 'Chinese',
-//   hr: 'Croatian',
-//   cs: 'Czech',
-//   da: 'Danish',
-//   nl: 'Dutch',
-//   en: 'English',
-//   'en-AU': 'English (AU)',
-//   'en-CA': 'English (CA)',
-//   'en-GB': 'English (GB)',
-//   fi: 'Finnish',
-//   fr: 'French',
-//   ka: 'Georgian',
-//   de: 'German',
-//   el: 'Greek, Modern',
-//   hi: 'Hindi',
-//   hu: 'Hungarian',
-//   id: 'Indonesian',
-//   it: 'Italian',
-//   ja: 'Japanese',
-//   jv: 'Javanese',
-//   ko: 'Korean',
-//   lt: 'Lithuanian',
-//   lv: 'Latvian',
-//   ms: 'Malay',
-//   no: 'Norwegian',
-//   pl: 'Polish',
-//   pt: 'Portuguese',
-//   ro: 'Romanian, Moldavian, Moldovan',
-//   ru: 'Russian',
-//   sk: 'Slovak',
-//   es: 'Spanish',
-//   sv: 'Swedish',
-//   uk: 'Ukrainian',
-//   vi: 'Vietnamese',
-// };
+export default APP_LOCALES;
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 4ea3eb1a7..117e66d76 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -1,4 +1,7 @@
 {
+   "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" : "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",
@@ -7,23 +10,23 @@
    "import.submit.label" : "Importa serveis",
    "infobar.buttonChangelog" : "Que hi ha de nou?",
    "infobar.buttonInstallUpdate" : "Reinicia i instal·la l'actualització",
-   "infobar.buttonReloadServices" : "Recarrega serveis",
+   "infobar.buttonReloadServices" : "Recarrega els serveis",
    "infobar.requiredRequestsFailed" : "No s'han pogut carregar els serveis i la informació de l'usuari",
-   "infobar.servicesUpdated" : "Els vostres serveis s'han actualitzat.",
+   "infobar.servicesUpdated" : "Els teus serveis s'han actualitzat.",
    "infobar.updateAvailable" : "Hi ha disponible una nova actualització per a Franz.",
    "invite.email.label" : "Correu electrònic",
-   "invite.headline.friends" : "Convida 3 dels teus amics o companys",
+   "invite.headline.friends" : "Convida a tres dels teus amics o companys",
    "invite.name.label" : "Nom",
-   "invite.skip.label" : "Vull fer-ho més tard",
+   "invite.skip.label" : "Ho vull fer més tard",
    "invite.submit.label" : "Enviar invitacions",
    "invite.successInfo" : "Invitacions enviades correctament",
    "login.email.label" : "Correu electrònic",
-   "login.headline" : "Accedir",
+   "login.headline" : "Accedir-hi",
    "login.invalidCredentials" : "El correu electrònic o la contrasenya no són vàlids",
-   "login.link.password" : "Restablir contrasenya",
+   "login.link.password" : "Restablir la contrasenya",
    "login.link.signup" : "Crea un compte gratuït",
    "login.password.label" : "Contrasenya",
-   "login.serverLogout" : "La teva sessió ha caducat, torna a iniciar la sessió.",
+   "login.serverLogout" : "La teva sessió ha caducat, torna-la a iniciar.",
    "login.submit.label" : "Accedir",
    "login.tokenExpired" : "La teva sessió ha caducat, torna a iniciar la sessió.",
    "menu.app.about" : "Sobre Franz",
@@ -76,6 +79,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",
    "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",
@@ -116,7 +120,8 @@
    "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.enableGPUAcceleration" : "Enable GPU Acceleration",
+   "settings.app.form.darkMode" : "Join the Dark Side",
+   "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",
    "settings.app.form.enableSystemTray" : "Mostra Franz a la safata del sistema",
@@ -126,6 +131,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.headline" : "Configuració",
    "settings.app.headlineAdvanced" : "Avançat",
    "settings.app.headlineAppearance" : "Aparença",
@@ -166,6 +172,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.enableNotification" : "Activa les notificacions",
    "settings.service.form.enableService" : "Activa el servei",
    "settings.service.form.headlineBadges" : "Insígnies de missatges no llegits",
@@ -178,6 +185,12 @@
    "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.saveButton" : "Desa el servei",
    "settings.service.form.tabHosted" : "Allotjat",
    "settings.service.form.tabOnPremise" : "Allotjat per si mateix ��",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "Residents d'EU: es poden aplicar impostos locals",
    "subscription.features.ads" : "Sense anuncis, mai!",
    "subscription.features.comingSoon" : "properament",
-   "subscription.features.customServices" : "Serveis privats per a vostè i el seu equip",
    "subscription.features.encryptedSync" : "Sincronització de sessió xifrada",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Afegiu serveis en premissa\/allotjats com HipChat",
-   "subscription.features.vpn" : "Compatibilitat amb proxy i VPN",
+   "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.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 ed4c7a468..eb8088e28 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -1,5 +1,8 @@
 {
-   "global.api.unhealthy" : "Nemůžeme Franz připojit k online službám",
+   "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" : "Nemůžeme připojit Franz k online službám",
    "global.notConnectedToTheInternet" : "Připojení k internetu není k dispozici.",
    "import.headline" : "Importovat služby z Franz 4",
    "import.notSupportedHeadline" : "Služby nejsou podporovány ve verzi Franz 5",
@@ -11,13 +14,13 @@
    "infobar.requiredRequestsFailed" : "Není možné nahrát služby a informace o uživateli",
    "infobar.servicesUpdated" : "Vaše služby byly aktualizovány",
    "infobar.updateAvailable" : "Nová aktualizace Franz je k dispozici",
-   "invite.email.label" : "Email",
+   "invite.email.label" : "E-mailová adresa",
    "invite.headline.friends" : "Pozvěte 3 přátele nebo kolegy",
    "invite.name.label" : "Jméno",
    "invite.skip.label" : "Nechat na později",
    "invite.submit.label" : "Poslat pozvánky",
    "invite.successInfo" : "Pozvánky byly úspěšně odeslány.",
-   "login.email.label" : "Email",
+   "login.email.label" : "E-mailová adresa",
    "login.headline" : "Přihlásit se",
    "login.invalidCredentials" : "Email nebo heslo nesouhlasí",
    "login.link.password" : "Obnovit heslo",
@@ -76,6 +79,7 @@
    "password.noUser" : "Pro emailovou adresu nebyl nalezený žádný uživatel",
    "password.submit.label" : "Odeslat",
    "password.successInfo" : "Prosím, zkontrolujte svůj e-mail",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
    "pricing.headline" : "Podpořit Franz",
    "pricing.link.skipPayment" : "Nechci podporovat vývoj aplikace Franz.",
    "pricing.submit.label" : "Chci podpořit vývoj aplikace Franz",
@@ -116,6 +120,7 @@
    "settings.app.form.autoLaunchInBackground" : "Spustit na pozadí",
    "settings.app.form.autoLaunchOnStart" : "Spustit Franz při startu",
    "settings.app.form.beta" : "Zahrnout beta verze",
+   "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Aktivovat GPU zrychlení",
    "settings.app.form.enableMenuBar" : "Zobraz Franz v Menu nabídce",
    "settings.app.form.enableSpellchecking" : "Zapnout kontrolu pravopisu",
@@ -126,6 +131,7 @@
    "settings.app.form.runInBackground" : "Ponechat Franze v pozadí při zavírání okna",
    "settings.app.form.showDisabledServices" : "Zobrazit záložky vypnutých služeb",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Zobrazit odznak pro nepře�tené zprávy když jsou upozornění vypnutá",
+   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Nastavení",
    "settings.app.headlineAdvanced" : "Pokro�ilé",
    "settings.app.headlineAppearance" : "Vzhled",
@@ -166,6 +172,7 @@
    "settings.service.form.editServiceHeadline" : "Upravit {name}",
    "settings.service.form.enableAudio" : "Zapnout zvuk",
    "settings.service.form.enableBadge" : "Ukázat odznaky nepře�tených zpráv",
+   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
    "settings.service.form.enableNotification" : "Povolit upozornění",
    "settings.service.form.enableService" : "Povolit službu",
    "settings.service.form.headlineBadges" : "Odznaky nepře�tených zpráv",
@@ -178,6 +185,12 @@
    "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.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.saveButton" : "Uložit službu",
    "settings.service.form.tabHosted" : "Hostováno",
    "settings.service.form.tabOnPremise" : "Samostatně hostované ��",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "Pro obyvatelé EU: mohou být aplikovány lokální daně",
    "subscription.features.ads" : "Žádné reklamy, nikdy!",
    "subscription.features.comingSoon" : "již brzy",
-   "subscription.features.customServices" : "Privátní služby pro vás a váš tým",
    "subscription.features.encryptedSync" : "Šifrovaná synchronizace relací",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Přidat hostované služby jako HipChat",
-   "subscription.features.vpn" : "Proxy & VPN podpora",
+   "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.includedFeatures" : "Placený ú�et Premium Supporter Franz zahrnuje",
    "subscription.paymentSessionError" : "Nebylo možné inicializovat platbu od",
    "subscription.submit.label" : "Chci podpořit vývoj aplikace Franz",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index fa61d26d4..6aa909519 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -1,37 +1,40 @@
 {
+   "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.",
    "global.api.unhealthy" : "Verbindung mit dem Franz Online Service fehlgeschlagen",
    "global.notConnectedToTheInternet" : "Du bist nicht mit dem Internet verbunden.",
    "import.headline" : "Deine Franz 4 Dienste importieren",
    "import.notSupportedHeadline" : "Dienste, die noch nicht von Franz 5 unterstützt werden",
    "import.skip.label" : "Ich möchte Dienste selbst hinzufügen",
    "import.submit.label" : "Dienste importieren",
-   "infobar.buttonChangelog" : "Was gibt es neues?",
+   "infobar.buttonChangelog" : "Was ist neu?",
    "infobar.buttonInstallUpdate" : "Neu starten & Update installieren",
    "infobar.buttonReloadServices" : "Dienste neuladen",
    "infobar.requiredRequestsFailed" : "Dienste und Benutzerinformationen konnten nicht geladen werden",
    "infobar.servicesUpdated" : "Deine Dienste wurden aktualisiert.",
    "infobar.updateAvailable" : "Eine neue Version von Franz ist verfügbar.",
-   "invite.email.label" : "E-Mail Adresse",
-   "invite.headline.friends" : "Lade 3 Freunde ein",
+   "invite.email.label" : "E-Mail-Adresse",
+   "invite.headline.friends" : "Lade 3 Freunde oder Kollegen ein",
    "invite.name.label" : "Name",
    "invite.skip.label" : "Ich möchte das später tun",
    "invite.submit.label" : "Einladungen schicken",
-   "invite.successInfo" : "Einladungen wurden erfolgreich gesendet, vielen Dank.",
-   "login.email.label" : "E-Mail Adresse",
+   "invite.successInfo" : "Die Einladungen wurden erfolgreich gesendet.",
+   "login.email.label" : "E-Mail-Adresse",
    "login.headline" : "Anmelden",
    "login.invalidCredentials" : "E-Mail Adresse oder Passwort ungültig",
    "login.link.password" : "Passwort zurücksetzen",
    "login.link.signup" : "Kostenloses Konto erstellen",
    "login.password.label" : "Passwort",
-   "login.serverLogout" : "Deine Sitzung ist abgelaufen, bitte melde dich erneut an.",
+   "login.serverLogout" : "Deine Sitzung ist abgelaufen, bitte melde Dich erneut an.",
    "login.submit.label" : "Anmelden",
-   "login.tokenExpired" : "Deine Sitzung ist abgelaufen, bitte melde dich erneut an.",
+   "login.tokenExpired" : "Deine Sitzung ist abgelaufen, bitte melde Dich erneut an.",
    "menu.app.about" : "Ãœber Franz",
-   "menu.app.hide" : "Franz ausblenden",
+   "menu.app.hide" : "Ausblenden",
    "menu.app.hideOthers" : "Andere ausblenden",
-   "menu.app.quit" : "Franz Beenden",
+   "menu.app.quit" : "Beenden",
    "menu.app.settings" : "Einstellungen",
-   "menu.app.unhide" : "Alle einblenden",
+   "menu.app.unhide" : "Einblenden",
    "menu.edit" : "Bearbeiten",
    "menu.edit.copy" : "Kopieren",
    "menu.edit.cut" : "Ausschneiden",
@@ -42,7 +45,7 @@
    "menu.edit.redo" : "Wiederholen",
    "menu.edit.selectAll" : "Alle auswählen",
    "menu.edit.speech" : "Sprachausgabe",
-   "menu.edit.startDictation" : "Diktat starten ...",
+   "menu.edit.startDictation" : "Diktat starten",
    "menu.edit.startSpeaking" : "Sprachausgabe starten",
    "menu.edit.stopSpeaking" : "Sprachausgabe stoppen",
    "menu.edit.undo" : "Widerrufen",
@@ -71,15 +74,16 @@
    "menu.window.minimize" : "Minimieren",
    "password.email.label" : "E-Mail Adresse",
    "password.headline" : "Passwort zurücksetzen",
-   "password.link.login" : "An deinem Konto anmelden",
+   "password.link.login" : "An Deinem Konto anmelden",
    "password.link.signup" : "Kostenloses Konto erstellen",
    "password.noUser" : "Es wurde kein Benutzer mit dieser E-Mail-Adresse gefunden.",
    "password.submit.label" : "Absenden",
-   "password.successInfo" : "Wir haben dir eine E-Mail mit weiteren Anweisungen geschickt.",
+   "password.successInfo" : "Wir haben Dir eine E-Mail mit weiteren Anweisungen geschickt.",
+   "premiumFeature.button.upgradeAccount" : "Account upgraden",
    "pricing.headline" : "Franz unterstützen",
    "pricing.link.skipPayment" : "Ich möchte die Entwicklung von Franz nicht unterstützen.",
    "pricing.submit.label" : "Ich möchte die Entwicklung von Franz unterstützen.",
-   "pricing.support.label" : "Wie möchtest du Franz unterstützen?",
+   "pricing.support.label" : "Wie möchtest Du Franz unterstützen?",
    "service.crashHandler.action" : "{name} neuladen",
    "service.crashHandler.autoReload" : "{name} wird in {seconds} Sekunden automatisch wiederhergestellt",
    "service.crashHandler.headline" : "Oh nein!",
@@ -93,8 +97,8 @@
    "settings.account.accountType.premium" : "Premium-Supporter Konto",
    "settings.account.buttonSave" : "Profil aktualisieren",
    "settings.account.deleteAccount" : "Benutzerkonto löschen",
-   "settings.account.deleteEmailSent" : "Du hast eine Email zur Bestätigung der Löschung deines Benutzerkontos erhalten. Dein Benutzerkonto und deine Daten können nach der Löschung nicht wiederhergestellt werden!",
-   "settings.account.deleteInfo" : "Hier kannst du dein Franz Benutzerkonto, und alle dazugehörigen Daten, löschen.",
+   "settings.account.deleteEmailSent" : "Du hast eine Email zur Bestätigung der Löschung Deines Benutzerkontos erhalten. Dein Benutzerkonto und Deine Daten können nach der Löschung nicht wiederhergestellt werden!",
+   "settings.account.deleteInfo" : "Wenn du dein Franz Benutzerkonto nicht mehr länger benötigst, kannst du hier deinen Account und alle dazugehörigen Daten löschen.",
    "settings.account.headline" : "Konto",
    "settings.account.headlineAccount" : "Konto Informationen",
    "settings.account.headlineDangerZone" : "Benutzerkonto löschen",
@@ -116,29 +120,31 @@
    "settings.app.form.autoLaunchInBackground" : "Im Hintergrund öffnen",
    "settings.app.form.autoLaunchOnStart" : "Franz beim Systemstart ausführen",
    "settings.app.form.beta" : "Beta-Versionen einbeziehen",
+   "settings.app.form.darkMode" : "Die dunkle Seite erwartet dich (Dark Mode)",
    "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 Systemleiste anzeigen",
+   "settings.app.form.enableSystemTray" : "Franz in der Taskleiste 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.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",
+   "settings.app.form.spellcheckerLanguage" : "Sprache für Rechtschreibprüfung",
    "settings.app.headline" : "Einstellungen",
    "settings.app.headlineAdvanced" : "Erweitert",
    "settings.app.headlineAppearance" : "Darstellung",
    "settings.app.headlineGeneral" : "Allgemeines",
    "settings.app.headlineLanguage" : "Sprache",
    "settings.app.headlineUpdates" : "Updates",
-   "settings.app.restartRequired" : "Änderungen werden erst nach einem Neustart wirksam. ",
+   "settings.app.restartRequired" : "Änderungen werden erst nach einem Neustart wirksam.",
    "settings.app.subheadlineCache" : "Cache",
-   "settings.app.translationHelp" : "Hilf uns, Franz in deine Sprache zu übersetzen.",
-   "settings.app.updateStatusAvailable" : "Update verfügbar, herunterladen...",
+   "settings.app.translationHelp" : "Hilf uns, Franz in Deine Sprache zu übersetzen.",
+   "settings.app.updateStatusAvailable" : "Update verfügbar, lädt herunter...",
    "settings.app.updateStatusSearching" : "Suche nach Updates",
    "settings.app.updateStatusUpToDate" : "Du nutzt die aktuellste Version von Franz",
-   "settings.invite.headline" : "Lade 3 deiner Freunde ein",
+   "settings.invite.headline" : "Lade 3 Deiner Freunde ein",
    "settings.navigation.account" : "Konto",
    "settings.navigation.availableServices" : "Verfügbare Dienste",
    "settings.navigation.inviteFriends" : "Freunde einladen",
@@ -150,7 +156,7 @@
    "settings.recipes.headline" : "Verfügbare Dienste",
    "settings.recipes.missingService" : "Fehlt ein Service?",
    "settings.recipes.mostPopular" : "Am beliebtesten",
-   "settings.recipes.nothingFound" : "Entschuldigung, aber kein Dienst entspricht deiner Suchanfrage.",
+   "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.service.error.goBack" : "Zurück zu den Diensten",
@@ -159,13 +165,14 @@
    "settings.service.form.addServiceHeadline" : "{name} hinzufügen",
    "settings.service.form.availableServices" : "Verfügbare Dienste",
    "settings.service.form.customUrl" : "Eigener Server",
-   "settings.service.form.customUrlPremiumInfo" : "Um einen selbst gehosteten Dienst hinzuzufügen, brauchst du ein Franz Premium-Supporter Konto.",
+   "settings.service.form.customUrlPremiumInfo" : "Um einen selbst gehosteten Dienst hinzuzufügen, brauchst Du ein Franz Premium-Supporter Konto.",
    "settings.service.form.customUrlUpgradeAccount" : "Dein Konto upgraden",
    "settings.service.form.customUrlValidationError" : "Dein {name}-Server konnte nicht verifiziert werden.",
    "settings.service.form.deleteButton" : "Dienst löschen",
    "settings.service.form.editServiceHeadline" : "{name} bearbeiten",
    "settings.service.form.enableAudio" : "Audio aktivieren",
    "settings.service.form.enableBadge" : "Nachrichten-Badge anzeigen",
+   "settings.service.form.enableDarkMode" : "Dark Mode aktivieren",
    "settings.service.form.enableNotification" : "Benachrichtigungen aktivieren",
    "settings.service.form.enableService" : "Dienst aktivieren",
    "settings.service.form.headlineBadges" : "Nachrichten-Badge",
@@ -178,6 +185,12 @@
    "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.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.user" : "Benutzer (optional)",
    "settings.service.form.saveButton" : "Dienst speichern",
    "settings.service.form.tabHosted" : "Gehostet",
    "settings.service.form.tabOnPremise" : "Selbst gehostet ��",
@@ -211,19 +224,21 @@
    "signup.firstname.label" : "Vorname",
    "signup.headline" : "Anmelden",
    "signup.lastname.label" : "Nachname",
-   "signup.legal.info" : "Mit der Erstellung eines Franz Kontos akzeptierst du die",
+   "signup.legal.info" : "Mit der Erstellung eines Franz Kontos akzeptierst Du die",
    "signup.legal.privacy" : "Datenschutzerklärung",
    "signup.legal.terms" : "Nutzungsbedingungen",
-   "signup.link.login" : "Du hast bereits ein Konto? Melde dich an.",
+   "signup.link.login" : "Du hast bereits ein Konto? Melde Dich an.",
    "signup.password.label" : "Passwort",
    "signup.submit.label" : "Konto erstellen",
    "subscription.euTaxInfo" : "Preise sind exklusive Steuern.",
-   "subscription.features.ads" : "Nie mehr Werbung!",
+   "subscription.features.ads" : "Werbefrei auf Lebenszeit!",
    "subscription.features.comingSoon" : "folgt bald",
-   "subscription.features.customServices" : "Private Dienste für dich und dein Team",
    "subscription.features.encryptedSync" : "Verschlüsselte Sitzungs-Synchronisation",
+   "subscription.features.noInterruptions" : "Keine Wartezeiten um Franz zu verwenden",
    "subscription.features.onpremise" : "Integration von gehosteten Diensten, wie HipChat",
-   "subscription.features.vpn" : "Proxy- & VPN-Unterstützung",
+   "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.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",
@@ -247,5 +262,5 @@
    "validation.url" : "{field} ist keine gültige URL",
    "welcome.loginButton" : "Bei Franz einloggen",
    "welcome.signupButton" : "Kostenloses Konto erstellen",
-   "welcome.slogan" : "Kommunikation, die für dich funktioniert"
+   "welcome.slogan" : "Kommunikation, die für Dich funktioniert"
 }
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 7361d29b7..31852d20c 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -1,7 +1,10 @@
 {
-   "global.api.unhealthy" : "Δεν είναι δυνατή η σ�νδεση με τις online υπη�εσίες του Franz",
-   "global.notConnectedToTheInternet" : "Δεν είστε συνδεδεμένοι στο διαδίκτυο.",
-   "import.headline" : "Εισαγάγετε τις Franz 4 υπη�εσίες σας",
+   "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.skip.label" : "Θέλω να π�οσθέσω υπη�εσίες χει�οκίνητα",
    "import.submit.label" : "Εισαγωγή υπη�εσιών",
@@ -16,7 +19,7 @@
    "invite.name.label" : "Όνομα",
    "invite.skip.label" : "Θέλω να το κάνω α�γότε�α",
    "invite.submit.label" : "Αποστολή π�οσκλήσεων",
-   "invite.successInfo" : "Invitations sent successfully",
+   "invite.successInfo" : "Επιτυχής αποστολή π�οσκλήσεων",
    "login.email.label" : "Διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου",
    "login.headline" : "Σ�νδεση",
    "login.invalidCredentials" : "Το email ή ο κωδικός π�όσβασης δεν είναι έγκυ�ος",
@@ -26,49 +29,49 @@
    "login.serverLogout" : "Η συνεδ�ία σας έληξε, συνδεθείτε ξανά.",
    "login.submit.label" : "Σ�νδεση",
    "login.tokenExpired" : "Η συνεδ�ία σας έληξε, συνδεθείτε ξανά.",
-   "menu.app.about" : "About Franz",
-   "menu.app.hide" : "Hide",
-   "menu.app.hideOthers" : "Hide Others",
-   "menu.app.quit" : "Quit",
+   "menu.app.about" : "Σχετικά με το Franz",
+   "menu.app.hide" : "Απόκ�υψη",
+   "menu.app.hideOthers" : "Απόκ�υψη των άλλων",
+   "menu.app.quit" : "Έξοδος",
    "menu.app.settings" : "Ρυθμίσεις",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Εμφάνιση",
    "menu.edit" : "Επεξε�γασία",
-   "menu.edit.copy" : "Copy",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.copy" : "Αντιγ�αφή",
+   "menu.edit.cut" : "Αποκοπή",
    "menu.edit.delete" : "Διαγ�αφή",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
-   "menu.edit.paste" : "Paste",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
-   "menu.edit.redo" : "Redo",
-   "menu.edit.selectAll" : "Select All",
-   "menu.edit.speech" : "Speech",
-   "menu.edit.startDictation" : "Start Dictation",
-   "menu.edit.startSpeaking" : "Start Speaking",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
-   "menu.edit.undo" : "Undo",
-   "menu.file" : "File",
-   "menu.help" : "Help",
-   "menu.help.changelog" : "Changelog",
-   "menu.help.learnMore" : "Learn More",
+   "menu.edit.emojiSymbols" : "Emoji & Σ�μβολα",
+   "menu.edit.paste" : "Επικόλληση",
+   "menu.edit.pasteAndMatchStyle" : "Επικόλληση και διατή�ηση μο�φοποίησης",
+   "menu.edit.redo" : "Ακ��ωση αναί�εσης",
+   "menu.edit.selectAll" : "Επιλογή Όλων",
+   "menu.edit.speech" : "Ομιλία",
+   "menu.edit.startDictation" : "Ένα�ξη φωνητικής πληκτ�ολόγησης",
+   "menu.edit.startSpeaking" : "Ένα�ξη εκφώνησης",
+   "menu.edit.stopSpeaking" : "Σταμάτημα εκφώνησης",
+   "menu.edit.undo" : "Αναί�εση",
+   "menu.file" : "Α�χείο",
+   "menu.help" : "Βοήθεια",
+   "menu.help.changelog" : "Π�όσφατες αλλαγές",
+   "menu.help.learnMore" : "Μάθετε πε�ισσότε�α",
    "menu.help.privacy" : "Δήλωση απο��ήτου",
-   "menu.help.support" : "Support",
-   "menu.help.tos" : "Terms of Service",
-   "menu.services" : "Services",
-   "menu.services.addNewService" : "Add New Service...",
-   "menu.view" : "View",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
-   "menu.view.reloadFranz" : "Reload Franz",
-   "menu.view.reloadService" : "Reload Service",
-   "menu.view.resetZoom" : "Actual Size",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
-   "menu.view.zoomIn" : "Zoom In",
-   "menu.view.zoomOut" : "Zoom Out",
-   "menu.window" : "Window",
-   "menu.window.close" : "Close",
-   "menu.window.minimize" : "Minimize",
+   "menu.help.support" : "Υποστή�ιξη",
+   "menu.help.tos" : "Ό�οι Χ�ήσης",
+   "menu.services" : "Υπη�εσίες",
+   "menu.services.addNewService" : "�έα Υπη�εσία",
+   "menu.view" : "Π�οβολή",
+   "menu.view.enterFullScreen" : "Πλή�ης Οθόνη",
+   "menu.view.exitFullScreen" : "Έξοδος από πλή�η οθόνη",
+   "menu.view.reloadFranz" : "Ανανέωση Franz",
+   "menu.view.reloadService" : "Ανανέωση Υπη�εσίας",
+   "menu.view.resetZoom" : "Π�αγματικό μέγεθος",
+   "menu.view.toggleDevTools" : "Άνοιγμα Ε�γαλειοθήκη Π�ογ�αμματιστών",
+   "menu.view.toggleFullScreen" : "Λειτου�γία πλή�ους οθόνης",
+   "menu.view.toggleServiceDevTools" : "Λειτου�γεία Υπη�εσίασ Ε�γαλειοθήκης Π�ογ�αμματιστών",
+   "menu.view.zoomIn" : "Μεγέθυνση",
+   "menu.view.zoomOut" : "Σμίκ�υνση",
+   "menu.window" : "Πα�άθυ�ο",
+   "menu.window.close" : "Κλείσιμο",
+   "menu.window.minimize" : "Ελαχιστοποίηση",
    "password.email.label" : "Διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου",
    "password.headline" : "Επαναφο�ά κωδικο� π�όσβασης",
    "password.link.login" : "Σ�νδεση στο λογα�ιασμό σας",
@@ -76,6 +79,7 @@
    "password.noUser" : "Δεν β�έθηκε χ�ήστης με τη συγκεκ�ιμένη διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου",
    "password.submit.label" : "Υποβολή",
    "password.successInfo" : "Ελέγξτε το email σας",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
    "pricing.headline" : "Υποστη�ίξτε το Franz",
    "pricing.link.skipPayment" : "Δεν θέλω να βοηθήσω στην ανάπτυξη του Franz.",
    "pricing.submit.label" : "Θέλω να βοηθήσω στην ανάπτυξη του Franz",
@@ -116,16 +120,18 @@
    "settings.app.form.autoLaunchInBackground" : "Άνοιγμα στο πα�ασκήνιο",
    "settings.app.form.autoLaunchOnStart" : "Εκκίνηση του Franz κατά την εκκίνηση του συστήματος",
    "settings.app.form.beta" : "Συμπε�ιλάβετε εκδόσεις beta",
-   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
-   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
+   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.enableGPUAcceleration" : "Ενε�γοποιήση Ενίσχυσης GPU ",
+   "settings.app.form.enableMenuBar" : "Εμφάνιση Γ�αμμής Μενο� Franz",
    "settings.app.form.enableSpellchecking" : "Ενε�γοποίηση ο�θογ�αφικο� ελέγχου",
    "settings.app.form.enableSystemTray" : "Εμφάνιση του Franz στη γ�αμμή ειδοποιήσεων",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
+   "settings.app.form.hideDockIcon" : "Απόκ�υψη εικονιδίου Franz",
    "settings.app.form.language" : "Γλώσσα",
    "settings.app.form.minimizeToSystemTray" : "Ελαχιστοποίηση του Franz στη γ�αμμή ειδοποιήσεων",
    "settings.app.form.runInBackground" : "Κ�ατήστε το Franz στο πα�ασκήνιο κατά το κλείσιμο του πα�αθ��ου",
    "settings.app.form.showDisabledServices" : "Π�οβολή κα�τελών των απενε�γοποιημένων υπη�εσιών",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Π�οβολή του εικονιδίου μη αναγνωσμένου μην�ματος όταν οι ειδοποιήσεις είναι απενε�γοποιημένες",
+   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Ρυθμίσεις",
    "settings.app.headlineAdvanced" : "Για π�οχω�ημένους",
    "settings.app.headlineAppearance" : "Εμφάνιση",
@@ -138,10 +144,10 @@
    "settings.app.updateStatusAvailable" : "Υπά�χει διαθέσιμη ενημέ�ωση, γίνεται λήψη...",
    "settings.app.updateStatusSearching" : " Γίνεται αναζήτηση για ενημέ�ωση",
    "settings.app.updateStatusUpToDate" : "Χ�ησιμοποιείτε την τελευταία έκδοση του Franz",
-   "settings.invite.headline" : "Invite Friends",
+   "settings.invite.headline" : "Π�οσκαλέστε Φίλους",
    "settings.navigation.account" : "Λογα�ιασμός",
    "settings.navigation.availableServices" : "Διαθέσιμες υπη�εσίες",
-   "settings.navigation.inviteFriends" : "Invite Friends",
+   "settings.navigation.inviteFriends" : "Π�ασκαλέστε Φίλους",
    "settings.navigation.logout" : "Αποσ�νδεση",
    "settings.navigation.settings" : "Ρυθμίσεις",
    "settings.navigation.yourServices" : "Οι υπη�εσίες σας",
@@ -166,6 +172,7 @@
    "settings.service.form.editServiceHeadline" : "Επεξε�γασία {name}",
    "settings.service.form.enableAudio" : "Ενε�γοποίηση ήχου",
    "settings.service.form.enableBadge" : "Εμφάνιση εικονιδίων μη αναγνωσμένου μην�ματος",
+   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
    "settings.service.form.enableNotification" : "Ενε�γοποίηση ειδοποιήσεων",
    "settings.service.form.enableService" : "Ενε�γοποίηση υπη�εσίας",
    "settings.service.form.headlineBadges" : "Εικονίδια μη αναγνωσμένου μην�ματος",
@@ -178,6 +185,12 @@
    "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.saveButton" : "Αποθήκευση υπη�εσίας",
    "settings.service.form.tabHosted" : "Φιλοξενείται",
    "settings.service.form.tabOnPremise" : "Αυτο-φιλοξενείται ��",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "Πολίτες Ε.Ε.: Στις τιμές δεν πε�ιλαμβάνονται τυχόν φό�οι και άλλες τοπικές επιβα��νσεις",
    "subscription.features.ads" : "Τέλος στις διαφημίσεις",
    "subscription.features.comingSoon" : "σ�ντομα",
-   "subscription.features.customServices" : "Ιδιωτικές υπη�εσίες για εσάς και την ομάδα σας",
    "subscription.features.encryptedSync" : "Κ�υπτογ�αφημένος συγχ�ονισμός πε�ιόδου σ�νδεσης",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Add on-premise \/ hosted services όπως το HipChat",
-   "subscription.features.vpn" : "Υποστή�ιξη μεσολαβητή (Proxy) και VPN",
+   "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.includedFeatures" : "Ο Premium λογα�ιασμός υποστή�ιξης Franz πε�ιλαμβάνει",
    "subscription.paymentSessionError" : "Δεν ήταν δυνατή η π�οετοιμασία της φό�μας πλη�ωμής",
    "subscription.submit.label" : "Θέλω να βοηθήσω στην ανάπτυξη του Franz",
@@ -241,10 +256,10 @@
    "tabs.item.enableNotification" : "Ενε�γοποίηση ειδοποιήσεων",
    "tabs.item.enableService" : "Ενε�γοποίηση υπη�εσίας",
    "tabs.item.reload" : "Επαναφό�τωση",
-   "validation.email" : "{field} is not valid",
-   "validation.minLength" : "{field} should be at least {length} characters long",
-   "validation.required" : "{field} is required",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.email" : "{field} δεν είναι έγκυ�ο",
+   "validation.minLength" : "{field} π�έπει να είναι τουλάχιστον {length} χα�ακτή�ες",
+   "validation.required" : "{field} είναι υποχ�εωτικό",
+   "validation.url" : "{field} δεν είναι έγκυ�ος σ�νδεσμος URL",
    "welcome.loginButton" : "Σ�νδεση στο λογα�ιασμό σας",
    "welcome.signupButton" : "Δημιου�γία δω�εάν λογα�ιασμο�",
    "welcome.slogan" : "Επικοινωνία που λειτου�γεί για εσάς"
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 0c62da44a..aa55f5dfe 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -50,10 +50,12 @@
   "subscription.paymentSessionError": "Could not initialize payment form",
   "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes",
   "subscription.features.onpremise": "Add on-premise/hosted services like HipChat",
-  "subscription.features.customServices": "Private services for you and your team",
+  "subscription.features.onpremise.mattermost": "Add on-premise/hosted services like Mattermost",
   "subscription.features.encryptedSync": "Encrypted session synchronization",
-  "subscription.features.vpn": "Proxy & VPN support",
+  "subscription.features.proxy": "Proxy support for services",
   "subscription.features.ads": "No ads, ever!",
+  "subscription.features.spellchecker": "Support for spellchecker",
+  "subscription.features.noInterruptions": "No app delays & nagging to upgrade license",
   "subscription.features.comingSoon": "coming soon",
   "infobar.servicesUpdated": "Your services have been updated.",
   "infobar.updateAvailable": "A new update for Franz is available.",
@@ -130,6 +132,13 @@
   "settings.service.form.icon": "Custom icon",
   "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.isEnabled": "Use Proxy",
+  "settings.service.form.proxy.host": "Proxy Host/IP",
+  "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.error.headline": "Error",
   "settings.service.error.goBack": "Back to services",
   "settings.service.error.message": "Could not load service recipe.",
@@ -158,12 +167,14 @@
   "settings.app.form.autoLaunchOnStart": "Launch Franz on start",
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.enableSystemTray": "Show Franz in system tray",
+  "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray",
   "settings.app.form.enableMenuBar": "Show Franz in Menu Bar",
   "settings.app.form.hideDockIcon": "Hide Franz icon in Dock",
   "settings.app.form.runInBackground": "Keep Franz in background when closing the window",
   "settings.app.form.language": "Language",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
+  "settings.app.form.spellcheckerLanguage": "Spell checking language",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
@@ -247,5 +258,9 @@
   "validation.required": "{field} is required",
   "validation.email": "{field} is not valid",
   "validation.url": "{field} is not a valid URL",
-  "validation.minLength": "{field} should be at least {length} characters long"
+  "validation.minLength": "{field} should be at least {length} characters long",
+  "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"
 }
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 75047a613..a5984dd1c 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,8 +1,11 @@
 {
-   "global.api.unhealthy" : "No se puede conectar a los servicios en línea de Franz",
-   "global.notConnectedToTheInternet" : "No está conectado a Internet.",
+   "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" : "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",
-   "import.notSupportedHeadline" : "Servicios no soportados aún en Franz 5",
+   "import.notSupportedHeadline" : "Servicios no admitidos aún en Franz 5",
    "import.skip.label" : "Quiero agregar servicios manualmente",
    "import.submit.label" : "Importar servicios",
    "infobar.buttonChangelog" : "¿Qué hay de nuevo?",
@@ -14,7 +17,7 @@
    "invite.email.label" : "Dirección de correo electrónico",
    "invite.headline.friends" : "Invita a 3 de tus amigos o compañeros",
    "invite.name.label" : "Nombre",
-   "invite.skip.label" : "Quiero hacer esto después",
+   "invite.skip.label" : "Lo haré más tarde",
    "invite.submit.label" : "Enviar invitaciones",
    "invite.successInfo" : "Invitaciones enviadas correctamente",
    "login.email.label" : "Dirección de correo electrónico",
@@ -25,7 +28,7 @@
    "login.password.label" : "Contraseña",
    "login.serverLogout" : "Tu sesión ha expirado, por favor inicia la sesión de nuevo.",
    "login.submit.label" : "Iniciar sesión",
-   "login.tokenExpired" : "Tu sesión expiró, por favor inicia sesión otra vez.",
+   "login.tokenExpired" : "Tu sesión ha expirado, por favor inicia sesión de nuevo.",
    "menu.app.about" : "Sobre Franz",
    "menu.app.hide" : "Ocultar",
    "menu.app.hideOthers" : "Ocultar otros",
@@ -51,12 +54,12 @@
    "menu.help.changelog" : "Registro de cambios",
    "menu.help.learnMore" : "Conocer más",
    "menu.help.privacy" : "Declaración de privacidad",
-   "menu.help.support" : "Soporte",
+   "menu.help.support" : "Ayuda técnica",
    "menu.help.tos" : "Términos del Servicio",
    "menu.services" : "Servicios",
    "menu.services.addNewService" : "Añadir Nuevo Servicio...",
    "menu.view" : "Mostrar",
-   "menu.view.enterFullScreen" : "Entrar a Pantalla Completa",
+   "menu.view.enterFullScreen" : "Pasar a pantalla completa",
    "menu.view.exitFullScreen" : "Salir de Pantalla Completa",
    "menu.view.reloadFranz" : "Recargar Franz",
    "menu.view.reloadService" : "Recargar Servicio",
@@ -71,11 +74,12 @@
    "menu.window.minimize" : "Minimizar",
    "password.email.label" : "Dirección de correo electrónico",
    "password.headline" : "Restablecer contraseña",
-   "password.link.login" : "Iniciar sesión en tu cuenta",
+   "password.link.login" : "Inicia sesión en tu cuenta",
    "password.link.signup" : "Crear una cuenta gratuita",
    "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",
    "pricing.headline" : "Apoya a Franz",
    "pricing.link.skipPayment" : "No quiero apoyar el desarrollo de Franz.",
    "pricing.submit.label" : "Quiero apoyar el desarrollo de Franz",
@@ -116,8 +120,9 @@
    "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.enableGPUAcceleration" : "Enable GPU Acceleration",
-   "settings.app.form.enableMenuBar" : "mostrar a franz en La barra de menús",
+   "settings.app.form.darkMode" : "Join the Dark Side",
+   "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",
    "settings.app.form.enableSystemTray" : "Mostrar Franz en la bandeja del sistema",
    "settings.app.form.hideDockIcon" : "Ocultar Icono de Franz en barra de herramientas",
@@ -126,6 +131,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.headline" : "Configuración",
    "settings.app.headlineAdvanced" : "Avanzado",
    "settings.app.headlineAppearance" : "Apariencia",
@@ -134,7 +140,7 @@
    "settings.app.headlineUpdates" : "Actualizaciones",
    "settings.app.restartRequired" : "Los cambios requieren reiniciar",
    "settings.app.subheadlineCache" : "Caché",
-   "settings.app.translationHelp" : "Ayúdenos a traducir Franz a tu idioma.",
+   "settings.app.translationHelp" : "Ayúdanos a traducir Franz a tu idioma.",
    "settings.app.updateStatusAvailable" : "Actualización disponible, descargando...",
    "settings.app.updateStatusSearching" : "Buscando actualizaciones",
    "settings.app.updateStatusUpToDate" : "Estás utilizando la última versión de Franz",
@@ -144,18 +150,18 @@
    "settings.navigation.inviteFriends" : "Invita a tus amigos",
    "settings.navigation.logout" : "Cerrar sesión",
    "settings.navigation.settings" : "Configuración",
-   "settings.navigation.yourServices" : "Sus servicios",
+   "settings.navigation.yourServices" : "Tus servicios",
    "settings.recipes.all" : "Todos los servicios",
    "settings.recipes.dev" : "Desarrollo",
    "settings.recipes.headline" : "Servicios disponibles",
-   "settings.recipes.missingService" : "¿Falta algún servicio?",
+   "settings.recipes.missingService" : "¿Echas de menos algún servicio?",
    "settings.recipes.mostPopular" : "Más populares",
    "settings.recipes.nothingFound" : "Lo siento, pero no hay ningún servicio coincidente con tus términos de búsqueda.",
-   "settings.recipes.servicesSuccessfulAddedInfo" : "Servicio añadido exitosamente",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Servicio añadido con éxito",
    "settings.searchService" : "Buscar servicio",
    "settings.service.error.goBack" : "Volver a los servicios",
    "settings.service.error.headline" : "Error",
-   "settings.service.error.message" : "No se pudo cargar el servicio",
+   "settings.service.error.message" : "No se pudo cargar el servicio.",
    "settings.service.form.addServiceHeadline" : "Añadir {name}",
    "settings.service.form.availableServices" : "Servicios disponibles",
    "settings.service.form.customUrl" : "Servidor personalizado",
@@ -165,7 +171,8 @@
    "settings.service.form.deleteButton" : "Eliminar servicio",
    "settings.service.form.editServiceHeadline" : "Editar {name}",
    "settings.service.form.enableAudio" : "Habilitar audio",
-   "settings.service.form.enableBadge" : "Mostrar insignia de mensajes no leídos",
+   "settings.service.form.enableBadge" : "Mostrar señal de mensajes no leídos",
+   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
    "settings.service.form.enableNotification" : "Activar notificaciones",
    "settings.service.form.enableService" : "Activar servicio",
    "settings.service.form.headlineBadges" : "Insignias de mensaje no leídos",
@@ -175,9 +182,15 @@
    "settings.service.form.iconDelete" : "Borrar",
    "settings.service.form.iconUpload" : "Arrastra tu imagen, o haz clic aquí",
    "settings.service.form.indirectMessageInfo" : "Serás notificado de todos los mensajes del canal, no sólo @username, @channel, @here, ...",
-   "settings.service.form.indirectMessages" : "Mostrar insignia de notificación para todos los mensajes nuevos",
+   "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.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.saveButton" : "Guardar servicio",
    "settings.service.form.tabHosted" : "Alojado",
    "settings.service.form.tabOnPremise" : "Auto alojado ��",
@@ -192,10 +205,10 @@
    "settings.services.tooltip.isMuted" : "Todos los sonidos están silenciados",
    "settings.services.tooltip.notificationsDisabled" : "Las notificaciones están desactivadas",
    "settings.services.updatedInfo" : "Tus cambios han sido guardados",
-   "settings.user.form.accountType.company" : "Compañía",
+   "settings.user.form.accountType.company" : "Empresa",
    "settings.user.form.accountType.individual" : "Individual",
    "settings.user.form.accountType.label" : "Tipo de cuenta",
-   "settings.user.form.accountType.non-profit" : "Sin fines de lucro",
+   "settings.user.form.accountType.non-profit" : "Sin ánimo de lucro",
    "settings.user.form.currentPassword" : "Contraseña actual",
    "settings.user.form.email" : "Correo electrónico",
    "settings.user.form.firstname" : "Nombre",
@@ -211,7 +224,7 @@
    "signup.firstname.label" : "Nombre",
    "signup.headline" : "Registrarse",
    "signup.lastname.label" : "Apellido",
-   "signup.legal.info" : "Al crear una cuenta en Franz usted acepta las",
+   "signup.legal.info" : "Al crear una cuenta en Franz usted acepta",
    "signup.legal.privacy" : "Declaración de privacidad",
    "signup.legal.terms" : "Términos de servicio",
    "signup.link.login" : "Ya tienes una cuenta, ¿Iniciar sesión?",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "Residentes de la UE: pueden aplicarse impuestos locales",
    "subscription.features.ads" : "¡Sin publicidad, para siempre!",
    "subscription.features.comingSoon" : "próximamente",
-   "subscription.features.customServices" : "Servicios privados para ti y tu equipo",
    "subscription.features.encryptedSync" : "Sincronización de sesión encriptada",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Añade servicios locales\/autoalojados como HipChat",
-   "subscription.features.vpn" : "Soporte para Proxy y VPN",
+   "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.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 e00a5671b..6964d27d2 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1,4 +1,7 @@
 {
+   "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" : "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.",
@@ -11,20 +14,20 @@
    "infobar.requiredRequestsFailed" : "Impossible d'accéder aux services et informations de l'utilisateur",
    "infobar.servicesUpdated" : "Vos services ont été mis à jour.",
    "infobar.updateAvailable" : "Une nouvelle mise à jour pour Franz est disponible.",
-   "invite.email.label" : "Adresse e-mail",
+   "invite.email.label" : "Adresse Email",
    "invite.headline.friends" : "Invitez 3 amis ou collègues",
    "invite.name.label" : "Nom",
    "invite.skip.label" : "Je veux faire cela plus tard",
    "invite.submit.label" : "Envoyer des invitations",
-   "invite.successInfo" : "Invitations envoyées",
-   "login.email.label" : "Adresse e-mail",
-   "login.headline" : "S'inscrire",
-   "login.invalidCredentials" : "E-mail ou mot de passe invalide",
+   "invite.successInfo" : "Invitations envoyées avec succès",
+   "login.email.label" : "Adresse email",
+   "login.headline" : "S'identifier",
+   "login.invalidCredentials" : "Email ou mot de passe invalide",
    "login.link.password" : "Réinitialiser le mot de passe",
    "login.link.signup" : "Créer un compte gratuit",
    "login.password.label" : "Mot de passe",
    "login.serverLogout" : "Votre session a expiré. Reconnectez-vous s'il vous plaît.",
-   "login.submit.label" : "Connexion",
+   "login.submit.label" : "Se connecter",
    "login.tokenExpired" : "Votre session a expiré, veuillez vous reconnecter.",
    "menu.app.about" : "À propos de Franz",
    "menu.app.hide" : "Masquer",
@@ -55,7 +58,7 @@
    "menu.help.tos" : "Conditions d'utilisation",
    "menu.services" : "Services",
    "menu.services.addNewService" : "Ajouter un nouveau service...",
-   "menu.view" : "Affichage",
+   "menu.view" : "Aperçu",
    "menu.view.enterFullScreen" : "Entrer en mode plein écran",
    "menu.view.exitFullScreen" : "Sortir du mode plein écran",
    "menu.view.reloadFranz" : "Actualiser Franz",
@@ -76,6 +79,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",
    "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",
@@ -116,7 +120,8 @@
    "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.enableGPUAcceleration" : "Enable GPU Acceleration",
+   "settings.app.form.darkMode" : "Join the Dark Side",
+   "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",
    "settings.app.form.enableSystemTray" : "Afficher Franz dans la barre d'état système",
@@ -126,6 +131,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.headline" : "Paramètres",
    "settings.app.headlineAdvanced" : "Paramètres avancés",
    "settings.app.headlineAppearance" : "Apparence",
@@ -166,6 +172,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.enableNotification" : "Activer les notifications",
    "settings.service.form.enableService" : "Activer le service",
    "settings.service.form.headlineBadges" : "Badge des messages non lus",
@@ -178,6 +185,12 @@
    "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.saveButton" : "Enregistrer le service",
    "settings.service.form.tabHosted" : "Hébergé",
    "settings.service.form.tabOnPremise" : "Auto-hébergé ��",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "Résidents de l'UE : une taxe locale peut s'appliquer",
    "subscription.features.ads" : "Plus de pubs !",
    "subscription.features.comingSoon" : "Bientôt disponible",
-   "subscription.features.customServices" : "Services privés pour vous et votre équipe",
    "subscription.features.encryptedSync" : "Synchronisation de session cryptée",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Ajouter des services locaux\/hébergés comme HipChat",
-   "subscription.features.vpn" : "Support des Proxy et VPN",
+   "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.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 1c0b537b2..3bb838ba3 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -1,4 +1,7 @@
 {
+   "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" : "Ní féidir nascadh le seirbhísí Franz ar líne",
    "global.notConnectedToTheInternet" : "Níl tú nasctha leis an Idirlíon.",
    "import.headline" : "Iompórtáil do sheirbhísí Franz 4",
@@ -76,6 +79,7 @@
    "password.noUser" : "Níor aimsíodh úsáideoir leis an seoladh ríomhphoist seo",
    "password.submit.label" : "Cuir isteach",
    "password.successInfo" : "Seiceáil do chuid ríomhphoist le do thoil",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
    "pricing.headline" : "Tabhair tacaíocht do Franz",
    "pricing.link.skipPayment" : "Níor mhaith liom tacaíocht a thabhairt d'fhorbairt Franz.",
    "pricing.submit.label" : "Ba mhaith liom tacaíocht a thabhairt d'fhorbairt Franz.",
@@ -116,6 +120,7 @@
    "settings.app.form.autoLaunchInBackground" : "Oscail sa chúlra",
    "settings.app.form.autoLaunchOnStart" : "Láinseáil Franz ón tús",
    "settings.app.form.beta" : "Cuir leagain béite san áireamh",
+   "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Cumasaigh luasghéarú APG",
    "settings.app.form.enableMenuBar" : "Taispeáin Franz sa bharra roghchláir",
    "settings.app.form.enableSpellchecking" : "Cumasaigh seiceáil litrithe",
@@ -126,6 +131,7 @@
    "settings.app.form.runInBackground" : "Coimeád Franz sa chúlra nuair a dhúntar an fhuinneog",
    "settings.app.form.showDisabledServices" : "Taispeáin tabanna do sheirbhísí dhíchumasaithe",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Taispeáin teachtaireachtaí neamhléite, nuair a dhíchumasaítear fógraí",
+   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Socruithe",
    "settings.app.headlineAdvanced" : "Casta",
    "settings.app.headlineAppearance" : "Dealramh",
@@ -166,6 +172,7 @@
    "settings.service.form.editServiceHeadline" : "Cuir {name} in eagar",
    "settings.service.form.enableAudio" : "Cumasaigh fuaim",
    "settings.service.form.enableBadge" : "Taispeáin comhartha do theachtaireachtaí neamhléite",
+   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
    "settings.service.form.enableNotification" : "Cumasaigh fógraí",
    "settings.service.form.enableService" : "Cumasaigh seirbhís",
    "settings.service.form.headlineBadges" : "Comhartha do theachtaireachtaí neamhléite",
@@ -178,6 +185,12 @@
    "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.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.saveButton" : "Sábháil seirbhís",
    "settings.service.form.tabHosted" : "Óstáilte",
    "settings.service.form.tabOnPremise" : "Féinóstáilte ��",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "�ithritheoirí an tAÉ: is féidir cáin díolacháin áitiúla a chur i bhfeidhm",
    "subscription.features.ads" : "Fógraí ar bith, choíche!",
    "subscription.features.comingSoon" : "ag teacht go luath",
-   "subscription.features.customServices" : "Seirbhísí phríobháideach dhuitse agus do d'fhoireann",
    "subscription.features.encryptedSync" : "Sionchronú seisiúin chriptithe",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Cuir seirbhísí óstáilte ar nós HipChat leis",
-   "subscription.features.vpn" : "Tacaíocht seachfhreastalaí � LPF",
+   "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.includedFeatures" : "Cuireann Cuntas Phŕeimhthacadóra Franz san áireamh",
    "subscription.paymentSessionError" : "Ní féidir an bhfoirm íocaíochta a lódáil",
    "subscription.submit.label" : "Ba mhaith liom tacaíocht a thabhairt d'fhorbairt Franz",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index e227c4537..ae9f25695 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -1,4 +1,7 @@
 {
+   "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" : "Nije se moguće povezati na Francove on-line servise. ",
    "global.notConnectedToTheInternet" : "Sada ste povezani s internetom. ",
    "import.headline" : "Uvezite svoje Franc 4 servise. ",
@@ -26,7 +29,7 @@
    "login.serverLogout" : "Vaša sesija je istekla, prijavite se ponovo.",
    "login.submit.label" : "Prijavite se",
    "login.tokenExpired" : "Vaša sesija je istekla, prijavite se ponovo.",
-   "menu.app.about" : "About Franz",
+   "menu.app.about" : "O aplikaciji",
    "menu.app.hide" : "Hide",
    "menu.app.hideOthers" : "Hide Others",
    "menu.app.quit" : "Quit",
@@ -76,6 +79,7 @@
    "password.noUser" : "Ne postoji ni jedan korisnik s tom e-mail adresom",
    "password.submit.label" : "Pošalji",
    "password.successInfo" : "Molimo Vas da provjerite svoju e-mail adresu",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
    "pricing.headline" : "Podržite Franz aplikaciju",
    "pricing.link.skipPayment" : "Ne želim da podržim razvoj Franz-a.",
    "pricing.submit.label" : "Želim da podržim razvoj Franz-a.",
@@ -116,16 +120,18 @@
    "settings.app.form.autoLaunchInBackground" : "Otvori u pozadini",
    "settings.app.form.autoLaunchOnStart" : "Pokreni Franz sa sistemom",
    "settings.app.form.beta" : "Obuhvati i beta verzije",
+   "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
    "settings.app.form.enableMenuBar" : "Prikaži Franz u traci izbornika",
    "settings.app.form.enableSpellchecking" : "Omogući provjeru pravopisa",
    "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
+   "settings.app.form.hideDockIcon" : "Sakrij ikonu Franz u prostoru za obavijesti",
    "settings.app.form.language" : "Jezik",
    "settings.app.form.minimizeToSystemTray" : "Smanji Franca u sustavsku traku",
    "settings.app.form.runInBackground" : "Neka se Franc održava u pozadini i ako je prozor zatvoren",
    "settings.app.form.showDisabledServices" : "Prikaži plo�e s onemogućenim servisima",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Pokaži nepro�itane zna�ke poruka kad se obavještenja onemoguće",
+   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Postavke",
    "settings.app.headlineAdvanced" : "Napredne alatke",
    "settings.app.headlineAppearance" : "Izgled",
@@ -166,6 +172,7 @@
    "settings.service.form.editServiceHeadline" : "Uredite {ime}",
    "settings.service.form.enableAudio" : "Omogućite zvuk",
    "settings.service.form.enableBadge" : "Show unread message badges",
+   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
    "settings.service.form.enableNotification" : "Omogućite obavijesti",
    "settings.service.form.enableService" : "Omogućite usluge",
    "settings.service.form.headlineBadges" : "Unread message badges",
@@ -178,6 +185,12 @@
    "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.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.saveButton" : "Sa�uvaj uslugu\/e",
    "settings.service.form.tabHosted" : "Hostovano",
    "settings.service.form.tabOnPremise" : "Samo-hostovano ��",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "EU državljani, upozerenje: Moguće taksiranje ",
    "subscription.features.ads" : "Bez reklama, doživotno!",
    "subscription.features.comingSoon" : "Dolazi uskoro",
-   "subscription.features.customServices" : "Privatni servisi za Vas i Vaš tim",
    "subscription.features.encryptedSync" : "Kodirano usklađivanje sesija.",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Dodajte pretpostavljeni\/hostirani servis kao Å¡to ima usluga HipChat ",
-   "subscription.features.vpn" : "Podrška za Proxy i VPM ( VPN )",
+   "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.includedFeatures" : "Plaćeni\/Premium ra�un uklju�uje sljedeće: ",
    "subscription.paymentSessionError" : "Nemoguće inicijalizirati obrazac za uplatu",
    "subscription.submit.label" : "Želim da podržim razvoj Franca. ",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 3571ad453..365dec9c6 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -1,4 +1,7 @@
 {
+   "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" : "Nem lehet csatlakozni a Franz online szolgáltatáshoz",
    "global.notConnectedToTheInternet" : "Nincs hálózati kapcsolat.",
    "import.headline" : "Importáld szolgáltatásaidat a Franz 4-ből",
@@ -16,7 +19,7 @@
    "invite.name.label" : "Név",
    "invite.skip.label" : "Későbbre halasztom",
    "invite.submit.label" : "Meghívók küldése",
-   "invite.successInfo" : "Invitations sent successfully",
+   "invite.successInfo" : "Meghívás sikeresen elküldve",
    "login.email.label" : "Email cím",
    "login.headline" : "Bejelentkezés",
    "login.invalidCredentials" : "Hibás email cím vagy jelszó",
@@ -26,49 +29,49 @@
    "login.serverLogout" : "A munkamenet lejárt, kérlek lépj be újra.",
    "login.submit.label" : "Bejelentkezés",
    "login.tokenExpired" : "A munkamenet lejárt, kérlek lépj be újra.",
-   "menu.app.about" : "About Franz",
-   "menu.app.hide" : "Hide",
-   "menu.app.hideOthers" : "Hide Others",
-   "menu.app.quit" : "Quit",
+   "menu.app.about" : "Névjegy",
+   "menu.app.hide" : "Elrejt",
+   "menu.app.hideOthers" : "Többi elrejtése",
+   "menu.app.quit" : "Kilépés",
    "menu.app.settings" : "Beállítások",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Megjelenít",
    "menu.edit" : "Szerkesztés",
-   "menu.edit.copy" : "Copy",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.copy" : "Másolás",
+   "menu.edit.cut" : "Kivágás",
    "menu.edit.delete" : "Törlés",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
-   "menu.edit.paste" : "Paste",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
-   "menu.edit.redo" : "Redo",
-   "menu.edit.selectAll" : "Select All",
-   "menu.edit.speech" : "Speech",
-   "menu.edit.startDictation" : "Start Dictation",
-   "menu.edit.startSpeaking" : "Start Speaking",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
-   "menu.edit.undo" : "Undo",
-   "menu.file" : "File",
-   "menu.help" : "Help",
-   "menu.help.changelog" : "Changelog",
-   "menu.help.learnMore" : "Learn More",
+   "menu.edit.emojiSymbols" : "Emoji és Szimbólumok",
+   "menu.edit.paste" : "Beillesztés",
+   "menu.edit.pasteAndMatchStyle" : "Beillesztés ugyanazzal a megjelenéssel",
+   "menu.edit.redo" : "Újra",
+   "menu.edit.selectAll" : "Összes kijelölése",
+   "menu.edit.speech" : "Beszéd",
+   "menu.edit.startDictation" : "Diktálás elkezdése",
+   "menu.edit.startSpeaking" : "Beszélgetés kezdeményezése",
+   "menu.edit.stopSpeaking" : "Beszéd vége",
+   "menu.edit.undo" : "Visszavonás",
+   "menu.file" : "fájl",
+   "menu.help" : "Súgó",
+   "menu.help.changelog" : "Változások listája",
+   "menu.help.learnMore" : "Tudjon meg többet",
    "menu.help.privacy" : "Adatvédelmi Nyilatkozatot",
-   "menu.help.support" : "Support",
-   "menu.help.tos" : "Terms of Service",
-   "menu.services" : "Services",
-   "menu.services.addNewService" : "Add New Service...",
-   "menu.view" : "View",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
-   "menu.view.reloadFranz" : "Reload Franz",
-   "menu.view.reloadService" : "Reload Service",
-   "menu.view.resetZoom" : "Actual Size",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
-   "menu.view.zoomIn" : "Zoom In",
-   "menu.view.zoomOut" : "Zoom Out",
-   "menu.window" : "Window",
-   "menu.window.close" : "Close",
-   "menu.window.minimize" : "Minimize",
+   "menu.help.support" : "Támogatás",
+   "menu.help.tos" : "Felhasználói feltételek",
+   "menu.services" : "Szolgáltatások",
+   "menu.services.addNewService" : "Új kiszolgáló hozzáadása",
+   "menu.view" : "Nézet",
+   "menu.view.enterFullScreen" : "Kilépés a teljes képernyős módból",
+   "menu.view.exitFullScreen" : "Kilépés a teljes képernyős módból",
+   "menu.view.reloadFranz" : "Franz újrainditása",
+   "menu.view.reloadService" : "Kiszolgáló újraindítása",
+   "menu.view.resetZoom" : "Tényleges méret",
+   "menu.view.toggleDevTools" : "fejlesztői eszközök bekapcsolása",
+   "menu.view.toggleFullScreen" : "Váltás Teljes képernyős módra",
+   "menu.view.toggleServiceDevTools" : "Kiszolgáló Fejlesztői Eszközök Bekapcsolása",
+   "menu.view.zoomIn" : "Nagyítás",
+   "menu.view.zoomOut" : "Kicsinyítés",
+   "menu.window" : "Ablak",
+   "menu.window.close" : "Bezárás",
+   "menu.window.minimize" : "Tálcára",
    "password.email.label" : "Email cím",
    "password.headline" : "Jelszó visszaállítása",
    "password.link.login" : "Jelentkezz be a fiókodba",
@@ -76,6 +79,7 @@
    "password.noUser" : "Nem található felhasználó a megadott email címmel",
    "password.submit.label" : "Küldés",
    "password.successInfo" : "Ellenőrizd az email fiókodat",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
    "pricing.headline" : "Támogasd a Franz-ot",
    "pricing.link.skipPayment" : "Nem szeretném támogatni a Franz fejlesztését.",
    "pricing.submit.label" : "Támogatni szeretném a Franz fejlesztését.",
@@ -116,16 +120,18 @@
    "settings.app.form.autoLaunchInBackground" : "Megnyitás háttérben",
    "settings.app.form.autoLaunchOnStart" : "Franz betöltése indításkor",
    "settings.app.form.beta" : "Béta verziók keresése",
-   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
-   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
+   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.enableGPUAcceleration" : "hardveres gyorsítás engedélyezése",
+   "settings.app.form.enableMenuBar" : "Franz megjelenítése a menüsorban",
    "settings.app.form.enableSpellchecking" : "Helyesírás-ellenőrzés engedélyezése",
    "settings.app.form.enableSystemTray" : "Franz mutatása a tálcán",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
+   "settings.app.form.hideDockIcon" : "Franz ikon elrejtése a Dock mögött",
    "settings.app.form.language" : "Nyelv",
    "settings.app.form.minimizeToSystemTray" : "Franz kicsinyítése a tálcára",
    "settings.app.form.runInBackground" : "Franz fusson a háttérben az ablak bezárásakor",
    "settings.app.form.showDisabledServices" : "Letiltott szolgáltatások megjelenítése",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Mutass az 'olvasatlan üzenet' jelzést amikor az értesítések le vannak tiltva.",
+   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Beállítások",
    "settings.app.headlineAdvanced" : "Haladó",
    "settings.app.headlineAppearance" : "Megjelenés",
@@ -138,10 +144,10 @@
    "settings.app.updateStatusAvailable" : "Frissítés elérhető, letöltés folyamatban...",
    "settings.app.updateStatusSearching" : "Frissítéseket keres",
    "settings.app.updateStatusUpToDate" : "A Franz legfrissebb verzióját használod",
-   "settings.invite.headline" : "Invite Friends",
+   "settings.invite.headline" : "Barát meghívása",
    "settings.navigation.account" : "Fiók",
    "settings.navigation.availableServices" : "Elérhető szolgáltatások",
-   "settings.navigation.inviteFriends" : "Invite Friends",
+   "settings.navigation.inviteFriends" : "Barát meghívása",
    "settings.navigation.logout" : "Kijelentkezés",
    "settings.navigation.settings" : "Beállítások",
    "settings.navigation.yourServices" : "Szolgáltatásaid",
@@ -166,6 +172,7 @@
    "settings.service.form.editServiceHeadline" : "{name} szerkesztése",
    "settings.service.form.enableAudio" : "Hang engedélyezése",
    "settings.service.form.enableBadge" : "Mutasd az olvasatlan jelzéseket",
+   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
    "settings.service.form.enableNotification" : "Értesítések engedélyezése",
    "settings.service.form.enableService" : "Szolgáltatás engedélyezése",
    "settings.service.form.headlineBadges" : "Olvasatlan üzenet jelzések",
@@ -178,6 +185,12 @@
    "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.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.saveButton" : "Szolgáltatás mentése",
    "settings.service.form.tabHosted" : "Ãœzemeltetett",
    "settings.service.form.tabOnPremise" : "Egyénileg üzemeltetett",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "EU állampolgárok: helyi vásárlás esetén adók kerülhetnek felszámolásra",
    "subscription.features.ads" : "Hirdetésmentes, mindig!",
    "subscription.features.comingSoon" : "Hamarosan!",
-   "subscription.features.customServices" : "Privát szolgáltatások neked és a csapatodnak",
    "subscription.features.encryptedSync" : "Titkosított munkamenet szinkronizálás",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Helyi\/üzemeltetett szolgáltatások használata, pl. HipChat",
-   "subscription.features.vpn" : "Proxy & VPN támogatás",
+   "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.includedFeatures" : "Az előfizetett Franz Prémium Támogató Fiók tartalmazza",
    "subscription.paymentSessionError" : "Nem sikerült a fizetési felületet betölteni",
    "subscription.submit.label" : "Szeretném támogatni a Franz fejlesztését",
@@ -241,10 +256,10 @@
    "tabs.item.enableNotification" : "Értesítések engedélyezése",
    "tabs.item.enableService" : "Szolgáltatás engedélyezése",
    "tabs.item.reload" : "Újratöltés",
-   "validation.email" : "{field} is not valid",
-   "validation.minLength" : "{field} should be at least {length} characters long",
-   "validation.required" : "{field} is required",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.email" : "{field} nem érvényes",
+   "validation.minLength" : "{field} legalább {length} karakter hosszúnak kell lennie",
+   "validation.required" : "{field} Kitöltése kötelező",
+   "validation.url" : "{field} nem érvényes URL",
    "welcome.loginButton" : "Jelentkezz be a fiókodba",
    "welcome.signupButton" : "Új fiók létrehozása",
    "welcome.slogan" : "Üzenetküldés okosan"
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index e6d671c1b..437c1304f 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -1,74 +1,77 @@
 {
-   "global.api.unhealthy" : "Tidak bisa tersambung ke layanan Franz",
-   "global.notConnectedToTheInternet" : "Anda tidak tersambung ke internet.",
+   "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" : "Tidak dapat tersambung ke layanan Franz",
+   "global.notConnectedToTheInternet" : "Anda tidak mempunyai koneksi 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",
    "import.submit.label" : "Impor layanan",
-   "infobar.buttonChangelog" : "Yang baru",
-   "infobar.buttonInstallUpdate" : "Mulai ulang dan instal versi baru",
+   "infobar.buttonChangelog" : "Apa yang baru?",
+   "infobar.buttonInstallUpdate" : "Mulai ulang & instal pembaruan",
    "infobar.buttonReloadServices" : "Muat ulang layanan",
-   "infobar.requiredRequestsFailed" : "Tidak bisa memuat layanan dan informasi pengguna",
+   "infobar.requiredRequestsFailed" : "Gagal memuat layanan dan informasi pengguna",
    "infobar.servicesUpdated" : "Layanan Anda telah diperbarui",
    "infobar.updateAvailable" : "Versi baru Franz tersedia.",
    "invite.email.label" : "Alamat email",
    "invite.headline.friends" : "Undang 3 teman atau kolega Anda",
    "invite.name.label" : "Nama",
-   "invite.skip.label" : "Saya ingin melakukannya nanti saja",
+   "invite.skip.label" : "Nanti saja",
    "invite.submit.label" : "Kirim undangan",
    "invite.successInfo" : "Undangan berhasil dikirim",
    "login.email.label" : "Alamat email",
    "login.headline" : "Masuk",
-   "login.invalidCredentials" : "Email atau sandi tidak valid",
+   "login.invalidCredentials" : "Email atau sandi salah",
    "login.link.password" : "Setel ulang sandi",
    "login.link.signup" : "Buat akun gratis",
    "login.password.label" : "Sandi",
    "login.serverLogout" : "Sesi Anda telah berakhir, silakan masuk kembali.",
    "login.submit.label" : "Masuk",
-   "login.tokenExpired" : "Sesi Anda kedaluwarsa, silakan masuk kembali.",
-   "menu.app.about" : "About Franz",
-   "menu.app.hide" : "Hide",
-   "menu.app.hideOthers" : "Hide Others",
-   "menu.app.quit" : "Quit",
+   "login.tokenExpired" : "Sesi Anda telah kedaluwarsa, silakan masuk kembali.",
+   "menu.app.about" : "Tentang Franz",
+   "menu.app.hide" : "Sembunyikan",
+   "menu.app.hideOthers" : "Sembunyikan Lainnya",
+   "menu.app.quit" : "Keluar",
    "menu.app.settings" : "Pengaturan",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Perlihatkan",
    "menu.edit" : "Edit",
-   "menu.edit.copy" : "Copy",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.copy" : "Salin",
+   "menu.edit.cut" : "Potong",
    "menu.edit.delete" : "Hapus",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
-   "menu.edit.paste" : "Paste",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
-   "menu.edit.redo" : "Redo",
-   "menu.edit.selectAll" : "Select All",
-   "menu.edit.speech" : "Speech",
-   "menu.edit.startDictation" : "Start Dictation",
-   "menu.edit.startSpeaking" : "Start Speaking",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
-   "menu.edit.undo" : "Undo",
-   "menu.file" : "File",
-   "menu.help" : "Help",
-   "menu.help.changelog" : "Changelog",
-   "menu.help.learnMore" : "Learn More",
+   "menu.edit.emojiSymbols" : "Emoji & Simbol",
+   "menu.edit.paste" : "Tempel",
+   "menu.edit.pasteAndMatchStyle" : "Tempel dan Cocokkan Gaya",
+   "menu.edit.redo" : "Ulangi lagi",
+   "menu.edit.selectAll" : "Pilih Semua",
+   "menu.edit.speech" : "Bicara",
+   "menu.edit.startDictation" : "Mulai Dikte",
+   "menu.edit.startSpeaking" : "Mulai Berbicara",
+   "menu.edit.stopSpeaking" : "Berhenti Berbicara",
+   "menu.edit.undo" : "Batalkan",
+   "menu.file" : "Berkas",
+   "menu.help" : "Bantuan",
+   "menu.help.changelog" : "Log Perubahan",
+   "menu.help.learnMore" : "Pelajari Lebih Lanjut",
    "menu.help.privacy" : "Pernyataan Privasi",
-   "menu.help.support" : "Support",
-   "menu.help.tos" : "Terms of Service",
-   "menu.services" : "Services",
-   "menu.services.addNewService" : "Add New Service...",
-   "menu.view" : "View",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
-   "menu.view.reloadFranz" : "Reload Franz",
-   "menu.view.reloadService" : "Reload Service",
-   "menu.view.resetZoom" : "Actual Size",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
-   "menu.view.zoomIn" : "Zoom In",
-   "menu.view.zoomOut" : "Zoom Out",
-   "menu.window" : "Window",
-   "menu.window.close" : "Close",
-   "menu.window.minimize" : "Minimize",
+   "menu.help.support" : "Dukungan",
+   "menu.help.tos" : "Ketentuan Layanan",
+   "menu.services" : "Layanan",
+   "menu.services.addNewService" : "Tambahkan Layanan Baru...",
+   "menu.view" : "Tampilan",
+   "menu.view.enterFullScreen" : "Masuk ke Mode Layar Penuh",
+   "menu.view.exitFullScreen" : "Keluar dari Layar Penuh",
+   "menu.view.reloadFranz" : "Muat Ulang Franz",
+   "menu.view.reloadService" : "Muat ulang Layanan",
+   "menu.view.resetZoom" : "Ukuran Sebenarnya",
+   "menu.view.toggleDevTools" : "Aktif\/Nonaktifkan alat pengembang",
+   "menu.view.toggleFullScreen" : "Aktif\/Nonaktifkan Layar Penuh",
+   "menu.view.toggleServiceDevTools" : "Aktif\/Nonaktifkan layanan alat pengembang",
+   "menu.view.zoomIn" : "Perbesar",
+   "menu.view.zoomOut" : "Perkecil",
+   "menu.window" : "Jendela",
+   "menu.window.close" : "Tutup",
+   "menu.window.minimize" : "Minimalkan",
    "password.email.label" : "Alamat email",
    "password.headline" : "Setel ulang sandi",
    "password.link.login" : "Masuk ke akun Anda",
@@ -76,6 +79,7 @@
    "password.noUser" : "Tidak ditemukan pengguna dengan email tersebut",
    "password.submit.label" : "Kirim",
    "password.successInfo" : "Periksa email Anda",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
    "pricing.headline" : "Dukung Franz",
    "pricing.link.skipPayment" : "Saya tidak ingin mendukung pengembangan Franz.",
    "pricing.submit.label" : "Saya ingin mendukung pengembangan Franz",
@@ -86,7 +90,7 @@
    "service.crashHandler.text" : "{name} menyebabkan kesalahan.",
    "service.disabledHandler.action" : "Aktifkan {name}",
    "service.disabledHandler.headline" : "{name} dinonaktifkan",
-   "services.getStarted" : "Memulai",
+   "services.getStarted" : "Ayo mulai!",
    "services.welcome" : "Selamat datang di Franz",
    "settings.account.account.editButton" : "Edit akun",
    "settings.account.accountType.basic" : "Akun Dasar",
@@ -107,7 +111,7 @@
    "settings.account.manageSubscription.label" : "Kelola langganan Anda",
    "settings.account.successInfo" : "Perubahan Anda telah disimpan",
    "settings.account.tryReloadUserInfoRequest" : "Coba lagi",
-   "settings.account.userInfoRequestFailed" : "Tidak bisa memuat informasi pengguna",
+   "settings.account.userInfoRequestFailed" : "Gagal memuat informasi pengguna",
    "settings.app.buttonClearAllCache" : "Bersihkan singgahan",
    "settings.app.buttonInstallUpdate" : "Mulai ulang dan instal versi baru",
    "settings.app.buttonSearchForUpdate" : "Periksa versi baru",
@@ -116,7 +120,8 @@
    "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.enableGPUAcceleration" : "Enable GPU Acceleration",
+   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.enableGPUAcceleration" : "Aktifkan Akselerasi GPU",
    "settings.app.form.enableMenuBar" : "Tampilkan Franz di Bilah Menu",
    "settings.app.form.enableSpellchecking" : "Aktifkan pemeriksaan ejaan",
    "settings.app.form.enableSystemTray" : "Tampilkan Franz di baki sistem",
@@ -126,6 +131,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.headline" : "Pengaturan",
    "settings.app.headlineAdvanced" : "Tingkat Lanjut",
    "settings.app.headlineAppearance" : "Tampilan",
@@ -149,7 +155,7 @@
    "settings.recipes.dev" : "Pengembangan",
    "settings.recipes.headline" : "Layanan tersedia",
    "settings.recipes.missingService" : "Layanan tidak tersedia?",
-   "settings.recipes.mostPopular" : "Paling populer",
+   "settings.recipes.mostPopular" : "Terpopuler",
    "settings.recipes.nothingFound" : "Maaf, tidak ada layanan yang cocok dengan pencarian Anda.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Layanan berhasil ditambahkan",
    "settings.searchService" : "Cari layanan",
@@ -161,11 +167,12 @@
    "settings.service.form.customUrl" : "Server khusus",
    "settings.service.form.customUrlPremiumInfo" : "Untuk menambahkan layanan hosted yang dijalankan mandiri, Anda membutuhkan Franz Premium Supporter Account.",
    "settings.service.form.customUrlUpgradeAccount" : "Tingkatkan akun Anda",
-   "settings.service.form.customUrlValidationError" : "Tidak bisa memvalidasi server {name} khusus.",
+   "settings.service.form.customUrlValidationError" : "Gagal memvalidasi server {nama} khusus.",
    "settings.service.form.deleteButton" : "Hapus layanan",
-   "settings.service.form.editServiceHeadline" : "Edit {name}",
+   "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.enableNotification" : "Aktifkan pemberitahuan",
    "settings.service.form.enableService" : "Aktifkan layanan",
    "settings.service.form.headlineBadges" : "Lencana pesan belum dibaca",
@@ -175,9 +182,15 @@
    "settings.service.form.iconDelete" : "Hapus",
    "settings.service.form.iconUpload" : "Lepaskan gambar atau klik di sini",
    "settings.service.form.indirectMessageInfo" : "Anda akan diberi tahu tentang semua pesan dalam kanal, bukan hanya @username, @channel, @here, ...",
-   "settings.service.form.indirectMessages" : "Tampilkan lencana pesan untuk semua pesan",
+   "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.saveButton" : "Simpan layanan",
    "settings.service.form.tabHosted" : "Hosted",
    "settings.service.form.tabOnPremise" : "Hosted mandiri",
@@ -187,7 +200,7 @@
    "settings.services.deletedInfo" : "Layanan telah dihapus",
    "settings.services.discoverServices" : "Temukan layanan",
    "settings.services.headline" : "Layanan Anda",
-   "settings.services.noServicesAdded" : "Anda belum menambahkan layanan.",
+   "settings.services.noServicesAdded" : "Anda belum menambahkan layanan apa pun.",
    "settings.services.tooltip.isDisabled" : "Layanan dinonaktifkan",
    "settings.services.tooltip.isMuted" : "Semua suara dibisukan",
    "settings.services.tooltip.notificationsDisabled" : "Pemberitahuan dinonaktifkan",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "Warga UE: pajak penjualan lokal mungkin berlaku",
    "subscription.features.ads" : "Tanpa iklan, selamanya!",
    "subscription.features.comingSoon" : "segera hadir",
-   "subscription.features.customServices" : "Layanan pribadi untuk Anda dan tim Anda",
    "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.vpn" : "Dukungan proxy & VPN",
+   "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.includedFeatures" : "Franz Premium Supporter Account berbayar menyertakan",
    "subscription.paymentSessionError" : "Tidak bisa menginisialisasi formulir pembayaran",
    "subscription.submit.label" : "Saya ingin mendukung pengembangan Franz",
@@ -236,15 +251,15 @@
    "tabs.item.disableAudio" : "Nonaktifkan audio",
    "tabs.item.disableNotifications" : "Nonaktifkan pemberitahuan",
    "tabs.item.disableService" : "Nonaktifkan layanan",
-   "tabs.item.edit" : "Edit",
+   "tabs.item.edit" : "Sunting",
    "tabs.item.enableAudio" : "Aktifkan audio",
    "tabs.item.enableNotification" : "Aktifkan pemberitahuan",
    "tabs.item.enableService" : "Aktifkan layanan",
    "tabs.item.reload" : "Muat Ulang",
-   "validation.email" : "{field} is not valid",
-   "validation.minLength" : "{field} should be at least {length} characters long",
-   "validation.required" : "{field} is required",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.email" : "{field} tidak benar",
+   "validation.minLength" : "{field} setidaknya harus {length} karakter",
+   "validation.required" : "{field} wajib diisi",
+   "validation.url" : "{field} bukan URL yang benar",
    "welcome.loginButton" : "Masuk ke akun Anda",
    "welcome.signupButton" : "Buat akun gratis",
    "welcome.slogan" : "Perpesanan yang bekerja untuk Anda"
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 9d23a309b..958d1470d 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -1,14 +1,17 @@
 {
+   "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" : "Impossibile connettersi ai servizi online di Franz",
    "global.notConnectedToTheInternet" : "Non sei connesso a Internet.",
    "import.headline" : "Importa i servizi di Franz 4",
    "import.notSupportedHeadline" : "Servizi non ancora supportati in Franz 5",
-   "import.skip.label" : "Voglio aggiungere servizi manualmente",
+   "import.skip.label" : "Voglio aggiungere i servizi manualmente",
    "import.submit.label" : "Importa servizi",
    "infobar.buttonChangelog" : "Cosa c'è di nuovo?",
-   "infobar.buttonInstallUpdate" : "Riavvia e installa aggiornamento",
+   "infobar.buttonInstallUpdate" : "Riavvia e installa l'aggiornamento",
    "infobar.buttonReloadServices" : "Ricarica servizi",
-   "infobar.requiredRequestsFailed" : "Impossibile caricare servizi e info utente",
+   "infobar.requiredRequestsFailed" : "Impossibile caricare i servizi e le informazioni dell'utente",
    "infobar.servicesUpdated" : "I tuoi servizi sono stati aggiornati.",
    "infobar.updateAvailable" : "È disponibile un nuovo aggiornamento di Franz.",
    "invite.email.label" : "Indirizzo email",
@@ -23,14 +26,14 @@
    "login.link.password" : "Reimposta password",
    "login.link.signup" : "Crea un account gratuito",
    "login.password.label" : "Password",
-   "login.serverLogout" : "La tua sessione è scaduta, accedi nuovamente.",
+   "login.serverLogout" : "La tua sessione è scaduta, per favore accedi di nuovo.",
    "login.submit.label" : "Accedi",
-   "login.tokenExpired" : "La tua sessione è scaduta, accedi nuovamente.",
+   "login.tokenExpired" : "La tua sessione è scaduta, per favore accedi di nuovo.",
    "menu.app.about" : "Info su Franz",
    "menu.app.hide" : "Nascondi",
    "menu.app.hideOthers" : "Nascondi Altri",
    "menu.app.quit" : "Esci",
-   "menu.app.settings" : "Impostazioni",
+   "menu.app.settings" : "Settings",
    "menu.app.unhide" : "Mostra",
    "menu.edit" : "Modifica",
    "menu.edit.copy" : "Copia",
@@ -50,20 +53,20 @@
    "menu.help" : "Aiuto",
    "menu.help.changelog" : "Changelog",
    "menu.help.learnMore" : "Maggiori Informazioni",
-   "menu.help.privacy" : "Informativa sulla Privacy",
+   "menu.help.privacy" : "Dichiarazione della Privacy",
    "menu.help.support" : "Supporto",
    "menu.help.tos" : "Termini di Servizio",
    "menu.services" : "Servizi",
    "menu.services.addNewService" : "Aggiungi Nuovo Servizio...",
    "menu.view" : "Visualizza",
-   "menu.view.enterFullScreen" : "Visualizza a Tutto Schermo",
-   "menu.view.exitFullScreen" : "Modalità Finestra",
+   "menu.view.enterFullScreen" : "Visualizza a Schermo Intero",
+   "menu.view.exitFullScreen" : "Esci da Schermo Intero",
    "menu.view.reloadFranz" : "Ricarica Franz",
    "menu.view.reloadService" : "Ricarica Servizio",
    "menu.view.resetZoom" : "Dimensione Attuale",
-   "menu.view.toggleDevTools" : "Attiva Strumenti Sviluppo",
-   "menu.view.toggleFullScreen" : "Passa a Schermo Intero",
-   "menu.view.toggleServiceDevTools" : "Attiva Strumenti per Sviluppatori di Servizi",
+   "menu.view.toggleDevTools" : "Attiva\/Disattiva Strumenti Sviluppo",
+   "menu.view.toggleFullScreen" : "Attiva\/Disattiva Schermo Intero",
+   "menu.view.toggleServiceDevTools" : "Attiva\/Disattiva Strumenti per Sviluppatori di Servizi",
    "menu.view.zoomIn" : "Aumenta Zoom",
    "menu.view.zoomOut" : "Diminuisci Zoom",
    "menu.window" : "Finestra",
@@ -75,11 +78,12 @@
    "password.link.signup" : "Crea un account gratuito",
    "password.noUser" : "Non è stato trovato nessun utente con questo indirizzo e-mail",
    "password.submit.label" : "Invia",
-   "password.successInfo" : "Please check your email",
-   "pricing.headline" : "Support Franz",
-   "pricing.link.skipPayment" : "Non voglio supportare lo sviluppo di Franz.",
+   "password.successInfo" : "Per favore controlla la tua email",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "pricing.headline" : "Supporta Franz",
+   "pricing.link.skipPayment" : "Non voglio supportare lo sviluppo di Franz",
    "pricing.submit.label" : "Voglio supportare lo sviluppo di Franz",
-   "pricing.support.label" : "Select your support plan",
+   "pricing.support.label" : "Seleziona la modalità di supporto",
    "service.crashHandler.action" : "Ricarica {name}",
    "service.crashHandler.autoReload" : "Tentativo di ripristino automatico di {name} in {seconds} secondi",
    "service.crashHandler.headline" : "Oh no!",
@@ -87,13 +91,13 @@
    "service.disabledHandler.action" : "Attiva {name}",
    "service.disabledHandler.headline" : "{name} è disattivato",
    "services.getStarted" : "Iniziamo",
-   "services.welcome" : "Welcome to Franz",
+   "services.welcome" : "Benvenuto su Franz",
    "settings.account.account.editButton" : "Modifica account",
-   "settings.account.accountType.basic" : "Account Basic",
-   "settings.account.accountType.premium" : "Premium Supporter Account",
+   "settings.account.accountType.basic" : "Account Base",
+   "settings.account.accountType.premium" : "Account Supporto Premium ",
    "settings.account.buttonSave" : "Aggiorna profilo",
    "settings.account.deleteAccount" : "Elimina account",
-   "settings.account.deleteEmailSent" : "Hai ricevuto un'email con un link per confermare l'eliminazione del tuo account. I dati del tuo account non potranno più essere ripristinati!",
+   "settings.account.deleteEmailSent" : "Hai ricevuto un'email con un link per confermare l'eliminazione del tuo account.I dati del tuo account non potranno più essere ripristinati!",
    "settings.account.deleteInfo" : "Se non hai più bisogno dell'account Franz, puoi eliminare il tuo account e tutti i dati relativi qui.",
    "settings.account.headline" : "Account",
    "settings.account.headlineAccount" : "Informazioni account",
@@ -101,13 +105,13 @@
    "settings.account.headlineInvoices" : "Fatture",
    "settings.account.headlinePassword" : "Cambia password",
    "settings.account.headlineProfile" : "Aggiorna profilo",
-   "settings.account.headlineSubscription" : "La tua iscrizione",
+   "settings.account.headlineSubscription" : "Il tuo abbonamento",
    "settings.account.headlineUpgrade" : "Aggiorna il tuo account e supporta Franz",
    "settings.account.invoiceDownload" : "Scarica",
-   "settings.account.manageSubscription.label" : "Gestisci la tua iscrizione",
+   "settings.account.manageSubscription.label" : "Gestisci il tuo abbonamento",
    "settings.account.successInfo" : "Le tue modifiche sono state salvate",
-   "settings.account.tryReloadUserInfoRequest" : "Prova ancora",
-   "settings.account.userInfoRequestFailed" : "Impossibile caricare informazioni utente.",
+   "settings.account.tryReloadUserInfoRequest" : "Prova di nuovo",
+   "settings.account.userInfoRequestFailed" : "Impossibile caricare le informazioni dell'utente.",
    "settings.app.buttonClearAllCache" : "Svuota la cache",
    "settings.app.buttonInstallUpdate" : "Riavvia e installa l'aggiornamento",
    "settings.app.buttonSearchForUpdate" : "Controlla aggiornamenti",
@@ -116,16 +120,18 @@
    "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.enableGPUAcceleration" : "Attiva Accelerazione GPU",
    "settings.app.form.enableMenuBar" : "Mostra Franz nella Barra del Menu",
    "settings.app.form.enableSpellchecking" : "Attiva controllo ortografico",
    "settings.app.form.enableSystemTray" : "Mostra Franz nell'area di notifica",
-   "settings.app.form.hideDockIcon" : "Nascondi icona Franz nella Dock",
+   "settings.app.form.hideDockIcon" : "Nascondi l'icona Franz nel Dock",
    "settings.app.form.language" : "Lingua",
    "settings.app.form.minimizeToSystemTray" : "Minimizza Franz nell'area di notifica",
    "settings.app.form.runInBackground" : "Mantieni Franz in esecuzione quando chiudi la finestra",
    "settings.app.form.showDisabledServices" : "Mostra schede servizi disattivati",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostra l'etichetta  dei messaggi non letti quanto le notifiche sono disattivate",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostra l'etichetta dei messaggi non letti quando le notifiche sono disattivate",
+   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Impostazioni",
    "settings.app.headlineAdvanced" : "Avanzate",
    "settings.app.headlineAppearance" : "Aspetto",
@@ -136,7 +142,7 @@
    "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Aiutaci a tradurre Franz nella tua lingua.",
    "settings.app.updateStatusAvailable" : "Aggiornamento disponibile, download in corso...",
-   "settings.app.updateStatusSearching" : "Ricerca aggiornamenti...",
+   "settings.app.updateStatusSearching" : "Ricerca aggiornamenti",
    "settings.app.updateStatusUpToDate" : "Stai utilizzando l'ultima versione di Franz",
    "settings.invite.headline" : "Invita Amici",
    "settings.navigation.account" : "Account",
@@ -148,14 +154,14 @@
    "settings.recipes.all" : "Tutti i servizi",
    "settings.recipes.dev" : "Sviluppo",
    "settings.recipes.headline" : "Servizi disponibili",
-   "settings.recipes.missingService" : "Richiedi un servizio",
+   "settings.recipes.missingService" : "Manca un servizio?",
    "settings.recipes.mostPopular" : "Più popolari",
    "settings.recipes.nothingFound" : "Ci dispiace, ma nessun servizio corrisponde alla tua ricerca.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Servizio aggiunto con successo",
    "settings.searchService" : "Cerca servizio",
    "settings.service.error.goBack" : "Torna ai servizi",
    "settings.service.error.headline" : "Errore",
-   "settings.service.error.message" : "Impossibile caricare il servizio.",
+   "settings.service.error.message" : "Impossibile caricare il contenuto del servizio.",
    "settings.service.form.addServiceHeadline" : "Aggiungi {name}",
    "settings.service.form.availableServices" : "Servizi disponibili",
    "settings.service.form.customUrl" : "Server personalizzato",
@@ -166,6 +172,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.enableNotification" : "Attiva le notifiche",
    "settings.service.form.enableService" : "Attiva il servizio",
    "settings.service.form.headlineBadges" : "Etichetta dei messaggi non letti",
@@ -175,9 +182,15 @@
    "settings.service.form.iconDelete" : "Elimina",
    "settings.service.form.iconUpload" : "Trascina la tua immagine o clicca qui",
    "settings.service.form.indirectMessageInfo" : "Verranno notificati tutti i messaggi di un canale, non solo @username, @channel, @here, ...",
-   "settings.service.form.indirectMessages" : "Mostra l'etichetta per tutti i messaggi",
-   "settings.service.form.isMutedInfo" : "Se  disattivato, tutte le notifiche sonore e le riproduzioni audio saranno mute",
+   "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.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.saveButton" : "Salva servizio",
    "settings.service.form.tabHosted" : "Hosted",
    "settings.service.form.tabOnPremise" : "Self hosted ��",
@@ -187,15 +200,15 @@
    "settings.services.deletedInfo" : "Il servizio è stato eliminato",
    "settings.services.discoverServices" : "Scopri servizi",
    "settings.services.headline" : "I tuoi servizi",
-   "settings.services.noServicesAdded" : "Non aggiunto nessun servizio.",
+   "settings.services.noServicesAdded" : "Non hai aggiunto ancora nessun servizio.",
    "settings.services.tooltip.isDisabled" : "Il servizio è disattivato",
-   "settings.services.tooltip.isMuted" : "Tutti i suoni sono stati disattivati",
-   "settings.services.tooltip.notificationsDisabled" : "Le notifiche sono state disattivate",
-   "settings.services.updatedInfo" : "Le modifiche sono state salvate",
+   "settings.services.tooltip.isMuted" : "Tutti i suoni sono disattivati",
+   "settings.services.tooltip.notificationsDisabled" : "Le notifiche sono disattivate",
+   "settings.services.updatedInfo" : "Le tue modifiche sono state salvate",
    "settings.user.form.accountType.company" : "Società",
-   "settings.user.form.accountType.individual" : "Individuo",
-   "settings.user.form.accountType.label" : "Tipo account",
-   "settings.user.form.accountType.non-profit" : "Non-Profit",
+   "settings.user.form.accountType.individual" : "Individuale",
+   "settings.user.form.accountType.label" : "Tipo di account",
+   "settings.user.form.accountType.non-profit" : "No profit",
    "settings.user.form.currentPassword" : "Password attuale",
    "settings.user.form.email" : "Email",
    "settings.user.form.firstname" : "Nome",
@@ -211,21 +224,23 @@
    "signup.firstname.label" : "Nome",
    "signup.headline" : "Iscriviti",
    "signup.lastname.label" : "Cognome",
-   "signup.legal.info" : "Creando un account di Franz accetti",
+   "signup.legal.info" : "Creando un account di Franz accetti l' ",
    "signup.legal.privacy" : "Informativa sulla Privacy",
-   "signup.legal.terms" : "Termini del Servizio",
-   "signup.link.login" : "Hai già un account, accedi?",
+   "signup.legal.terms" : "Termini di Servizio",
+   "signup.link.login" : "Hai già un account, vuoi accedere?",
    "signup.password.label" : "Password",
    "signup.submit.label" : "Crea un account",
    "subscription.euTaxInfo" : "Per i residenti UE: possono essere applicate tasse locali",
    "subscription.features.ads" : "Nessuna pubblicità, mai!",
    "subscription.features.comingSoon" : "in arrivo",
-   "subscription.features.customServices" : "Servizi privati per te e il tuo gruppo",
    "subscription.features.encryptedSync" : "Sincronizzazione sessione crittografata",
-   "subscription.features.onpremise" : "Aggiungi servizi on-premise\/in casa come HipChat",
-   "subscription.features.vpn" : "Supporto Proxy e VPN",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.onpremise" : "Aggiungi servizi on-premise\/hosted come 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.includedFeatures" : "L'account a pagamento Franz Premium Supporter include",
-   "subscription.paymentSessionError" : "Impossibile inizializzare il form del pagamento",
+   "subscription.paymentSessionError" : "Impossibile inizializzare il modulo per il pagamento",
    "subscription.submit.label" : "Voglio supportare lo sviluppo di Franz",
    "subscription.type.free" : "gratis",
    "subscription.type.month" : "mese",
@@ -240,12 +255,12 @@
    "tabs.item.enableAudio" : "Attiva audio",
    "tabs.item.enableNotification" : "Attiva notifiche",
    "tabs.item.enableService" : "Attiva servizio",
-   "tabs.item.reload" : "Aggiorna",
+   "tabs.item.reload" : "Ricarica",
    "validation.email" : "{field} non valido",
    "validation.minLength" : "{field} dovrebbe contenere almeno {length} caratteri",
    "validation.required" : "{field} è necessario",
    "validation.url" : "{field} non è un URL valido",
    "welcome.loginButton" : "Accedi al tuo account",
    "welcome.signupButton" : "Crea un account gratuito",
-   "welcome.slogan" : "Un sistema di messaggistica che funziona"
+   "welcome.slogan" : "Un sistema di messaggistica che va bene per te"
 }
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index a7af10aba..57b767ef1 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -1,11 +1,14 @@
 {
-   "global.api.unhealthy" : "Franzオンラインサービス�接続����ん。",
+   "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.headline" : "Franz 4�サービスをイン�ート��下��",
    "import.notSupportedHeadline" : "Franz 5����サービス���対応�����ん",
-   "import.skip.label" : "後�手動�サービスを追加�る",
-   "import.submit.label" : "サービスをイン�ート",
-   "infobar.buttonChangelog" : "最新情報",
+   "import.skip.label" : "手動�サービスを追加�る",
+   "import.submit.label" : "サービスをイン�ート��下��",
+   "infobar.buttonChangelog" : "最新�情報",
    "infobar.buttonInstallUpdate" : "�起動��更新をインストール�る",
    "infobar.buttonReloadServices" : "サービス��読�込�",
    "infobar.requiredRequestsFailed" : "サービス�ユーザー情報を読�込���ん���",
@@ -26,7 +29,7 @@
    "login.serverLogout" : "セッション�期��切れ���。ログイン�直��下��。",
    "login.submit.label" : "サインイン",
    "login.tokenExpired" : "セッション�期��切れ���。ログイン�直��下��。",
-   "menu.app.about" : "Franz����",
+   "menu.app.about" : "�ージョン情報",
    "menu.app.hide" : "隠�",
    "menu.app.hideOthers" : "他を隠�",
    "menu.app.quit" : "終了",
@@ -49,7 +52,7 @@
    "menu.file" : "ファイル",
    "menu.help" : "ヘルプ",
    "menu.help.changelog" : "更新履歴",
-   "menu.help.learnMore" : "詳細����",
+   "menu.help.learnMore" : "Franz����",
    "menu.help.privacy" : "プライ�シー����",
    "menu.help.support" : "サ�ート",
    "menu.help.tos" : "サービス利用�約",
@@ -76,6 +79,7 @@
    "password.noUser" : "��メールアドレス���登録�れ����ん",
    "password.submit.label" : "�信",
    "password.successInfo" : "メールを確���下��",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
    "pricing.headline" : "Franzを支��る",
    "pricing.link.skipPayment" : "Franz�開発を支������。",
    "pricing.submit.label" : "Franz�開発を支����。",
@@ -116,6 +120,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.enableGPUAcceleration" : "GPUアクセラレーションを有効��る",
    "settings.app.form.enableMenuBar" : "メニュー�ー�Franzを表示�る",
    "settings.app.form.enableSpellchecking" : "スペル�ェックを有効��る",
@@ -126,6 +131,7 @@
    "settings.app.form.runInBackground" : "ウインドウを閉��際�Franzを�ックグラウンド�実行�����",
    "settings.app.form.showDisabledServices" : "無効化�れ�サービス�タブを表示�る",
    "settings.app.form.showMessagesBadgesWhenMuted" : "通知�無効時�未読メッセージ件数を表示�る",
+   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "設定",
    "settings.app.headlineAdvanced" : "詳細",
    "settings.app.headlineAppearance" : "表示スタイル",
@@ -166,6 +172,7 @@
    "settings.service.form.editServiceHeadline" : "{name}を編集",
    "settings.service.form.enableAudio" : "オーディオを有効��る",
    "settings.service.form.enableBadge" : "未読件数�通知�ッジを表示�る",
+   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
    "settings.service.form.enableNotification" : "通知を有効��る",
    "settings.service.form.enableService" : "サービスを有効��る",
    "settings.service.form.headlineBadges" : "未読件数�通知�ッジ",
@@ -178,6 +185,12 @@
    "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.saveButton" : "サービス��存",
    "settings.service.form.tabHosted" : "ホスト",
    "settings.service.form.tabOnPremise" : "セルフホスト ��",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "EU在�者 : 地域�消費税��用�れる�能性��り��",
    "subscription.features.ads" : "広告�一切�り��ん!",
    "subscription.features.comingSoon" : "�も��登場",
-   "subscription.features.customServices" : "���������ーム����プライベートサービス",
    "subscription.features.encryptedSync" : "暗�化�れ�セッション��期",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "HipChat�よ��オンプレミス\/ホスト型サービス�追加",
-   "subscription.features.vpn" : "プロキシサー�ー�VPN�サ�ート",
+   "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.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 7679bc6fc..d521c838a 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -1,4 +1,7 @@
 {
+   "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-ის სერვისები",
@@ -26,23 +29,23 @@
    "login.serverLogout" : "თქვენს სესი�ს ვ�დ� გ�უვიდ�, შედით �ნგ�რიშში ხელ�ხლ�.",
    "login.submit.label" : "შესვლ�",
    "login.tokenExpired" : "თქვენს სესი�ს ვ�დ� გ�უვიდ�, შედით �ნგ�რიშში ხელ�ხლ�.",
-   "menu.app.about" : "About Franz",
+   "menu.app.about" : "Franz-ის შეს�ხებ",
    "menu.app.hide" : "Hide",
-   "menu.app.hideOthers" : "Hide Others",
-   "menu.app.quit" : "Quit",
+   "menu.app.hideOthers" : "სხვების დ�მ�ლვ�",
+   "menu.app.quit" : "გ�მ�სვლ�",
    "menu.app.settings" : "პ�რ�მეტრები",
    "menu.app.unhide" : "Unhide",
    "menu.edit" : "რედ�ქტირებ�",
-   "menu.edit.copy" : "Copy",
-   "menu.edit.cut" : "Cut",
-   "menu.edit.delete" : "Delete",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
-   "menu.edit.paste" : "Paste",
+   "menu.edit.copy" : "კ�პირებ�",
+   "menu.edit.cut" : "�მ�ჭრ�",
+   "menu.edit.delete" : "წ�შლ�",
+   "menu.edit.emojiSymbols" : "გრ�ფიკული გ�მ�ს�ხულებები & სიმბ�ლ�ები",
+   "menu.edit.paste" : "ჩ�სმ�",
    "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
-   "menu.edit.redo" : "Redo",
-   "menu.edit.selectAll" : "Select All",
-   "menu.edit.speech" : "Speech",
-   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.redo" : "�ღდგენ�",
+   "menu.edit.selectAll" : "ყველ�ს მ�ნიშვნ�",
+   "menu.edit.speech" : "ს�უბრები",
+   "menu.edit.startDictation" : "პრ�გრ�მის დ�წყებ�",
    "menu.edit.startSpeaking" : "Start Speaking",
    "menu.edit.stopSpeaking" : "Stop Speaking",
    "menu.edit.undo" : "Undo",
@@ -76,6 +79,7 @@
    "password.noUser" : "მ�მხმ�რებელი მითითებული მეილით ვერ მ�იძებნ�",
    "password.submit.label" : "დ�დ�სტურებ�",
    "password.successInfo" : "გთხ�ვთ შე�მ�წმეთ მეილი",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
    "pricing.headline" : "Franz-ის მხ�რდ�ჭერ�",
    "pricing.link.skipPayment" : "�რ მინდ� ხელი შევუწყ� Franz-ის გ�ნვით�რებ�ს.",
    "pricing.submit.label" : "მინდ� ხელი შევუწყ� Franz-ის გ�ნვით�რებ�ს",
@@ -116,6 +120,7 @@
    "settings.app.form.autoLaunchInBackground" : "გ�ხსენით ფ�ნზე",
    "settings.app.form.autoLaunchOnStart" : "გ�ეშვ�ს Franz სისტემის ჩ�ტვირთვის�ს",
    "settings.app.form.beta" : "ჩ�რთეთ ბეტ� ვერსიები",
+   "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
    "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "Enable spell checking",
@@ -126,6 +131,7 @@
    "settings.app.form.runInBackground" : "დ�ტ�ვეთ Franz გ�შვებული რ�დეს�ც ფ�ნჯ�რ� დ�იხურებ�",
    "settings.app.form.showDisabledServices" : "Display disabled services tabs",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "პ�რ�მეტრები",
    "settings.app.headlineAdvanced" : "Advanced",
    "settings.app.headlineAppearance" : "Appearance",
@@ -166,18 +172,25 @@
    "settings.service.form.editServiceHeadline" : "შე�სწ�რე {name}",
    "settings.service.form.enableAudio" : "Enable audio",
    "settings.service.form.enableBadge" : "Show unread message badges",
+   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
    "settings.service.form.enableNotification" : "შეტყ�ბინებების ჩ�რთვ�",
    "settings.service.form.enableService" : "სერვისის ჩ�რთვ�",
    "settings.service.form.headlineBadges" : "Unread message badges",
    "settings.service.form.headlineGeneral" : "მთ�ვ�რი",
    "settings.service.form.headlineNotifications" : "Notifications",
    "settings.service.form.icon" : "Custom icon",
-   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconDelete" : "წ�შლ�",
    "settings.service.form.iconUpload" : "Drop your image, or click here",
    "settings.service.form.indirectMessageInfo" : "თქვენ მიიღებთ შეტყ�ბინებ�ს ყ�ველი �ხ�ლი შეტყ�ბინების�ს �რხზე, �რ�მ�რტ� @username, @channel, @here, ...",
    "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.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.saveButton" : "სერვისის შენ�ხვ�",
    "settings.service.form.tabHosted" : "დ�ჰ�სტილი",
    "settings.service.form.tabOnPremise" : "თვით დ�ჰ�სტილი ��",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
    "subscription.features.ads" : "�რ�ნ�ირი რეკლ�მები, �რ�სდრ�ს!",
    "subscription.features.comingSoon" : "მ�ლე",
-   "subscription.features.customServices" : "პირ�დი მ�მს�ხურებ� თქვენთვის დ� თქვენი გუნდისთვის",
    "subscription.features.encryptedSync" : "დ�შიფრული სესიის სინქრ�ნიზ�ცი�",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "on-premise\/hosted სერვისების დ�მ�ტებ�, რ�გ�რიც�� HipChat",
-   "subscription.features.vpn" : "Proxy-ს� დ� VPN-ის მხ�რდ�ჭერ�",
+   "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.includedFeatures" : "ფ�სი�ნი Franz-ის პრემიუმ მხ�რმდ�მჭერი �ნგ�რიში",
    "subscription.paymentSessionError" : "გ�დ�ხდის ფ�რმ�ტის ინიცი�ლიზ�ცი� ვერ მ�ხერხდ�",
    "subscription.submit.label" : "მინდ� ხელი შევუწყ� Franz-ის გ�ნვით�რებ�ს",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 13dc7548e..5807f11f6 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -1,11 +1,14 @@
 {
+   "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" : "Kan geen verbinding maken met de Franz services",
    "global.notConnectedToTheInternet" : "Je hebt geen internet verbinding.",
    "import.headline" : "Importeer je Franz 4 services",
    "import.notSupportedHeadline" : "De volgende services worden nog niet ondersteund in Franz 5",
-   "import.skip.label" : "I want to add services manually",
+   "import.skip.label" : "Ik wens services manueel toe te voegen",
    "import.submit.label" : "Importeer services",
-   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonChangelog" : "Wat is er nieuw?",
    "infobar.buttonInstallUpdate" : "Start opnieuw op & installeer de update",
    "infobar.buttonReloadServices" : "Herlaad de services",
    "infobar.requiredRequestsFailed" : "Kan de services en gebruikers informatie niet laden",
@@ -16,7 +19,7 @@
    "invite.name.label" : "Naam",
    "invite.skip.label" : "Ik wil dit later doen",
    "invite.submit.label" : "Verzend uitnodigingen",
-   "invite.successInfo" : "Invitations sent successfully",
+   "invite.successInfo" : "Uitnodiging met succes verzonden",
    "login.email.label" : "E-mailadres",
    "login.headline" : "Inloggen",
    "login.invalidCredentials" : "E-mailadres of wachtwoord ongeldig",
@@ -26,49 +29,49 @@
    "login.serverLogout" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
    "login.submit.label" : "Log in",
    "login.tokenExpired" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
-   "menu.app.about" : "About Franz",
-   "menu.app.hide" : "Hide",
-   "menu.app.hideOthers" : "Hide Others",
-   "menu.app.quit" : "Quit",
+   "menu.app.about" : "Over Franz",
+   "menu.app.hide" : "Verbergen",
+   "menu.app.hideOthers" : "Andere verbergen",
+   "menu.app.quit" : "Afsluiten",
    "menu.app.settings" : "Instellingen",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Zichtbaar maken",
    "menu.edit" : "Aanpassen",
-   "menu.edit.copy" : "Copy",
-   "menu.edit.cut" : "Cut",
-   "menu.edit.delete" : "Delete",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
-   "menu.edit.paste" : "Paste",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
-   "menu.edit.redo" : "Redo",
-   "menu.edit.selectAll" : "Select All",
-   "menu.edit.speech" : "Speech",
-   "menu.edit.startDictation" : "Start Dictation",
-   "menu.edit.startSpeaking" : "Start Speaking",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
-   "menu.edit.undo" : "Undo",
-   "menu.file" : "File",
+   "menu.edit.copy" : "Kopiëren",
+   "menu.edit.cut" : "Knippen",
+   "menu.edit.delete" : "Verwijderen",
+   "menu.edit.emojiSymbols" : "Emoji & Symbolen",
+   "menu.edit.paste" : "Plakken",
+   "menu.edit.pasteAndMatchStyle" : "Plakken en stijl overeen laten komen",
+   "menu.edit.redo" : "Opnieuw uitvoeren",
+   "menu.edit.selectAll" : "Selecteer alles",
+   "menu.edit.speech" : "Spraakuitvoer",
+   "menu.edit.startDictation" : "Beginnen met dicteren",
+   "menu.edit.startSpeaking" : "Begin met spreken",
+   "menu.edit.stopSpeaking" : "Stoppen met spreken",
+   "menu.edit.undo" : "Ongedaan maken",
+   "menu.file" : "Bestand",
    "menu.help" : "Help",
-   "menu.help.changelog" : "Changelog",
-   "menu.help.learnMore" : "Learn More",
+   "menu.help.changelog" : "Logboek",
+   "menu.help.learnMore" : "Meer weten",
    "menu.help.privacy" : "Privacyverklaring",
-   "menu.help.support" : "Support",
-   "menu.help.tos" : "Terms of Service",
-   "menu.services" : "Services",
-   "menu.services.addNewService" : "Add New Service...",
-   "menu.view" : "View",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
-   "menu.view.reloadFranz" : "Reload Franz",
-   "menu.view.reloadService" : "Reload Service",
-   "menu.view.resetZoom" : "Actual Size",
+   "menu.help.support" : "Ondersteuning",
+   "menu.help.tos" : "Servicevoorwaarden",
+   "menu.services" : "Diensten",
+   "menu.services.addNewService" : "Nieuwe service toevoegen...",
+   "menu.view" : "Beeld",
+   "menu.view.enterFullScreen" : "Volledig scherm openen",
+   "menu.view.exitFullScreen" : "Volledig scherm verlaten",
+   "menu.view.reloadFranz" : "Franz Herladen",
+   "menu.view.reloadService" : "Service herladen",
+   "menu.view.resetZoom" : "Werkelijke grootte",
    "menu.view.toggleDevTools" : "Toggle Developer Tools",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleFullScreen" : "Volledig scherm aan\/uit",
    "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
-   "menu.view.zoomIn" : "Zoom In",
-   "menu.view.zoomOut" : "Zoom Out",
-   "menu.window" : "Window",
-   "menu.window.close" : "Close",
-   "menu.window.minimize" : "Minimize",
+   "menu.view.zoomIn" : "Inzoomen",
+   "menu.view.zoomOut" : "Uitzoomen",
+   "menu.window" : "Venster",
+   "menu.window.close" : "Sluiten",
+   "menu.window.minimize" : "Minimaliseren",
    "password.email.label" : "E-mailadres",
    "password.headline" : "Wachtwoord resetten",
    "password.link.login" : "Log in op je account",
@@ -76,28 +79,29 @@
    "password.noUser" : "Geen gebruiker bekend met dat e-mailadres",
    "password.submit.label" : "Doorgaan",
    "password.successInfo" : "Controleer alsjeblieft je e-mail",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
    "pricing.headline" : "Ondersteun Franz",
    "pricing.link.skipPayment" : "Ik wil de ontwikkeling van Franz niet ondersteunen.",
    "pricing.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
    "pricing.support.label" : "Selecteer je ondersteuningsplan",
    "service.crashHandler.action" : "{naam} herladen",
-   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
-   "service.crashHandler.headline" : "Oh no!",
-   "service.crashHandler.text" : "{name} has caused an error.",
-   "service.disabledHandler.action" : "Enable {name}",
-   "service.disabledHandler.headline" : "{name} is disabled",
+   "service.crashHandler.autoReload" : "Automatisch herstellen {name} proberen in {seconds} seconden",
+   "service.crashHandler.headline" : "Oh nee!",
+   "service.crashHandler.text" : "{name} heeft een probleem veroorzaakt.",
+   "service.disabledHandler.action" : "Activeer {name}",
+   "service.disabledHandler.headline" : "{name} is uitgeschakeld",
    "services.getStarted" : "Beginnen",
    "services.welcome" : "Welkom bij Franz",
    "settings.account.account.editButton" : "Bewerk account",
    "settings.account.accountType.basic" : "Basis Account",
    "settings.account.accountType.premium" : "Premium Supporter Account",
    "settings.account.buttonSave" : "Profiel aanpassen",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "settings.account.deleteAccount" : "Account verwijderen",
+   "settings.account.deleteEmailSent" : "U heeft een email ontvangen met een bevestiginslink om uw account te verwijderen. Uw account en de bijhorende gegevens kunnen niet meer worden herstel na deze actie!",
+   "settings.account.deleteInfo" : "Indien u uw Franz account nietmeer nodig heeft, kan u hier uw account en de gerelateerde gegegevens verwijderen.",
    "settings.account.headline" : "Account",
    "settings.account.headlineAccount" : "Account informatie",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "Gevaren Zone",
    "settings.account.headlineInvoices" : "Facturen",
    "settings.account.headlinePassword" : "Wijzig wachtwoord",
    "settings.account.headlineProfile" : "Profiel aanpassen",
@@ -108,17 +112,18 @@
    "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
    "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
    "settings.account.userInfoRequestFailed" : "Kon gebruikerinformatie niet laden",
-   "settings.app.buttonClearAllCache" : "Clear cache",
+   "settings.app.buttonClearAllCache" : "Cache wissen",
    "settings.app.buttonInstallUpdate" : "Herstart & installeer update",
    "settings.app.buttonSearchForUpdate" : "Controleer op updates",
-   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
+   "settings.app.cacheInfo" : "Franz cache gebruikt momenteel {size} schijfruimte.",
    "settings.app.currentVersion" : "Huidige versie:",
    "settings.app.form.autoLaunchInBackground" : "Open op de achtergrond",
    "settings.app.form.autoLaunchOnStart" : "Lanceer Franz bij opstarten",
    "settings.app.form.beta" : "Inclusief bèta versies",
-   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
-   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
-   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.enableGPUAcceleration" : "GPU Acceleratie Activeren",
+   "settings.app.form.enableMenuBar" : "Toon Franz in Menu Bar",
+   "settings.app.form.enableSpellchecking" : "Spellingcontrole inschakelen",
    "settings.app.form.enableSystemTray" : "Toon Franz in de systeembalk",
    "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "settings.app.form.language" : "Taal",
@@ -126,6 +131,7 @@
    "settings.app.form.runInBackground" : "Houd Franz op de achtergrond wanneer het venster gesloten wordt",
    "settings.app.form.showDisabledServices" : "Display disabled services tabs",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Instellingen",
    "settings.app.headlineAdvanced" : "Advanced",
    "settings.app.headlineAppearance" : "Appearance",
@@ -166,18 +172,25 @@
    "settings.service.form.editServiceHeadline" : "{name} aanpassen",
    "settings.service.form.enableAudio" : "Enable audio",
    "settings.service.form.enableBadge" : "Show unread message badges",
+   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
    "settings.service.form.enableNotification" : "Notificaties aanzetten",
    "settings.service.form.enableService" : "Service aanzetten",
    "settings.service.form.headlineBadges" : "Unread message badges",
    "settings.service.form.headlineGeneral" : "Algemeen",
    "settings.service.form.headlineNotifications" : "Notifications",
    "settings.service.form.icon" : "Custom icon",
-   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconDelete" : "Verwijderen",
    "settings.service.form.iconUpload" : "Drop your image, or click here",
    "settings.service.form.indirectMessageInfo" : "Je wordt verwittigd over alle nieuwe berichten in een kanaal, niet alleen @username, @channel, @here, ...",
    "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.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.saveButton" : "Service bewaren",
    "settings.service.form.tabHosted" : "Gehost",
    "settings.service.form.tabOnPremise" : "Intern gehost ��",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
    "subscription.features.ads" : "Geen reclame, nooit!",
    "subscription.features.comingSoon" : "komt binnenkort",
-   "subscription.features.customServices" : "Persoonlijke services voor jou en je team",
    "subscription.features.encryptedSync" : "Synchronisatie van geëncrypteerde sessies",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Intern gehoste services zoals HipChat",
-   "subscription.features.vpn" : "Proxy & VPN ondersteuning",
+   "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.includedFeatures" : "Een betalend account voor Franz omvat",
    "subscription.paymentSessionError" : "Betalingsformulier kon niet geladen worden",
    "subscription.submit.label" : "Ik wil de ontwikkeling van Franz steunen",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 4ff3cdd80..a6db3d773 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -1,4 +1,7 @@
 {
+   "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" : "Kan geen verbinding maken met de Franz-services",
    "global.notConnectedToTheInternet" : "U bent niet verbonden met het internet.",
    "import.headline" : "Importeer uw Franz 4-services",
@@ -21,7 +24,7 @@
    "login.headline" : "Inloggen",
    "login.invalidCredentials" : "E-mailadres of wachtwoord ongeldig",
    "login.link.password" : "Wachtwoord vergeten",
-   "login.link.signup" : "Maak een gratis account",
+   "login.link.signup" : "Maak een gratis account aan",
    "login.password.label" : "Wachtwoord",
    "login.serverLogout" : "De sessie is verlopen, log alsjeblieft opnieuw in.",
    "login.submit.label" : "Inloggen",
@@ -59,16 +62,16 @@
    "menu.view.enterFullScreen" : "Gebruik volledig scherm",
    "menu.view.exitFullScreen" : "Volledig scherm verlaten",
    "menu.view.reloadFranz" : "Herlaad Franz",
-   "menu.view.reloadService" : "Reload Service",
-   "menu.view.resetZoom" : "Actual Size",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
-   "menu.view.zoomIn" : "Zoom In",
-   "menu.view.zoomOut" : "Zoom Out",
-   "menu.window" : "Window",
-   "menu.window.close" : "Close",
-   "menu.window.minimize" : "Minimize",
+   "menu.view.reloadService" : "Een service opnieuw laden",
+   "menu.view.resetZoom" : "Werkelijke grootte",
+   "menu.view.toggleDevTools" : "Ontwikkelaarstools aan\/uit",
+   "menu.view.toggleFullScreen" : "Volledig scherm aan\/uit",
+   "menu.view.toggleServiceDevTools" : "Service ontwikkelaarstools aan\/uit",
+   "menu.view.zoomIn" : "Inzoomen",
+   "menu.view.zoomOut" : "Uitzoomen",
+   "menu.window" : "Venster",
+   "menu.window.close" : "Sluiten",
+   "menu.window.minimize" : "Minimaliseren",
    "password.email.label" : "E-mailadres",
    "password.headline" : "Wachtwoord vergeten",
    "password.link.login" : "Log in op je account",
@@ -76,6 +79,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",
    "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",
@@ -116,7 +120,8 @@
    "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.enableGPUAcceleration" : "Enable GPU Acceleration",
+   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.enableGPUAcceleration" : "Schakel videokaart acceleratie in ",
    "settings.app.form.enableMenuBar" : "Toon Franz in menubalk",
    "settings.app.form.enableSpellchecking" : "Zet spellingcontrole aan",
    "settings.app.form.enableSystemTray" : "Toon Franz in de systeembalk",
@@ -126,6 +131,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.headline" : "Instellingen",
    "settings.app.headlineAdvanced" : "Geavanceerd",
    "settings.app.headlineAppearance" : "Weergave",
@@ -166,6 +172,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.enableNotification" : "Meldingen inschakelen",
    "settings.service.form.enableService" : "Service inschakelen",
    "settings.service.form.headlineBadges" : "Ongelezen berichten badges",
@@ -178,6 +185,12 @@
    "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.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.saveButton" : "Service opslaan",
    "settings.service.form.tabHosted" : "Gehost",
    "settings.service.form.tabOnPremise" : "Zelf-gehost ��",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "Bewoners binnen EU: lokale belasting kan van toepassing zijn",
    "subscription.features.ads" : "Geen advertenties, nooit!",
    "subscription.features.comingSoon" : "komt binnenkort",
-   "subscription.features.customServices" : "Privé-services voor jou en je team",
    "subscription.features.encryptedSync" : "Beveiligde sessie synchronisatie",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Add on-geschikt\/gehoste services zoals HipChat",
-   "subscription.features.vpn" : "Proxy & VPN ondersteuning",
+   "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.includedFeatures" : "Betaald Franz Premium Supporter Account bevat",
    "subscription.paymentSessionError" : "Kan betaalformulier niet initialiseren",
    "subscription.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
@@ -236,15 +251,15 @@
    "tabs.item.disableAudio" : "Schakel audio uit",
    "tabs.item.disableNotifications" : "Schakel meldingen uit",
    "tabs.item.disableService" : "Schakel service uit",
-   "tabs.item.edit" : "Bewerk",
+   "tabs.item.edit" : "Bewerken",
    "tabs.item.enableAudio" : "Audio inschakelen",
    "tabs.item.enableNotification" : "Meldingen inschakelen",
    "tabs.item.enableService" : "Service inschakelen",
    "tabs.item.reload" : "Laad opnieuw",
-   "validation.email" : "{field} is not valid",
-   "validation.minLength" : "{field} should be at least {length} characters long",
-   "validation.required" : "{field} is required",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.email" : "{field} is niet geldig",
+   "validation.minLength" : "{field} moet minimaal {length} karakters lang zijn",
+   "validation.required" : "{field} is vereist",
+   "validation.url" : "{field} is niet een geldige URL",
    "welcome.loginButton" : "Log in op je account",
    "welcome.signupButton" : "Maak een gratis account",
    "welcome.slogan" : "Messaging die voor jou werkt"
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 9fb72b9c9..60ced5933 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -1,4 +1,7 @@
 {
+   "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" : "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",
@@ -28,20 +31,20 @@
    "login.tokenExpired" : "Twoja sesja wygasła, zaloguj się ponownie.",
    "menu.app.about" : "O Franz",
    "menu.app.hide" : "Ukryj",
-   "menu.app.hideOthers" : "Hide Others",
-   "menu.app.quit" : "Quit",
+   "menu.app.hideOthers" : "Ukryj pozostałe",
+   "menu.app.quit" : "Zakończ",
    "menu.app.settings" : "Ustawienia",
    "menu.app.unhide" : "Pokaż",
    "menu.edit" : "Edytuj",
    "menu.edit.copy" : "Skopiuj",
    "menu.edit.cut" : "Wytnij",
    "menu.edit.delete" : "Usuń",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.emojiSymbols" : "Emoji i symbole",
    "menu.edit.paste" : "Wklej",
    "menu.edit.pasteAndMatchStyle" : "Wklej i dopasuj styl",
    "menu.edit.redo" : "Ponów",
    "menu.edit.selectAll" : "Zaznacz wszystko",
-   "menu.edit.speech" : "Speech",
+   "menu.edit.speech" : "Mowa",
    "menu.edit.startDictation" : "Zacznij dyktować",
    "menu.edit.startSpeaking" : "Zacznij mówić",
    "menu.edit.stopSpeaking" : "Przestań mówić",
@@ -52,7 +55,7 @@
    "menu.help.learnMore" : "Dowiedz się więcej",
    "menu.help.privacy" : "Polityka prywatności",
    "menu.help.support" : "Wsparcie",
-   "menu.help.tos" : "Terms of Service",
+   "menu.help.tos" : "Warunki świadczenia usług",
    "menu.services" : "Usługi",
    "menu.services.addNewService" : "Dodaj nową usługę...",
    "menu.view" : "Widok",
@@ -61,9 +64,9 @@
    "menu.view.reloadFranz" : "Przeładuj Franz",
    "menu.view.reloadService" : "Przeładuj usługę",
    "menu.view.resetZoom" : "Domyślny rozmiar",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleDevTools" : "Pokaż narzędzia developerskie",
    "menu.view.toggleFullScreen" : "Przełącz tryb pełnoekranowy",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.toggleServiceDevTools" : "Włącz narzędzia developerskie serwisu",
    "menu.view.zoomIn" : "Powiększ",
    "menu.view.zoomOut" : "Pomniejsz",
    "menu.window" : "Okno",
@@ -76,6 +79,7 @@
    "password.noUser" : "Nie znaleziono użytkownika z takim adresem email",
    "password.submit.label" : "Wyślij",
    "password.successInfo" : "Proszę sprawdzić swój email",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
    "pricing.headline" : "Wspieraj Franz",
    "pricing.link.skipPayment" : "Nie chcę wspierać rozwoju aplikacji Franz.",
    "pricing.submit.label" : "Chcę wspierać rozwój aplikacji Franz",
@@ -116,16 +120,18 @@
    "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.enableGPUAcceleration" : "WÅ‚Ä…cz akceleracjÄ™ GPU",
    "settings.app.form.enableMenuBar" : "Pokaż Franz na pasku menu",
    "settings.app.form.enableSpellchecking" : "WÅ‚Ä…cz sprawdzanie pisowni",
-   "settings.app.form.enableSystemTray" : "Pokaż Franza w tacy systemowej",
+   "settings.app.form.enableSystemTray" : "Pokaż Franza w obszarze powiadomień",
    "settings.app.form.hideDockIcon" : "Ukrywaj ikonÄ™ Franz w zasobniku systemowym",
    "settings.app.form.language" : "Język",
    "settings.app.form.minimizeToSystemTray" : "Zminimalizuj aplikacjÄ™ Franz",
    "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.headline" : "Ustawienia",
    "settings.app.headlineAdvanced" : "Zaawansowane",
    "settings.app.headlineAppearance" : "WyglÄ…d",
@@ -166,6 +172,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.enableNotification" : "Aktywuj powiadomienia",
    "settings.service.form.enableService" : "Aktywuj usługę",
    "settings.service.form.headlineBadges" : "Znaczniki nieprzeczytanych wiadomości",
@@ -178,11 +185,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.saveButton" : "Zapisz usługę",
    "settings.service.form.tabHosted" : "Hostowane",
    "settings.service.form.tabOnPremise" : "Hostowane lokalnie ��",
    "settings.service.form.team" : "Zespół",
-   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
+   "settings.service.form.useHostedService" : "Użyj hostowanej usługi {name}",
    "settings.service.form.yourServices" : "Twoje usługi",
    "settings.services.deletedInfo" : "Usługa została usunięta",
    "settings.services.discoverServices" : "Przeglądaj usługi",
@@ -195,13 +208,13 @@
    "settings.user.form.accountType.company" : "Firma",
    "settings.user.form.accountType.individual" : "Prywatne",
    "settings.user.form.accountType.label" : "Typ konta",
-   "settings.user.form.accountType.non-profit" : "Non-profit",
+   "settings.user.form.accountType.non-profit" : "Non-Profit",
    "settings.user.form.currentPassword" : "Obecne hasło",
    "settings.user.form.email" : "Adres email",
    "settings.user.form.firstname" : "ImiÄ™",
    "settings.user.form.lastname" : "Nazwisko",
    "settings.user.form.newPassword" : "Nowe hasło",
-   "sidebar.addNewService" : "!!!Add new service",
+   "sidebar.addNewService" : "Dodaj kolejną usługę",
    "sidebar.muteApp" : "Wyłącz powiadomienia i dźwięki",
    "sidebar.settings" : "Ustawienia",
    "sidebar.unmuteApp" : "Włącz powiadomienia i dźwięki",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "Rezydenci UE: lokalne stawki VAT mogą zostać zaaplikowane",
    "subscription.features.ads" : "Brak reklam, na zawsze!",
    "subscription.features.comingSoon" : "wkrótce dostępne",
-   "subscription.features.customServices" : "Prywatne usługi dla Ciebie i Twojego zespołu",
    "subscription.features.encryptedSync" : "Szyfrowana synchronizacja sesji",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Dodawanie lokalnych\/hostowanych usług takich jak HipChat",
-   "subscription.features.vpn" : "Wsprarcie Proxy i VPN",
+   "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.includedFeatures" : "PÅ‚atne konto Franz Premium obejmuje",
    "subscription.paymentSessionError" : "Nie można wczytać formularza płatności\"",
    "subscription.submit.label" : "Chcę wspierać rozwój aplikacji Franz",
@@ -241,10 +256,10 @@
    "tabs.item.enableNotification" : "WÅ‚Ä…cz powiadomienia",
    "tabs.item.enableService" : "Aktywuj usługę",
    "tabs.item.reload" : "Przeładuj",
-   "validation.email" : "{field} is not valid",
-   "validation.minLength" : "{field} should be at least {length} characters long",
-   "validation.required" : "{field} is required",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.email" : "Pole {field} nie jest poprawne",
+   "validation.minLength" : "Pole {field} powinno składać się z co najmniej {length} znaków",
+   "validation.required" : "Pole {field} jest wymagane",
+   "validation.url" : "Pole {field} nie jest poprawnym ciÄ…giem URL.",
    "welcome.loginButton" : "Zaloguj siÄ™ na swoje konto",
    "welcome.signupButton" : "Stwórz darmowe konto",
    "welcome.slogan" : "Komunikator który działa"
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index ceb35ce30..70f6431df 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,23 +1,26 @@
 {
-   "global.api.unhealthy" : "Não foi possível conectar aos serviços do Franz",
-   "global.notConnectedToTheInternet" : "Você não está conectado à internet.",
-   "import.headline" : "Importe seus serviços do Franz 4",
-   "import.notSupportedHeadline" : "Serviços ainda não suportados pelo Franz 5",
+   "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" : "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 ",
+   "import.notSupportedHeadline" : "Serviços ainda não suportados pelo Franz 5 ",
    "import.skip.label" : "Quero adicionar serviços manualmente",
    "import.submit.label" : "Importar serviços",
    "infobar.buttonChangelog" : "O que há de novo?",
-   "infobar.buttonInstallUpdate" : "Reiniciar e instalar atualizações",
+   "infobar.buttonInstallUpdate" : "Reiniciar e instalar atualizações ",
    "infobar.buttonReloadServices" : "Recarregar serviços",
-   "infobar.requiredRequestsFailed" : "Não foi possível carregar serviços e informações do usuário",
+   "infobar.requiredRequestsFailed" : "Não foi possível carregar os serviços e informações de usuário",
    "infobar.servicesUpdated" : "Seus serviços foram atualizados.",
    "infobar.updateAvailable" : "Uma nova atualização do Franz está disponível.",
-   "invite.email.label" : "Endereço de e-mail ",
-   "invite.headline.friends" : "Convide três de seus amigos ou colegas",
+   "invite.email.label" : "Endereço de E-mail",
+   "invite.headline.friends" : "Convide 3 amigos ou colegas",
    "invite.name.label" : "Nome",
    "invite.skip.label" : "Quero fazer isso depois",
    "invite.submit.label" : "Enviar convites",
    "invite.successInfo" : "Convites enviados com sucesso",
-   "login.email.label" : "Endereço de e-mail",
+   "login.email.label" : "E-mail",
    "login.headline" : "Entrar",
    "login.invalidCredentials" : "E-mail ou senha inválida",
    "login.link.password" : "Trocar a senha",
@@ -28,58 +31,59 @@
    "login.tokenExpired" : "Sua sessão expirou, faça o login novamente.",
    "menu.app.about" : "Sobre Franz",
    "menu.app.hide" : "Ocultar",
-   "menu.app.hideOthers" : "Ocultar os demais",
+   "menu.app.hideOthers" : "Ocultar Outros",
    "menu.app.quit" : "Sair",
-   "menu.app.settings" : "Ajustes",
-   "menu.app.unhide" : "Exibir",
+   "menu.app.settings" : "Configurações",
+   "menu.app.unhide" : "Reexibir",
    "menu.edit" : "Editar",
    "menu.edit.copy" : "Copiar",
    "menu.edit.cut" : "Cortar",
    "menu.edit.delete" : "Excluir",
-   "menu.edit.emojiSymbols" : "Emoji & Símbolos ",
+   "menu.edit.emojiSymbols" : "Emoji & Símbolos",
    "menu.edit.paste" : "Colar",
-   "menu.edit.pasteAndMatchStyle" : "Colar e corresponder ao estilo",
+   "menu.edit.pasteAndMatchStyle" : "Colar e Corresponder ao Estilo",
    "menu.edit.redo" : "Refazer",
-   "menu.edit.selectAll" : "Selecionar tudo",
+   "menu.edit.selectAll" : "Selecionar Tudo",
    "menu.edit.speech" : "Discurso",
-   "menu.edit.startDictation" : "iniciar digitação por voz",
-   "menu.edit.startSpeaking" : "começar a falar",
-   "menu.edit.stopSpeaking" : "Parar de falar",
+   "menu.edit.startDictation" : "Iniciar Digitação",
+   "menu.edit.startSpeaking" : "Começar a Falar",
+   "menu.edit.stopSpeaking" : "Parar de Falar",
    "menu.edit.undo" : "Desfazer",
    "menu.file" : "Arquivo",
    "menu.help" : "Ajuda",
-   "menu.help.changelog" : "Registro de alterações",
-   "menu.help.learnMore" : "Saiba Mais",
-   "menu.help.privacy" : "Declaração de privacidade",
+   "menu.help.changelog" : "Registro de Alterações ",
+   "menu.help.learnMore" : "Saiba Mais ",
+   "menu.help.privacy" : "Declaração de Privacidade ",
    "menu.help.support" : "Suporte",
    "menu.help.tos" : "Termos de Serviço",
    "menu.services" : "Serviços",
    "menu.services.addNewService" : "Adicionar Novo Serviço",
-   "menu.view" : "Visualizar",
-   "menu.view.enterFullScreen" : "Entrar na tela cheia",
-   "menu.view.exitFullScreen" : "Sair da tela cheia",
+   "menu.view" : "Visualizar ",
+   "menu.view.enterFullScreen" : "Modo Tela Cheia",
+   "menu.view.exitFullScreen" : "Sair da Tela Cheia",
    "menu.view.reloadFranz" : "Recarregar Franz",
-   "menu.view.reloadService" : "Reiniciar o serviço",
+   "menu.view.reloadService" : "Reiniciar o Serviço",
    "menu.view.resetZoom" : "Tamanho real",
-   "menu.view.toggleDevTools" : "alternar ferramentas de desenvolvedor",
-   "menu.view.toggleFullScreen" : "tela cheia",
-   "menu.view.toggleServiceDevTools" : "habilitar ferramentas de serviços de desenvolvedor",
+   "menu.view.toggleDevTools" : "Ferramentas de Desenvolvedor",
+   "menu.view.toggleFullScreen" : "Modo Tela Cheia",
+   "menu.view.toggleServiceDevTools" : "Ferramentas de Serviços de Desenvolvedor",
    "menu.view.zoomIn" : "Ampliar",
-   "menu.view.zoomOut" : "reduzir",
-   "menu.window" : "Janela",
+   "menu.view.zoomOut" : "Reduzir",
+   "menu.window" : "Modo Janela",
    "menu.window.close" : "Fechar",
    "menu.window.minimize" : "Minimizar",
-   "password.email.label" : "Endereço de e-mail",
-   "password.headline" : "Trocar a senha",
+   "password.email.label" : "E-mail",
+   "password.headline" : "Trocar senha",
    "password.link.login" : "Fazer login na sua conta",
    "password.link.signup" : "Criar uma conta grátis",
    "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",
    "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",
-   "pricing.support.label" : "Selecione uma opção de apoio",
+   "pricing.support.label" : "Selecione uma opção de plano",
    "service.crashHandler.action" : "Recarregar {name}",
    "service.crashHandler.autoReload" : "Tentando reestabelecer {name} automaticamente em {seconds} segundos",
    "service.crashHandler.headline" : "Ah, não!",
@@ -97,7 +101,7 @@
    "settings.account.deleteInfo" : "Se você não precisa mais de sua conta Franz, pode exclui-la juntamente com todos os  dados relacionados, aqui.",
    "settings.account.headline" : "Conta",
    "settings.account.headlineAccount" : "Informações de conta",
-   "settings.account.headlineDangerZone" : "Zona de perigo",
+   "settings.account.headlineDangerZone" : "Zona de Perigo",
    "settings.account.headlineInvoices" : "Recibos",
    "settings.account.headlinePassword" : "Mudar senha",
    "settings.account.headlineProfile" : "Atualizar perfil",
@@ -116,16 +120,18 @@
    "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.enableGPUAcceleration" : "Ativar Aceleração de GPU (Unidade de Processamento Gráfico)",
+   "settings.app.form.darkMode" : "Join the Dark Side",
+   "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",
-   "settings.app.form.enableSystemTray" : "Exibir o Franz na área de notificações",
+   "settings.app.form.enableSystemTray" : "Exibir o Franz na barra de sistema",
    "settings.app.form.hideDockIcon" : "Ocultar ícone do Franz no Dock",
    "settings.app.form.language" : "Idioma",
-   "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a área de notificações",
+   "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a área de sistema",
    "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.headline" : "Configurações",
    "settings.app.headlineAdvanced" : "Avançado",
    "settings.app.headlineAppearance" : "Aparência",
@@ -133,20 +139,20 @@
    "settings.app.headlineLanguage" : "Idioma",
    "settings.app.headlineUpdates" : "Atualizações",
    "settings.app.restartRequired" : "As atualizações exigem reiniciar o sistema",
-   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.subheadlineCache" : "Cachê",
    "settings.app.translationHelp" : "Ajude-nos a traduzir o Franz para seu idioma.",
    "settings.app.updateStatusAvailable" : "Atualização disponível, baixando...",
    "settings.app.updateStatusSearching" : "Buscando atualizações",
    "settings.app.updateStatusUpToDate" : "Você está usando a última versão do Franz",
-   "settings.invite.headline" : "Convidar amigos",
+   "settings.invite.headline" : "Convidar Amigos",
    "settings.navigation.account" : "Conta",
    "settings.navigation.availableServices" : "Serviços disponíveis",
-   "settings.navigation.inviteFriends" : "Convidar amigos",
+   "settings.navigation.inviteFriends" : "Convidar Amigos",
    "settings.navigation.logout" : "Sair",
    "settings.navigation.settings" : "Ajustes",
    "settings.navigation.yourServices" : "Seus serviços",
    "settings.recipes.all" : "Todos os serviços",
-   "settings.recipes.dev" : "Desenvolvimento ",
+   "settings.recipes.dev" : "Desenvolvimento",
    "settings.recipes.headline" : "Serviços disponíveis",
    "settings.recipes.missingService" : "Sentiu falta de algum serviço?",
    "settings.recipes.mostPopular" : "Mais populares",
@@ -166,6 +172,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.enableNotification" : "Ativar notificações",
    "settings.service.form.enableService" : "Ativar serviço",
    "settings.service.form.headlineBadges" : "Mensagens não lidas",
@@ -178,7 +185,13 @@
    "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.saveButton" : "Gravar serviço",
+   "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.saveButton" : "Salvar serviço",
    "settings.service.form.tabHosted" : "Hospedado",
    "settings.service.form.tabOnPremise" : "Auto-hospedado ��",
    "settings.service.form.team" : "Equipe",
@@ -212,18 +225,20 @@
    "signup.headline" : "Cadastrar-se",
    "signup.lastname.label" : "Sobrenome",
    "signup.legal.info" : "Ao criar uma conta Franz, você aceita os ",
-   "signup.legal.privacy" : "Declaração de privacidade",
+   "signup.legal.privacy" : "Declaração de Privacidade",
    "signup.legal.terms" : "Termos de serviço",
    "signup.link.login" : "Já tem uma conta?",
    "signup.password.label" : "Senha",
    "signup.submit.label" : "Criar uma conta",
    "subscription.euTaxInfo" : "Residentes na União Europeia: taxas locais serão aplicadas",
-   "subscription.features.ads" : "Sem anúncios, sempre!",
+   "subscription.features.ads" : "Sem anúncios, pra sempre!",
    "subscription.features.comingSoon" : "em breve",
-   "subscription.features.customServices" : "Serviços privados para você e sua equipe",
    "subscription.features.encryptedSync" : "Sincronização encriptada das sessões",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Adicionar serviços locais\/hospedados como o HipChat",
-   "subscription.features.vpn" : "Suporte a proxy e VPN",
+   "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.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",
@@ -242,7 +257,7 @@
    "tabs.item.enableService" : "Ativar serviço",
    "tabs.item.reload" : "Recarregar",
    "validation.email" : "inválido",
-   "validation.minLength" : "{campo} deve ser pelo menos {comprimento} mais caracteres ",
+   "validation.minLength" : "{campo} deve ter pelo menos {comprimento} mais caracteres ",
    "validation.required" : "{campo} obrigatório",
    "validation.url" : "{campo} essa URL não é válida",
    "welcome.loginButton" : "Entrar na sua conta",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 44048e505..71978ed6b 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -1,32 +1,35 @@
 {
-   "global.api.unhealthy" : "Não foi possível conetar aos serviços do Franz",
-   "global.notConnectedToTheInternet" : "Não existe ligação à Internet.",
+   "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" : "Não foi possível estabelecer ligação aos serviços do Franz",
+   "global.notConnectedToTheInternet" : "Não existe ligação à Internet",
    "import.headline" : "Importe os seus serviços do Franz 4",
-   "import.notSupportedHeadline" : "Serviços ainda não são suportados pelo Franz 5",
-   "import.skip.label" : "Quero adicionar serviços manualmente",
+   "import.notSupportedHeadline" : "Serviços ainda não suportados pelo Franz 5",
+   "import.skip.label" : "Pretendo adicionar serviços manualmente",
    "import.submit.label" : "Importar serviços",
-   "infobar.buttonChangelog" : "Novidades?",
-   "infobar.buttonInstallUpdate" : "Reiniciar & Instalar Atualizações",
+   "infobar.buttonChangelog" : "O que há de novo?",
+   "infobar.buttonInstallUpdate" : "Reiniciar e instalar atualizações",
    "infobar.buttonReloadServices" : "Recarregar serviços",
-   "infobar.requiredRequestsFailed" : "Não foi possivel carregar os serviços e informações do utilizador",
+   "infobar.requiredRequestsFailed" : "Não foi possível carregar os serviços e informações do utilizador",
    "infobar.servicesUpdated" : "Os seus serviços foram atualizados.",
-   "infobar.updateAvailable" : "Está disponível uma atualização",
+   "infobar.updateAvailable" : "Está disponível uma nova atualização para o Franz",
    "invite.email.label" : "Endereço de e-mail",
    "invite.headline.friends" : "Convide 3 amigos ou colegas",
    "invite.name.label" : "Nome",
-   "invite.skip.label" : "Quero fazer isto mais tarde",
+   "invite.skip.label" : "Pretendo fazer isto mais tarde",
    "invite.submit.label" : "Enviar convites",
    "invite.successInfo" : "Convites enviados com sucesso",
    "login.email.label" : "Endereço de e-mail",
-   "login.headline" : "Registar",
-   "login.invalidCredentials" : "O email ou a palavra-passe estão incorretos",
+   "login.headline" : "Iniciar Sessão",
+   "login.invalidCredentials" : "O email ou a palavra-passe estão incorrectos",
    "login.link.password" : "Repor a minha palavra-passe",
    "login.link.signup" : "Criar uma conta gratuita",
    "login.password.label" : "Palavra-passe",
    "login.serverLogout" : "A sua sessão expirou, inicie sessão novamente.",
    "login.submit.label" : "Iniciar sessão",
    "login.tokenExpired" : "A sua sessão expirou, inicie sessão novamente.",
-   "menu.app.about" : "Sobre Franz",
+   "menu.app.about" : "Sobre o Franz",
    "menu.app.hide" : "Ocultar",
    "menu.app.hideOthers" : "Ocultar Outros",
    "menu.app.quit" : "Sair",
@@ -36,51 +39,52 @@
    "menu.edit.copy" : "Copiar",
    "menu.edit.cut" : "Cortar",
    "menu.edit.delete" : "Apagar",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
-   "menu.edit.paste" : "Paste",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
-   "menu.edit.redo" : "Redo",
-   "menu.edit.selectAll" : "Select All",
-   "menu.edit.speech" : "Speech",
-   "menu.edit.startDictation" : "Start Dictation",
-   "menu.edit.startSpeaking" : "Start Speaking",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
-   "menu.edit.undo" : "Undo",
-   "menu.file" : "File",
-   "menu.help" : "Help",
-   "menu.help.changelog" : "Changelog",
-   "menu.help.learnMore" : "Learn More",
+   "menu.edit.emojiSymbols" : "Emojis e Símbolos",
+   "menu.edit.paste" : "Colar",
+   "menu.edit.pasteAndMatchStyle" : "Colar e Manter Estilo",
+   "menu.edit.redo" : "Refazer",
+   "menu.edit.selectAll" : "Selecionar Tudo",
+   "menu.edit.speech" : "Voz",
+   "menu.edit.startDictation" : "Começar a ditar",
+   "menu.edit.startSpeaking" : "Comece a falar",
+   "menu.edit.stopSpeaking" : "Pare de Falar",
+   "menu.edit.undo" : "Desfazer",
+   "menu.file" : "Ficheiro",
+   "menu.help" : "Ajuda",
+   "menu.help.changelog" : "Registo de alterações",
+   "menu.help.learnMore" : "Saber mais",
    "menu.help.privacy" : "Declaração de privacidade",
-   "menu.help.support" : "Support",
-   "menu.help.tos" : "Terms of Service",
-   "menu.services" : "Services",
-   "menu.services.addNewService" : "Add New Service...",
-   "menu.view" : "View",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
-   "menu.view.reloadFranz" : "Reload Franz",
-   "menu.view.reloadService" : "Reload Service",
-   "menu.view.resetZoom" : "Actual Size",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
-   "menu.view.zoomIn" : "Zoom In",
-   "menu.view.zoomOut" : "Zoom Out",
-   "menu.window" : "Window",
-   "menu.window.close" : "Close",
-   "menu.window.minimize" : "Minimize",
+   "menu.help.support" : "Suporte",
+   "menu.help.tos" : "Termos do Serviço",
+   "menu.services" : "Serviços",
+   "menu.services.addNewService" : "Adicionar Novo Serviço...",
+   "menu.view" : "Ver",
+   "menu.view.enterFullScreen" : "Ativar Modo de Ecrã Completo",
+   "menu.view.exitFullScreen" : "Sair do Modo de Ecrã Completo",
+   "menu.view.reloadFranz" : "Recarregar Franz",
+   "menu.view.reloadService" : "Recarregar serviço",
+   "menu.view.resetZoom" : "Tamanho Real",
+   "menu.view.toggleDevTools" : "Activar\/Desativar Ferramentas de Desenvolvimento",
+   "menu.view.toggleFullScreen" : "Ativar\/Desativar Ecrã Completo",
+   "menu.view.toggleServiceDevTools" : "Ativar\/Desativar Ferramentas de Desenvolvimento de Serviços",
+   "menu.view.zoomIn" : "Aumentar",
+   "menu.view.zoomOut" : "Reduzir",
+   "menu.window" : "Janela",
+   "menu.window.close" : "Fechar",
+   "menu.window.minimize" : "Minimizar",
    "password.email.label" : "Endereço de e-mail",
    "password.headline" : "Repor a minha palavra-passe",
    "password.link.login" : "Iniciar sessão",
    "password.link.signup" : "Criar uma conta gratuita",
-   "password.noUser" : "Não existe nenhuma conta associada a esse email",
+   "password.noUser" : "Não existe nenhuma conta associada a esse endereço de e-mail",
    "password.submit.label" : "Submeter",
-   "password.successInfo" : "Por favor reveja o seu email",
+   "password.successInfo" : "Por favor verifique o seu endereço de e-mail",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
    "pricing.headline" : "Apoie o Franz",
-   "pricing.link.skipPayment" : "Não pretendo ajudar no desenvolvimento do Franz",
-   "pricing.submit.label" : "Pretendo ajudar no desenvolvimento do Franz",
+   "pricing.link.skipPayment" : "Não pretendo patrocinar o desenvolvimento do Franz",
+   "pricing.submit.label" : "Pretendo patrocinar o desenvolvimento do Franz",
    "pricing.support.label" : "Selecione o seu plano",
-   "service.crashHandler.action" : "Recarregar",
+   "service.crashHandler.action" : "Recarregar {name}",
    "service.crashHandler.autoReload" : "A tentar restaurar automaticamente {name} em {seconds} segundos",
    "service.crashHandler.headline" : "Oh não!",
    "service.crashHandler.text" : "{name} causou um erro.",
@@ -94,7 +98,7 @@
    "settings.account.buttonSave" : "Atualizar o perfil",
    "settings.account.deleteAccount" : "Apagar conta",
    "settings.account.deleteEmailSent" : "Recebeu um email com um endereço para confirmar a remoção da sua conta. A sua conta e dados não poderão ser restaurados!",
-   "settings.account.deleteInfo" : "Se não necessita mais da sua conta Franz, pode apagar a sua conta e dados aqui.",
+   "settings.account.deleteInfo" : "Se já não necessita da sua conta Franz, pode apagar a sua conta e todos os dados aqui.",
    "settings.account.headline" : "Conta",
    "settings.account.headlineAccount" : "Informação da conta",
    "settings.account.headlineDangerZone" : "Zona de perigo",
@@ -105,38 +109,40 @@
    "settings.account.headlineUpgrade" : "Atualize a sua conta e ajude o Franz",
    "settings.account.invoiceDownload" : "Transferir",
    "settings.account.manageSubscription.label" : "Gerir as minhas subscrições",
-   "settings.account.successInfo" : "As suas mudanças foram efetuadas com sucesso",
+   "settings.account.successInfo" : "As suas alterações foram efetuadas com sucesso",
    "settings.account.tryReloadUserInfoRequest" : "Tentar novamente",
    "settings.account.userInfoRequestFailed" : "Não é possível carregar a informação do utilizador",
    "settings.app.buttonClearAllCache" : "Limpar cache",
-   "settings.app.buttonInstallUpdate" : "Reiniciar & Instalar Atualizações",
-   "settings.app.buttonSearchForUpdate" : "Procurar por atualizações",
-   "settings.app.cacheInfo" : "A cache do Franz está a usar {size} do espaço em disco.",
+   "settings.app.buttonInstallUpdate" : "Reiniciar & instalar atualização",
+   "settings.app.buttonSearchForUpdate" : "Procurar atualizações",
+   "settings.app.cacheInfo" : "A cache do Franz está a usar {size} de espaço em disco.",
    "settings.app.currentVersion" : "Versão atual",
    "settings.app.form.autoLaunchInBackground" : "Abrir em segundo plano",
-   "settings.app.form.autoLaunchOnStart" : "Iniciar o Franz com o início de sessão",
+   "settings.app.form.autoLaunchOnStart" : "Iniciar o Franz após iniciar o computador",
    "settings.app.form.beta" : "Incluir versões instáveis (beta)",
-   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
+   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.enableGPUAcceleration" : "Activar Aceleração de GPU",
    "settings.app.form.enableMenuBar" : "Mostrar Franz na Barra de Menu",
    "settings.app.form.enableSpellchecking" : "Ativar verificação ortográfica",
    "settings.app.form.enableSystemTray" : "Mostrar o Franz na barra do sistema",
    "settings.app.form.hideDockIcon" : "Esconder ícone na Dock",
-   "settings.app.form.language" : "Idioma:",
+   "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a barra do sistema",
    "settings.app.form.runInBackground" : "Manter o Franz em segundo plano ao fechar a janela",
    "settings.app.form.showDisabledServices" : "Apresentar separadores de serviços desativados",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Apresentar emblema com o número de mensagens não lidas quando as notificações estão desactivadas",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Apresentar emblema com o número de mensagens não lidas quando as notificações estão desativadas",
+   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Definições",
    "settings.app.headlineAdvanced" : "Avançado",
    "settings.app.headlineAppearance" : "Aparência",
    "settings.app.headlineGeneral" : "Geral",
-   "settings.app.headlineLanguage" : "Idioma:",
+   "settings.app.headlineLanguage" : "Idioma",
    "settings.app.headlineUpdates" : "Atualizações",
    "settings.app.restartRequired" : "Alterações requerem reinício",
    "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Ajude-nos a traduzir a Franz para a sua língua.",
    "settings.app.updateStatusAvailable" : "Atualização disponivel, a transferir...",
-   "settings.app.updateStatusSearching" : "Procurando por atualizações",
+   "settings.app.updateStatusSearching" : "A procurar atualizações",
    "settings.app.updateStatusUpToDate" : "Está a usar a versão mais recente do Franz",
    "settings.invite.headline" : "Convide amigos",
    "settings.navigation.account" : "Conta",
@@ -148,9 +154,9 @@
    "settings.recipes.all" : "Todos os serviços",
    "settings.recipes.dev" : "Desenvolvimento",
    "settings.recipes.headline" : "Serviços disponíveis",
-   "settings.recipes.missingService" : "A faltar um serviço?",
+   "settings.recipes.missingService" : "Falta um serviço?",
    "settings.recipes.mostPopular" : "Os mais populares",
-   "settings.recipes.nothingFound" : "Lamentamos, mas não existe nenhum serviço corresponde ao pesquisado.",
+   "settings.recipes.nothingFound" : "Lamentamos, nenhum serviço corresponde ao pesquisado.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Serviço adicionado",
    "settings.searchService" : "Pesquisa de serviço",
    "settings.service.error.goBack" : "Voltar aos serviços",
@@ -159,25 +165,32 @@
    "settings.service.form.addServiceHeadline" : "Adicionar {name}",
    "settings.service.form.availableServices" : "Serviços disponíveis",
    "settings.service.form.customUrl" : "Servidor personalizado",
-   "settings.service.form.customUrlPremiumInfo" : "Para adicionar serviços com domínio próprio, é necessário uma Conta Premium.",
+   "settings.service.form.customUrlPremiumInfo" : "Para adicionar serviços com domínio próprio, é necessário uma Conta Premium no Franz.",
    "settings.service.form.customUrlUpgradeAccount" : "Atualizar a conta",
    "settings.service.form.customUrlValidationError" : "Não foi possível validar o servidor {nome}.",
    "settings.service.form.deleteButton" : "Apagar serviço",
    "settings.service.form.editServiceHeadline" : "Editar {name}",
    "settings.service.form.enableAudio" : "Ativar áudio",
-   "settings.service.form.enableBadge" : "Mostrar emblema de mensagens não vistas",
+   "settings.service.form.enableBadge" : "Mostrar emblemas de mensagens não lidas",
+   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
    "settings.service.form.enableNotification" : "Ativar notificações",
    "settings.service.form.enableService" : "Ativar serviço",
-   "settings.service.form.headlineBadges" : "Emblema de mensagem não vista",
+   "settings.service.form.headlineBadges" : "Emblema de mensagem não lida",
    "settings.service.form.headlineGeneral" : "Geral",
    "settings.service.form.headlineNotifications" : "Notificações",
    "settings.service.form.icon" : "Personalizar ícone",
    "settings.service.form.iconDelete" : "Apagar",
    "settings.service.form.iconUpload" : "Arraste a sua imagem, ou clique aqui",
-   "settings.service.form.indirectMessageInfo" : "Será notificado sobre todas as novas mensagens de um canal, não apenas @username, @channel, @here, ...",
+   "settings.service.form.indirectMessageInfo" : "Será notificado sobre todas as novas mensagens num canal, não apenas @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Mostrar o emblema da mensagem para todas as novas mensagens",
-   "settings.service.form.isMutedInfo" : "Quando desativado, todas as notificações de áudio serão silenciadas",
+   "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.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.saveButton" : "Guardar serviço",
    "settings.service.form.tabHosted" : "Com domínio",
    "settings.service.form.tabOnPremise" : "Com domínio próprio ��",
@@ -187,7 +200,7 @@
    "settings.services.deletedInfo" : "O serviço foi apagado",
    "settings.services.discoverServices" : "Descobrir serviços",
    "settings.services.headline" : "Os seus serviços",
-   "settings.services.noServicesAdded" : "Ainda não adicionou nenhum serviço.",
+   "settings.services.noServicesAdded" : "Ainda não adicionou um serviço.",
    "settings.services.tooltip.isDisabled" : "O serviço está desativado",
    "settings.services.tooltip.isMuted" : "Todos os sons estão silenciados",
    "settings.services.tooltip.notificationsDisabled" : "As notificações estão desativadas",
@@ -206,28 +219,30 @@
    "sidebar.settings" : "Definições",
    "sidebar.unmuteApp" : "Ativar notificações e áudio",
    "signup.company.label" : "Empresa",
-   "signup.email.label" : "Endereço de e-mail",
-   "signup.emailDuplicate" : "Já existe uma conta associada a este endereço",
+   "signup.email.label" : "Endereço de email",
+   "signup.emailDuplicate" : "Já existe uma conta associada a este endereço de email",
    "signup.firstname.label" : "Primeiro Nome",
    "signup.headline" : "Criar conta",
    "signup.lastname.label" : "Último Nome",
    "signup.legal.info" : "Ao criar uma conta Franz, aceita",
-   "signup.legal.privacy" : "Declaração de privacidade",
-   "signup.legal.terms" : "Termos de Serviço",
-   "signup.link.login" : "Já tem conta, iniciar sessão?",
+   "signup.legal.privacy" : "Declaração de Privacidade",
+   "signup.legal.terms" : "Termos do Serviço",
+   "signup.link.login" : "Já tem uma conta, iniciar sessão?",
    "signup.password.label" : "Palavra-passe",
    "signup.submit.label" : "Criar uma conta",
    "subscription.euTaxInfo" : "Residentes EU: Taxas locais podem ser aplicadas",
    "subscription.features.ads" : "Sem anúncios, para sempre!",
-   "subscription.features.comingSoon" : "Em breve!",
-   "subscription.features.customServices" : "Serviços privados para si e para a sua equipa",
-   "subscription.features.encryptedSync" : "Sincronização encriptada de serviços",
+   "subscription.features.comingSoon" : "em breve",
+   "subscription.features.encryptedSync" : "Sincronização encriptada de sessão",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Adicionar serviços 'on-premise'\/hosted como o HipChat",
-   "subscription.features.vpn" : "Suporte para proxy\/VPN",
+   "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.includedFeatures" : "Ao subscrever uma Conta Premium, tem acesso a",
    "subscription.paymentSessionError" : "Erro no serviço de pagamento",
    "subscription.submit.label" : "Pretendo ajudar o desenvolvimento do Franz",
-   "subscription.type.free" : "Gratuito",
+   "subscription.type.free" : "gratuito",
    "subscription.type.month" : "mês",
    "subscription.type.year" : "ano",
    "subscriptionPopup.buttonCancel" : "Cancelar",
@@ -241,11 +256,11 @@
    "tabs.item.enableNotification" : "Ativar notificações",
    "tabs.item.enableService" : "Ativar serviço",
    "tabs.item.reload" : "Recarregar",
-   "validation.email" : "{field} is not valid",
-   "validation.minLength" : "{field} should be at least {length} characters long",
-   "validation.required" : "{field} is required",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.email" : "{field} não é válido",
+   "validation.minLength" : "{field} deveria ter pelo menos {comprimento} caracteres",
+   "validation.required" : "{field} é obrigatório",
+   "validation.url" : "{field} não é uma hiperligação válida",
    "welcome.loginButton" : "Iniciar sessão",
    "welcome.signupButton" : "Criar uma conta gratuita",
-   "welcome.slogan" : "Messaging that works for you"
+   "welcome.slogan" : "Sistema de mensagens feito para si"
 }
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index ecebc46ee..78030dc15 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -1,25 +1,28 @@
 {
-   "global.api.unhealthy" : "�евозможно подключить�� к �ерви�ам Franz",
-   "global.notConnectedToTheInternet" : "�ет Интернет-�оединени�",
-   "import.headline" : "Импортировать �ерви�ы из Franz 4",
-   "import.notSupportedHeadline" : "Серви�ы ещё не поддерживают�� в Franz 5",
-   "import.skip.label" : "Я хочу добавить �ерви� вручную",
+   "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.skip.label" : "Я хочу добавить �ерви�ы вручную",
    "import.submit.label" : "Импортировать �ерви�ы",
    "infobar.buttonChangelog" : "Что новенького?",
-   "infobar.buttonInstallUpdate" : "Перезапу�тить и обновить",
+   "infobar.buttonInstallUpdate" : "Перезапу�тить и у�тановить обновлени�",
    "infobar.buttonReloadServices" : "Перезагрузить �ерви�ы",
    "infobar.requiredRequestsFailed" : "�евозможно загрузить �ерви�ы и информацию пользовател�",
    "infobar.servicesUpdated" : "Ваши �ерви�ы были обновлены.",
    "infobar.updateAvailable" : "До�тупно обновление Franz.",
-   "invite.email.label" : "Email адре�",
+   "invite.email.label" : "�дре� �лектронной почты",
    "invite.headline.friends" : "Пригла�ите 3-х друзей или коллег",
    "invite.name.label" : "Им�",
    "invite.skip.label" : "Я �делаю �то позже",
    "invite.submit.label" : "Вы�лать приглашени�",
    "invite.successInfo" : "Приглашени� у�пешно отправлены",
-   "login.email.label" : "Email",
+   "login.email.label" : "�дре� �лектронной почты",
    "login.headline" : "Вход",
-   "login.invalidCredentials" : "�еправильный email или пароль",
+   "login.invalidCredentials" : "�еправильный адре� �лектронной почты или пароль",
    "login.link.password" : "Во��тановить пароль",
    "login.link.signup" : "Создать бе�платный аккаунт",
    "login.password.label" : "Пароль",
@@ -32,19 +35,19 @@
    "menu.app.quit" : "Выйти",
    "menu.app.settings" : "�а�тройки",
    "menu.app.unhide" : "Показать",
-   "menu.edit" : "Редактировать",
+   "menu.edit" : "Правка",
    "menu.edit.copy" : "Копировать",
    "menu.edit.cut" : "Вырезать",
    "menu.edit.delete" : "Удалить",
    "menu.edit.emojiSymbols" : "Эмодзи и �имволы",
    "menu.edit.paste" : "В�тавить",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.pasteAndMatchStyle" : "В�тавить � �облюдением �тил�",
    "menu.edit.redo" : "Вернуть",
    "menu.edit.selectAll" : "Выделить в�ё",
-   "menu.edit.speech" : "Speech",
-   "menu.edit.startDictation" : "Start Dictation",
-   "menu.edit.startSpeaking" : "Start Speaking",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.speech" : "Речь",
+   "menu.edit.startDictation" : "�ачать диктовать",
+   "menu.edit.startSpeaking" : "�ачать говорить",
+   "menu.edit.stopSpeaking" : "Закончить говорить",
    "menu.edit.undo" : "Отменить",
    "menu.file" : "Файл",
    "menu.help" : "Справка",
@@ -53,33 +56,34 @@
    "menu.help.privacy" : "Политика конфиденциально�ти",
    "menu.help.support" : "Поддержка",
    "menu.help.tos" : "У�лови� и�пользовани�",
-   "menu.services" : "Services",
-   "menu.services.addNewService" : "Добавить �ерви�...",
+   "menu.services" : "Службы",
+   "menu.services.addNewService" : "Добавить новый �ерви�...",
    "menu.view" : "Вид",
    "menu.view.enterFullScreen" : "�а ве�ь �кран",
    "menu.view.exitFullScreen" : "В окне",
    "menu.view.reloadFranz" : "Перезагрузить Franz",
    "menu.view.reloadService" : "Перезапу�тить �ерви�",
    "menu.view.resetZoom" : "Фактиче�кий размер",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.toggleDevTools" : "Показать ин�трументы разработчика",
+   "menu.view.toggleFullScreen" : "Переключить�� на полный �кран",
+   "menu.view.toggleServiceDevTools" : "Показать ин�трументы разработчика �ерви�а",
    "menu.view.zoomIn" : "Увеличить ма�штаб",
    "menu.view.zoomOut" : "Уменьшить ма�штаб",
    "menu.window" : "Окно",
    "menu.window.close" : "Закрыть",
    "menu.window.minimize" : "Свернуть",
-   "password.email.label" : "Email адре�",
+   "password.email.label" : "�дре� �лектронной почты",
    "password.headline" : "Сбро�ить пароль",
    "password.link.login" : "Вход",
-   "password.link.signup" : "Создать учётную запи�ь пользовател�",
-   "password.noUser" : "�е найдено пользовател� � таким email",
+   "password.link.signup" : "Создать бе�платную учётную запи�ь пользовател�",
+   "password.noUser" : "�е найдено пользовател� � таким адре�ом �лектронной почты",
    "password.submit.label" : "Прин�ть",
-   "password.successInfo" : "Проверьте Вашу �лектронную почту",
+   "password.successInfo" : "Проверьте вашу �лектронную почту",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
    "pricing.headline" : "Поддержать Franz",
    "pricing.link.skipPayment" : "Я не хочу поддерживать разработку Franz.",
    "pricing.submit.label" : "Я хочу поддержать разработку Franz",
-   "pricing.support.label" : "Выберите план поддержки",
+   "pricing.support.label" : "Выберите ваш план поддержки",
    "service.crashHandler.action" : "Перезагрузить {name}",
    "service.crashHandler.autoReload" : "Пытаю�ь автоматиче�ки во��тановить {name} в течение {seconds} �екунд",
    "service.crashHandler.headline" : "О, нет!",
@@ -104,8 +108,8 @@
    "settings.account.headlineSubscription" : "Ваша подпи�ка",
    "settings.account.headlineUpgrade" : "Улучшить аккаунт и поддержать Franz",
    "settings.account.invoiceDownload" : "Скачать",
-   "settings.account.manageSubscription.label" : "Управление подпи�кой",
-   "settings.account.successInfo" : "Изменени� �охранены",
+   "settings.account.manageSubscription.label" : "Управление вашей подпи�кой",
+   "settings.account.successInfo" : "Ваши изменени� были �охранены",
    "settings.account.tryReloadUserInfoRequest" : "Попробовать �нова",
    "settings.account.userInfoRequestFailed" : "�евозможно загрузить информацию пользовател�",
    "settings.app.buttonClearAllCache" : "Очи�тить к�ш",
@@ -116,16 +120,18 @@
    "settings.app.form.autoLaunchInBackground" : "Открывать в фоне",
    "settings.app.form.autoLaunchOnStart" : "Запу�кать Franz при �тарте",
    "settings.app.form.beta" : "Включа� бета вер�ии",
-   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
-   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
+   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.enableGPUAcceleration" : "Включить у�корение GPU",
+   "settings.app.form.enableMenuBar" : "Показывать Franz на панели меню",
    "settings.app.form.enableSpellchecking" : "Включить проверку правопи�ани�",
    "settings.app.form.enableSystemTray" : "Показывать Franz в �и�темном трее",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
+   "settings.app.form.hideDockIcon" : "Спр�тать иконку Franz на панели",
    "settings.app.form.language" : "Язык",
    "settings.app.form.minimizeToSystemTray" : "Сворачивать Franz в �и�темный трей",
    "settings.app.form.runInBackground" : "О�тавл�ть Franz в фоне при закрытии окна",
    "settings.app.form.showDisabledServices" : "Показывать вкладки отключённых �лужб",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Показывать значок непрочитанного �ообщени� при отключённых уведомлени�х",
+   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "�а�тройки",
    "settings.app.headlineAdvanced" : "Дополнительно",
    "settings.app.headlineAppearance" : "Внешний вид",
@@ -148,43 +154,50 @@
    "settings.recipes.all" : "В�е �ерви�ы",
    "settings.recipes.dev" : "Разработка",
    "settings.recipes.headline" : "До�тупные �ерви�ы",
-   "settings.recipes.missingService" : "�е можете найти �лужбу?",
-   "settings.recipes.mostPopular" : "Попул�рные",
-   "settings.recipes.nothingFound" : "�ичего не найдено по вашему запро�у.",
+   "settings.recipes.missingService" : "�е можете найти �ерви�?",
+   "settings.recipes.mostPopular" : "Самые попул�рные",
+   "settings.recipes.nothingFound" : "Извините, но ничего не найдено по вашему пои�ковому запро�у.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Серви� у�пешно добавлен",
    "settings.searchService" : "�айти �ерви�",
    "settings.service.error.goBack" : "Вернуть�� к �ерви�ам",
    "settings.service.error.headline" : "Ошибка",
-   "settings.service.error.message" : "�евозможно загрузить рецепт �ерви�а.",
+   "settings.service.error.message" : "�евозможно загрузить \"рецепт\" �ерви�а.",
    "settings.service.form.addServiceHeadline" : "Добавление {name}",
    "settings.service.form.availableServices" : "До�тупные �ерви�ы",
-   "settings.service.form.customUrl" : "�дре� �ервера",
-   "settings.service.form.customUrlPremiumInfo" : "Дл� добавлени� �ерви�а на �воем хо�тинге необходим аккаунт Franz Premium.",
-   "settings.service.form.customUrlUpgradeAccount" : "Улучшить аккаунт",
+   "settings.service.form.customUrl" : "Пользователь�кий �ервер",
+   "settings.service.form.customUrlPremiumInfo" : "Дл� добавлени� �ерви�а на �воем хо�тинге необходим премиум аккаунт Franz.",
+   "settings.service.form.customUrlUpgradeAccount" : "Улучшить ваш аккаунт",
    "settings.service.form.customUrlValidationError" : "�евозможно проверить �ервер {name}.",
    "settings.service.form.deleteButton" : "Удалить �ерви�",
    "settings.service.form.editServiceHeadline" : "Редактирование {name}",
    "settings.service.form.enableAudio" : "Включить звук",
    "settings.service.form.enableBadge" : "Показывать иконку непрочитанных �ообщений",
+   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
    "settings.service.form.enableNotification" : "Включить уведомлени�",
    "settings.service.form.enableService" : "Включить �ерви�",
    "settings.service.form.headlineBadges" : "Значки непрочитанных �ообщений",
    "settings.service.form.headlineGeneral" : "Общие",
    "settings.service.form.headlineNotifications" : "Уведомлени�",
-   "settings.service.form.icon" : "�е�тандартна� иконка",
+   "settings.service.form.icon" : "Пользователь�ка� иконка",
    "settings.service.form.iconDelete" : "Удалить",
-   "settings.service.form.iconUpload" : "Перетащите картинку или кликните зде�ь",
-   "settings.service.form.indirectMessageInfo" : "Вы будете получать уведомлени� дл� в�ех �ообщений, не только дл� @username, @channel, @here, ...",
+   "settings.service.form.iconUpload" : "Перетащите ваше изображение или кликните зде�ь",
+   "settings.service.form.indirectMessageInfo" : "Вы будете получать уведомлени� обо в�ех новых �ообщений на канале, не только дл� @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Показывать значок уведомлений дл� в�ех новых �ообщений",
    "settings.service.form.isMutedInfo" : "Когда выключено, в�е звуковые уведомлени� будут отключены",
    "settings.service.form.name" : "�азвание",
-   "settings.service.form.saveButton" : "Сохранить",
+   "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.saveButton" : "Сохранить �ерви�",
    "settings.service.form.tabHosted" : "Размещено",
    "settings.service.form.tabOnPremise" : "Свой хо�тинг ��",
    "settings.service.form.team" : "Команда",
    "settings.service.form.useHostedService" : "И�пользовать �об�твенный �ерви� {name}",
    "settings.service.form.yourServices" : "Ваши �ерви�ы",
-   "settings.services.deletedInfo" : "Серви� удален",
+   "settings.services.deletedInfo" : "Серви� был удален",
    "settings.services.discoverServices" : "�айти �ерви�ы",
    "settings.services.headline" : "Ваши �ерви�ы",
    "settings.services.noServicesAdded" : "Вы пока не добавили никаких �ерви�ов.",
@@ -197,7 +210,7 @@
    "settings.user.form.accountType.label" : "Тип аккаунта",
    "settings.user.form.accountType.non-profit" : "�екоммерче�кий",
    "settings.user.form.currentPassword" : "Текущий пароль",
-   "settings.user.form.email" : "Email",
+   "settings.user.form.email" : "�дре� �лектронной почты",
    "settings.user.form.firstname" : "Им�",
    "settings.user.form.lastname" : "Фамили�",
    "settings.user.form.newPassword" : "�овый пароль",
@@ -206,8 +219,8 @@
    "sidebar.settings" : "�а�тройки",
    "sidebar.unmuteApp" : "Включить уведомлени� и звук",
    "signup.company.label" : "Организаци�",
-   "signup.email.label" : "Email адре�",
-   "signup.emailDuplicate" : "Пользователь � таким email уже �уще�твует",
+   "signup.email.label" : "�дре� �лектронной почты",
+   "signup.emailDuplicate" : "Пользователь � таким адре�ом �лектронной почты уже �уще�твует",
    "signup.firstname.label" : "Им�",
    "signup.headline" : "Реги�траци�",
    "signup.lastname.label" : "Фамили�",
@@ -220,11 +233,13 @@
    "subscription.euTaxInfo" : "Резидентам ЕвроСоюза: могут примен�ть�� ме�тные налоги",
    "subscription.features.ads" : "Без рекламы, нав�егда!",
    "subscription.features.comingSoon" : "�коро",
-   "subscription.features.customServices" : "�а�траиваемые �ерви�ы дл� ва� и вашей команды",
-   "subscription.features.encryptedSync" : "Шифрование �е��ий �инхронизации",
+   "subscription.features.encryptedSync" : "Зашифрованные �е��ии �инхронизации",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Добавление облачных �лужб или �лужб на �воём хо�тинге типа HipChat",
-   "subscription.features.vpn" : "Поддержку прок�и и VPN",
-   "subscription.includedFeatures" : "Платный аккаунт Franz Premium включает",
+   "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.includedFeatures" : "Платный премиум аккаунт Franz включает",
    "subscription.paymentSessionError" : "�евозможно загрузить форму оплаты",
    "subscription.submit.label" : "Я хочу поддержать разработку Franz",
    "subscription.type.free" : "бе�платно",
@@ -241,11 +256,11 @@
    "tabs.item.enableNotification" : "Включить уведомлени�",
    "tabs.item.enableService" : "Включить �лужбу",
    "tabs.item.reload" : "Перезагрузить",
-   "validation.email" : "{field} is not valid",
-   "validation.minLength" : "{field} should be at least {length} characters long",
-   "validation.required" : "{field} is required",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.email" : "{field} недей�твительно",
+   "validation.minLength" : "{field} должно быть не менее {length} �имволов",
+   "validation.required" : "{field} об�зательно",
+   "validation.url" : "{field} �вл�ет�� недей�твительной ��ылкой",
    "welcome.loginButton" : "Вход",
-   "welcome.signupButton" : "Создать аккаунт",
-   "welcome.slogan" : "Общение, которое про�то работает"
+   "welcome.signupButton" : "Создать бе�платный аккаунт",
+   "welcome.slogan" : "Общение, которое работает дл� ва�"
 }
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index c43e998a4..70e3e7f2d 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -1,233 +1,248 @@
 {
-   "global.api.unhealthy" : "Franz sa nemôže pripojit k online službám",
-   "global.notConnectedToTheInternet" : "Nie ste pripojený k internetu",
-   "import.headline" : "Importovať služby z Franz 4",
+   "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" : "Nedá sa pripojiť k online službám Franz",
+   "global.notConnectedToTheInternet" : "Nie ste pripojení k internetu.",
+   "import.headline" : "Importovať vaše služby z Franz 4",
    "import.notSupportedHeadline" : "Služby zatiaľ nie sú podporované vo verzii Franz 5",
-   "import.skip.label" : "Chcem pridať službu ru�ne",
+   "import.skip.label" : "Chcem pridať služby ru�ne",
    "import.submit.label" : "Importovať služby",
-   "infobar.buttonChangelog" : "Čo je nové:",
-   "infobar.buttonInstallUpdate" : "Reštartovať a inštalovať aktualizáciu",
+   "infobar.buttonChangelog" : "Čo je nového?",
+   "infobar.buttonInstallUpdate" : "Reštartovať a nainštalovať aktualizáciu",
    "infobar.buttonReloadServices" : "Obnoviť služby",
-   "infobar.requiredRequestsFailed" : "Nie je možné na�ítať služby a informácie o užívateľovi",
+   "infobar.requiredRequestsFailed" : "Nie je možné na�ítať služby a informácie o používateľovi",
    "infobar.servicesUpdated" : "Vaše služby boli aktualizované.",
-   "infobar.updateAvailable" : "Nová aktualizácia Franz je k dispozícii.",
+   "infobar.updateAvailable" : "Je k dispozícii nová aktualizácia Franz.",
    "invite.email.label" : "E-mailová adresa",
-   "invite.headline.friends" : "Pozvite 3 priateľov alebo kolegov",
+   "invite.headline.friends" : "Pozvite troch vašich priateľov alebo kolegov",
    "invite.name.label" : "Meno",
-   "invite.skip.label" : "Spravím to neskôr",
+   "invite.skip.label" : "Chcem to urobiť neskôr",
    "invite.submit.label" : "Poslať pozvánky",
    "invite.successInfo" : "Pozvánky boli úspešne odoslané",
-   "login.email.label" : "Emailová adresa",
+   "login.email.label" : "E-mailová adresa",
    "login.headline" : "Prihlásiť sa",
-   "login.invalidCredentials" : "E-mail alebo heslo nesúhlasí",
+   "login.invalidCredentials" : "E-mail alebo heslo nesúhlasia",
    "login.link.password" : "Obnoviť heslo",
-   "login.link.signup" : "Vytvoriť užívateľský ú�et zdarma",
+   "login.link.signup" : "Vytvoriť používateľský ú�et zdarma",
    "login.password.label" : "Heslo",
-   "login.serverLogout" : "Relácia vypršala, prihláste sa prosím znova.",
+   "login.serverLogout" : "Vaša relácia vypršala, prihláste sa prosím znovu.",
    "login.submit.label" : "Prihlásiť sa",
-   "login.tokenExpired" : "Relácia vypršala, prosím prihláste sa znova.",
-   "menu.app.about" : "About Franz",
-   "menu.app.hide" : "Hide",
-   "menu.app.hideOthers" : "Hide Others",
-   "menu.app.quit" : "Quit",
+   "login.tokenExpired" : "Vaša relácia vypršala, prihláste sa prosím znovu.",
+   "menu.app.about" : "O aplikácii",
+   "menu.app.hide" : "Skryť",
+   "menu.app.hideOthers" : "Skryť ostatné",
+   "menu.app.quit" : "Ukon�iť",
    "menu.app.settings" : "Nastavenia",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Odkryť",
    "menu.edit" : "Upraviť",
-   "menu.edit.copy" : "Copy",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.copy" : "Kopírovať",
+   "menu.edit.cut" : "Vystrihnúť",
    "menu.edit.delete" : "Zmazať",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
-   "menu.edit.paste" : "Paste",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
-   "menu.edit.redo" : "Redo",
-   "menu.edit.selectAll" : "Select All",
-   "menu.edit.speech" : "Speech",
-   "menu.edit.startDictation" : "Start Dictation",
-   "menu.edit.startSpeaking" : "Start Speaking",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
-   "menu.edit.undo" : "Undo",
-   "menu.file" : "File",
-   "menu.help" : "Help",
-   "menu.help.changelog" : "Changelog",
-   "menu.help.learnMore" : "Learn More",
+   "menu.edit.emojiSymbols" : "Emoji a symboly",
+   "menu.edit.paste" : "Vložiť",
+   "menu.edit.pasteAndMatchStyle" : "Vložiť s prevzatím jestvujúceho štýlu",
+   "menu.edit.redo" : "Znovu",
+   "menu.edit.selectAll" : "Vybrať všetko",
+   "menu.edit.speech" : "Rozprávanie",
+   "menu.edit.startDictation" : "Za�ať diktovanie",
+   "menu.edit.startSpeaking" : "Za�ať rozprávanie",
+   "menu.edit.stopSpeaking" : "Zastaviť rozprávanie",
+   "menu.edit.undo" : "Späť",
+   "menu.file" : "Súbor",
+   "menu.help" : "Pomocník",
+   "menu.help.changelog" : "Záznam zmien",
+   "menu.help.learnMore" : "Zistiť viac",
    "menu.help.privacy" : "Vyhlásenie o ochrane súkromia",
-   "menu.help.support" : "Support",
-   "menu.help.tos" : "Terms of Service",
-   "menu.services" : "Services",
-   "menu.services.addNewService" : "Add New Service...",
-   "menu.view" : "View",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
-   "menu.view.reloadFranz" : "Reload Franz",
-   "menu.view.reloadService" : "Reload Service",
-   "menu.view.resetZoom" : "Actual Size",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
-   "menu.view.zoomIn" : "Zoom In",
-   "menu.view.zoomOut" : "Zoom Out",
-   "menu.window" : "Window",
-   "menu.window.close" : "Close",
-   "menu.window.minimize" : "Minimize",
-   "password.email.label" : "Emailová adresa",
-   "password.headline" : "Vynulovať heslo",
-   "password.link.login" : "Prihlásenie do vašeho ú�tu",
-   "password.link.signup" : "Vytvoriť užívateľský ú�et zdarma",
-   "password.noUser" : "Užívateľ s touto emailovou adresou nebol nájdený",
+   "menu.help.support" : "Podpora",
+   "menu.help.tos" : "Podmienky použitia",
+   "menu.services" : "Služby",
+   "menu.services.addNewService" : "Pridať novú službu...",
+   "menu.view" : "Zobraziť",
+   "menu.view.enterFullScreen" : "Na celú obrazovku",
+   "menu.view.exitFullScreen" : "Ukon�iť režim na celú obrazovku",
+   "menu.view.reloadFranz" : "Obnoviť Franz",
+   "menu.view.reloadService" : "Obnoviť službu",
+   "menu.view.resetZoom" : "Pôvodná veľkosť",
+   "menu.view.toggleDevTools" : "Prepnúť vývojárske nástroje",
+   "menu.view.toggleFullScreen" : "Prepnúť na celú obrazovku",
+   "menu.view.toggleServiceDevTools" : "Prepnúť vývojárske nástroje služby",
+   "menu.view.zoomIn" : "Priblížiť",
+   "menu.view.zoomOut" : "Oddialiť",
+   "menu.window" : "Okno",
+   "menu.window.close" : "Zatvoriť",
+   "menu.window.minimize" : "Minimalizovať",
+   "password.email.label" : "E-mailová adresa",
+   "password.headline" : "Obnoviť heslo",
+   "password.link.login" : "Prihlásiť sa do vášho ú�tu",
+   "password.link.signup" : "Vytvoriť používateľský ú�et zdarma",
+   "password.noUser" : "Používateľ s touto e-mailovou adresou nebol nájdený",
    "password.submit.label" : "Odoslať",
-   "password.successInfo" : "Prosím, zkontrolujte svoj e-mail",
-   "pricing.headline" : "Podporte Franz",
+   "password.successInfo" : "Skontrolujte prosím váš e-mail",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "pricing.headline" : "Podporiť Franz",
    "pricing.link.skipPayment" : "Nechcem podporiť vývoj aplikácie Franz.",
    "pricing.submit.label" : "Chcem podporiť vývoj aplikácie Franz",
-   "pricing.support.label" : "Vyberte váš plán podpory",
-   "service.crashHandler.action" : "Na�ítať znovu {name}",
-   "service.crashHandler.autoReload" : "Pokus o automatické obnovenie {name} za {seconds} sekúnd",
+   "pricing.support.label" : "Vyberte si váš plán podpory",
+   "service.crashHandler.action" : "Znovu na�ítať {name}",
+   "service.crashHandler.autoReload" : "Najbližší pokus o automatické obnovenie {name} o {seconds} sekúnd",
    "service.crashHandler.headline" : "Ale nie!",
    "service.crashHandler.text" : "{name} spôsobil chybu.",
    "service.disabledHandler.action" : "Zapnúť {name}",
-   "service.disabledHandler.headline" : "{name} je vypnutý",
+   "service.disabledHandler.headline" : "{name} je vypnuté",
    "services.getStarted" : "Za�íname",
-   "services.welcome" : "Víta vás Franz",
+   "services.welcome" : "Vítajte v aplikácii Franz",
    "settings.account.account.editButton" : "Upraviť ú�et",
    "settings.account.accountType.basic" : "Základný ú�et",
    "settings.account.accountType.premium" : "Prémiový ú�et podporovateľa",
    "settings.account.buttonSave" : "Aktualizovať profil",
    "settings.account.deleteAccount" : "Odstrániť ú�et",
-   "settings.account.deleteEmailSent" : "Na váš mail bol odoslaný email s odkazom pre potvrdenie zmazanie ú�tu. Váš ú�et a dáta potom nepôjde obnoviť!",
-   "settings.account.deleteInfo" : "Ak už nepotrebujete váš Franz ú�et, môžete tu váš ú�et, a všetky dáta v ňom, zmazať.",
+   "settings.account.deleteEmailSent" : "Bol vám odoslaný e-mail s odkazom pre potvrdenie odstránenia vášho ú�tu. Váš ú�et a údaje sa nebudú dať obnoviť!",
+   "settings.account.deleteInfo" : "Ak už nepotrebujete váš Franz ú�et, tu ho môžete zmazať spolu so všetkými prislúchajúcimi údajmi.",
    "settings.account.headline" : "Ú�et",
    "settings.account.headlineAccount" : "Informácie o ú�te",
    "settings.account.headlineDangerZone" : "Nebezpe�ná zóna",
    "settings.account.headlineInvoices" : "Faktúry",
    "settings.account.headlinePassword" : "Zmeniť heslo",
    "settings.account.headlineProfile" : "Aktualizovať profil",
-   "settings.account.headlineSubscription" : "Vaše predplatné",
-   "settings.account.headlineUpgrade" : "Inovujte svoj ú�et a podporte Franz",
-   "settings.account.invoiceDownload" : "Stiahnuť",
-   "settings.account.manageSubscription.label" : "Spravovať vaše predplatné",
+   "settings.account.headlineSubscription" : "Vaše odoberanie",
+   "settings.account.headlineUpgrade" : "Povýšte svoj ú�et a podporte Franz",
+   "settings.account.invoiceDownload" : "Prevziať",
+   "settings.account.manageSubscription.label" : "Spravovať vaše odoberanie",
    "settings.account.successInfo" : "Vaše zmeny boli uložené",
    "settings.account.tryReloadUserInfoRequest" : "Skúsiť znova",
-   "settings.account.userInfoRequestFailed" : "Nebolo možné získať informácie o užívateľovi",
+   "settings.account.userInfoRequestFailed" : "Nebolo možné na�ítať informácie o používateľovi",
    "settings.app.buttonClearAllCache" : "Vy�istiť vyrovnávaciu pamäť",
-   "settings.app.buttonInstallUpdate" : "Reštart a inštalácia aktualizácií",
+   "settings.app.buttonInstallUpdate" : "Reštartovať a nainštalovať aktualizáciu",
    "settings.app.buttonSearchForUpdate" : "Skontrolovať aktualizácie",
-   "settings.app.cacheInfo" : "Franz momentálne používa {size} miesta na disku.",
-   "settings.app.currentVersion" : "Aktuálna verzia:",
+   "settings.app.cacheInfo" : "Vyrovnávacia pamäť Franz momentálne používa {size} miesta na disku.",
+   "settings.app.currentVersion" : "Sú�asná verzia:",
    "settings.app.form.autoLaunchInBackground" : "Otvoriť na pozadí",
    "settings.app.form.autoLaunchOnStart" : "Spustiť Franz pri štarte",
    "settings.app.form.beta" : "Vrátane beta verzií",
-   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
-   "settings.app.form.enableMenuBar" : "Zobraz Franz v Menu bare",
-   "settings.app.form.enableSpellchecking" : "Povoliť zvýraznenie preklepov",
+   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.enableGPUAcceleration" : "Zapnúť GPU zrýchlenie",
+   "settings.app.form.enableMenuBar" : "Zobraziť Franz v ponuke menu",
+   "settings.app.form.enableSpellchecking" : "Zapnúť kontrolu pravopisu",
    "settings.app.form.enableSystemTray" : "Zobrazovať Franz v systémovej lište",
-   "settings.app.form.hideDockIcon" : "Schovaj ikonu Franz v doku",
+   "settings.app.form.hideDockIcon" : "Skryť ikonu Franz v doku",
    "settings.app.form.language" : "Jazyk",
    "settings.app.form.minimizeToSystemTray" : "Minimalizovať Franz do systémovej lišty",
-   "settings.app.form.runInBackground" : "Ponechať Franz spustený v pozadí pri zatvorení okna",
+   "settings.app.form.runInBackground" : "Po zatvorení okna ponechať Franz spustený na pozadí",
    "settings.app.form.showDisabledServices" : "Zobraziť záložky vypnutých služieb",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Zobraziť odznak pre nepre�ítané správy ke� sú upozornenia vypnutá",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Zobraziť symbol pre nepre�ítané správy, ke� sú vypnuté upozornenia",
+   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Nastavenia",
-   "settings.app.headlineAdvanced" : "Rozšírené",
+   "settings.app.headlineAdvanced" : "Pokro�ilé",
    "settings.app.headlineAppearance" : "Vzhľad",
    "settings.app.headlineGeneral" : "Všeobecné",
    "settings.app.headlineLanguage" : "Jazyk",
    "settings.app.headlineUpdates" : "Aktualizácie",
-   "settings.app.restartRequired" : "Zmeny vyžadujú restart",
+   "settings.app.restartRequired" : "Zmeny vyžadujú reštart",
    "settings.app.subheadlineCache" : "Vyrovnávacia pamäť",
    "settings.app.translationHelp" : "Pomôžte nám preložiť Franz do svojho jazyka.",
-   "settings.app.updateStatusAvailable" : "Dostupná aktualizácia, sťahujem...",
-   "settings.app.updateStatusSearching" : "Vyhľadávam aktualizácie",
+   "settings.app.updateStatusAvailable" : "Je dostupná aktualizácia, sťahuje sa...",
+   "settings.app.updateStatusSearching" : "Vyhľadáva aktualizácie",
    "settings.app.updateStatusUpToDate" : "Používate najnovšiu verziu Franz",
-   "settings.invite.headline" : "Pozvi priateľov",
+   "settings.invite.headline" : "Pozvať priateľov",
    "settings.navigation.account" : "Ú�et",
    "settings.navigation.availableServices" : "Dostupné služby",
-   "settings.navigation.inviteFriends" : "Pozvi priateľov",
+   "settings.navigation.inviteFriends" : "Pozvať priateľov",
    "settings.navigation.logout" : "Odhlásiť sa",
    "settings.navigation.settings" : "Nastavenia",
    "settings.navigation.yourServices" : "Vaše služby",
    "settings.recipes.all" : "Všetky služby",
    "settings.recipes.dev" : "Vývoj",
    "settings.recipes.headline" : "Dostupné služby",
-   "settings.recipes.missingService" : "Chýbajúce služba?",
+   "settings.recipes.missingService" : "Chýba vám služba?",
    "settings.recipes.mostPopular" : "Najpopulárnejšie",
-   "settings.recipes.nothingFound" : "Je nám ľúto, ale žiadna služba nezodpovedala vášmu hľadanému výrazu.",
-   "settings.recipes.servicesSuccessfulAddedInfo" : "Služba úspešne pridaná",
+   "settings.recipes.nothingFound" : "Ľutujeme, ale žiadna služba nezodpovedá vami hľadanému výrazu.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Služba bola úspešne pridaná",
    "settings.searchService" : "Vyhľadať službu",
    "settings.service.error.goBack" : "Späť na služby",
    "settings.service.error.headline" : "Chyba",
    "settings.service.error.message" : "Nepodarilo sa na�ítať službu.",
-   "settings.service.form.addServiceHeadline" : "Pridať {názov}",
+   "settings.service.form.addServiceHeadline" : "Pridať {name}",
    "settings.service.form.availableServices" : "Dostupné služby",
    "settings.service.form.customUrl" : "Vlastný server",
    "settings.service.form.customUrlPremiumInfo" : "Ak chcete pridať vlastné hostované služby, potrebujete ú�et Franz Premium Supporter.",
-   "settings.service.form.customUrlUpgradeAccount" : "Inovujte váš ú�et",
+   "settings.service.form.customUrlUpgradeAccount" : "Povýšte váš ú�et",
    "settings.service.form.customUrlValidationError" : "Nebolo možné overiť vlastný server: {name}.",
    "settings.service.form.deleteButton" : "Odstrániť službu",
-   "settings.service.form.editServiceHeadline" : "Upraviť {meno}",
+   "settings.service.form.editServiceHeadline" : "Upraviť {name}",
    "settings.service.form.enableAudio" : "Zapnúť zvuk",
-   "settings.service.form.enableBadge" : "Ukázať odznaky nepre�ítaných správ",
+   "settings.service.form.enableBadge" : "Zobraziť symboly nepre�ítaných správ",
+   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
    "settings.service.form.enableNotification" : "Povoliť oznámenia",
    "settings.service.form.enableService" : "Povoliť službu",
-   "settings.service.form.headlineBadges" : "Odznaky nepre�ítaných správ",
+   "settings.service.form.headlineBadges" : "Symboly nepre�ítaných správ",
    "settings.service.form.headlineGeneral" : "Všeobecné",
-   "settings.service.form.headlineNotifications" : "Upozornenia",
+   "settings.service.form.headlineNotifications" : "Oznámenia",
    "settings.service.form.icon" : "Vlastná ikona",
    "settings.service.form.iconDelete" : "Zmazať",
    "settings.service.form.iconUpload" : "Presuňte váš obrázok, alebo kliknite sem",
-   "settings.service.form.indirectMessageInfo" : "Budete dostávať upozornenia na všetky nové správy v kanáli, nielen na @meno, @kanál, @kde, ...",
-   "settings.service.form.indirectMessages" : "Zobraziť znak správy pre všetky nové správy",
-   "settings.service.form.isMutedInfo" : "Ak je vypnuté, všetky zvuky notifikácií a iného audia budú stíšené",
+   "settings.service.form.indirectMessageInfo" : "Budete dostávať upozornenia na všetky nové správy v kanáli, nielen na @username, @channel, @here, ......",
+   "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.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.saveButton" : "Uložiť službu",
-   "settings.service.form.tabHosted" : "Hostovaný",
-   "settings.service.form.tabOnPremise" : "Vlastné hosťovanie ��",
+   "settings.service.form.tabHosted" : "Hostované",
+   "settings.service.form.tabOnPremise" : "Vlastné hostovanie ��",
    "settings.service.form.team" : "Tím",
-   "settings.service.form.useHostedService" : "Použite hostovanú {name} službu.",
+   "settings.service.form.useHostedService" : "Použiť hostovanú {name} službu.",
    "settings.service.form.yourServices" : "Vaše služby",
    "settings.services.deletedInfo" : "Služba bola odstránená",
-   "settings.services.discoverServices" : "Preskúmajte služby",
+   "settings.services.discoverServices" : "Preskúmať služby",
    "settings.services.headline" : "Vaše služby",
-   "settings.services.noServicesAdded" : "Nepridali ste ešte žiadne služby",
+   "settings.services.noServicesAdded" : "Doposiaľ ste nepridali žiadne služby.",
    "settings.services.tooltip.isDisabled" : "Služba je vypnutá",
    "settings.services.tooltip.isMuted" : "Všetky zvuky sú stíšené",
    "settings.services.tooltip.notificationsDisabled" : "Oznámenia sú vypnuté",
    "settings.services.updatedInfo" : "Vaše zmeny boli uložené",
    "settings.user.form.accountType.company" : "Spolo�nosť",
-   "settings.user.form.accountType.individual" : "Jednotlivec",
+   "settings.user.form.accountType.individual" : "Osoba",
    "settings.user.form.accountType.label" : "Typ ú�tu",
    "settings.user.form.accountType.non-profit" : "Nezisková organizácia",
    "settings.user.form.currentPassword" : "Sú�asné heslo",
-   "settings.user.form.email" : "Email",
+   "settings.user.form.email" : "E-mail",
    "settings.user.form.firstname" : "Krstné meno",
    "settings.user.form.lastname" : "Priezvisko",
    "settings.user.form.newPassword" : "Nové heslo",
    "sidebar.addNewService" : "Pridať novú službu",
    "sidebar.muteApp" : "Vypnúť upozornenia a zvuky",
    "sidebar.settings" : "Nastavenia",
-   "sidebar.unmuteApp" : "Zapnúť upozornenia a zvuky",
+   "sidebar.unmuteApp" : "Povoliť oznámenia a zvuky",
    "signup.company.label" : "Spolo�nosť",
-   "signup.email.label" : "Emailová adresa",
-   "signup.emailDuplicate" : "Kontakt s touto emailovou adresou už existuje",
+   "signup.email.label" : "E-mailová adresa",
+   "signup.emailDuplicate" : "Používateľ s touto e-mailovou adresou už jestvuje",
    "signup.firstname.label" : "Krstné meno",
    "signup.headline" : "Prihlásiť sa",
    "signup.lastname.label" : "Priezvisko",
-   "signup.legal.info" : "Vytvorením ú�tu Franz akceptujete",
+   "signup.legal.info" : "Vytvorením ú�tu Franz súhlasíte s",
    "signup.legal.privacy" : "Vyhlásenie o ochrane súkromia",
    "signup.legal.terms" : "Podmienky služby",
-   "signup.link.login" : "Už máte ú�et, prihlásiť sa?",
+   "signup.link.login" : "Už máte ú�et, chcete sa prihlásiť?",
    "signup.password.label" : "Heslo",
    "signup.submit.label" : "Vytvoriť ú�et",
-   "subscription.euTaxInfo" : "Pro obyvatelé EÚ: môžu byť aplikované miestne dane",
+   "subscription.euTaxInfo" : "Pre obyvateľov EÚ: môže byť aplikovaná miestna daň",
    "subscription.features.ads" : "Žiadne reklamy, nikdy!",
    "subscription.features.comingSoon" : "už �oskoro",
-   "subscription.features.customServices" : "Privátne ​​služby pre vás a váš tím",
    "subscription.features.encryptedSync" : "Šifrovaná synchronizácia relácie",
-   "subscription.features.onpremise" : "Pridať vlastné\/hostované služby, ako je HipChat",
-   "subscription.features.vpn" : "Proxy & VPN podpora",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.onpremise" : "Pridať lokálne hostované služby, ako napr. 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.includedFeatures" : "Platený ú�et Premium Supporter Franz zahŕňa",
    "subscription.paymentSessionError" : "Nepodarilo sa inicializovať platbu od",
-   "subscription.submit.label" : "Chcem podporiť vývoj programu Franz",
-   "subscription.type.free" : "Zdarma",
+   "subscription.submit.label" : "Chcem podporiť vývoj aplikácie Franz",
+   "subscription.type.free" : "zdarma",
    "subscription.type.month" : "mesiac",
    "subscription.type.year" : "rok",
    "subscriptionPopup.buttonCancel" : "Zrušiť",
@@ -241,11 +256,11 @@
    "tabs.item.enableNotification" : "Povoliť oznámenia",
    "tabs.item.enableService" : "Povoliť službu",
    "tabs.item.reload" : "Obnoviť",
-   "validation.email" : "{field} is not valid",
-   "validation.minLength" : "{field} should be at least {length} characters long",
-   "validation.required" : "{field} is required",
-   "validation.url" : "{field} is not a valid URL",
-   "welcome.loginButton" : "Prihláste sa k vášmu ú�tu",
-   "welcome.signupButton" : "Vytvoriť užívateľský ú�et zdarma",
+   "validation.email" : "{field} je neplatný",
+   "validation.minLength" : "{field} by malo byť dlhé aspoň {length} znakov",
+   "validation.required" : "{field} je povinné",
+   "validation.url" : "{field} nie je platné URL",
+   "welcome.loginButton" : "Prihlásiť sa do vášho ú�tu",
+   "welcome.signupButton" : "Vytvoriť ú�et zdarma",
    "welcome.slogan" : "Správy, ktoré pracujú pre vás"
 }
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 1f31bc834..dd4c74277 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -1,9 +1,12 @@
 {
-   "global.api.unhealthy" : "Nije moguće pristupiti Francovim on-line servisima. ",
+   "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" : "Nije moguće pristupiti Franz-ovim on-line servisima. ",
    "global.notConnectedToTheInternet" : "Niste povezani sa serverom.",
-   "import.headline" : "Uvezite svoje Franc4 servise",
-   "import.notSupportedHeadline" : "Servis trenutno nije podržan u Franc5",
-   "import.skip.label" : "I want to add services manually",
+   "import.headline" : "Uvezite svoje Franz 4 servise",
+   "import.notSupportedHeadline" : "Servis trenutno nije podržan u Franz 5",
+   "import.skip.label" : "Желим да додам у�луге ручно",
    "import.submit.label" : "Uvezi servise",
    "infobar.buttonChangelog" : "Å ta je novo? ",
    "infobar.buttonInstallUpdate" : "Ponovo pokreni i instaliraj ažuriranje ",
@@ -16,7 +19,7 @@
    "invite.name.label" : "Ime",
    "invite.skip.label" : "Želim da ovo uradim kasnije",
    "invite.submit.label" : "Pošalji pozivnice",
-   "invite.successInfo" : "Invitations sent successfully",
+   "invite.successInfo" : "Poziv je uspešno poslat.",
    "login.email.label" : "Vaša e-adresa:",
    "login.headline" : "Prijavite se",
    "login.invalidCredentials" : "E-mail ili lozinka nisu to�ni",
@@ -26,49 +29,49 @@
    "login.serverLogout" : "Vaša sesija je istekla, prijavite se ponovo.",
    "login.submit.label" : "Prijavite se",
    "login.tokenExpired" : "Vaša sesija je istekla, prijavite se ponovo.",
-   "menu.app.about" : "About Franz",
-   "menu.app.hide" : "Hide",
-   "menu.app.hideOthers" : "Hide Others",
-   "menu.app.quit" : "Quit",
+   "menu.app.about" : "O Francu",
+   "menu.app.hide" : "Sakrij",
+   "menu.app.hideOthers" : "Sakrij ostale",
+   "menu.app.quit" : "Izađi",
    "menu.app.settings" : "Postavke",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Otkrij",
    "menu.edit" : "Uredi",
-   "menu.edit.copy" : "Copy",
-   "menu.edit.cut" : "Cut",
-   "menu.edit.delete" : "Delete",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
-   "menu.edit.paste" : "Paste",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
-   "menu.edit.redo" : "Redo",
-   "menu.edit.selectAll" : "Select All",
-   "menu.edit.speech" : "Speech",
-   "menu.edit.startDictation" : "Start Dictation",
-   "menu.edit.startSpeaking" : "Start Speaking",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
-   "menu.edit.undo" : "Undo",
-   "menu.file" : "File",
-   "menu.help" : "Help",
-   "menu.help.changelog" : "Changelog",
-   "menu.help.learnMore" : "Learn More",
+   "menu.edit.copy" : "Kopiraj",
+   "menu.edit.cut" : "Iseci",
+   "menu.edit.delete" : "Obriši",
+   "menu.edit.emojiSymbols" : "Smajliji i simboli",
+   "menu.edit.paste" : "Nalepi",
+   "menu.edit.pasteAndMatchStyle" : "�алепи не мењајући �тил",
+   "menu.edit.redo" : "Понови",
+   "menu.edit.selectAll" : "Изабери �ве",
+   "menu.edit.speech" : "Говор",
+   "menu.edit.startDictation" : "Започни диктирање",
+   "menu.edit.startSpeaking" : "Започни изговор",
+   "menu.edit.stopSpeaking" : "Зау�тави изговор",
+   "menu.edit.undo" : "Поништи",
+   "menu.file" : "Датотека",
+   "menu.help" : "Помоћ",
+   "menu.help.changelog" : "Дневник измена",
+   "menu.help.learnMore" : "Сазнајте више",
    "menu.help.privacy" : "Izjava o privatnosti",
-   "menu.help.support" : "Support",
-   "menu.help.tos" : "Terms of Service",
-   "menu.services" : "Services",
-   "menu.services.addNewService" : "Add New Service...",
-   "menu.view" : "View",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
-   "menu.view.reloadFranz" : "Reload Franz",
-   "menu.view.reloadService" : "Reload Service",
-   "menu.view.resetZoom" : "Actual Size",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.help.support" : "Подршка",
+   "menu.help.tos" : "У�лови коришћења у�луге",
+   "menu.services" : "Usluge",
+   "menu.services.addNewService" : "Додај нову у�лугу",
+   "menu.view" : "Преглед",
+   "menu.view.enterFullScreen" : "Отвори у целом екрану",
+   "menu.view.exitFullScreen" : "�апу�ти цео екран",
+   "menu.view.reloadFranz" : "Поново учитај Франз",
+   "menu.view.reloadService" : "Поново учирај у�лугу",
+   "menu.view.resetZoom" : "Стварна величина",
+   "menu.view.toggleDevTools" : "Промени алатке за развој",
+   "menu.view.toggleFullScreen" : "Преко целог екрана",
    "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
-   "menu.view.zoomIn" : "Zoom In",
-   "menu.view.zoomOut" : "Zoom Out",
-   "menu.window" : "Window",
-   "menu.window.close" : "Close",
-   "menu.window.minimize" : "Minimize",
+   "menu.view.zoomIn" : "Увећај приказ",
+   "menu.view.zoomOut" : "Умањи приказ",
+   "menu.window" : "У прозору",
+   "menu.window.close" : "Затвори",
+   "menu.window.minimize" : "Умањи",
    "password.email.label" : "Vaša e-adresa",
    "password.headline" : "Stvorite novu zaporku",
    "password.link.login" : "Prijavite se na Vaš ra�un",
@@ -76,6 +79,7 @@
    "password.noUser" : "Ne postoji ni jedan korisnik s tom e-mail adresom",
    "password.submit.label" : "Pošalji",
    "password.successInfo" : "Molimo Vas da provjerite vašu e-mail adresu",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
    "pricing.headline" : "Podržite Franz",
    "pricing.link.skipPayment" : "Ne želim da podržim razvoj Franz-a.",
    "pricing.submit.label" : "Želim da podržim razvoj Franz-a.",
@@ -92,12 +96,12 @@
    "settings.account.accountType.basic" : "Osnovni ra�un",
    "settings.account.accountType.premium" : "Premium ra�un",
    "settings.account.buttonSave" : "Ažuriraj profil",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "settings.account.deleteAccount" : "Обриши налог",
+   "settings.account.deleteEmailSent" : "Добили �те имејл �а линком путем којег потврђујете бри�ање �вог налога. Ваш налог и подаци не могу бити повраћени!",
+   "settings.account.deleteInfo" : "Уколико Вам више није потребан Франз налог, овде можете обри�ати �вој налог и �ве податке везане за и�ти.",
    "settings.account.headline" : "Korisni�ki nalog",
    "settings.account.headlineAccount" : "Podaci o nalogu",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "Зона опреза",
    "settings.account.headlineInvoices" : "Fakture",
    "settings.account.headlinePassword" : "Promijenite lozinku",
    "settings.account.headlineProfile" : "Ažurirajte profil",
@@ -108,40 +112,42 @@
    "settings.account.successInfo" : "Vaše promjene su spremljene",
    "settings.account.tryReloadUserInfoRequest" : "Pokušajte ponovno",
    "settings.account.userInfoRequestFailed" : "Nije moguće u�itati informacije o korisniku",
-   "settings.app.buttonClearAllCache" : "Clear cache",
+   "settings.app.buttonClearAllCache" : "Очи�ти кеш",
    "settings.app.buttonInstallUpdate" : "Ponovo pokreni i instaliraj ažuriranje",
    "settings.app.buttonSearchForUpdate" : "Potraži ažuriranja",
-   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
+   "settings.app.cacheInfo" : "Франз кеш тренутно кори�ти {величина} про�тора на ди�ку.",
    "settings.app.currentVersion" : "Trenutna verzija:",
    "settings.app.form.autoLaunchInBackground" : "Otvori u pozadini",
    "settings.app.form.autoLaunchOnStart" : "Pokreni Franz sa sistemom",
    "settings.app.form.beta" : "Obuhvati i beta verzije",
-   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
-   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
+   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.enableGPUAcceleration" : "Омогући убрзање графичке јединице",
+   "settings.app.form.enableMenuBar" : "Покажи Франз у менију",
    "settings.app.form.enableSpellchecking" : "Omogući provjeru pravopisa",
    "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
+   "settings.app.form.hideDockIcon" : "Сакриј Франз иконицу у доку",
    "settings.app.form.language" : "Jezik",
    "settings.app.form.minimizeToSystemTray" : "Smanji Franca u sustavsku traku",
    "settings.app.form.runInBackground" : "Neka se Franc održava u pozadini i ako je prozor zatvoren",
    "settings.app.form.showDisabledServices" : "Prikaži plo�e s onemogućenim servisima",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
-   "settings.app.headline" : "Postavke",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Покажи беџ за непрочитане поруке када �у обавештења онемогућена",
+   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.headline" : "Подешавања",
    "settings.app.headlineAdvanced" : "Napredne alatke",
    "settings.app.headlineAppearance" : "Izgled",
    "settings.app.headlineGeneral" : "Općenito",
    "settings.app.headlineLanguage" : "Jezik",
    "settings.app.headlineUpdates" : "Nadogradnje",
    "settings.app.restartRequired" : "Promjene postavki zahtijevaju ponovni pogon",
-   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.subheadlineCache" : "Кеш",
    "settings.app.translationHelp" : "Pomozite nam prevesti aplikaciju na Vaš jezik. ",
    "settings.app.updateStatusAvailable" : "Nadogradnja dostupna, preuzimanje...",
    "settings.app.updateStatusSearching" : "Traže se ažuriranja",
    "settings.app.updateStatusUpToDate" : "Koristite najnoviju verziju Franca.",
-   "settings.invite.headline" : "Invite Friends",
+   "settings.invite.headline" : "Позови пријатеље",
    "settings.navigation.account" : "Ra�un",
    "settings.navigation.availableServices" : "Dostupne usluge",
-   "settings.navigation.inviteFriends" : "Invite Friends",
+   "settings.navigation.inviteFriends" : "Позови пријатеље",
    "settings.navigation.logout" : "Odjava",
    "settings.navigation.settings" : "Postavke",
    "settings.navigation.yourServices" : "Vaše usluge",
@@ -152,7 +158,7 @@
    "settings.recipes.mostPopular" : "Najpopularniji",
    "settings.recipes.nothingFound" : "Žao nam je, ali ne postoje usluge koje se poklapaju s onima koje tražite",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Usluga uspješno dodana",
-   "settings.searchService" : "Search service",
+   "settings.searchService" : "Претражи у�луге",
    "settings.service.error.goBack" : "Nazad do servisa",
    "settings.service.error.headline" : "Greška ",
    "settings.service.error.message" : "Nemoguće u�itati sadržaj usluge",
@@ -165,24 +171,31 @@
    "settings.service.form.deleteButton" : "Izbriši uslugu",
    "settings.service.form.editServiceHeadline" : "Uredite {ime}",
    "settings.service.form.enableAudio" : "Omogućite zvuk",
-   "settings.service.form.enableBadge" : "Show unread message badges",
+   "settings.service.form.enableBadge" : "Покажи беџеве за непрочитане поруке",
+   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
    "settings.service.form.enableNotification" : "Omogućite obavijesti",
    "settings.service.form.enableService" : "Omogućite usluge",
-   "settings.service.form.headlineBadges" : "Unread message badges",
-   "settings.service.form.headlineGeneral" : "Općenito",
-   "settings.service.form.headlineNotifications" : "Notifications",
-   "settings.service.form.icon" : "Custom icon",
-   "settings.service.form.iconDelete" : "Delete",
-   "settings.service.form.iconUpload" : "Drop your image, or click here",
+   "settings.service.form.headlineBadges" : "Беџеви за непрочитане поруке",
+   "settings.service.form.headlineGeneral" : "Опште",
+   "settings.service.form.headlineNotifications" : "Обавештења",
+   "settings.service.form.icon" : "По�ебна иконица",
+   "settings.service.form.iconDelete" : "Обриши",
+   "settings.service.form.iconUpload" : "Превуци �лику или кликни овде",
    "settings.service.form.indirectMessageInfo" : "Vi ćete biti obavješteni o svim novim porukama na kanalu, ne samo o @imenima, kanalima, @ovdje, ...",
    "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.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.saveButton" : "Sa�uvaj uslugu\/e",
    "settings.service.form.tabHosted" : "Hostovano",
    "settings.service.form.tabOnPremise" : "Samo-hostovano ��",
    "settings.service.form.team" : "Tim",
-   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
+   "settings.service.form.useHostedService" : "Кори�ти хо�товану {име} у�лугу.",
    "settings.service.form.yourServices" : "Vaše usluge",
    "settings.services.deletedInfo" : "Usluga je onemogućena",
    "settings.services.discoverServices" : "Pronađite usluge",
@@ -202,9 +215,9 @@
    "settings.user.form.lastname" : "Prezime",
    "settings.user.form.newPassword" : "Nova lozinka",
    "sidebar.addNewService" : "Dodajte novu uslugu",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.muteApp" : "Онемогући обавештења и звукове",
    "sidebar.settings" : "Postavke",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "И�кључи обавештења и звукове",
    "signup.company.label" : "Tvrtka",
    "signup.email.label" : "Vaša e-adresa",
    "signup.emailDuplicate" : "Već postoji korisnik s tom e-mail adresom",
@@ -212,7 +225,7 @@
    "signup.headline" : "Prijava",
    "signup.lastname.label" : "Prezime",
    "signup.legal.info" : "Prilikom stvaranja Franz ra�una, slažete se sa sljedećim stavkama",
-   "signup.legal.privacy" : "Izjava o privatnosti",
+   "signup.legal.privacy" : "Изјава о приватно�ти",
    "signup.legal.terms" : "Uvjeti korištenja",
    "signup.link.login" : "Imate ra�un? Prijavite se.",
    "signup.password.label" : "Lozinka",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "EU državljani, upozerenje: Moguće taksiranje",
    "subscription.features.ads" : "Bez reklama, doživotno!",
    "subscription.features.comingSoon" : "Dolazi uskoro",
-   "subscription.features.customServices" : "Privatni servisi za Vas i Vaš tim",
    "subscription.features.encryptedSync" : "Kodirano usklađivanje sesija.",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Dodajte pretpostavljeni\/hostirani servis kao Å¡to ima usluga HipChat",
-   "subscription.features.vpn" : "Podrška za Proxy i VPM ( VPN )",
+   "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.includedFeatures" : "Plaćeni\/Premium ra�un uklju�uje sljedeće:",
    "subscription.paymentSessionError" : "Nemoguće inicijalizirati obrazac za uplatu",
    "subscription.submit.label" : "Želim da podržim razvoj Franca.",
@@ -236,15 +251,15 @@
    "tabs.item.disableAudio" : "Onemogući zvuk",
    "tabs.item.disableNotifications" : "Onemogući obavijesti",
    "tabs.item.disableService" : "Onemogući servis",
-   "tabs.item.edit" : "Uredi",
+   "tabs.item.edit" : "Уреди",
    "tabs.item.enableAudio" : "Uklju�i zvuk",
    "tabs.item.enableNotification" : "Omogući obavijesti",
    "tabs.item.enableService" : "Omogući usluge",
    "tabs.item.reload" : "Ponovno u�itavanje",
-   "validation.email" : "{field} is not valid",
-   "validation.minLength" : "{field} should be at least {length} characters long",
-   "validation.required" : "{field} is required",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.email" : "{поље} није валидно",
+   "validation.minLength" : "{поље} треба да буде најмање {дужина} карактера дугачко",
+   "validation.required" : "{поље} је неопходно",
+   "validation.url" : "{field} није валидан УРЛ",
    "welcome.loginButton" : "Prijavite se na ra�un",
    "welcome.signupButton" : "Stvorite novi korisni�ki ra�un",
    "welcome.slogan" : "Poruke koje su stvorene za tebe"
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index d03077d8d..130b51ddf 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -1,8 +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.",
    "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'te desteklenmiyor.",
+   "import.notSupportedHeadline" : "Servisler henüz Franz 5'de desteklenmiyor.",
    "import.skip.label" : "Servisleri kendim eklemek istiyorum",
    "import.submit.label" : "Servisleri içe aktar",
    "infobar.buttonChangelog" : "Yeni ne var?",
@@ -21,7 +24,7 @@
    "login.headline" : "Oturum Aç",
    "login.invalidCredentials" : "Yanlış parola ya da e-posta adresi",
    "login.link.password" : "Parola sıfırla",
-   "login.link.signup" : "Kullanıcı hesabı oluştur",
+   "login.link.signup" : "Ãœcretsiz hesap oluÅŸtur",
    "login.password.label" : "Parola",
    "login.serverLogout" : "Oturum süreniz dolmuş, lütfen tekrar giriş yapın.",
    "login.submit.label" : "Oturum Aç",
@@ -76,6 +79,7 @@
    "password.noUser" : "Bu e-posta adresinde bir kullanıcı bulunamadı",
    "password.submit.label" : "Gönder",
    "password.successInfo" : "E-postanızı kontrol ediniz",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
    "pricing.headline" : "Franz'ı Destekle",
    "pricing.link.skipPayment" : "Franz'ın gelişimini desteklemek istemiyorum.",
    "pricing.submit.label" : "Franz'ın gelişimini desteklemek istiyorum",
@@ -84,7 +88,7 @@
    "service.crashHandler.autoReload" : "{name}'i {seconds} saniye içerisinde otomatik onarmayı deniyoruz",
    "service.crashHandler.headline" : "Aman Tanrım hayır!",
    "service.crashHandler.text" : "{name} bir hataya neden oldu.",
-   "service.disabledHandler.action" : "AktifleÅŸtir {name}",
+   "service.disabledHandler.action" : "{name} aktif",
    "service.disabledHandler.headline" : "{name} devredışı",
    "services.getStarted" : "Haydi başlayalım",
    "services.welcome" : "Franz'a HoÅŸgeldiniz",
@@ -116,7 +120,8 @@
    "settings.app.form.autoLaunchInBackground" : "Arka planda aç",
    "settings.app.form.autoLaunchOnStart" : "Franz'ı başlangıçta aç",
    "settings.app.form.beta" : "Beta versiyonları dahil et",
-   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
+   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.enableGPUAcceleration" : "Grafik İşlemci Ünitesi (GPU) Hızlandırıcısını Aktif et",
    "settings.app.form.enableMenuBar" : "Menü çubuğunda Franz'ı göster",
    "settings.app.form.enableSpellchecking" : "Yazım denetimini etkinleştir",
    "settings.app.form.enableSystemTray" : "Franz'ı sistem tepsisinde göster",
@@ -126,6 +131,7 @@
    "settings.app.form.runInBackground" : "Pencereyi kapatırken Franz'ı arka planda tut",
    "settings.app.form.showDisabledServices" : "Devre dışı bırakılan servis sekmelerini göster",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Bildirimler kapalı iken okunmamış mesaj sayısını göster",
+   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Ayarlar",
    "settings.app.headlineAdvanced" : "GeliÅŸmiÅŸ",
    "settings.app.headlineAppearance" : "Görünüm",
@@ -166,6 +172,7 @@
    "settings.service.form.editServiceHeadline" : "{name} düzenle",
    "settings.service.form.enableAudio" : "Sesi etkinleÅŸtirin",
    "settings.service.form.enableBadge" : "Okunmamış mesajları göster",
+   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
    "settings.service.form.enableNotification" : "Bildirimleri etkinleÅŸtir",
    "settings.service.form.enableService" : "Servisi etkinleÅŸtir",
    "settings.service.form.headlineBadges" : "Okunmamış mesajlar",
@@ -178,6 +185,12 @@
    "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.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.saveButton" : "Servisi kaydet",
    "settings.service.form.tabHosted" : "Barındırılan",
    "settings.service.form.tabOnPremise" : "Kendi barındırılan",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "AB vatandaşları: yerel satış vergileri uygulanabilir",
    "subscription.features.ads" : "Reklam yok, asla!",
    "subscription.features.comingSoon" : "yakında geliyor",
-   "subscription.features.customServices" : "Sen ve takımın için gizli servis",
    "subscription.features.encryptedSync" : "Åžifreli oturum senkronizasyonu",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "HipChat gibi kurum içi\/barındırılan hizmetler ekle",
-   "subscription.features.vpn" : "Proxy & VPN desteÄŸi",
+   "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.includedFeatures" : "Ücretli Franz Premium Destekçi Hesabına dahil",
    "subscription.paymentSessionError" : "Ödeme formu başlatılamadı",
    "subscription.submit.label" : "Franz'ın gelişimini desteklemek istiyorum",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 3f732b896..94c6f7e54 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -1,4 +1,7 @@
 {
+   "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",
@@ -26,49 +29,49 @@
    "login.serverLogout" : "Ваша �е�і� закінчила�ь, будь ла�ка, зайдіть знову.",
    "login.submit.label" : "Увійти",
    "login.tokenExpired" : "Ваша �е�і� закінчила�ь, будь ла�ка, зайдіть знову.",
-   "menu.app.about" : "About Franz",
-   "menu.app.hide" : "Hide",
-   "menu.app.hideOthers" : "Hide Others",
-   "menu.app.quit" : "Quit",
+   "menu.app.about" : "Про Franz",
+   "menu.app.hide" : "Приховати",
+   "menu.app.hideOthers" : "Приховати інші",
+   "menu.app.quit" : "Вийти",
    "menu.app.settings" : "�алаштуванн�",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Показати",
    "menu.edit" : "Редагувати",
-   "menu.edit.copy" : "Copy",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.copy" : "Копіювати",
+   "menu.edit.cut" : "Вирізати",
    "menu.edit.delete" : "Видалити",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
-   "menu.edit.paste" : "Paste",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
-   "menu.edit.redo" : "Redo",
-   "menu.edit.selectAll" : "Select All",
-   "menu.edit.speech" : "Speech",
-   "menu.edit.startDictation" : "Start Dictation",
-   "menu.edit.startSpeaking" : "Start Speaking",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
-   "menu.edit.undo" : "Undo",
-   "menu.file" : "File",
-   "menu.help" : "Help",
-   "menu.help.changelog" : "Changelog",
-   "menu.help.learnMore" : "Learn More",
+   "menu.edit.emojiSymbols" : "Емодзі та �имволи",
+   "menu.edit.paste" : "В�тавити",
+   "menu.edit.pasteAndMatchStyle" : "В�тавити з дотриманн�м �тилю",
+   "menu.edit.redo" : "Повернути",
+   "menu.edit.selectAll" : "Виділити в�е",
+   "menu.edit.speech" : "Мова",
+   "menu.edit.startDictation" : "Почати диктувати",
+   "menu.edit.startSpeaking" : "Почати говорити",
+   "menu.edit.stopSpeaking" : "Закінчити говорити",
+   "menu.edit.undo" : "Відмінити",
+   "menu.file" : "Файл",
+   "menu.help" : "Довідка",
+   "menu.help.changelog" : "Журнал змін",
+   "menu.help.learnMore" : "Докладніше",
    "menu.help.privacy" : "За�ва про конфіденційні�ть",
-   "menu.help.support" : "Support",
-   "menu.help.tos" : "Terms of Service",
-   "menu.services" : "Services",
-   "menu.services.addNewService" : "Add New Service...",
-   "menu.view" : "View",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
-   "menu.view.reloadFranz" : "Reload Franz",
-   "menu.view.reloadService" : "Reload Service",
-   "menu.view.resetZoom" : "Actual Size",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
-   "menu.view.zoomIn" : "Zoom In",
-   "menu.view.zoomOut" : "Zoom Out",
-   "menu.window" : "Window",
-   "menu.window.close" : "Close",
-   "menu.window.minimize" : "Minimize",
+   "menu.help.support" : "Підтримка",
+   "menu.help.tos" : "Умови викори�танн�",
+   "menu.services" : "Служби",
+   "menu.services.addNewService" : "Додати �ерві�",
+   "menu.view" : "Вигл�д",
+   "menu.view.enterFullScreen" : "Вікно на повний екран",
+   "menu.view.exitFullScreen" : "Вийти з повного екрану",
+   "menu.view.reloadFranz" : "Перезавантажити Franz",
+   "menu.view.reloadService" : "Перезавантажити �ерві�",
+   "menu.view.resetZoom" : "Фактичний розмір",
+   "menu.view.toggleDevTools" : "Переключити ін�трумент розробника",
+   "menu.view.toggleFullScreen" : "Переключити�� на повний екран",
+   "menu.view.toggleServiceDevTools" : "Переключити ін�трументи розробника �ерві�у",
+   "menu.view.zoomIn" : "Збільшити ма�штаб",
+   "menu.view.zoomOut" : "Зменьшити ма�штаб",
+   "menu.window" : "Вікно",
+   "menu.window.close" : "Закрити",
+   "menu.window.minimize" : "Згорнути",
    "password.email.label" : "Email адре�а",
    "password.headline" : "Скинути пароль",
    "password.link.login" : "Увійти до вашого акаунту",
@@ -76,6 +79,7 @@
    "password.noUser" : "�е знайдено жодного кори�тувача з цією email адре�ою",
    "password.submit.label" : "Подати",
    "password.successInfo" : "Будь ла�ка, перевірте ваш email",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
    "pricing.headline" : "Підтримайте Franz",
    "pricing.link.skipPayment" : "Я не хочу підтримувати розробку Franz.",
    "pricing.submit.label" : "Я хочу підтримати розробку Franz",
@@ -93,7 +97,7 @@
    "settings.account.accountType.premium" : "Преміум �каунт Прихильника",
    "settings.account.buttonSave" : "Оновити профіль",
    "settings.account.deleteAccount" : "Видалити обліковий запи�",
-   "settings.account.deleteEmailSent" : "Ви отримали електронного ли�та з лінком, щоб підтвердити видаленн� облікового запи�у. Ваш обліковий запи� і дані не можна буде відновити!",
+   "settings.account.deleteEmailSent" : "Ви отримали електронного ли�та з по�иланн�м, щоб підтвердити видаленн� облікового запи�у. Ваш обліковий запи� і дані не можна буде відновити!",
    "settings.account.deleteInfo" : "Якщо Вам більше не потрібний обліковий запи� Franz, Ви можете його видалити і в�і �уміжні дані.",
    "settings.account.headline" : "�каунт",
    "settings.account.headlineAccount" : "Інформаці� про акаунт",
@@ -111,23 +115,25 @@
    "settings.app.buttonClearAllCache" : "Очи�тити кеш",
    "settings.app.buttonInstallUpdate" : "Перезавантажити і в�тановити оновленн�",
    "settings.app.buttonSearchForUpdate" : "Перевірити на�вні�ть оновлень",
-   "settings.app.cacheInfo" : "Кеш, �кий викори�товує Franz, займає {розмір} ди�ку.",
+   "settings.app.cacheInfo" : "Кеш, �кий викори�товує Franz, займає {size} ди�кового про�тору.",
    "settings.app.currentVersion" : "Поточна вер�і�:",
    "settings.app.form.autoLaunchInBackground" : "Відкрити у фоновому режимі",
    "settings.app.form.autoLaunchOnStart" : "Запу�кати Franz на початку",
    "settings.app.form.beta" : "Включити бета-вер�ії",
-   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
+   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.enableGPUAcceleration" : "Ввімкнути при�коренн� GPU",
    "settings.app.form.enableMenuBar" : "Відображати Franz в панелі головного меню",
    "settings.app.form.enableSpellchecking" : "Увімкнути перевірку орфографії",
    "settings.app.form.enableSystemTray" : "Показувати Franz у �и�темному лотку",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
+   "settings.app.form.hideDockIcon" : "Сховати значок Franz в Dock",
    "settings.app.form.language" : "Мова",
    "settings.app.form.minimizeToSystemTray" : "Мінімізувати Franz до �и�темного лотка",
    "settings.app.form.runInBackground" : "Тримати Franz в фоні при закритті вікна",
    "settings.app.form.showDisabledServices" : "Показати вкладку вимкнених �ерві�ів",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Показувати значок непрочитаних повідомлень коли �повіщенн� вимкнені",
+   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "�алаштуванн�",
-   "settings.app.headlineAdvanced" : "Advanced",
+   "settings.app.headlineAdvanced" : "Додаткові налаштуванн�",
    "settings.app.headlineAppearance" : "Вигл�д",
    "settings.app.headlineGeneral" : "Загальні",
    "settings.app.headlineLanguage" : "Мова",
@@ -152,7 +158,7 @@
    "settings.recipes.mostPopular" : "�айбільш попул�рні",
    "settings.recipes.nothingFound" : "Вибачте, але жоден �ерві� не відповідає пошуковому терміну.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Серві� у�пішно додано",
-   "settings.searchService" : "Search service",
+   "settings.searchService" : "Знайти �ерві�",
    "settings.service.error.goBack" : "Повернути�ь до �ерві�ів",
    "settings.service.error.headline" : "Помилка",
    "settings.service.error.message" : "�е вдало�ь завантажити �ерверний протокол.",
@@ -165,10 +171,11 @@
    "settings.service.form.deleteButton" : "Видалити �ерві�",
    "settings.service.form.editServiceHeadline" : "Редагувати {name}",
    "settings.service.form.enableAudio" : "Увімкнути звук",
-   "settings.service.form.enableBadge" : "Show unread message badges",
+   "settings.service.form.enableBadge" : "Показувати непрочитані повідомленн�",
+   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
    "settings.service.form.enableNotification" : "Увімкнути �повіщенн�",
    "settings.service.form.enableService" : "Увімкнути �ерві�",
-   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineBadges" : "Значки непрочитаних повідомлень",
    "settings.service.form.headlineGeneral" : "Загальні",
    "settings.service.form.headlineNotifications" : "Сповіщенн�",
    "settings.service.form.icon" : "Сво� іконка",
@@ -176,13 +183,19 @@
    "settings.service.form.iconUpload" : "Скиньте �воє зображенн� або нати�ніть тут",
    "settings.service.form.indirectMessageInfo" : "Ви отримаєте �повіщенн� про в�і нові повідомленн� в каналі, а не лише про @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Показувати значок повідомленн� дл� в�іх нових повідомлень",
-   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "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.saveButton" : "Зберегти �ерві�",
    "settings.service.form.tabHosted" : "Розміщений",
    "settings.service.form.tabOnPremise" : "Само�тійно розміщений ��",
    "settings.service.form.team" : "Команда",
-   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
+   "settings.service.form.useHostedService" : "Викоритати розміщений {name} �ерві�.",
    "settings.service.form.yourServices" : "Ваші �ерві�и",
    "settings.services.deletedInfo" : "Серві� було видалено",
    "settings.services.discoverServices" : "Відкрийте дл� �ебе �ерві�и",
@@ -212,7 +225,7 @@
    "signup.headline" : "Увійти",
    "signup.lastname.label" : "Прізвище",
    "signup.legal.info" : "Створенн�м акаунту Franz ви приймаєте",
-   "signup.legal.privacy" : "За�ва про конфіденційні�ть",
+   "signup.legal.privacy" : "Політика конфіденційно�ті",
    "signup.legal.terms" : "Умови викори�танн�",
    "signup.link.login" : "У ва� вже є обліковий запи�, увійти?",
    "signup.password.label" : "Пароль",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "Дл� жителів ЄС: можуть за�то�овувати�� податки",
    "subscription.features.ads" : "Жодної реклами!",
    "subscription.features.comingSoon" : "очікуйте незабаром",
-   "subscription.features.customServices" : "Приватні �ерві�и дл� ва� і вашої команди",
    "subscription.features.encryptedSync" : "Шифрована �инхронізаці� �еан�у",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Додайте on-premise \/ hosted �ерві�и, такі �к Hipchat",
-   "subscription.features.vpn" : "Підтримка прок�і та VPN",
+   "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.includedFeatures" : "Платний Преміальний �каунт Прихильника Franz включає",
    "subscription.paymentSessionError" : "�е вдало�� ініціалізувати форму платежу",
    "subscription.submit.label" : "Я хочу підтримати розробку Franz",
@@ -241,10 +256,10 @@
    "tabs.item.enableNotification" : "Увімкнути �повіщенн�",
    "tabs.item.enableService" : "Увімкнути �лужбу",
    "tabs.item.reload" : "Перезавантажити",
-   "validation.email" : "{field} is not valid",
-   "validation.minLength" : "{field} should be at least {length} characters long",
-   "validation.required" : "{field} is required",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.email" : "{field} не валідне",
+   "validation.minLength" : "Кількі�ть �имволів в {field} повина бути не меньше {length} ",
+   "validation.required" : "{field} обов'�звоке",
+   "validation.url" : "{field} не валідний URL",
    "welcome.loginButton" : "Увійдіть до �вого акаунту",
    "welcome.signupButton" : "Створити безплатний акаунт",
    "welcome.slogan" : "Обмін повідомленн�ми, �кий працює дл� ва�"
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index 3bbcc8288..23bff247d 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -1,4 +1,7 @@
 {
+   "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的�務",
@@ -43,32 +46,32 @@
    "menu.edit.selectAll" : "�擇所有",
    "menu.edit.speech" : "朗讀",
    "menu.edit.startDictation" : "開始�寫",
-   "menu.edit.startSpeaking" : "Start Speaking",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
-   "menu.edit.undo" : "Undo",
-   "menu.file" : "File",
-   "menu.help" : "Help",
-   "menu.help.changelog" : "Changelog",
-   "menu.help.learnMore" : "Learn More",
+   "menu.edit.startSpeaking" : "開始語音",
+   "menu.edit.stopSpeaking" : "�止語音",
+   "menu.edit.undo" : "復原",
+   "menu.file" : "檔案",
+   "menu.help" : "求助",
+   "menu.help.changelog" : "變更紀錄",
+   "menu.help.learnMore" : "深入瞭解",
    "menu.help.privacy" : "隱��明",
-   "menu.help.support" : "Support",
-   "menu.help.tos" : "Terms of Service",
-   "menu.services" : "Services",
-   "menu.services.addNewService" : "Add New Service...",
-   "menu.view" : "View",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
-   "menu.view.reloadFranz" : "Reload Franz",
-   "menu.view.reloadService" : "Reload Service",
-   "menu.view.resetZoom" : "Actual Size",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
-   "menu.view.zoomIn" : "Zoom In",
-   "menu.view.zoomOut" : "Zoom Out",
-   "menu.window" : "Window",
-   "menu.window.close" : "Close",
-   "menu.window.minimize" : "Minimize",
+   "menu.help.support" : "支�",
+   "menu.help.tos" : "�務�款",
+   "menu.services" : "�務",
+   "menu.services.addNewService" : "新增�務",
+   "menu.view" : "檢視",
+   "menu.view.enterFullScreen" : "進入全螢幕模�",
+   "menu.view.exitFullScreen" : "離開全螢幕模�",
+   "menu.view.reloadFranz" : "�新載入Franz",
+   "menu.view.reloadService" : "�新載入�務",
+   "menu.view.resetZoom" : "實際大�",
+   "menu.view.toggleDevTools" : "切�開發者工具",
+   "menu.view.toggleFullScreen" : "切�全螢幕",
+   "menu.view.toggleServiceDevTools" : "切��務開發者工具",
+   "menu.view.zoomIn" : "放大",
+   "menu.view.zoomOut" : "縮�",
+   "menu.window" : "視窗",
+   "menu.window.close" : "關閉",
+   "menu.window.minimize" : "最�化",
    "password.email.label" : "電�郵件地�",
    "password.headline" : "�設密碼",
    "password.link.login" : "登入您的帳號",
@@ -76,6 +79,7 @@
    "password.noUser" : "找�到該電�郵件地�的用戶",
    "password.submit.label" : "�出",
    "password.successInfo" : "請檢查您的電�郵件",
+   "premiumFeature.button.upgradeAccount" : "Upgrade account",
    "pricing.headline" : "支�Franz",
    "pricing.link.skipPayment" : "我�想支�Franz的開發。",
    "pricing.submit.label" : "我想支�Franz的開發。",
@@ -111,21 +115,23 @@
    "settings.app.buttonClearAllCache" : "清除快�",
    "settings.app.buttonInstallUpdate" : "�新啟動並安�更新",
    "settings.app.buttonSearchForUpdate" : "檢查更新",
-   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
+   "settings.app.cacheInfo" : "Franz快�目��用�碟空間{大�}。",
    "settings.app.currentVersion" : "目�的版本",
    "settings.app.form.autoLaunchInBackground" : "在背景開啟",
    "settings.app.form.autoLaunchOnStart" : "開機時啟動Franz",
    "settings.app.form.beta" : "包�測試版",
-   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
-   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
+   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.enableGPUAcceleration" : "啟用GPU加速",
+   "settings.app.form.enableMenuBar" : "顯示Franz在�單列",
    "settings.app.form.enableSpellchecking" : "啟用拼字檢查",
    "settings.app.form.enableSystemTray" : "顯示Franz在系統列",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
+   "settings.app.form.hideDockIcon" : "在工作列中隱�Franz圖示",
    "settings.app.form.language" : "語言",
    "settings.app.form.minimizeToSystemTray" : "最�化Franz到系統列",
    "settings.app.form.runInBackground" : "當關閉視窗時��Franz在背景�作",
    "settings.app.form.showDisabledServices" : "顯示�用的�務標籤",
    "settings.app.form.showMessagesBadgesWhenMuted" : "當通知關閉時，標記未讀的訊�",
+   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "設定",
    "settings.app.headlineAdvanced" : "進階",
    "settings.app.headlineAppearance" : "外觀",
@@ -133,15 +139,15 @@
    "settings.app.headlineLanguage" : "語言",
    "settings.app.headlineUpdates" : "æ›´æ–°",
    "settings.app.restartRequired" : "需��啟以更變",
-   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.subheadlineCache" : "快�",
    "settings.app.translationHelp" : "幫助我們將Franz翻譯�您的語言。",
    "settings.app.updateStatusAvailable" : "有�用更新，下載中...",
    "settings.app.updateStatusSearching" : "正在�尋更新",
    "settings.app.updateStatusUpToDate" : "您正在使用最新版本的Franz",
-   "settings.invite.headline" : "Invite Friends",
+   "settings.invite.headline" : "邀請朋�",
    "settings.navigation.account" : "帳號",
    "settings.navigation.availableServices" : "�使用的�務",
-   "settings.navigation.inviteFriends" : "Invite Friends",
+   "settings.navigation.inviteFriends" : "邀請朋�",
    "settings.navigation.logout" : "登出",
    "settings.navigation.settings" : "設定",
    "settings.navigation.yourServices" : "您的�務",
@@ -152,7 +158,7 @@
    "settings.recipes.mostPopular" : "最熱門",
    "settings.recipes.nothingFound" : "很抱歉，沒有與您的�尋字詞符�的�務",
    "settings.recipes.servicesSuccessfulAddedInfo" : "�務已�功新增。",
-   "settings.searchService" : "Search service",
+   "settings.searchService" : "尋找�務",
    "settings.service.error.goBack" : "返回�務",
    "settings.service.error.headline" : "錯誤",
    "settings.service.error.message" : "無法載入�務命令。",
@@ -165,24 +171,31 @@
    "settings.service.form.deleteButton" : "刪除�務",
    "settings.service.form.editServiceHeadline" : "編輯{�稱}",
    "settings.service.form.enableAudio" : "啟用音訊",
-   "settings.service.form.enableBadge" : "Show unread message badges",
+   "settings.service.form.enableBadge" : "顯示未讀訊�圖示",
+   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
    "settings.service.form.enableNotification" : "啟用通知",
    "settings.service.form.enableService" : "啟用�務",
-   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineBadges" : "未讀訊�圖示",
    "settings.service.form.headlineGeneral" : "一般",
-   "settings.service.form.headlineNotifications" : "Notifications",
-   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.headlineNotifications" : "通知",
+   "settings.service.form.icon" : "自訂圖示",
    "settings.service.form.iconDelete" : "刪除",
-   "settings.service.form.iconUpload" : "Drop your image, or click here",
+   "settings.service.form.iconUpload" : "拖曳你的圖片，或按此上傳",
    "settings.service.form.indirectMessageInfo" : "您將收到有關頻�中所有新消�的通知，而�僅僅是@username，@channel，@here，...",
    "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.saveButton" : "�存�務",
    "settings.service.form.tabHosted" : "託管",
    "settings.service.form.tabOnPremise" : "自我託管��",
    "settings.service.form.team" : "團隊",
-   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
+   "settings.service.form.useHostedService" : "使用託管{name}�務",
    "settings.service.form.yourServices" : "您的�務",
    "settings.services.deletedInfo" : "已刪除�務",
    "settings.services.discoverServices" : "發��務",
@@ -220,10 +233,12 @@
    "subscription.euTaxInfo" : "�盟居民：�能採用當地銷售稅",
    "subscription.features.ads" : "無廣告，永�!",
    "subscription.features.comingSoon" : "�將推出",
-   "subscription.features.customServices" : "為您和您的團隊�供�人�務",
    "subscription.features.encryptedSync" : "加密的會話�步",
+   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "添加本地\/託管�務如HipChat",
-   "subscription.features.vpn" : "代�和VPN支�",
+   "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.includedFeatures" : "包�高級Franz付費帳戶",
    "subscription.paymentSessionError" : "無法�始化付款表單",
    "subscription.submit.label" : "我想支�Franz的開發",
@@ -241,10 +256,10 @@
    "tabs.item.enableNotification" : "啟用通知",
    "tabs.item.enableService" : "啟用�務",
    "tabs.item.reload" : "�新載入",
-   "validation.email" : "{field} is not valid",
-   "validation.minLength" : "{field} should be at least {length} characters long",
-   "validation.required" : "{field} is required",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.email" : "{field}無效",
+   "validation.minLength" : "{field}長度至少應為{length}個字",
+   "validation.required" : "{field}為必填",
+   "validation.url" : "{field}�是個有效的網�",
    "welcome.loginButton" : "登入您的帳戶",
    "welcome.signupButton" : "建立�費帳號",
    "welcome.slogan" : "為你通信"
diff --git a/src/index.js b/src/index.js
index 5ba901b89..663f81cc9 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,10 +1,16 @@
-import { app, BrowserWindow, shell } 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';
+
+// DEV MODE: Save user data into FranzDev
+if (isDevMode) {
+  app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev'));
+}
+/* eslint-disable import/first */
 import ipcApi from './electron/ipc-api';
 import Tray from './lib/Tray';
 import Settings from './electron/Settings';
@@ -12,7 +18,10 @@ import handleDeepLink from './electron/deepLinking';
 import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
 import './electron/exception';
 
-const debug = require('debug')('App');
+import { DEFAULT_APP_SETTINGS } from './config';
+/* eslint-enable import/first */
+
+const debug = require('debug')('Franz:App');
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
@@ -57,7 +66,8 @@ if (isLinux && ['Pantheon', 'Unity:Unity7'].indexOf(process.env.XDG_CURRENT_DESK
 }
 
 // Initialize Settings
-const settings = new Settings();
+const settings = new Settings('app', DEFAULT_APP_SETTINGS);
+const proxySettings = new Settings('proxy');
 
 // Disable GPU acceleration
 if (!settings.get('enableGPUAcceleration')) {
@@ -82,14 +92,21 @@ const createWindow = () => {
     minHeight: 500,
     titleBarStyle: isMac ? 'hidden' : '',
     frame: isLinux,
-    backgroundColor: '#3498db',
+    backgroundColor: !settings.get('darkMode') ? '#3498db' : '#1E1E1E',
   });
 
   // Initialize System Tray
   const trayIcon = new Tray();
 
   // Initialize ipcApi
-  ipcApi({ mainWindow, settings, trayIcon });
+  ipcApi({
+    mainWindow,
+    settings: {
+      app: settings,
+      proxy: proxySettings,
+    },
+    trayIcon,
+  });
 
   // Manage Window State
   mainWindowState.manage(mainWindow);
@@ -115,7 +132,7 @@ const createWindow = () => {
         mainWindow.hide();
       }
 
-      if (isWindows && settings.get('minimizeToSystemTray')) {
+      if (isWindows) {
         mainWindow.setSkipTaskbar(true);
       }
     } else {
@@ -172,6 +189,24 @@ const createWindow = () => {
 // Some APIs can only be used after this event occurs.
 app.on('ready', createWindow);
 
+// This is the worst possible implementation as the webview.webContents based callback doesn't work 🖕
+app.on('login', (event, webContents, request, authInfo, callback) => {
+  event.preventDefault();
+  debug('browser login event', authInfo);
+  if (authInfo.isProxy && authInfo.scheme === 'basic') {
+    webContents.send('get-service-id');
+
+    ipcMain.on('service-id', (e, id) => {
+      debug('Received service id', id);
+
+      const ps = proxySettings.get(id);
+      callback(ps.user, ps.password);
+    });
+  } else {
+    // TODO: implement basic auth
+  }
+});
+
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
   // On OS X it is common for applications and their menu bar
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index e3f8a04fa..32ec1b207 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -285,7 +285,7 @@ const _templateFactory = intl => [
     submenu: [
       {
         label: intl.formatMessage(menuItems.learnMore),
-        click() { shell.openExternal('http://meetfranz.com'); },
+        click() { shell.openExternal('https://meetfranz.com'); },
       },
       {
         label: intl.formatMessage(menuItems.changelog),
@@ -296,7 +296,7 @@ const _templateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.support),
-        click() { shell.openExternal('http://meetfranz.com/support'); },
+        click() { shell.openExternal('https://meetfranz.com/support'); },
       },
       {
         type: 'separator',
@@ -485,7 +485,9 @@ export default class FranzMenu {
     this.stores = stores;
     this.actions = actions;
 
-    autorun(this._build.bind(this));
+    setTimeout(() => {
+      autorun(this._build.bind(this));
+    }, 10);
   }
 
   rebuild() {
@@ -497,7 +499,6 @@ export default class FranzMenu {
   }
 
   _build() {
-    // console.log(window.franz);
     const serviceTpl = Object.assign([], this.serviceTpl); // need to clone object so we don't modify computed (cached) object
 
     if (window.franz === undefined) {
@@ -521,6 +522,7 @@ export default class FranzMenu {
       click: () => {
         this.actions.service.openDevToolsForActiveService();
       },
+      enabled: this.stores.user.isLoggedIn && this.stores.services.enabled.length > 0,
     });
 
     tpl[1].submenu.unshift({
@@ -559,6 +561,7 @@ export default class FranzMenu {
           click: () => {
             this.actions.ui.openSettings({ path: 'app' });
           },
+          enabled: this.stores.user.isLoggedIn,
         },
         {
           type: 'separator',
@@ -640,6 +643,7 @@ export default class FranzMenu {
           click: () => {
             this.actions.ui.openSettings({ path: 'app' });
           },
+          enabled: this.stores.user.isLoggedIn,
         },
         {
           type: 'separator',
@@ -661,6 +665,7 @@ export default class FranzMenu {
       click: () => {
         this.actions.ui.openSettings({ path: 'recipes' });
       },
+      enabled: this.stores.user.isLoggedIn,
     }, {
       type: 'separator',
     });
@@ -680,7 +685,7 @@ export default class FranzMenu {
     if (this.stores.user.isLoggedIn) {
       return services.map((service, i) => ({
         label: this._getServiceName(service),
-        accelerator: i <= 9 ? `${cmdKey}+${i + 1}` : null,
+        accelerator: i < 9 ? `${cmdKey}+${i + 1}` : null,
         type: 'radio',
         checked: service.isActive,
         click: () => {
diff --git a/src/lib/analytics.js b/src/lib/analytics.js
index 585cbcdba..8b9a44579 100644
--- a/src/lib/analytics.js
+++ b/src/lib/analytics.js
@@ -2,7 +2,7 @@ import { remote } from 'electron';
 import { GA_ID } from '../config';
 // import { isDevMode } from '../environment';
 
-const debug = require('debug')('Analytics');
+const debug = require('debug')('Franz:Analytics');
 
 const { app } = remote;
 
diff --git a/src/models/News.js b/src/models/News.js
index a96e6550f..caf1d70e5 100644
--- a/src/models/News.js
+++ b/src/models/News.js
@@ -1,10 +1,10 @@
 // @flow
 
 export default class News {
-  id: string = '';
-  message: string = '';
-  type: string = 'primary';
-  sticky: bool = false;
+  id = '';
+  message = '';
+  type = 'primary';
+  sticky = false;
 
   constructor(data) {
     if (!data.id) {
diff --git a/src/models/Plan.js b/src/models/Plan.js
index e77353824..c7b4a0962 100644
--- a/src/models/Plan.js
+++ b/src/models/Plan.js
@@ -1,11 +1,11 @@
 // @flow
 
 export default class Plan {
-  month: {
+  month = {
     id: '',
     price: 0,
   }
-  year: {
+  year = {
     id: '',
     price: 0,
   }
diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index 032a9aa19..43c44514c 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -1,5 +1,7 @@
 import emailParser from 'address-rfc2822';
 import semver from 'semver';
+import fs from 'fs-extra';
+import path from 'path';
 
 export default class Recipe {
   id = '';
@@ -73,4 +75,8 @@ export default class Recipe {
 
     return [];
   }
+
+  get hasDarkMode() {
+    return fs.pathExistsSync(path.join(this.path, 'darkmode.css'));
+  }
 }
diff --git a/src/models/RecipePreview.js b/src/models/RecipePreview.js
index 525a5c4b5..7470d757a 100644
--- a/src/models/RecipePreview.js
+++ b/src/models/RecipePreview.js
@@ -1,10 +1,10 @@
 // @flow
 
 export default class RecipePreview {
-  id: string = '';
-  name: string = '';
-  icon: string = ''; // TODO: check if this isn't replaced by `icons`
-  featured: bool = false;
+  id = '';
+  name = '';
+  icon = ''; // TODO: check if this isn't replaced by `icons`
+  featured = false;
 
   constructor(data) {
     if (!data.id) {
diff --git a/src/models/Service.js b/src/models/Service.js
index bafb3f564..41180dd76 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -7,7 +7,7 @@ export default class Service {
   recipe = '';
   webview = null;
   timer = null;
-  events: {};
+  events = {};
 
   isAttached = false;
 
@@ -28,6 +28,7 @@ export default class Service {
   @observable iconUrl = '';
   @observable hasCustomUploadedIcon = false;
   @observable hasCrashed = false;
+  @observable isDarkModeEnabled = false;
 
   constructor(data, recipe) {
     if (!data) {
@@ -64,8 +65,12 @@ export default class Service {
 
     this.isMuted = data.isMuted !== undefined ? data.isMuted : this.isMuted;
 
+    this.isDarkModeEnabled = data.isDarkModeEnabled !== undefined ? data.isDarkModeEnabled : this.isDarkModeEnabled;
+
     this.hasCustomUploadedIcon = data.hasCustomIcon !== undefined ? data.hasCustomIcon : this.hasCustomUploadedIcon;
 
+    this.proxy = data.proxy !== undefined ? data.proxy : this.proxy;
+
     this.recipe = recipe;
 
     autorun(() => {
diff --git a/src/models/Settings.js b/src/models/Settings.js
deleted file mode 100644
index 0e4c59057..000000000
--- a/src/models/Settings.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { observable, extendObservable } from 'mobx';
-import { DEFAULT_APP_SETTINGS } from '../config';
-
-export default class Settings {
-  @observable app = DEFAULT_APP_SETTINGS
-
-  @observable service = {
-    activeService: '',
-  }
-
-  @observable group = {
-    collapsed: [],
-    disabled: [],
-  }
-
-  @observable stats = {
-    appStarts: 0,
-  }
-
-  @observable migration = {}
-
-  constructor({ app, service, group, stats, migration }) {
-    Object.assign(this.app, app);
-    Object.assign(this.service, service);
-    Object.assign(this.group, group);
-    Object.assign(this.stats, stats);
-    Object.assign(this.migration, migration);
-  }
-
-  update(data) {
-    extendObservable(this, data);
-  }
-}
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 38edff1b4..6f156a96d 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -12,12 +12,14 @@ import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
 import { isMac, isLinux, isWindows } from '../environment';
 import locales from '../i18n/translations';
 import { gaEvent } from '../lib/analytics';
+import { onVisibilityChange } from '../helpers/visibility-helper';
+import { getLocale } from '../helpers/i18n-helpers';
 
 import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
 
-const debug = require('debug')('AppStore');
+const debug = require('debug')('Franz:AppStore');
 
-const { app } = remote;
+const { app, systemPreferences } = remote;
 
 const mainWindow = remote.getCurrentWindow();
 
@@ -50,10 +52,16 @@ export default class AppStore extends Store {
 
   @observable isSystemMuteOverridden = false;
 
+  @observable isSystemDarkModeEnabled = false;
+
   @observable isClearingAllCache = false;
 
   @observable isFullScreen = mainWindow.isFullScreen();
 
+  @observable isFocused = true;
+
+  dictionaries = [];
+
   constructor(...args) {
     super(...args);
 
@@ -77,7 +85,7 @@ export default class AppStore extends Store {
     ]);
   }
 
-  setup() {
+  async setup() {
     this._appStartsCounter();
     // Focus the active service
     window.addEventListener('focus', this.actions.service.focusActiveService);
@@ -159,6 +167,14 @@ export default class AppStore extends Store {
     this.locale = this._getDefaultLocale();
 
     this._healthCheck();
+
+    this.isSystemDarkModeEnabled = systemPreferences.isDarkMode();
+
+    onVisibilityChange((isVisible) => {
+      this.isFocused = isVisible;
+
+      debug('Window is visible/focused', isVisible);
+    });
   }
 
   @computed get cacheSize() {
@@ -304,31 +320,12 @@ export default class AppStore extends Store {
   }
 
   _getDefaultLocale() {
-    let locale = app.getLocale();
-    if (locales[locale] === undefined) {
-      let localeFuzzy;
-      Object.keys(locales).forEach((localStr) => {
-        if (locales && Object.hasOwnProperty.call(locales, localStr)) {
-          if (locale.substring(0, 2) === localStr.substring(0, 2)) {
-            localeFuzzy = localStr;
-          }
-        }
-      });
-
-      if (localeFuzzy !== undefined) {
-        locale = localeFuzzy;
-      }
-    }
-
-    if (locales[locale] === undefined) {
-      locale = defaultLocale;
-    }
-
-    if (!locale) {
-      locale = DEFAULT_APP_SETTINGS.fallbackLocale;
-    }
-
-    return locale;
+    return getLocale({
+      locale: app.getLocale(),
+      locales,
+      defaultLocale,
+      fallbackLocale: DEFAULT_APP_SETTINGS.fallbackLocale,
+    });
   }
 
   _muteAppHandler() {
diff --git a/src/stores/DictionaryStore.js b/src/stores/DictionaryStore.js
new file mode 100644
index 000000000..b9c5f2abf
--- /dev/null
+++ b/src/stores/DictionaryStore.js
@@ -0,0 +1,45 @@
+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
new file mode 100644
index 000000000..10c893d3f
--- /dev/null
+++ b/src/stores/FeaturesStore.js
@@ -0,0 +1,50 @@
+import { computed, observable } from 'mobx';
+
+import Store from './lib/Store';
+import CachedRequest from './lib/CachedRequest';
+
+import delayApp from '../features/delayApp';
+import spellchecker from '../features/spellchecker';
+import serviceProxy from '../features/serviceProxy';
+
+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() {
+    this.registerReactions([
+      this._monitorLoginStatus.bind(this),
+    ]);
+
+    await this.featuresRequest._promise;
+    setTimeout(this._enableFeatures.bind(this), 1);
+  }
+
+  @computed get anonymousFeatures() {
+    return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG;
+  }
+
+  @computed get features() {
+    if (this.stores.user.isLoggedIn) {
+      return this.featuresRequest.execute().result || DEFAULT_FEATURES_CONFIG;
+    }
+
+    return DEFAULT_FEATURES_CONFIG;
+  }
+
+  _monitorLoginStatus() {
+    if (this.stores.user.isLoggedIn) {
+      this.featuresRequest.invalidate({ immediately: true });
+    } else {
+      this.defaultFeaturesRequest.invalidate({ immediately: true });
+    }
+  }
+
+  _enableFeatures() {
+    delayApp(this.stores, this.actions);
+    spellchecker(this.stores, this.actions);
+    serviceProxy(this.stores, this.actions);
+  }
+}
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index a24308f6a..f2480bc8e 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -5,7 +5,7 @@ import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 import { matchRoute } from '../helpers/routing-helpers';
 
-const debug = require('debug')('RecipeStore');
+const debug = require('debug')('Franz:RecipeStore');
 
 export default class RecipesStore extends Store {
   @observable allRecipesRequest = new CachedRequest(this.api.recipes, 'all');
diff --git a/src/stores/RequestStore.js b/src/stores/RequestStore.js
index 595852583..bbfe6f6df 100644
--- a/src/stores/RequestStore.js
+++ b/src/stores/RequestStore.js
@@ -2,7 +2,7 @@ import { action, computed, observable } from 'mobx';
 
 import Store from './lib/Store';
 
-const debug = require('debug')('RequestsStore');
+const debug = require('debug')('Franz:RequestsStore');
 
 export default class RequestStore extends Store {
   @observable userInfoRequest;
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index ccb85421a..99b091589 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -7,7 +7,7 @@ import CachedRequest from './lib/CachedRequest';
 import { matchRoute } from '../helpers/routing-helpers';
 import { gaEvent } from '../lib/analytics';
 
-const debug = require('debug')('ServiceStore');
+const debug = require('debug')('Franz:ServiceStore');
 
 export default class ServicesStore extends Store {
   @observable allServicesRequest = new CachedRequest(this.api.services, 'all');
@@ -67,9 +67,14 @@ export default class ServicesStore extends Store {
   }
 
   setup() {
-    // Single key reactions
+    // Single key reactions for the sake of your CPU
     reaction(
-      () => this.stores.settings.all.app.enableSpellchecking,
+      () => this.stores.settings.app.enableSpellchecking,
+      () => this._shareSettingsWithServiceProcess(),
+    );
+
+    reaction(
+      () => this.stores.settings.app.spellcheckerLanguage,
       () => this._shareSettingsWithServiceProcess(),
     );
   }
@@ -93,7 +98,7 @@ export default class ServicesStore extends Store {
     return this.stores.settings.all.app.showDisabledServices ? this.all : this.enabled;
   }
 
-  // This is just used to avoid unnecessary rerendering of resource-heavy webviews 
+  // This is just used to avoid unnecessary rerendering of resource-heavy webviews
   @computed get allDisplayedUnordered() {
     const services = this.allServicesRequest.execute().result || [];
     return this.stores.settings.all.app.showDisabledServices ? services : services.filter(service => service.isEnabled);
@@ -143,6 +148,7 @@ export default class ServicesStore extends Store {
   // Actions
   @action async _createService({ recipeId, serviceData, redirect = true }) {
     const data = this._cleanUpTeamIdAndCustomUrl(recipeId, serviceData);
+
     const response = await this.createServiceRequest.execute(recipeId, data)._promise;
 
     this.allServicesRequest.patch((result) => {
@@ -150,6 +156,13 @@ export default class ServicesStore extends Store {
       result.push(response.data);
     });
 
+    this.actions.settings.update({
+      type: 'proxy',
+      data: {
+        [`${response.data.id}`]: data.proxy,
+      },
+    });
+
     this.actionStatus = response.status || [];
 
     if (redirect) {
@@ -214,6 +227,21 @@ export default class ServicesStore extends Store {
     await request._promise;
     this.actionStatus = request.result.status;
 
+    if (service.isEnabled) {
+      this._sendIPCMessage({
+        serviceId,
+        channel: 'service-settings-update',
+        args: newData,
+      });
+    }
+
+    this.actions.settings.update({
+      type: 'proxy',
+      data: {
+        [`${serviceId}`]: data.proxy,
+      },
+    });
+
     if (redirect) {
       this.stores.router.push('/settings/services');
       gaEvent('Service', 'update', service.recipe.id);
@@ -411,6 +439,8 @@ export default class ServicesStore extends Store {
 
   @action _reload({ serviceId }) {
     const service = this.one(serviceId);
+    if (!service.isEnabled) return;
+
     service.resetMessageCount();
 
     service.webview.loadURL(service.url);
@@ -567,9 +597,10 @@ export default class ServicesStore extends Store {
   }
 
   _shareSettingsWithServiceProcess() {
+    const settings = this.stores.settings.app;
     this.actions.service.sendIPCMessageToAllServices({
       channel: 'settings-update',
-      args: this.stores.settings.all.app,
+      args: settings,
     });
   }
 
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index d8519c609..9ea14a911 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,54 +1,105 @@
+import { remote, ipcRenderer } from 'electron';
 import { action, computed, observable } from 'mobx';
 import localStorage from 'mobx-localstorage';
 
 import Store from './lib/Store';
-import SettingsModel from '../models/Settings';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
+import { getLocale } from '../helpers/i18n-helpers';
 
-const debug = require('debug')('SettingsStore');
+import { DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES } from '../config';
+import { SPELLCHECKER_LOCALES } from '../i18n/languages';
+
+const { systemPreferences } = remote;
+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 = [];
+
+  fileSystemSettingsTypes = FILE_SYSTEM_SETTINGS_TYPES;
+  @observable _fileSystemSettingsCache = {
+    app: DEFAULT_APP_SETTINGS,
+    proxy: {},
+  };
+
   constructor(...args) {
     super(...args);
 
     // Register action handlers
     this.actions.settings.update.listen(this._update.bind(this));
     this.actions.settings.remove.listen(this._remove.bind(this));
+
+    this.fileSystemSettingsTypes.forEach((type) => {
+      this.fileSystemSettingsRequests[type] = new CachedRequest(this.api.local, 'getAppSettings');
+    });
+
+    ipcRenderer.on('appSettings', (event, resp) => {
+      debug('Get appSettings resolves', resp, resp.type, resp.data);
+
+      this._fileSystemSettingsCache[resp.type] = resp.data;
+    });
+
+    this.fileSystemSettingsTypes.forEach((type) => {
+      ipcRenderer.send('getAppSettings', type);
+    });
   }
 
   async setup() {
     // We need to wait until `appSettingsRequest` has been executed once, otherwise we can't patch the result. If we don't wait we'd run into an issue with mobx not reacting to changes of previously not existing keys
     await this.appSettingsRequest._promise;
-    this._migrate();
+    await this._migrate();
+  }
+
+  @computed get app() {
+    return this._fileSystemSettingsCache.app || DEFAULT_APP_SETTINGS;
+  }
+
+  @computed get proxy() {
+    return this._fileSystemSettingsCache.proxy || {};
+  }
+
+  @computed get service() {
+    return localStorage.getItem('service') || {
+      activeService: '',
+    };
+  }
+
+  @computed get stats() {
+    return localStorage.getItem('stats') || {
+      activeService: '',
+    };
+  }
+
+  @computed get migration() {
+    return localStorage.getItem('migration') || {};
   }
 
   @computed get all() {
-    return new SettingsModel({
-      app: this.appSettingsRequest.execute().result || {},
-      service: localStorage.getItem('service') || {},
-      group: localStorage.getItem('group') || {},
-      stats: localStorage.getItem('stats') || {},
-      migration: localStorage.getItem('migration') || {},
-    });
+    return {
+      app: this.app,
+      proxy: this.proxy,
+      service: this.service,
+      stats: this.stats,
+      migration: this.migration,
+    };
   }
 
   @action async _update({ type, data }) {
     const appSettings = this.all;
-    if (type !== 'app') {
+    if (!this.fileSystemSettingsTypes.includes(type)) {
       debug('Update settings', type, data, this.all);
       localStorage.setItem(type, Object.assign(appSettings[type], data));
     } else {
       debug('Update settings on file system', type, data);
-      this.updateAppSettingsRequest.execute(data);
-
-      this.appSettingsRequest.patch((result) => {
-        if (!result) return;
-        Object.assign(result, data);
+      ipcRenderer.send('updateAppSettings', {
+        type,
+        data,
       });
+
+      Object.assign(this._fileSystemSettingsCache[type], data);
     }
   }
 
@@ -67,8 +118,8 @@ export default class SettingsStore extends Store {
   }
 
   // Helper
-  _migrate() {
-    const legacySettings = localStorage.getItem('app');
+  async _migrate() {
+    const legacySettings = localStorage.getItem('app') || {};
 
     if (!this.all.migration['5.0.0-beta.17-settings']) {
       this.actions.settings.update({
@@ -104,5 +155,34 @@ export default class SettingsStore extends Store {
 
       debug('Migrated settings to split stores');
     }
+
+    // Enable dark mode once
+    if (!this.all.migration['5.0.0-beta.19-settings']) {
+      const spellcheckerLanguage = getLocale({
+        locale: this.stores.settings.app.locale,
+        locales: SPELLCHECKER_LOCALES,
+        defaultLocale: DEFAULT_APP_SETTINGS.spellcheckerLanguage,
+        fallbackLocale: DEFAULT_APP_SETTINGS.spellcheckerLanguage,
+      });
+
+      this.actions.settings.update({
+        type: 'app',
+        data: {
+          darkMode: systemPreferences.isDarkMode(),
+          spellcheckerLanguage,
+        },
+      });
+
+      this.actions.settings.update({
+        type: 'migration',
+        data: {
+          '5.0.0-beta.19-settings': true,
+        },
+      });
+    }
+  }
+
+  _getFileBasedSettings(type) {
+    ipcRenderer.send('getAppSettings', type);
   }
 }
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index b391bdcae..d37ebe4c7 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -1,6 +1,8 @@
 import { action, observable, computed } from 'mobx';
 
 import Store from './lib/Store';
+import * as themeDefault from '../theme/default';
+import * as themeDark from '../theme/dark';
 
 export default class UIStore extends Store {
   @observable showServicesUpdatedInfoBar = false;
@@ -20,13 +22,21 @@ export default class UIStore extends Store {
     return (settings.app.isAppMuted && settings.app.showMessageBadgeWhenMuted) || !settings.isAppMuted;
   }
 
+  @computed get theme() {
+    if (this.stores.settings.all.app.darkMode) {
+      return Object.assign({}, themeDefault, themeDark);
+    }
+
+    return themeDefault;
+  }
+
   // Actions
   @action _openSettings({ path = '/settings' }) {
     const settingsPath = path !== '/settings' ? `/settings/${path}` : path;
     this.stores.router.push(settingsPath);
   }
 
-  @action _closeSettings(): void {
+  @action _closeSettings() {
     this.stores.router.push('/');
   }
 
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 574616925..26ac2c60e 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -9,7 +9,7 @@ import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { gaEvent } from '../lib/analytics';
 
-const debug = require('debug')('UserStore');
+const debug = require('debug')('Franz:UserStore');
 
 // TODO: split stores into UserStore and AuthStore
 export default class UserStore extends Store {
@@ -122,13 +122,13 @@ export default class UserStore extends Store {
   }
 
   @computed get data() {
-    this.getUserInfoRequest.execute();
-    return this.getUserInfoRequest.result || {};
+    if (!this.isLoggedIn) return {};
+
+    return this.getUserInfoRequest.execute().result || {};
   }
 
   @computed get legacyServices() {
-    this.getLegacyServicesRequest.execute();
-    return this.getLegacyServicesRequest.result || [];
+    return this.getLegacyServicesRequest.execute() || {};
   }
 
   // Actions
diff --git a/src/stores/index.js b/src/stores/index.js
index 2d99e3952..f547d0a7a 100644
--- a/src/stores/index.js
+++ b/src/stores/index.js
@@ -1,5 +1,6 @@
 import AppStore from './AppStore';
 import UserStore from './UserStore';
+import FeaturesStore from './FeaturesStore';
 import SettingsStore from './SettingsStore';
 import ServicesStore from './ServicesStore';
 import RecipesStore from './RecipesStore';
@@ -8,6 +9,7 @@ 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) => {
@@ -16,6 +18,7 @@ export default (api, actions, router) => {
     router,
     app: new AppStore(stores, api, actions),
     user: new UserStore(stores, api, actions),
+    features: new FeaturesStore(stores, api, actions),
     settings: new SettingsStore(stores, api, actions),
     services: new ServicesStore(stores, api, actions),
     recipes: new RecipesStore(stores, api, actions),
@@ -24,6 +27,7 @@ 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/styles/animations.scss b/src/styles/animations.scss
index 1e49af207..b121af7d2 100644
--- a/src/styles/animations.scss
+++ b/src/styles/animations.scss
@@ -1,49 +1,41 @@
 // FadeIn
-.fadeIn-appear {
-  opacity: 0.01;
-}
+.fadeIn-appear { opacity: .01; }
 
 .fadeIn-appear.fadeIn-appear-active {
   opacity: 1;
-  transition: opacity 0.5s ease-out;
+  transition: opacity .5s ease-out;
 }
 
 .fadeIn-enter {
-  opacity: 0.01;
-  transition: opacity 0.5s ease-out;
+  opacity: .01;
+  transition: opacity .5s ease-out;
 }
 
-.fadeIn-leave {
-  opacity: 1;
-}
+.fadeIn-leave { opacity: 1; }
 
 .fadeIn-leave.fadeIn-leave-active {
-  opacity: 0.01;
+  opacity: .01;
   transition: opacity 300ms ease-in;
 }
 
 // FadeIn Fast
-.fadeIn-fast-appear {
-  opacity: 0.01;
-}
+.fadeIn-fast-appear { opacity: .01; }
 
 .fadeIn-fast-appear.fadeIn-fast-appear-active {
   opacity: 1;
-  transition: opacity 0.25s ease-out;
+  transition: opacity .25s ease-out;
 }
 
 .fadeIn-fast-enter {
-  opacity: 0.01;
-  transition: opacity 0.25s ease-out;
+  opacity: .01;
+  transition: opacity .25s ease-out;
 }
 
-.fadeIn-fast-leave {
-  opacity: 1;
-}
+.fadeIn-fast-leave { opacity: 1; }
 
 .fadeIn-fast-leave.fadeIn-fast-leave-active {
-  opacity: 0.01;
-  transition: opacity 0.25s ease-in;
+  opacity: .01;
+  transition: opacity .25s ease-in;
 }
 
 // Slide down
@@ -54,37 +46,35 @@
 
 .slideDown-appear.slideDown-appear-active {
   max-height: 500px;
-  transition: max-height 0.5s ease-out;
+  transition: max-height .5s ease-out;
 }
 
 .slideDown-enter {
   max-height: 0;
-  transition: max-height 0.5s ease-out;
+  transition: max-height .5s ease-out;
 }
 
 // Slide up
 .slideUp-appear {
-  transform: translateY(20px);
   opacity: 0;
+  transform: translateY(20px);
 }
 
 .slideUp-appear.slideUp-appear-active {
-  transform: translateY(0px);
   opacity: 1;
-  transition: all 0.3s ease-out;
+  transform: translateY(0px);
+  transition: all .3s ease-out;
 }
 
 .slideUp-enter {
-  transform: translateY(20px);
   opacity: 0;
-  transition: all 0.3s ease-out;
+  transform: translateY(20px);
+  transition: all .3s ease-out;
 }
 
-.slideUp-leave {
-  opacity: 1;
-}
+.slideUp-leave { opacity: 1; }
 
 .slideUp-leave.slideUp-leave-active {
-  opacity: 0.01;
+  opacity: .01;
   transition: opacity 300ms ease-in;
 }
diff --git a/src/styles/auth.scss b/src/styles/auth.scss
index 9ad71867c..54e264dc6 100644
--- a/src/styles/auth.scss
+++ b/src/styles/auth.scss
@@ -1,144 +1,135 @@
 @import './config.scss';
 
+.theme__dark .auth {
+  background: $dark-theme-gray-darkest;
+
+  .auth__container {
+    background: $dark-theme-gray-darker;
+    box-shadow: 0 0 50px rgba($dark-theme-black, .2);
+  }
+
+  .auth__logo.auth__logo--sm {
+    border: 4px solid $dark-theme-black;
+    box-shadow: 0 0 6px rgba($dark-theme-black, .5);
+  }
+
+  .auth__links {
+    background: $dark-theme-gray-dark;
+
+    a { color: $dark-theme-text-color; }
+  }
+
+  .legal {
+    color: $dark-theme-text-color;
+
+    a { color: $dark-theme-gray-lightest; }
+  }
+}
+
 .auth {
+  background: $theme-brand-primary;
   display: flex;
   justify-content: center;
-  background: $theme-brand-primary;
 
   .auth__layout {
     width: 100%;
-    &>div>span {
-      width: 100%;
-    }
-    // display: flex;
-    // align-items: center;
-    // justify-content: center;
-    // flex-direction: column;
-
-    // @media only screen and (max-height : 700px) {
-    //   margin: 100px 0;
-    // }
 
-    &>div {
+    & > div {
+      align-items: center;
       display: flex;
       justify-content: center;
-      align-items: center;
 
-      &>span {
+      & > span {
         position: absolute;
+        width: 100%;
       }
     }
   }
 
   .auth__container {
-    position: relative;
-    width: 350px;
-    height: auto;
-    margin: 40px auto 0 auto;
     background: #FFF;
-    // padding: 20px;
     border-radius: $theme-border-radius;
-    box-shadow: 0 0 50px rgba(black, 0.2);
+    box-shadow: 0 0 50px rgba(black, .2);
+    height: auto;
+    margin: 40px auto 0;
+    position: relative;
+    width: 350px;
 
-    &.auth__container--signup {
-      width: 450px;
-      // margin-left: auto;
-      // margin-right: auto;
-    }
+    &.auth__container--signup { width: 450px; }
   }
 
   .auth__logo {
+    border-radius: $theme-border-radius;
     display: block;
-    width: 150px;
     height: auto;
     margin: -105px auto 20px auto;
-    border-radius: $theme-border-radius;
+    width: 150px;
 
     &.auth__logo--sm {
       border: 4px solid #FFF;
-      box-shadow: 0 0 6px rgba(black, 0.5);
       border-radius: 100%;
+      box-shadow: 0 0 6px rgba(black, .5);
     }
   }
 
   .auth__form {
     padding: 20px;
 
-    h1 {
-      text-align: center;
-    }
+    h1 { text-align: center; }
   }
 
   .auth__button {
     width: 100%;
 
-    &.auth__button--skip {
-      margin: 10px auto 0;
-    }
+    &.auth__button--skip { margin: 10px auto 0; }
   }
 
   .auth__links {
-    padding: 20px;
     background: $theme-gray-lighter;
     border-bottom-left-radius: $theme-border-radius;
     border-bottom-right-radius: $theme-border-radius;
+    padding: 20px;
 
     a {
       display: block;
-      text-align: center;
       color: $theme-gray;
       margin-bottom: 8px;
+      text-align: center;
 
-      &:last-of-type {
-        margin-bottom: 0;
-      }
+      &:last-of-type { margin-bottom: 0; }
     }
   }
 
   .auth__adlk {
+    bottom: 15px;
     position: absolute;
     right: 25px;
-    bottom: 15px;
 
-    img {
-      width: 65px;
-    }
+    img { width: 65px; }
   }
 
-  .auth__letter {
-    margin-bottom: 30px;
-  }
-
-  .scroll-container {
-    z-index: 10;
-  }
-
-  .info-bar {
-    position: absolute;
-  }
+  .auth__letter { margin-bottom: 30px; }
+  .scroll-container { z-index: 10; }
+  .info-bar { position: absolute; }
 
   &__scroll-container {
-    overflow: scroll;
-    width: 100%;
     max-height: 100vh;
     padding: 80px 0;
+    overflow: scroll;
+    width: 100%;
   }
 
-  .available-services {
-    margin-bottom: 15px;
-  }
+  .available-services { margin-bottom: 15px; }
 
   .unavailable-services {
     margin: 15px 0;
 
-    p {
-      text-transform: capitalize;
-    }
+    p { text-transform: capitalize; }
   }
 
   .legal {
-    text-align: center;
-    margin-top: 20px;
     color: $theme-gray-light;
+    margin-top: 20px;
+    text-align: center;
   }
 }
diff --git a/src/styles/badge.scss b/src/styles/badge.scss
index d7dfaf783..f9fac039a 100644
--- a/src/styles/badge.scss
+++ b/src/styles/badge.scss
@@ -1,15 +1,34 @@
 @import './config.scss';
 
+.theme__dark .badge {
+  background: $dark-theme-gray;
+  border-radius: $theme-border-radius-small;
+  color: $dark-theme-gray-lightest;
+
+  &.badge--primary,
+  &.badge--premium {
+    background: $theme-brand-primary;
+    color: $dark-theme-gray-smoke;
+  }
+}
+
+
 .badge {
-  font-size: 14px;
+  background: $theme-gray-lighter;
+  border-radius: $theme-border-radius;
   display: inline-block;
+  font-size: 14px;
   padding: 5px 10px;
-  border-radius: $theme-border-radius;
-  background: $theme-gray-lighter;
 
   &.badge--primary,
   &.badge--premium {
     background: $theme-brand-primary;
     color: #FFF;
   }
+
+  &.badge--success {
+    background: $theme-brand-success;
+    color: #FFF;
+  }
+
 }
diff --git a/src/styles/button.scss b/src/styles/button.scss
index 8d2adbbcc..a66345114 100644
--- a/src/styles/button.scss
+++ b/src/styles/button.scss
@@ -1,71 +1,94 @@
 @import './config.scss';
 
+.theme__dark .franz-form__button {
+  background: $theme-brand-primary;
+  color: $dark-theme-text-color;
+
+  &:hover { background: darken($theme-brand-primary, 5%); }
+  &:active { background: lighten($theme-brand-primary, 5%); }
+
+  &.franz-form__button--secondary {
+    background: $dark-theme-gray-lighter;
+    color: $dark-theme-text-color;
+
+    &:hover { background: lighten($dark-theme-gray-lighter, 10%); }
+    &:active { background: lighten($dark-theme-gray-lighter, 20%); }
+  }
+
+  &.franz-form__button--danger {
+    background: $theme-brand-danger;
+
+    &:hover { background: darken($theme-brand-danger, 5%); }
+    &:active { background: lighten($theme-brand-danger, 5%); }
+  }
+
+  &.franz-form__button--warning {
+    background: $theme-brand-warning;
+
+    &:hover { background: darken($theme-brand-warning, 5%); }
+    &:active { background: lighten($theme-brand-warning, 5%); }
+  }
+
+  &.franz-form__button--inverted {
+    border: 2px solid $theme-brand-primary;
+    color: $theme-brand-primary;
+
+    &:hover {
+      background: darken($theme-brand-primary, 5%);
+      color: $dark-theme-text-color;
+    }
+  }
+
+  &:disabled { opacity: .5; }
+}
+
 .franz-form__button {
-  position: relative;
   background: $theme-brand-primary;
+  border-radius: 3px;
   display: block;
-  padding: 10px 20px;
   color: #FFF;
-  border-radius: 3px;
-  transition: background 0.5s;
+  padding: 10px 20px;
+  position: relative;
+  transition: background .5s;
   text-align: center;
 
-  &:hover {
-    background: darken($theme-brand-primary, 5%);
-  }
+  &:hover { background: darken($theme-brand-primary, 5%) }
 
   &:active {
-    transition: none;
     background: lighten($theme-brand-primary, 5%);
+    transition: none;
   }
 
-  &:disabled {
-    opacity: 0.2;
-  }
+  &:disabled { opacity: .2; }
 
   &.franz-form__button--secondary {
     background: $theme-gray-lighter;
     color: $theme-gray;
 
-    &:hover {
-      background: darken($theme-gray-lighter, 5%);
-    }
-
-    &:active {
-      background: lighten($theme-gray-lighter, 5%);
-    }
+    &:hover { background: darken($theme-gray-lighter, 5%); }
+    &:active { background: lighten($theme-gray-lighter, 5%); }
   }
 
   &.franz-form__button--danger {
     background: $theme-brand-danger;
 
-    &:hover {
-      background: darken($theme-brand-danger, 5%);
-    }
-
-    &:active {
-      background: lighten($theme-brand-danger, 5%);
-    }
+    &:hover { background: darken($theme-brand-danger, 5%); }
+    &:active { background: lighten($theme-brand-danger, 5%); }
   }
 
   &.franz-form__button--warning {
     background: $theme-brand-warning;
 
-    &:hover {
-      background: darken($theme-brand-warning, 5%);
-    }
-
-    &:active {
-      background: lighten($theme-brand-warning, 5%);
-    }
+    &:hover { background: darken($theme-brand-warning, 5%); }
+    &:active { background: lighten($theme-brand-warning, 5%); }
   }
 
   &.franz-form__button--inverted {
     background: none;
-    padding: 10px 20px;
     border: 2px solid $theme-brand-primary;
     color: $theme-brand-primary;
-    transition: background 0.5s, color 0.5s;
+    padding: 10px 20px;
+    transition: background .5s, color .5s;
 
     &:hover {
       background: darken($theme-brand-primary, 5%);
@@ -74,11 +97,11 @@
   }
 
   .loader {
+    display: inline-block;
+    height: 12px;
+    margin-right: 5px;
     position: relative;
     width: 20px;
-    height: 12px;
     z-index: 9999;
-    display: inline-block;
-    margin-right: 5px;
   }
 }
diff --git a/src/styles/colors.scss b/src/styles/colors.scss
index 5d8302c28..80c2fb633 100644
--- a/src/styles/colors.scss
+++ b/src/styles/colors.scss
@@ -1,22 +1,40 @@
-$theme-brand-primary: #3498db;
-$theme-brand-success: #5cb85c;
-$theme-brand-info: #5bc0de;
-$theme-brand-warning: #FF9F00;
-$theme-brand-danger: #d9534f;
+@import "./type-helper";
 
-$theme-gray-dark: #373a3c;
-$theme-gray: #55595c;
-$theme-gray-light: #818a91;
-$theme-gray-lighter: #eceeef;
-$theme-gray-lightest: #f7f7f9;
+$theme-brand-primary:        convert-rgb-string-to-color($raw-theme-brand-primary);
+$theme-brand-success:        convert-rgb-string-to-color($raw-theme-brand-success);
+$theme-brand-info:           convert-rgb-string-to-color($raw-theme-brand-info);
+$theme-brand-warning:        convert-rgb-string-to-color($raw-theme-brand-warning);
+$theme-brand-danger:         convert-rgb-string-to-color($raw-theme-brand-danger);
 
-$theme-border-radius: 6px;
-$theme-border-radius-small: 3px;
+$theme-gray-dark:            convert-rgb-string-to-color($raw-theme-gray-dark);
+$theme-gray:                 convert-rgb-string-to-color($raw-theme-gray);
+$theme-gray-light:           convert-rgb-string-to-color($raw-theme-gray-light);
+$theme-gray-lighter:         convert-rgb-string-to-color($raw-theme-gray-lighter);
+$theme-gray-lightest:        convert-rgb-string-to-color($raw-theme-gray-lightest);
 
-$theme-sidebar-width: 68px;
+$theme-border-radius:        to-number($raw-theme-border-radius);
+$theme-border-radius-small:  to-number($raw-theme-border-radius-small);
 
-$theme-text-color: $theme-gray-dark;
+$theme-sidebar-width:        to-number($raw-theme-sidebar-width);
 
-$theme-transition-time: 0.5s;
+$theme-text-color:           convert-rgb-string-to-color($raw-theme-gray-dark);
 
-$theme-inset-shadow: inset 0 2px 5px rgba(0,0,0,0.03);
+$theme-transition-time:      .5s;
+
+$theme-inset-shadow:         inset 0 2px 5px rgba(0, 0, 0, .03);
+
+// Dark Theme
+$dark-theme-black:           convert-rgb-string-to-color($raw-dark-theme-black);
+
+$dark-theme-gray-darkest:    convert-rgb-string-to-color($raw-dark-theme-gray-darkest);
+$dark-theme-gray-darker:     convert-rgb-string-to-color($raw-dark-theme-gray-darker);
+$dark-theme-gray-dark:       convert-rgb-string-to-color($raw-dark-theme-gray-dark);
+
+$dark-theme-gray:            convert-rgb-string-to-color($raw-dark-theme-gray);
+
+$dark-theme-gray-light:      convert-rgb-string-to-color($raw-dark-theme-gray-light);
+$dark-theme-gray-lighter:    convert-rgb-string-to-color($raw-dark-theme-gray-lighter);
+$dark-theme-gray-lightest:   convert-rgb-string-to-color($raw-dark-theme-gray-lightest);
+
+$dark-theme-gray-smoke:      convert-rgb-string-to-color($raw-dark-theme-gray-smoke);
+$dark-theme-text-color:      convert-rgb-string-to-color($raw-dark-theme-text-color);
diff --git a/src/styles/content-tabs.scss b/src/styles/content-tabs.scss
index 47dfea2c4..ca3820fb4 100644
--- a/src/styles/content-tabs.scss
+++ b/src/styles/content-tabs.scss
@@ -2,53 +2,43 @@
 
 .content-tabs {
   .content-tabs__tabs {
-    display: flex;
     border-top-left-radius: $theme-border-radius-small;
     border-top-right-radius: $theme-border-radius-small;
+    display: flex;
     overflow: hidden;
 
     .content-tabs__item {
-      padding: 10px;
-      flex: 1;
-      // border: 1px solid $theme-gray-lightest;
-      color: $theme-gray-dark;
       background: linear-gradient($theme-gray-lightest 80%, darken($theme-gray-lightest, 3%));
       border-right: 1px solid $theme-gray-lighter;
+      color: $theme-gray-dark;
+      flex: 1;
+      padding: 10px;
       transition: background $theme-transition-time;
 
-      &:last-of-type {
-        border-right: 0;
-      }
+      &:last-of-type { border-right: 0; }
 
       &.is-active {
         background: $theme-brand-primary;
-        color: #FFF;
         box-shadow: none;
+        color: #FFF;
       }
     }
   }
 
   .content-tabs__content {
-    padding: 20px 20px;
+    background: $theme-gray-lightest;
     border-bottom-left-radius: $theme-border-radius-small;
     border-bottom-right-radius: $theme-border-radius-small;
-    background: $theme-gray-lightest;
+    padding: 20px 20px;
 
     .content-tabs__item {
-      top: 0;
       display: none;
+      top: 0;
 
-      &.is-active {
-        display: block;
-      }
-    }
-
-    .franz-form__input-wrapper {
-      background: #FFF;
+      &.is-active { display: block; }
     }
 
-    .franz-form__field:last-of-type {
-      margin-bottom: 0;
-    }
+    .franz-form__input-wrapper { background: #FFF; }
+    .franz-form__field:last-of-type { margin-bottom: 0; }
   }
 }
diff --git a/src/styles/image-upload.scss b/src/styles/image-upload.scss
index 06176a7af..31300c227 100644
--- a/src/styles/image-upload.scss
+++ b/src/styles/image-upload.scss
@@ -1,74 +1,89 @@
+.theme__dark {
+  .image-upload {
+    background: $dark-theme-gray-darker;
+    border: 1px solid $dark-theme-gray-light;
+    color: $dark-theme-gray-lighter;
+
+    &__action {
+      &-background { background: rgba($dark-theme-black, .7); }
+
+      button {
+        color: $dark-theme-gray-lightest;
+
+        .mdi { color: $dark-theme-gray-lightest; }
+      }
+    }
+  }
+
+  .image-upload-wrapper .mdi { color: $dark-theme-gray-light; }
+}
+
 .image-upload {
-  position: absolute;
-  width: 140px;
-  height: 140px;
+  background: $theme-gray-lightest;
   border: 1px solid $theme-gray-lighter;
   border-radius: $theme-border-radius-small;
-  background: $theme-gray-lightest;
-  overflow: hidden;
+  height: 140px;
   margin-top: 5px;
+  overflow: hidden;
+  position: relative;
+  width: 140px;
 
   &__preview,
   &__action {
-    position: absolute;
-    top: 0;
     left: 0;
+    position: absolute;
     right: 0;
+    top: 0;
   }
 
   &__preview {
-    z-index: 1;
-    background-size: cover;
-    background-size: 100%;
-    background-repeat: no-repeat;
     background-position: center center;
+    background-repeat: no-repeat;
+    background-size: cover;
     border-radius: 3px;
+    z-index: 1;
   }
 
   &__action {
-    position: relative;
-    z-index: 10;
-    opacity: 0;
-    transition: opacity 0.5s;
     display: flex;
     justify-content: center;
+    opacity: 0;
+    position: relative;
+    transition: opacity .5s;
+    z-index: 10;
 
     &-background {
-      position: absolute;
-      top: 0;
+      background: rgba($theme-gray, .7);
+      bottom: 0;
       left: 0;
+      position: absolute;
       right: 0;
-      bottom: 0;
-      background: rgba($theme-gray, 0.7);
+      top: 0;
       z-index: 10;
     }
 
     button {
+      color: #FFF;
       position: relative;
       z-index: 100;
-      color: #FFF;
 
-      .mdi {
-        color: #FFF;
-      }
+      .mdi { color: #FFF; }
     }
   }
 
   &__dropzone {
-    text-align: center;
+    align-items: center;
     border-radius: 5px;
-    padding: 10px;
     display: flex;
-    align-items: center;
-    justify-content: center;
     flex-direction: column;
+    justify-content: center;
+    padding: 10px;
+    text-align: center;
   }
 
-  &__dropzone, 
+  &__dropzone,
   button {
-    .mdi {
-      margin-bottom: 5px;
-    }
+    .mdi { margin-bottom: 5px; }
 
     p {
       font-size: 10px;
@@ -76,16 +91,10 @@
     }
   }
 
-  &:hover {
-    .image-upload__action {
-      opacity: 1;
-    }
-  }
+  &:hover .image-upload__action { opacity: 1; }
 }
 
-.image-upload-wrapper {
-  .mdi {
-    font-size: 40px;
-    color: $theme-gray-light;
-  }
-}
\ No newline at end of file
+.image-upload-wrapper .mdi {
+  color: $theme-gray-light;
+  font-size: 40px;
+}
diff --git a/src/styles/info-bar.scss b/src/styles/info-bar.scss
index b6d1e84e2..fb4917358 100644
--- a/src/styles/info-bar.scss
+++ b/src/styles/info-bar.scss
@@ -1,83 +1,68 @@
 @import './config.scss';
 
 .info-bar {
-  width: 100%;
-  height: 50px;
+  align-items: center;
   background: $theme-brand-primary;
+  box-shadow: 0 0 8px rgba(black, .2);
   display: flex;
-  align-items: center;
+  height: 50px;
   justify-content: center;
   padding: 0 20px;
   position: relative;
-  // bottom: 0;
+  width: 100%;
   z-index: 100;
-  box-shadow: 0 0 8px rgba(black, 0.2);
 
   .info-bar__content {
     height: auto;
 
-    .mdi {
-      margin-right: 5px;
-    }
+    .mdi { margin-right: 5px; }
   }
 
   .info-bar__close {
+    color: #FFF;
     position: absolute;
     right: 10px;
-    color: #FFF;
   }
 
   .info-bar__cta {
-    color: #FFF;
-    padding: 3px 8px;
-    border-radius: $theme-border-radius-small;
     border-color: #FFF;
-    border-width: 2px;
+    border-radius: $theme-border-radius-small;
     border-style: solid;
+    border-width: 2px;
+    color: #FFF;
     margin-left: 15px;
+    padding: 3px 8px;
 
     .loader {
+      display: inline-block;
+      height: 12px;
+      margin-right: 5px;
       position: relative;
       width: 20px;
-      height: 12px;
       z-index: 9999;
-      display: inline-block;
-      margin-right: 5px;
     }
   }
 
-  a {
-    // text-decoration: underline;
-  }
-
-  &.info-bar--bottom {
-    order: 10;
-  }
+  &.info-bar--bottom { order: 10; }
 
   &.info-bar--primary {
     background: $theme-brand-primary;
     color: #FFF;
 
-    a {
-      color: #FFF;
-    }
+    a { color: #FFF; }
   }
 
   &.info-bar--warning {
     background: $theme-brand-warning;
     color: #FFF;
 
-    a {
-      color: #FFF;
-    }
+    a { color: #FFF; }
   }
 
   &.info-bar--danger {
     background: $theme-brand-danger;
     color: #FFF;
 
-    a {
-      color: #FFF;
-    }
+    a { color: #FFF; }
   }
 }
diff --git a/src/styles/infobox.scss b/src/styles/infobox.scss
index 7ab094058..e287e5be7 100644
--- a/src/styles/infobox.scss
+++ b/src/styles/infobox.scss
@@ -1,20 +1,16 @@
 @import './config.scss';
 
 .infobox {
-  height: auto;
-  padding: 15px 20px;
-  margin-bottom: 30px;
+  align-items: center;
   border-radius: $theme-border-radius-small;
   display: flex;
-  align-items: center;
+  height: auto;
+  margin-bottom: 30px;
+  padding: 15px 20px;
 
-  a {
-    color: #FFF;
-  }
+  a { color: #FFF; }
 
-  .infobox__content {
-    flex: 1;
-  }
+  .infobox__content { flex: 1; }
 
   &.infobox--success {
     background: $theme-brand-success;
@@ -36,26 +32,24 @@
     color: #FFF;
   }
 
-  .mdi {
-    margin-right: 10px;
-  }
+  .mdi { margin-right: 10px; }
 
   .infobox__cta {
-    color: #FFF;
-    padding: 3px 8px;
-    border-radius: $theme-border-radius-small;
     border-color: #FFF;
-    border-width: 2px;
+    border-radius: $theme-border-radius-small;
     border-style: solid;
+    border-width: 2px;
+    color: #FFF;
     margin-left: 15px;
+    padding: 3px 8px;
 
     .loader {
+      display: inline-block;
+      height: 12px;
+      margin-right: 5px;
       position: relative;
       width: 20px;
-      height: 12px;
       z-index: 9999;
-      display: inline-block;
-      margin-right: 5px;
     }
   }
 
diff --git a/src/styles/input.scss b/src/styles/input.scss
index 7042f56e8..687bcac64 100644
--- a/src/styles/input.scss
+++ b/src/styles/input.scss
@@ -1,6 +1,34 @@
 @import './config.scss';
 @import './mixins.scss';
 
+.theme__dark .franz-form {
+  .franz-form__label { color: $dark-theme-text-color; }
+
+  .franz-form__input-wrapper {
+    background: $dark-theme-gray-dark;
+    border: 1px solid $dark-theme-gray-light;
+  }
+
+  .franz-form__input {
+    color: $dark-theme-gray-lightest;
+
+    &::placeholder { color: $dark-theme-gray-lighter; }
+  }
+
+  .franz-form__input-prefix,
+  .franz-form__input-suffix {
+    background: $dark-theme-gray;
+    color: $dark-theme-gray-lighter;
+  }
+
+  .franz-form__input-modifier {
+    border-left: 1px solid $dark-theme-gray-light;
+    color: $dark-theme-gray-lighter;
+  }
+
+  .franz-form__password-score { background: $dark-theme-gray-dark; }
+}
+
 .franz-form {
   .franz-form__field {
     display: flex;
@@ -9,19 +37,12 @@
     margin-bottom: 20px;
 
     &.has-error {
-      .franz-form__input-wrapper {
-        border-color: $theme-brand-danger;
-      }
-
-      .franz-form__input-modifier {
-        border-color: $theme-brand-danger;
-      }
+      .franz-form__input-wrapper,
+      .franz-form__input-modifier { border-color: $theme-brand-danger; }
     }
   }
 
-  .franz-form__label {
-    @include formLabel();
-  }
+  .franz-form__label { @include formLabel(); }
 
   .franz-form__error {
     color: $theme-brand-danger;
@@ -30,74 +51,60 @@
   }
 
   .franz-form__input-wrapper {
-    display: flex;
-    width: 100%;
-    order: 1;
-    border-radius: $theme-border-radius-small;
     background: $theme-gray-lightest;
     border: 1px solid $theme-gray-lighter;
+    border-radius: $theme-border-radius-small;
+    display: flex;
     flex-wrap: wrap;
+    order: 1;
+    width: 100%;
   }
 
   .franz-form__input {
-    flex: 1;
-    border: 0;
     background: none;
-    width: 100%;
-    padding: 8px;
-    // font-size: 18px;
+    border: 0;
     color: $theme-gray;
+    flex: 1;
+    padding: 8px;
+    width: 100%;
 
-    &::placeholder {
-      color: lighten($theme-gray-light, 10%);
-    }
+    &::placeholder { color: lighten($theme-gray-light, 10%); }
   }
 
   .franz-form__input-prefix,
   .franz-form__input-suffix {
-    padding: 0 10px;
     background: $theme-gray-lighter;
     color: $theme-gray-light;
     line-height: 35px;
+    padding: 0 10px;
   }
 
   .franz-form__input-modifier {
-    padding: 0 20px;
     border-left: 1px solid $theme-gray-lighter;
     color: $theme-gray-light;
     font-size: 20px;
+    padding: 0 20px;
   }
 
   .franz-form__password-score {
     background: $theme-gray-lighter;
-    height: 5px;
-    flex-basis: 100%;
     border-bottom-left-radius: 3px;
     border-bottom-right-radius: 3px;
+    flex-basis: 100%;
+    height: 5px;
 
     meter {
-      width: 100%;
-      height: 100%;
-      display: block;
       border-bottom-left-radius: 3px;
       border-bottom-right-radius: 3px;
+      display: block;
+      height: 100%;
       overflow: hidden;
+      width: 100%;
 
-      &::-webkit-meter-bar {
-        background: none;
-      }
-
-      &::-webkit-meter-even-less-good-value {
-        background: $theme-brand-danger;
-      }
-
-      &::-webkit-meter-suboptimum-value {
-        background: $theme-brand-warning;
-      }
-
-      &::-webkit-meter-optimum-value {
-        background: $theme-brand-success;
-      }
+      &::-webkit-meter-bar { background: none; }
+      &::-webkit-meter-even-less-good-value { background: $theme-brand-danger; }
+      &::-webkit-meter-suboptimum-value { background: $theme-brand-warning; }
+      &::-webkit-meter-optimum-value { background: $theme-brand-success; }
     }
   }
 }
diff --git a/src/styles/invite.scss b/src/styles/invite.scss
index bfb1a4b6b..594224f62 100644
--- a/src/styles/invite.scss
+++ b/src/styles/invite.scss
@@ -1,15 +1,8 @@
 .invite__form {
-  /* play with values to see different layouts */
-  // display: flex;
   align-items: center;
   align-self: center;
   justify-content: center;
 }
 
-.invite__embed {
-  text-align: center;
-}
-
-.invite__embed--button {
-  width: 100%;
-}
\ No newline at end of file
+.invite__embed { text-align: center; }
+.invite__embed--button { width: 100%; }
diff --git a/src/styles/layout.scss b/src/styles/layout.scss
index 964a9fcea..ebf468cf0 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -1,16 +1,36 @@
 @import './config.scss';
 
-html {
-  overflow: hidden;
+html { overflow: hidden; }
+
+.theme__dark .app {
+  .sidebar {
+    background: $dark-theme-gray-darker;
+    box-shadow: 0 0 5px 0 $dark-theme-black;
+    color: $theme-text-color;
+
+    .sidebar__add-service {
+      color: $dark-theme-gray-lighter;
+      background: $dark-theme-gray;
+    }
+
+    .sidebar__button {
+      color: $dark-theme-gray-lighter;
+      font-size: 22px;
+
+      &:hover,
+      &:active { color: $dark-theme-gray-smoke; }
+      &.is-muted { color: $dark-theme-gray; }
+    }
+  }
+
+  .app-loader .app-loader__title { color: $dark-theme-gray-lightest; }
 }
 
 .app {
   display: flex;
   flex-direction: column;
 
-  .app__content {
-    display: flex;
-  }
+  .app__content { display: flex; }
 
   .app__service {
     display: flex;
@@ -19,134 +39,100 @@ html {
   }
 }
 
-.electron-app-title-bar {
-  z-index: 99999999;
-}
+.electron-app-title-bar { z-index: 99999999; }
 
 .window-draggable {
-  position: absolute;
-  width: 100%;
-  top: 0px;
-  left: 0px;
   height: 35px;
+  left: 0;
   pointer-events: none;
-  -webkit-app-region: drag;
+  position: absolute;
+  top: 0;
+  width: 100%;
   z-index: 9999;
+  -webkit-app-region: drag;
 }
 
-.darwin {
-  .sidebar {
-    padding-top: 23px;
-  }
-}
+.darwin .sidebar { padding-top: 23px; }
 
 .sidebar {
-  display: flex;
-  flex-direction: column;
   align-items: center;
-  width: $theme-sidebar-width;
   background: $theme-gray-lightest;
-  box-shadow: 1px 0 10px rgba(0,0,0,0.08);
-  z-index: 200;
-  text-align: center;
+  box-shadow: 1px 0 10px rgba(0, 0, 0, .08);
   color: $theme-text-color;
+  display: flex;
+  flex-direction: column;
   padding-bottom: 10px;
+  text-align: center;
+  width: $theme-sidebar-width;
+  z-index: 200;
 
   .sidebar__add-service {
-    width: 32px;
-    height: 32px;
+    color: $theme-gray-light;
     background: $theme-gray-lighter;
     border-radius: $theme-border-radius-small;
+    height: 32px;
     margin: 10px auto;
-    color: $theme-gray-light;
+    width: 32px;
   }
 
   .sidebar__button {
-    width: $theme-sidebar-width;
-    padding: 7px 0;
+    color: $theme-gray-light;
     font-size: 24px;
+    padding: 7px 0;
     position: relative;
-    color: $theme-gray-light;
-
-    &:hover {
-      color: darken($theme-gray-light, 10%);
-    }
-
-    &:active {
-      color: lighten($theme-gray-light, 10%);
-    }
-
-    &.is-muted {
-      color: $theme-brand-primary;
-    }
+    width: $theme-sidebar-width;
 
-    &--new-service {
-      padding-bottom: 6px;
-    }
+    &:hover,
+    &:active { color: lighten($theme-gray-light, 10%); }
+    &.is-muted { color: $theme-brand-primary; }
+    &--new-service { padding-bottom: 6px; }
   }
 
   & > div {
     display: flex;
     overflow-y: scroll;
 
-    &::-webkit-scrollbar {
-      display: none;
-    }
+    &::-webkit-scrollbar { display: none; }
   }
 }
 
-.grid {
-  .grid__row {
-    display: flex;
-    flex-direction: row;
-
-    &>* {
-      margin-right: 20px;
-    }
+.grid .grid__row {
+  display: flex;
+  flex-direction: row;
 
-    & :last-child {
-      margin-right: 0;
-    }
-  }
+  & > * { margin-right: 20px; }
+  & :last-child { margin-right: 0; }
 }
 
 .app-loader {
+  align-items: center;
   display: flex;
   justify-content: center;
-  align-items: center;
 
   .app-loader__title {
     color: #FFF;
     font-size: 40px;
   }
 
-  &>span {
-    height: auto;
-  }
-}
-
-.dev-warning {
-  display: none;
+  & > span { height: auto; }
 }
 
-.isDevMode {
-  .dev-warning {
-    display: block;
-    position: fixed;
-    background: $theme-brand-warning;
-    width: auto;
-    height: auto;
-    top: 5px;
-    right: 5px;
-    padding: 4px;
-    font-size: 10px;
-    color: #FFF;
-    z-index: 999999999;
-    border-radius: 3px;
-    transition: opacity 0.5s ease;
-
-    &:hover {
-      opacity: 0;
-    }
-  }
+.dev-warning { display: none; }
+
+.isDevMode .dev-warning {
+  border-radius: 3px;
+  background: $theme-brand-warning;
+  color: #FFF;
+  display: block;
+  font-size: 10px;
+  height: auto;
+  padding: 4px;
+  position: fixed;
+  right: 5px;
+  top: 5px;
+  transition: opacity .5s ease;
+  width: auto;
+  z-index: 999999999;
+
+  &:hover { opacity: 0; }
 }
diff --git a/src/styles/mixins.scss b/src/styles/mixins.scss
index c9b1bc988..06efb475a 100644
--- a/src/styles/mixins.scss
+++ b/src/styles/mixins.scss
@@ -1,9 +1,9 @@
 @import './config.scss';
 
 @mixin formLabel {
-  width: 100%;
   color: $theme-gray-light;
   display: block;
   margin-bottom: 5px;
   order: 0;
+  width: 100%;
 }
diff --git a/src/styles/radio.scss b/src/styles/radio.scss
index 644478cd6..87d401215 100644
--- a/src/styles/radio.scss
+++ b/src/styles/radio.scss
@@ -1,34 +1,39 @@
 @import './config.scss';
 
-.franz-form {
-  .franz-form__radio-wrapper {
-    display: flex;
+.theme__dark .franz-form .franz-form__radio {
+  border: 1px solid $dark-theme-gray-lighter;
+  color: $dark-theme-gray-lightest;
+
+  &.is-selected {
+    background: $dark-theme-gray-lighter;
+    border: 1px solid $dark-theme-gray-lighter;
+    color: $dark-theme-gray-smoke;
   }
+}
+
+
+.franz-form {
+  .franz-form__radio-wrapper { display: flex; }
 
   .franz-form__radio {
-    // background: $theme-gray-lightest;
     border: 2px solid $theme-gray-lighter;
+    border-radius: $theme-border-radius-small;
+    box-shadow: $theme-inset-shadow;
     color: $theme-gray;
-    padding: 11px;
+    flex: 1;
     margin-right: 20px;
+    padding: 11px;
     text-align: center;
-    border-radius: $theme-border-radius-small;
-    flex: 1;
-    box-shadow: $theme-inset-shadow;
     transition: background $theme-transition-time;
 
-    &:last-of-type {
-      margin-right: 0;
-    }
+    &:last-of-type { margin-right: 0; }
 
     &.is-selected {
-      border: 2px solid $theme-brand-primary;
       background: #FFF;
+      border: 2px solid $theme-brand-primary;
       color: $theme-brand-primary;
     }
 
-    input {
-      display: none;
-    }
+    input { display: none; }
   }
 }
diff --git a/src/styles/recipes.scss b/src/styles/recipes.scss
index 1b519a5e5..84222e1fe 100644
--- a/src/styles/recipes.scss
+++ b/src/styles/recipes.scss
@@ -1,16 +1,22 @@
 @import './config.scss';
 
+.theme__dark .recipe-teaser {
+  background-color: $dark-theme-gray-dark;
+
+  &:hover { background-color: $dark-theme-gray; }
+}
+
 .recipes {
   .recipes__list {
+    align-content: flex-start;
     display: flex;
     flex-flow: row wrap;
-    align-content: flex-start;
-    min-height: 70%;
     height: auto;
+    min-height: 70%;
 
     &.recipes__list--disabled {
-      opacity: 0.3;
       filter: grayscale(100%);
+      opacity: .3;
       pointer-events: none;
     }
   }
@@ -19,58 +25,48 @@
     height: auto;
     margin-bottom: 35px;
 
-    .badge {
-      margin-right: 10px;
-    }
+    .badge { margin-right: 10px; }
 
     &.recipes__navigation--disabled {
-      opacity: 0.3;
       filter: grayscale(100%);
+      opacity: .3;
       pointer-events: none;
     }
   }
 
-  &__service-request {
-    float: right;
-  }
+  &__service-request { float: right; }
 }
 
 .recipe-teaser {
-  position: relative;
-  width: calc(25% - 20px);
+  background-color: $theme-gray-lightest;
+  border-radius: $theme-border-radius;
   height: 120px;
   margin: 0 20px 20px 0;
-  border-radius: $theme-border-radius;
-  background-color: $theme-gray-lightest;
-  transition: background $theme-transition-time;
   overflow: hidden;
+  position: relative;
+  transition: background $theme-transition-time;
+  width: calc(25% - 20px);
 
-  &:hover {
-    background-color: $theme-gray-lighter;
-  }
+  &:hover { background-color: $theme-gray-lighter; }
 
   .recipe-teaser__icon {
-    width: 50px;
     margin-bottom: 10px;
+    width: 50px;
   }
 
-  .recipe-teaser__label {
-    display: block;
-  }
+  .recipe-teaser__label { display: block; }
 
-  h2 {
-    z-index: 10;
-  }
+  h2 { z-index: 10; }
 
   &__dev-badge {
-    position: absolute;
-    top: 5px;
-    right: -13px;
-    width: 50px;
     background: $theme-brand-warning;
+    box-shadow: 0 0 4px rgba(black, .2);
     color: #FFF;
     font-size: 10px;
+    position: absolute;
+    right: -13px;
+    top: 5px;
     transform: rotateZ(45deg);
-    box-shadow: 0 0 4px rgba(black, 0.2);
+    width: 50px;
   }
 }
diff --git a/src/styles/reset.scss b/src/styles/reset.scss
index 21763f44f..80328dcef 100644
--- a/src/styles/reset.scss
+++ b/src/styles/reset.scss
@@ -16,63 +16,62 @@ article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
 menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
-  margin: 0;
-  padding: 0;
   border: 0;
-  font-size: 100%;
   font: inherit;
+  font-size: 100%;
+  margin: 0;
+  padding: 0;
 }
-/* HTML5 display-role reset for older browsers */
+
 article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-  display: block;
-}
-body {
-  line-height: 1;
-}
-ol, ul {
-  list-style: none;
-}
-blockquote, q {
+footer, header, hgroup, menu, nav, section { display: block; }
+
+ol,
+ul { list-style: none; }
+
+blockquote,
+q {
   quotes: none;
+
+  &::before,
+  &::after {
+    content: '';
+    content: none;
+  }
 }
-blockquote:before, blockquote:after, q:before, q:after {
-  content: '';
-  content: none;
-}
+
 table {
   border-collapse: collapse;
   border-spacing: 0;
 }
 
-/* Buttons should not have any special style applied by default */
 button {
   background: none;
   border: none;
   padding: 0;
-}
 
-button:focus {
-  outline: 0;
+  &:focus { outline: 0; }
+  .theme__dark & { color: $dark-theme-gray-smoke; }
 }
 
 html {
-  /* base for rem / 1rem = 10px */
         font-size: 62.5%;
   font-family: 'Open Sans';
 }
 
 body {
-  /* default font size = 14px */
-  font-size: 1.4rem;
   color: $theme-gray-dark;
+  font-size: 1.4rem;
+  line-height: 1;
+
+  .theme__dark { color: $dark-theme-gray-smoke; }
 }
 
 * {
-  -webkit-font-smoothing: antialiased;
   box-sizing: border-box;
-  font-size: 1.4rem;
   font-family: 'Open Sans';
+  font-size: 1.4rem;
+  -webkit-font-smoothing: antialiased;
   -webkit-user-select: none;
 }
 
@@ -82,14 +81,6 @@ html, body, div {
   box-sizing: border-box;
 }
 
-*:focus {
-  outline: none;
-}
-
-img {
-  pointer-events: none;
-}
-
-a {
-  cursor: default;
-}
+*:focus { outline: none; }
+img { pointer-events: none; }
+a { cursor: default; }
diff --git a/src/styles/searchInput.scss b/src/styles/searchInput.scss
index 633a31e09..32b9da065 100644
--- a/src/styles/searchInput.scss
+++ b/src/styles/searchInput.scss
@@ -1,20 +1,32 @@
+@import './config.scss';
+@import './mixins.scss';
+
+.theme__dark .search-input {
+  @extend %headline__dark;
+  background: $dark-theme-gray-dark;
+  border: 1px solid $dark-theme-gray-light;
+  border-radius: $theme-border-radius;
+  color: $dark-theme-gray-lightest;
+
+  input { color: $dark-theme-gray-lightest; }
+}
+
 .search-input {
-  width: 100%;
-  height: auto;
-  display: flex;
+  @extend %headline;
   align-items: center;
-  padding: 0 10px;
-  border-radius: 30px;
   background: $theme-gray-lightest;
-  padding: 5px 10px;
-  @extend %headline;
+  border-radius: 30px;
   color: $theme-gray-light;
+  display: flex;
+  height: auto;
+  padding: 5px 10px;
+  width: 100%;
 
   input {
-    padding-left: 10px;
     background: none;
     border: 0;
-    flex: 1;
     color: $theme-gray-light;
+    flex: 1;
+    padding-left: 10px;
   }
 }
diff --git a/src/styles/select.scss b/src/styles/select.scss
index 965b4321a..ed0fc0fc2 100644
--- a/src/styles/select.scss
+++ b/src/styles/select.scss
@@ -3,17 +3,21 @@
 
 $toggle: "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICBpZD0ic3ZnMiIKICAgdmlld0JveD0iMCAwIDM1Ljk3MDk4MyAyMy4wOTE1MTgiCiAgIGhlaWdodD0iNi41MTY5Mzk2bW0iCiAgIHdpZHRoPSIxMC4xNTE4MTFtbSI+CiAgPGRlZnMKICAgICBpZD0iZGVmczQiIC8+CiAgPG1ldGFkYXRhCiAgICAgaWQ9Im1ldGFkYXRhNyI+CiAgICA8cmRmOlJERj4KICAgICAgPGNjOldvcmsKICAgICAgICAgcmRmOmFib3V0PSIiPgogICAgICAgIDxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0PgogICAgICAgIDxkYzp0eXBlCiAgICAgICAgICAgcmRmOnJlc291cmNlPSJodHRwOi8vcHVybC5vcmcvZGMvZGNtaXR5cGUvU3RpbGxJbWFnZSIgLz4KICAgICAgICA8ZGM6dGl0bGU+PC9kYzp0aXRsZT4KICAgICAgPC9jYzpXb3JrPgogICAgPC9yZGY6UkRGPgogIDwvbWV0YWRhdGE+CiAgPGcKICAgICB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMjAyLjAxNDUxLC00MDcuMTIyMjUpIgogICAgIGlkPSJsYXllcjEiPgogICAgPHRleHQKICAgICAgIGlkPSJ0ZXh0MzMzNiIKICAgICAgIHk9IjYyOS41MDUwNyIKICAgICAgIHg9IjI5MS40Mjg1NiIKICAgICAgIHN0eWxlPSJmb250LXN0eWxlOm5vcm1hbDtmb250LXdlaWdodDpub3JtYWw7Zm9udC1zaXplOjQwcHg7bGluZS1oZWlnaHQ6MTI1JTtmb250LWZhbWlseTpzYW5zLXNlcmlmO2xldHRlci1zcGFjaW5nOjBweDt3b3JkLXNwYWNpbmc6MHB4O2ZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZTtzdHJva2Utd2lkdGg6MXB4O3N0cm9rZS1saW5lY2FwOmJ1dHQ7c3Ryb2tlLWxpbmVqb2luOm1pdGVyO3N0cm9rZS1vcGFjaXR5OjEiCiAgICAgICB4bWw6c3BhY2U9InByZXNlcnZlIj48dHNwYW4KICAgICAgICAgeT0iNjI5LjUwNTA3IgogICAgICAgICB4PSIyOTEuNDI4NTYiCiAgICAgICAgIGlkPSJ0c3BhbjMzMzgiPjwvdHNwYW4+PC90ZXh0PgogICAgPGcKICAgICAgIGlkPSJ0ZXh0MzM0MCIKICAgICAgIHN0eWxlPSJmb250LXN0eWxlOm5vcm1hbDtmb250LXZhcmlhbnQ6bm9ybWFsO2ZvbnQtd2VpZ2h0Om5vcm1hbDtmb250LXN0cmV0Y2g6bm9ybWFsO2ZvbnQtc2l6ZTo0MHB4O2xpbmUtaGVpZ2h0OjEyNSU7Zm9udC1mYW1pbHk6Rm9udEF3ZXNvbWU7LWlua3NjYXBlLWZvbnQtc3BlY2lmaWNhdGlvbjpGb250QXdlc29tZTtsZXR0ZXItc3BhY2luZzowcHg7d29yZC1zcGFjaW5nOjBweDtmaWxsOiMwMDAwMDA7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOm5vbmU7c3Ryb2tlLXdpZHRoOjFweDtzdHJva2UtbGluZWNhcDpidXR0O3N0cm9rZS1saW5lam9pbjptaXRlcjtzdHJva2Utb3BhY2l0eToxIj4KICAgICAgPHBhdGgKICAgICAgICAgaWQ9InBhdGgzMzQ1IgogICAgICAgICBzdHlsZT0iZmlsbDojMzMzMzMzO2ZpbGwtb3BhY2l0eToxIgogICAgICAgICBkPSJtIDIzNy41NjY5Niw0MTMuMjU1MDcgYyAwLjU1ODA0LC0wLjU1ODA0IDAuNTU4MDQsLTEuNDczMjIgMCwtMi4wMzEyNSBsIC0zLjcwNTM1LC0zLjY4MzA0IGMgLTAuNTU4MDQsLTAuNTU4MDQgLTEuNDUwOSwtMC41NTgwNCAtMi4wMDg5MywwIEwgMjIwLDQxOS4zOTM0NiAyMDguMTQ3MzIsNDA3LjU0MDc4IGMgLTAuNTU4MDMsLTAuNTU4MDQgLTEuNDUwODksLTAuNTU4MDQgLTIuMDA4OTMsMCBsIC0zLjcwNTM1LDMuNjgzMDQgYyAtMC41NTgwNCwwLjU1ODAzIC0wLjU1ODA0LDEuNDczMjEgMCwyLjAzMTI1IGwgMTYuNTYyNSwxNi41NDAxNyBjIDAuNTU4MDMsMC41NTgwNCAxLjQ1MDg5LDAuNTU4MDQgMi4wMDg5MiwwIGwgMTYuNTYyNSwtMTYuNTQwMTcgeiIgLz4KICAgIDwvZz4KICA8L2c+Cjwvc3ZnPgo=";
 
-.franz-form {
-  .franz-form__select {
-    -webkit-appearance: none;
-    min-width: 200px;
-    padding: 10px;
-    background-color: $theme-gray-lightest;
-    background-position: right center;
-    background-repeat: no-repeat;
-    background-size: 1ex;
-    background-origin: content-box;
-    background-image: url(data:image/svg+xml;base64,#{$toggle});
-    border: 1px solid $theme-gray-lighter;
-  }
+.theme__dark .franz-form .franz-form__select {
+  background-color: $dark-theme-gray-dark;
+  border: 1px solid $dark-theme-gray-light;
+  color: $dark-theme-gray-lightest;
+}
+
+.franz-form .franz-form__select {
+  background-color: $theme-gray-lightest;
+  background-image: url(data:image/svg+xml;base64,#{$toggle});
+  background-origin: content-box;
+  background-position: right center;
+  background-repeat: no-repeat;
+  background-size: 1ex;
+  border: 1px solid $theme-gray-lighter;
+  min-width: 200px;
+  padding: 10px;
+  -webkit-appearance: none;
 }
diff --git a/src/styles/service-table.scss b/src/styles/service-table.scss
index 66d5ac941..f2090685b 100644
--- a/src/styles/service-table.scss
+++ b/src/styles/service-table.scss
@@ -1,62 +1,63 @@
 @import './config.scss';
 
+.theme__dark .service-table {
+  .service-table__icon.has-custom-icon { border: 1px solid $dark-theme-gray-dark; }
+  .service-table__column-info .mdi { color: $dark-theme-gray-lightest; }
+
+  .service-table__row {
+    border-bottom: 1px solid $dark-theme-gray-darker;
+
+    &:hover { background: $dark-theme-gray-darker; }
+    &.service-table__row--disabled { color: $dark-theme-gray; }
+  }
+}
+
 .service-table {
   width: 100%;
 
   .service-table__toggle {
     width: 60px;
 
-    .franz-form__field {
-      margin-bottom: 0;
-    }
+    .franz-form__field { margin-bottom: 0; }
   }
 
   .service-table__icon {
     width: 35px;
 
     &.has-custom-icon {
-      border-radius: $theme-border-radius;
       border: 1px solid $theme-gray-lighter;
+      border-radius: $theme-border-radius;
       width: 37px;
     }
   }
 
-  .service-table__column-icon {
-    width: 40px;
-  }
-
-  .service-table__column-action {
-    width: 40px
-  }
+  .service-table__column-icon,
+  .service-table__column-action { width: 40px }
 
   .service-table__column-info {
     width: 40px;
 
     .mdi {
+      color: $theme-gray-light;
       display: block;
       font-size: 18px;
-      color: $theme-gray-light;
     }
   }
 
   .service-table__row {
     border-bottom: 1px solid $theme-gray-lightest;
 
-    &:hover {
-      background: $theme-gray-lightest;
-    }
+    &:hover { background: $theme-gray-lightest; }
 
     &.service-table__row--disabled {
       color: $theme-gray-light;
 
       .service-table__column-icon {
         filter: grayscale(100%);
-        opacity: 0.5;
+        opacity: .5;
       }
     }
   }
 
-  td {
-    padding: 10px;
-  }
+  td { padding: 10px; }
 }
diff --git a/src/styles/services.scss b/src/styles/services.scss
index 9f6cfc772..0e559501c 100644
--- a/src/styles/services.scss
+++ b/src/styles/services.scss
@@ -1,30 +1,46 @@
 @import './config.scss';
 
+.theme__dark .services {
+  background: $dark-theme-gray-darkest;
+
+  .services__webview-wrapper { background: $dark-theme-gray-darkest; }
+
+  .services__webview,
+  .services__info-layer {
+    webview { background: $dark-theme-gray-darkest; }
+  }
+
+  .services__no-service,
+  .services__info-layer {
+    background: $dark-theme-gray-darkest;
+
+    h1 { color: $dark-theme-gray-lightest; }
+  }
+}
+
 .services {
+  background: #FFF;
   flex: 1;
   height: 100%;
-  position: relative;
-  overflow: hidden;
-  background: #FFF;
   order: 5;
+  overflow: hidden;
+  position: relative;
 
-  .services__webview-wrapper {
-    background: $theme-gray-lighter;
-  }
+  .services__webview-wrapper { background: $theme-gray-lighter; }
 
-  .services__webview, 
+  .services__webview,
   .services__info-layer {
+    left: 0;
     position: absolute;
-    width: 100%;
     top: 0;
-    left: 0;
+    width: 100%;
     z-index: 0;
 
     webview {
-      display: inline-flex;
-      width: 0px;
-      height: 0px;
       background: $theme-gray-lighter;
+      display: inline-flex;
+      height: 0;
+      width: 0;
     }
 
     &.is-active {
@@ -32,36 +48,30 @@
 
       webview {
         flex: 0 1;
-        width: 100%;
         height: 100%;
+        width: 100%;
       }
     }
 
-    &--force-repaint {
-      webview {
-        z-index: 5;
-      }
-    }
+    &--force-repaint webview { z-index: 5; }
   }
 
-  .services__no-service, 
+  .services__no-service,
   .services__info-layer {
+    align-items: center;
+    background: $theme-gray-lighter;
     display: flex;
     flex-direction: column;
     justify-content: center;
-    align-items: center;
     text-align: center;
-    background: $theme-gray-lighter;
 
     h1 {
-      margin: 25px 0 40px;
       color: $theme-gray-dark;
+      margin: 25px 0 40px;
     }
 
     a.button,
-    button {
-      margin: 40px 0 20px;
-    }
+    button { margin: 40px 0 20px; }
   }
 
   .services__info-layer {
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index 2182c9b5f..f94ca114d 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -1,130 +1,215 @@
 @import './config.scss';
 
 %headline {
+  color: $theme-gray-light;
   font-size: 20px;
   font-weight: 400;
   letter-spacing: -1px;
-  color: $theme-gray-light;
 
-  a {
-    color: $theme-gray-light;
+  a { color: $theme-gray-light; }
+}
+
+%headline__dark {
+  color: $dark-theme-gray-lightest;
+
+  a { color: $dark-theme-gray-lightest; }
+}
+
+.theme__dark {
+  .settings-wrapper { background: rgba($dark-theme-black, .8); }
+
+  .settings {
+    background: $dark-theme-gray-darkest;
+    box-shadow: 0 20px 50px rgba($dark-theme-black, .5);
+
+    .settings__header {
+      background: $dark-theme-gray-darker;
+
+      h1,
+      .settings__header-item { @extend %headline__dark; }
+
+      .separator { border-right: 1px solid $dark-theme-gray-dark; }
+      .mdi { color: $dark-theme-gray-lightest; }
+    }
+
+    .settings__body::-webkit-scrollbar-thumb { background: $dark-theme-gray; }
+
+    .settings__close {
+      background: $dark-theme-gray-darker;
+      border-left: none;
+      color: $dark-theme-gray-lightest;
+
+      &:hover { background: darken($dark-theme-gray-darker, 5%); }
+    }
+
+    &__settings-group h3 { color: $dark-theme-gray-lightest; }
+
+    .settings__message {
+      border-top: 1px solid $theme-gray-lighter;
+      color: $dark-theme-gray-lightest;
+
+      .mdi { color: $dark-theme-gray-lightest; }
+    }
+
+    .settings__help { color: $dark-theme-gray-lightest; }
+
+    .settings__controls {
+      background: $dark-theme-gray-darker;
+
+      .franz-form__button.franz-form__button--secondary { background: $theme-gray-light; }
+    }
+
+    .account {
+      .account__box { background: $dark-theme-gray-darker; }
+
+      .invoices {
+        td { border-bottom: 1px solid $dark-theme-gray-darker; }
+        .invoices__action button { color: $theme-brand-primary; }
+      }
+    }
+
+    .premium-info { 
+      background: $dark-theme-gray-darker;
+      border: 2px solid $theme-brand-primary;
+    }
+    .legal { color: $theme-gray-light; }
+  }
+
+  .settings-navigation {
+    background: $dark-theme-gray-darker;
+    border-right: 1px solid $dark-theme-gray-dark;
+
+    .settings-navigation__link {
+      color: $dark-theme-gray-lightest;
+
+      .badge {
+        background: $dark-theme-gray-lighter;
+        color: $dark-theme-gray-smoke;
+      }
+
+      &:hover {
+        background: darken($dark-theme-gray-darker, 5%);
+
+        .badge {
+          background: $dark-theme-gray-lighter;
+          color: $dark-theme-gray-smoke;
+        }
+      }
+
+      &.is-active {
+        background: $dark-theme-gray;
+        color: $dark-theme-gray-smoke;
+
+        .badge {
+          background: $dark-theme-gray-lighter;
+          color: $dark-theme-gray-smoke;
+        }
+      }
+    }
+
+    .settings-navigation__action-badge { background: $theme-brand-danger; }
   }
 }
 
 .settings-wrapper {
-  background: rgba(black, 0.5);
-  position: absolute;
-  width: 100%;
+  align-items: center;
+  background: rgba(black, .5);
+  display: flex;
   height: 100%;
-  top: 0;
   left: 0;
-  z-index: 9998;
-  display: flex;
   justify-content: center;
-  align-items: center;
   padding: 25px;
+  position: absolute;
+  top: 0;
+  width: 100%;
+  z-index: 9998;
 
   .settings-wrapper__action {
-    position: absolute;
-    width: 100%;
     height: 100%;
-    top: 0;
     left: 0;
+    position: absolute;
+    top: 0;
+    width: 100%;
   }
 }
 
 .settings {
-  position: relative;
+  background: #FFF;
+  border-radius: $theme-border-radius;
+  box-shadow: 0 20px 50px rgba(black, .5);
   display: flex;
   height: 100%;
-  width: 100%;
+  max-height: 720px;
   max-width: 900px;
   min-height: 400px;
-  max-height: 720px;
-  z-index: 9999;
-  background: #FFF;
-  border-radius: $theme-border-radius;
-  box-shadow: 0 20px 50px rgba(black, 0.5);
   overflow: hidden;
-  // margin-top: -10%;
+  position: relative;
+  width: 100%;
+  z-index: 9999;
 
   .settings__main {
-    flex: 1;
     display: flex;
+    flex: 1;
     flex-direction: column;
     height: auto;
   }
 
   .settings__header {
-    display: flex;
     align-items: center;
-    width: calc(100% - 60px);
+    background: $theme-gray-lighter;
+    display: flex;
     height: 50px;
     padding: 0 40px;
-    background: $theme-gray-lighter;
+    width: calc(100% - 60px);
 
     h1 {
       @extend %headline;
       margin: 0;
     }
 
-    .settings__header-item {
-      @extend %headline;
-    }
+    .settings__header-item { @extend %headline; }
 
     .separator {
+      border-right: 1px solid darken($theme-gray-lighter, 10%);
       height: 100%;
       margin: 0 15px;
-      border-right: 1px solid darken($theme-gray-lighter, 10%);
       transform: skew(15deg) rotate(2deg);
     }
 
-    .mdi {
-      color: $theme-gray-light;
-    }
+    .mdi { color: $theme-gray-light; }
   }
 
   .settings__body {
     flex: 1;
-    padding: 25px 15px 15px 25px;
     margin: 15px;
     overflow-y: scroll;
+    padding: 25px 15px 15px 25px;
 
-    &::-webkit-scrollbar {
-      width: 8px;
-    }
+    &::-webkit-scrollbar { width: 8px; }
 
     /* Track */
     &::-webkit-scrollbar-track {
-      -webkit-border-radius: 10px;
-      border-radius: 10px;
       background: none;
+      border-radius: 10px;
+      -webkit-border-radius: 10px;
     }
 
     /* Handle */
     &::-webkit-scrollbar-thumb {
-      -webkit-border-radius: 10px;
-      border-radius: 10px;
       background: $theme-gray-lighter;
+      border-radius: 10px;
+      -webkit-border-radius: 10px;
     }
 
-    &::-webkit-scrollbar-thumb:window-inactive {
-        background: none;
-    }
-    
-    .service-flex-grid {
-      display: flex;
-    }
-
-    .service-name {
-      flex: 1px;
-    }
+    &::-webkit-scrollbar-thumb:window-inactive { background: none; }
+    .service-flex-grid { display: flex; }
+    .service-name { flex: 1px; }
 
     .service-icon {
-      width: 140px;
       float: right;
-      margin-top: 30px;
       margin-left: 40px;
+      margin-top: 30px;
+      width: 140px;
 
       label {
         font-weight: bold;
@@ -134,51 +219,50 @@
   }
 
   .settings__close {
-    position: absolute;
-    right: 0;
     background: $theme-gray-lighter;
-    height: 50px;
-    padding: 0 20px;
-    font-size: 20px;
     border-left: 1px solid darken($theme-gray-lighter, 5%);
     color: $theme-gray-light;
+    font-size: 20px;
+    height: 50px;
+    padding: 0 20px;
+    position: absolute;
+    right: 0;
     transition: background $theme-transition-time;
 
-    &:hover {
-      background: darken($theme-gray-lighter, 5%);
-    }
+    &:hover { background: darken($theme-gray-lighter, 5%); }
   }
 
-  .search-input {
-    margin-bottom: 30px;
-  }
+  .search-input { margin-bottom: 30px; }
 
   &__options {
-    margin-top: 20px;
     flex: 1;
+    margin-top: 20px;
   }
 
   &__settings-group {
     margin-top: 10px;
 
     h3 {
+      color: $theme-gray-light;
       font-weight: bold;
+      letter-spacing: -.1px;
       margin: 25px 0 15px;
-      color: $theme-gray-light;
-      letter-spacing: -0.1px;
 
-      &:first-of-type {
-        margin-top: 0;
+      &:first-of-type { margin-top: 0; }
+
+      .badge {
+        font-weight: normal;
+        margin-left: 10px;
       }
     }
   }
 
   .settings__message {
+    border-top: 1px solid $theme-gray-lighter;
+    color: $theme-gray-light;
     display: flex;
     margin-top: 40px;
     padding-top: 15px;
-    border-top: 1px solid $theme-gray-lighter;
-    color: $theme-gray-light;
 
     .mdi {
       color: $theme-gray-light;
@@ -188,69 +272,53 @@
   }
 
   .settings__help {
-    margin: -10px 0 20px 55px;;
-    font-size: 12px;
     color: $theme-gray-light;
+    font-size: 12px;
+    margin: -10px 0 20px 55px;;
   }
 
   .settings__controls {
+    background: $theme-gray-lighter;
     display: flex;
+    height: auto;
     justify-content: space-between;
     padding: 10px 20px;
-    height: auto;
-    background: $theme-gray-lighter;
 
     .franz-form__button {
-      &[type='submit'] {
-        margin-left: auto;
-      }
-
-      &.franz-form__button--secondary {
-        background: $theme-gray-light;
-      }
+      &[type='submit'] { margin-left: auto; }
+      &.franz-form__button--secondary { background: $theme-gray-light; }
     }
   }
 
-  .settings__delete-button {
-    right: 0;
-  }
+  .settings__delete-button { right: 0; }
 
   .settings__empty-state {
-    width: 100%;
+    align-items: center;
+    align-self: center;
     height: auto;
     min-height: 70%;
     text-align: center;
-    align-self: center;
-    // margin-top: -20px;
-    align-items: center;
+    width: 100%;
 
-    a.button {
-      margin-top: 40px;
-    }
+    a.button { margin-top: 40px; }
   }
 
   .account {
     height: auto;
-    // padding: 20px;
 
     .account__box {
+      align-items: center;
       background: $theme-gray-lightest;
       border-radius: $theme-border-radius;
-      padding: 20px;
       margin-bottom: 40px;
-      align-items: center;
-
-      &.account__box--flex {
-        display: flex;
-      }
+      padding: 20px;
 
-      &.account__box--last {
-        margin-bottom: 0;
-      }
+      &.account__box--flex { display: flex; }
+      &.account__box--last { margin-bottom: 0; }
 
       .auth__button {
-        width: 100%;
         margin-top: 10px;
+        width: 100%;
       }
     }
 
@@ -258,57 +326,40 @@
       margin-right: 20px;
       position: relative;
 
-      .emoji img {
-        width: 30px;
-      }
+      .emoji img { width: 30px; }
     }
 
     .account__avatar-premium {
+      font-size: 26px;
       position: absolute;
-      top: 2px;
       right: 2px;
-      font-size: 26px;
+      top: 2px;
     }
 
     .account__info {
       flex: 1;
 
-      h2 {
-        margin-bottom: 5px;
-      }
-
-      .badge {
-        margin-top: 5px;
-      }
+      h2 { margin-bottom: 5px; }
+      .badge { margin-top: 5px; }
     }
 
     .account__subscription {
-      display: flex;
       align-items: center;
+      display: flex;
 
-      .badge {
-        margin-left: 10px;
-      }
-    }
-
-    .account__subscription-button {
-      margin-left: auto;
-    }
-
-    .franz-form__button {
-      white-space: nowrap;
+      .badge { margin-left: 10px; }
     }
 
-    div {
-      height: auto;
-    }
+    .account__subscription-button { margin-left: auto; }
+    .franz-form__button { white-space: nowrap; }
+    div { height: auto; }
 
     .invoices {
       width: 100%;
 
       td {
-        padding: 15px 0;
         border-bottom: 1px solid $theme-gray-lighter;
+        padding: 15px 0;
       }
 
       tr:last-of-type td {
@@ -319,9 +370,7 @@
       .invoices__action {
         text-align: right;
 
-        button {
-          color: $theme-brand-primary;
-        }
+        button { color: $theme-brand-primary; }
       }
     }
   }
@@ -331,15 +380,13 @@
     font-size: 40px;
     margin-bottom: 20px;
 
-    img {
-      width: 40px;
-    }
+    img { width: 40px; }
   }
 
   .premium-info {
     background: lighten($theme-brand-primary, 40%);
-    padding: 20px;
     border-radius: $theme-border-radius;
+    padding: 20px;
   }
 
   .content-tabs .premium-info {
@@ -348,35 +395,33 @@
   }
 
   .legal {
-    text-align: center;
-    margin-top: 20px;
     color: $theme-gray-light;
+    margin-top: 20px;
+    text-align: center;
   }
 }
 
 .settings-navigation {
-  width: 200px;
-  height: auto;
-  background: $theme-gray-lightest;
   display: flex;
+  background: $theme-gray-lightest;
   flex-direction: column;
+  height: auto;
+  width: 200px;
 
   .settings-navigation__link {
-    display: flex;
     align-items: center;
-    height: 50px;
-    flex-shrink: 0;
-    text-decoration: none;
     color: $theme-text-color;
+    display: flex;
+    flex-shrink: 0;
+    height: 50px;
     padding: 0 20px;
+    text-decoration: none;
     transition: background $theme-transition-time, color $theme-transition-time;
 
     &:hover {
       background: darken($theme-gray-lightest, 5%);
 
-      .badge {
-        background: #FFF;
-      }
+      .badge { background: #FFF; }
     }
 
     &.is-active {
@@ -390,22 +435,20 @@
     }
   }
 
-  .settings-navigation__expander {
-    flex: 1;
-  }
+  .settings-navigation__expander { flex: 1; }
 
   .badge {
-    transition: background $theme-transition-time, color $theme-transition-time;
     display: initial;
     margin-left: 5px;
+    transition: background $theme-transition-time, color $theme-transition-time;
   }
 
   .settings-navigation__action-badge {
-    display: inline-block;
-    width: 7px;
-    height: 7px;
     background: $theme-brand-danger;
     border-radius: 100%;
+    display: inline-block;
+    height: 7px;
     margin-left: 5px;
+    width: 7px;
   }
 }
diff --git a/src/styles/status-bar-target-url.scss b/src/styles/status-bar-target-url.scss
index bc7438be9..36f69df28 100644
--- a/src/styles/status-bar-target-url.scss
+++ b/src/styles/status-bar-target-url.scss
@@ -1,14 +1,14 @@
 @import './config.scss';
 
 .status-bar-target-url {
-  height: auto;
   background: $theme-gray-lighter;
-  padding: 4px;
-  position: absolute;
-  box-shadow: 0 0 8px rgba(black, 0.2);
-  font-size: 12px;
-  color: $theme-gray-dark;
+  border-top-left-radius: 5px;
   bottom: 0;
+  box-shadow: 0 0 8px rgba(black, .2);
+  color: $theme-gray-dark;
+  font-size: 12px;
+  height: auto;
   right: 0;
-  border-top-left-radius: 5px;
+  padding: 4px;
+  position: absolute;
 }
diff --git a/src/styles/subscription-popup.scss b/src/styles/subscription-popup.scss
index b6f232fcb..fb4795d6c 100644
--- a/src/styles/subscription-popup.scss
+++ b/src/styles/subscription-popup.scss
@@ -1,20 +1,15 @@
 .subscription-popup {
   height: 100%;
 
-  &__content {
-    height: calc(100% - 60px);
-  }
-
-  &__webview {
-    height: 100%;
-  }
+  &__content { height: calc(100% - 60px); }
+  &__webview { height: 100%; }
 
   &__toolbar {
-    height: 60px;
     background: $theme-gray-lightest;
+    border-top: 1px solid $theme-gray-lighter;
     display: flex;
+    height: 60px;
     justify-content: space-between;
     padding: 10px;
-    border-top: 1px solid $theme-gray-lighter;
   }
 }
diff --git a/src/styles/subscription.scss b/src/styles/subscription.scss
index 8bfb68d23..70fb41cde 100644
--- a/src/styles/subscription.scss
+++ b/src/styles/subscription.scss
@@ -3,63 +3,47 @@
     margin: 10px 0;
 
     li {
-      height: 30px;
       align-items: center;
       display: flex;
+      height: 30px;
 
       &:before {
         content: "�";
         margin-right: 10px;
       }
 
-      .badge {
-        margin-left: 10px;
-      }
+      .badge { margin-left: 10px; }
     }
   }
 
-  .subscription__premium-info {
-    margin: 15px 0 25px;
-  }
+  .subscription__premium-info { margin: 15px 0 25px; }
 }
 
-.paymentTiers {
-  .franz-form__radio-wrapper {
-    flex-flow: wrap;
+.paymentTiers .franz-form__radio-wrapper {
+  flex-flow: wrap;
 
-    .franz-form__radio {
-      width: 32%;
-      flex: initial;
-      margin-right: 2%;
+  .franz-form__radio {
+    flex: initial;
+    margin-right: 2%;
+    width: 32%;
 
-      &:nth-child(3) {
-        margin-right: 0;
-      }
+    &:nth-child(3) { margin-right: 0; }
 
-      &:nth-child(4) {
-        margin-right: 0;
-        margin-top: 2%;
-        width: 100%;
-      }
+    &:nth-child(4) {
+      margin-right: 0;
+      margin-top: 2%;
+      width: 100%;
     }
   }
 }
 
-.settings {
-  .paymentTiers {
-    .franz-form__radio-wrapper {
-      .franz-form__radio {
-        width: 49%;
+.settings .paymentTiers .franz-form__radio-wrapper .franz-form__radio {
+  width: 49%;
 
-        &:nth-child(2) {
-          margin-right: 0;
-        }
+  &:nth-child(2) { margin-right: 0; }
 
-        &:nth-child(3) {
-          margin-top: 2%;
-          width: 100%;
-        }
-      }
-    }
+  &:nth-child(3) {
+    margin-top: 2%;
+    width: 100%;
   }
 }
diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss
index ac48aabd6..cbd833f04 100644
--- a/src/styles/tabs.scss
+++ b/src/styles/tabs.scss
@@ -1,104 +1,88 @@
 @import './config.scss';
 
+.theme__dark .tab-item {
+  &.is-active {
+    background: $dark-theme-gray;
+
+    .tab-item__icon { margin-left: -4px; }
+  }
+
+  &.is-disabled .tab-item__icon { filter: grayscale(100%) opacity(.2); }
+  .tab-item__icon { width: 34px; }
+}
+
 .tabs {
   display: flex;
-  // flex: 1;
   flex-direction: column;
   flex-shrink: 1;
-  // align-items: center;
-  // height: auto;
 
   .placeholder {
-    width: 100%;
     height: 40px;
+    width: 100%;
   }
 }
 
 .tab-item {
-  display: flex;
-  justify-content: center;
   align-items: center;
-  position: relative;
-  width: $theme-sidebar-width;
+  display: flex;
   height: 65px;
+  justify-content: center;
   min-height: 50px;
+  position: relative;
   transition: background $theme-transition-time;
+  width: $theme-sidebar-width;
 
   &.is-active {
-    border-left: 4px solid $theme-brand-primary;
     background: lighten($theme-brand-primary, 35%);
+    border-left: 4px solid $theme-brand-primary;
 
-    .tab-item__icon {
-      margin-left: -4px;
-    }
-  }
-
-  &.is-disabled {
-    .tab-item__icon {
-      filter: grayscale(100%) opacity(0.2);
-    }
-  }
-
-  &.has-custom-icon {
-    .tab-item__icon {
-      border-radius: $theme-border-radius;
-      // border: 1px solid $theme-gray-lighter;
-      // width: 32px;
-    }
+    .tab-item__icon { margin-left: -4px; }
   }
 
-  &:active {
-    .tab-item__icon {
-      opacity: 0.7;
-    }
-  }
+  &.is-disabled .tab-item__icon { filter: grayscale(100%) opacity(0.2); }
+  &.has-custom-icon .tab-item__icon { border-radius: $theme-border-radius; }
+  &:active .tab-item__icon { opacity: .7; }
 
   .tab-item__icon {
-    width: 30px;
     height: auto;
+    width: 30px;
   }
 
   .tab-item__message-count {
-    min-width: 17px;
-    min-height: 17px;
+    align-items: center;
     background: $theme-brand-danger;
-    color: #FFF;
     border-radius: 20px;
-    padding: 0px 5px;
-    font-size: 11px;
-    position: absolute;
-    right: 8px;
     bottom: 8px;
+    color: #FFF;
     display: flex;
+    font-size: 11px;
     justify-content: center;
-    align-items: center;
+    min-height: 17px;
+    min-width: 17px;
+    padding: 0px 5px;
+    position: absolute;
+    right: 8px;
 
-    &.is-indirect {
-      padding-top: 0px;
-    }
+    &.is-indirect { padding-top: 0; }
   }
 
   .tab-item__info-badge {
-    width: 17px;
-    height: 17px;
+    align-items: center;
     background: $theme-gray-light;
-    color: $theme-gray-lighter;
+    bottom: 8px;
     border-radius: 20px;
-    padding: 0px 5px;
+    color: $theme-gray-lighter;
+    display: flex;
     font-size: 11px;
+    height: 17px;
+    justify-content: center;
+    padding: 0px 5px;
     position: absolute;
     right: 8px;
-    bottom: 8px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
+    width: 17px;
 
-    &.is-indirect {
-      padding-top: 0px;
-    }
+    &.is-indirect { padding-top: 0; }
   }
 
-  &.is-reordering {
-    z-index: 99999;
-  }
+  &.is-reordering { z-index: 99999; }
 }
diff --git a/src/styles/title-bar.scss b/src/styles/title-bar.scss
index 5316f35b3..885eb94c4 100644
--- a/src/styles/title-bar.scss
+++ b/src/styles/title-bar.scss
@@ -1,49 +1,80 @@
-#electron-app-title-bar {
-  background: $theme-gray-lightest;
-  border-bottom: 0;
-  box-shadow: 0px 0 8px rgba(#000, 0.1);
-
-  span {
-    line-height: normal;
-  }
+@import './config.scss';
 
-  div {
-    height: auto;
-  }
+.theme__dark #electron-app-title-bar {
+  background: $dark-theme-gray-darker;
 
   .toolbar-dropdown {
-    &.open {
-      box-shadow: 0px 0 8px rgba(#000, 0.1);
+    &.open > .toolbar-button > button { 
+      background: $dark-theme-gray-light;
+      color: $dark-theme-gray-lightest;
     }
 
     &:not(.open) {
-      .menu-item .menu-label {
-        opacity: 1;
+      .menu-item .menu-label { opacity: 1; }
+      > .toolbar-button > button:hover { 
+        background: $dark-theme-gray-darkest; 
       }
+    }
+  }
 
-      &>.toolbar-button > button:hover {
-        background: $theme-brand-primary;
+  #app-menu-bar #foldout-container .foldout {
+    color: $dark-theme-gray-lightest;
+
+    .menu-pane {
+      background: $dark-theme-gray-light;
+  
+      .menu-item {
+        .accelerator {
+          color: lighten($dark-theme-gray-light, 20%);
+        }
+      }
+  
+      hr {
+        border-color: $dark-theme-gray-lighter;
       }
     }
   }
 
+  .list .ReactVirtualized__Grid {
+    background: $dark-theme-gray-light;
+  }
+}
+
+#electron-app-title-bar {
+  background: $theme-gray-lightest;
+  border-bottom: 0;
+  box-shadow: 0 0 8px rgba(black, .1);
+
+  span { line-height: normal; }
+
+  div { height: auto; }
+
+  .toolbar-dropdown {
+    &.open { box-shadow: 0 0 8px rgba(black, 0.1); }
+
+    &:not(.open) {
+      .menu-item .menu-label { opacity: 1; }
+      > .toolbar-button > button:hover { background: $theme-brand-primary; }
+    }
+  }
+
   .list-item {
     .menu-item {
-      margin: 4px;
       border-radius: $theme-border-radius-small;
+      margin: 4px;
     }
-    &.selected, &.selected:focus {
+
+    &.selected,
+    &.selected:focus {
       background: none;
 
-      .menu-item {
-        background: $theme-brand-primary;
-      }
+      .menu-item { background: $theme-brand-primary; }
     }
   }
 
   .menu-pane {
-    box-shadow: 0px 0 10px rgba(#000, 0.5);
     border-bottom-left-radius: $theme-border-radius-small;
     border-bottom-right-radius: $theme-border-radius-small;
+    box-shadow: 0 0 10px rgba(black, .5);
   }
 }
diff --git a/src/styles/toggle.scss b/src/styles/toggle.scss
index 5b47e6495..0ce0c3379 100644
--- a/src/styles/toggle.scss
+++ b/src/styles/toggle.scss
@@ -4,44 +4,46 @@ $toggle-size: 14px;
 $toggle-width: 40px;
 $toggle-button-size: 22px;
 
-.franz-form {
-  .franz-form__toggle-wrapper {
-    display: flex;
-    flex-direction: row;
+.theme__dark .franz-form .franz-form__toggle-wrapper .franz-form__toggle {
+  background: $dark-theme-gray;
+  border-radius: $toggle-size / 2;
 
-    .franz-form__label {
-      margin-left: 20px;
+  .franz-form__toggle-button {
+    background: $dark-theme-gray-lighter;
+    box-shadow: 0 1px 4px rgba($dark-theme-black, .3);
+  }
+}
+
+.franz-form .franz-form__toggle-wrapper {
+  display: flex;
+  flex-direction: row;
+
+  .franz-form__label { margin-left: 20px; }
+
+  .franz-form__toggle {
+    background: $theme-gray-lighter;
+    border-radius: $theme-border-radius;
+    height: $toggle-size;
+    position: relative;
+    width: $toggle-width;
+
+    .franz-form__toggle-button {
+      background: $theme-gray-light;
+      border-radius: 100%;
+      box-shadow: 0 1px 4px rgba(0, 0, 0, .3);
+      height: $toggle-size - 2;
+      left: 1px;
+      top: 1px;
+      position: absolute;
+      transition: all .5s;
+      width: $toggle-size - 2;
     }
 
-    .franz-form__toggle {
-      width: $toggle-width;
-      height: $toggle-size;
-      position: relative;
-      background: $theme-gray-lighter;
-      border-radius: $theme-border-radius;
-
-      .franz-form__toggle-button {
-        position: absolute;
-        left: 0;
-        top: -($toggle-button-size - $toggle-size) / 2;
-        width: $toggle-button-size;
-        height: $toggle-button-size;
-        background: $theme-gray-light;
-        border-radius: 100%;
-        transition: all 0.5s;
-        box-shadow: 0 1px 4px rgba(0,0,0,0.3);
-      }
-
-      &.is-active {
-        .franz-form__toggle-button {
-          left: $toggle-width - $toggle-button-size;
-          background: $theme-brand-primary;
-        }
-      }
-
-      input {
-        display: none;
-      }
+    &.is-active .franz-form__toggle-button {
+      background: $theme-brand-primary;
+      left: $toggle-width - $toggle-size - 3;;
     }
+
+    input { display: none; }
   }
 }
diff --git a/src/styles/tooltip.scss b/src/styles/tooltip.scss
index 1194e7fbb..5700e994c 100644
--- a/src/styles/tooltip.scss
+++ b/src/styles/tooltip.scss
@@ -1,4 +1,4 @@
 .__react_component_tooltip {
-  padding: 10px !important;
   height: auto;
+  padding: 10px !important;
 }
diff --git a/src/styles/type-helper.scss b/src/styles/type-helper.scss
new file mode 100644
index 000000000..b1da394b5
--- /dev/null
+++ b/src/styles/type-helper.scss
@@ -0,0 +1,100 @@
+@function str-split($string, $separator) {
+    // empty array/list
+    $split-arr: ();
+    // first index of separator in string
+    $index : str-index($string, $separator);
+    // loop through string
+    @while $index != null {
+        // get the substring from the first character to the separator
+        $item: str-slice($string, 1, $index - 1);
+        // push item to array
+        $split-arr: append($split-arr, $item);
+        // remove item and separator from string
+        $string: str-slice($string, $index + 1);
+        // find new index of separator
+        $index : str-index($string, $separator);
+    }
+    // add the remaining string to list (the last item)
+    $split-arr: append($split-arr, $string);
+
+    @return $split-arr;
+}
+
+// ----
+// Sass (v3.4.13)
+// Compass (v1.0.3)
+// ----
+
+/// String to number converter
+/// @author Hugo Giraudel
+/// @access private
+
+
+/// Casts a string into a number
+///
+/// @param {String | Number} $value - Value to be parsed
+///
+/// @return {Number}
+
+@function to-number($value) {
+  @if type-of($value) == 'number' {
+    @return $value;
+  } @else if type-of($value) != 'string' {
+    $_: log('Value for `to-number` should be a number or a string.');
+  }
+  
+  $result: 0;
+  $digits: 0;
+  $minus: str-slice($value, 1, 1) == '-';
+  $numbers: ('0': 0, '1': 1, '2': 2, '3': 3, '4': 4, '5': 5, '6': 6, '7': 7, '8': 8, '9': 9);
+  
+  @for $i from if($minus, 2, 1) through str-length($value) {
+    $character: str-slice($value, $i, $i);
+    
+    @if not (index(map-keys($numbers), $character) or $character == '.') {
+      @return to-length(if($minus, -$result, $result), str-slice($value, $i))
+    }
+    
+    @if $character == '.' {
+      $digits: 1; 
+    } @else if $digits == 0 {
+      $result: $result * 10 + map-get($numbers, $character);  
+    } @else {
+      $digits: $digits * 10;
+      $result: $result + map-get($numbers, $character) / $digits;
+    }
+  }
+  
+  @return if($minus, -$result, $result);;
+}
+
+
+/// Add `$unit` to `$value`
+///
+/// @param {Number} $value - Value to add unit to
+/// @param {String} $unit - String representation of the unit
+///
+/// @return {Number} - `$value` expressed in `$unit`
+@function to-length($value, $unit) {
+  $units: ('px': 1px, 'cm': 1cm, 'mm': 1mm, '%': 1%, 'ch': 1ch, 'pc': 1pc, 'in': 1in, 'em': 1em, 'rem': 1rem, 'pt': 1pt, 'ex': 1ex, 'vw': 1vw, 'vh': 1vh, 'vmin': 1vmin, 'vmax': 1vmax);
+  
+  @if not index(map-keys($units), $unit) {
+    $_: log('Invalid unit `#{$unit}`.');
+  }
+  
+  @return $value * map-get($units, $unit);
+}
+
+
+
+/// converts injectes rgb strings to sass colors 
+@function convert-rgb-string-to-color($string) {
+  $values: str-split($string, ',');
+  $colorList: ();
+  @each $value in $values {
+    $colorList: append($colorList, to-number($value));
+  }
+
+  $rgbaColor: rgb(nth($colorList, 1), nth($colorList, 2), nth($colorList, 3));
+  @return $rgbaColor;
+}
\ No newline at end of file
diff --git a/src/styles/type.scss b/src/styles/type.scss
index cacbec482..135d32da0 100644
--- a/src/styles/type.scss
+++ b/src/styles/type.scss
@@ -1,6 +1,12 @@
 @import './config.scss';
 @import './mixins.scss';
 
+.theme__dark {
+  a { color: $dark-theme-gray-smoke; }
+  .label { color: $dark-theme-gray-lightest; }
+  .footnote { color: $dark-theme-gray-lightest; }
+}
+
 h1 {
   font-size: 30px;
   font-weight: 300;
@@ -15,38 +21,32 @@ h2 {
   margin-bottom: 25px;
   margin-top: 55px;
 
-  &:first-of-type {
-    margin-top: 0;
-  }
+  &:first-of-type { margin-top: 0; }
 }
 
 p {
   margin-bottom: 10px;
   line-height: 1.7rem;
 
-  &:last-of-type {
-    margin-bottom: 0;
-  }
+  &:last-of-type { margin-bottom: 0; }
 }
 
-strong {
-  font-weight: bold;
-}
+strong { font-weight: bold; }
 
 a {
-  text-decoration: none;
   color: $theme-text-color;
+  text-decoration: none;
 
   &.button {
-    position: relative;
     background: none;
-    display: inline-block;
-    padding: 10px 20px;
     border: 2px solid $theme-brand-primary;
-    color: $theme-brand-primary;
     border-radius: 3px;
-    transition: background 0.5s, color 0.5s;
+    color: $theme-brand-primary;
+    display: inline-block;
+    padding: 10px 20px;
+    position: relative;
     text-align: center;
+    transition: background .5s, color .5s;
 
     &:hover {
       background: darken($theme-brand-primary, 5%);
@@ -54,25 +54,19 @@ a {
     }
   }
 
-  &.link {
-    color: $theme-brand-primary;
-  }
+  &.link { color: $theme-brand-primary; }
 }
 
 .error-message, .error-message:last-of-type {
-  margin: 10px 0;
   color: $theme-brand-danger;
+  margin: 10px 0;
 }
 
-.center {
-  text-align: center;
-}
+.center { text-align: center; }
 
-.label {
-  @include formLabel();
-}
+.label { @include formLabel(); }
 
 .footnote {
-  font-size: 12px;
   color: $theme-gray-light;
-}
\ No newline at end of file
+  font-size: 12px;
+}
diff --git a/src/styles/util.scss b/src/styles/util.scss
index 3faad8db3..cc93f79ab 100644
--- a/src/styles/util.scss
+++ b/src/styles/util.scss
@@ -1,16 +1,16 @@
 .scroll-container {
-  height: 100%;
   flex: 1;
-  overflow-y: scroll;
+  height: 100%;
   overflow-x: hidden;
+  overflow-y: scroll;
 }
 
 .loader {
-  position: relative;
-  z-index: 9999;
   display: block;
-  width: 100%;
   height: 40px;
+  position: relative;
+  width: 100%;
+  z-index: 9999;
 }
 
 .align-middle {
diff --git a/src/styles/welcome.scss b/src/styles/welcome.scss
index a12069ba4..b3d6515b1 100644
--- a/src/styles/welcome.scss
+++ b/src/styles/welcome.scss
@@ -1,92 +1,84 @@
-.auth {
-  .welcome {
-
-    &__content {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      color: #FFF;
-    }
-
-    &__logo {
-      width: 100px;
-    }
+.auth .welcome {
+  &__content {
+    align-items: center;
+    color: #FFF;
+    display: flex;
+    justify-content: center;
+  }
 
-    &__text {
-      margin-left: 40px;
-      padding-left: 40px;
-      border-left: 1px solid #FFF;
+  &__logo { width: 100px; }
 
-      h1 {
-        font-size: 60px;
-        letter-spacing: -0.4rem;
-        margin-bottom: 5px;
-      }
+  &__text {
+    border-left: 1px solid #FFF;
+    margin-left: 40px;
+    padding-left: 40px;
 
-      h2 {
-        margin-left: 2px;
-        margin-bottom: 0;
-      }
+    h1 {
+      font-size: 60px;
+      letter-spacing: -.4rem;
+      margin-bottom: 5px;
     }
 
-    &__services {
-      width: 100%;
-      max-width: 800px;
-      height: 100%;
-      max-height: 600px;
-      margin-left: -450px;
+    h2 {
+      margin-bottom: 0;
+      margin-left: 2px;
     }
+  }
 
-    &__buttons {
-      display: block;
-      margin-top: 100px;
-      text-align: center;
+  &__services {
+    height: 100%;
+    margin-left: -450px;
+    max-height: 600px;
+    max-width: 800px;
+    width: 100%;
+  }
 
-      .button:first-of-type {
-        margin-right: 25px;
-      }
-    }
+  &__buttons {
+    display: block;
+    margin-top: 100px;
+    text-align: center;
 
-    .button {
-      border-color: #FFF;
-      color: #FFF;
+    .button:first-of-type { margin-right: 25px; }
+  }
 
-      &:hover {
-        background: #FFF;
-        color: $theme-brand-primary;
-      }
+  .button {
+    border-color: #FFF;
+    color: #FFF;
 
-      &__inverted {
-        background: #FFF;
-        color: $theme-brand-primary;
-      }
-      &__inverted:hover {
-        background: none;
-        color: #FFF;
-      }
+    &:hover {
+      background: #FFF;
+      color: $theme-brand-primary;
     }
 
-    &__featured-services {
-      text-align: center;
-      width: 480px;
-      margin: 80px auto 0 auto;
-      display: flex;
-      align-items: center;
-      flex-wrap: wrap;
+    &__inverted {
       background: #FFF;
-      border-radius: 6px;
-      padding: 20px 20px 5px;
+      color: $theme-brand-primary;
     }
 
-    &__featured-service {
-      width: 35px;
-      height: 35px;
-      margin: 0 10px 15px;
-      transition: 0.5s filter, 0.5s opacity;
-
-      img {
-        width: 35px;
-      }
+    &__inverted:hover {
+      background: none;
+      color: #FFF;
     }
   }
+
+  &__featured-services {
+    align-items: center;
+    background: #FFF;
+    border-radius: 6px;
+    display: flex;
+    flex-wrap: wrap;
+    margin: 80px auto 0 auto;
+    padding: 20px 20px 5px;
+    text-align: center;
+    width: 480px;
+  }
+
+  &__featured-service {
+    margin: 0 10px 15px;
+    height: 35px;
+    transition: .5s filter, .5s opacity;
+    width: 35px;
+
+    img { width: 35px; }
+  }
 }
diff --git a/src/theme/dark/index.js b/src/theme/dark/index.js
new file mode 100644
index 000000000..496a51119
--- /dev/null
+++ b/src/theme/dark/index.js
@@ -0,0 +1,6 @@
+import * as legacyStyles from '../default/legacy';
+
+export const colorBackground = legacyStyles.darkThemeGrayDarkest;
+export const colorBackgroundSubscriptionContainer = legacyStyles.themeBrandInfo;
+
+export const colorHeadline = legacyStyles.darkThemeTextColor;
diff --git a/src/theme/default/index.js b/src/theme/default/index.js
new file mode 100644
index 000000000..8766fb609
--- /dev/null
+++ b/src/theme/default/index.js
@@ -0,0 +1,21 @@
+import * as legacyStyles from './legacy';
+
+export const brandPrimary = '#3498db';
+export const brandSuccess = '#5cb85c';
+export const brandInfo = '#5bc0de';
+export const brandWarning = '#FF9F00';
+export const brandDanger = '#d9534f';
+
+export const borderRadius = legacyStyles.themeBorderRadius;
+export const borderRadiusSmall = legacyStyles.themeBorderRadiusSmall;
+
+export const colorBackground = legacyStyles.themeGrayLighter;
+export const colorHeadline = legacyStyles.themeGrayDark;
+
+// Subscription Container Component
+export const colorSubscriptionContainerBackground = 'none';
+export const colorSubscriptionContainerBorder = [1, 'solid', brandPrimary];
+export const colorSubscriptionContainerTitle = brandPrimary;
+export const colorSubscriptionContainerActionButtonBackground = brandPrimary;
+export const colorSubscriptionContainerActionButtonColor = '#FFF';
+
diff --git a/src/theme/default/legacy.js b/src/theme/default/legacy.js
new file mode 100644
index 000000000..b676dc1d9
--- /dev/null
+++ b/src/theme/default/legacy.js
@@ -0,0 +1,39 @@
+/* legacy config, injected into sass */
+export const themeBrandPrimary = '#3498db';
+export const themeBrandSuccess = '#5cb85c';
+export const themeBrandInfo = '#5bc0de';
+export const themeBrandWarning = '#FF9F00';
+export const themeBrandDanger = '#d9534f';
+
+export const themeGrayDark = '#373a3c';
+export const themeGray = '#55595c';
+export const themeGrayLight = '#818a91';
+export const themeGrayLighter = '#eceeef';
+export const themeGrayLightest = '#f7f7f9';
+
+export const themeBorderRadius = '6px';
+export const themeBorderRadiusSmall = '3px';
+
+export const themeSidebarWidth = '68px';
+
+export const themeTextColor = themeGrayDark;
+
+export const themeTransitionTime = '.5s';
+
+export const themeInsetShadow = 'inset 0 2px 5px rgba(0, 0, 0, .03)';
+
+
+export const darkThemeBlack = '#1A1A1A';
+
+export const darkThemeGrayDarkest = '#1E1E1E';
+export const darkThemeGrayDarker = '#2D2F31';
+export const darkThemeGrayDark = '#383A3B';
+
+export const darkThemeGray = '#47494B';
+
+export const darkThemeGrayLight = '#515355';
+export const darkThemeGrayLighter = '#8a8b8b';
+export const darkThemeGrayLightest = '#FFFFFF';
+
+export const darkThemeGraySmoke = '#CED0D1';
+export const darkThemeTextColor = '#FFFFFF';
diff --git a/src/webview/contextMenu.js b/src/webview/contextMenu.js
new file mode 100644
index 000000000..195306fda
--- /dev/null
+++ b/src/webview/contextMenu.js
@@ -0,0 +1,178 @@
+// This is heavily based on https://github.com/sindresorhus/electron-context-menu
+// � @sindresorhus
+
+import { clipboard, remote, ipcRenderer, shell } from 'electron';
+
+import { isDevMode } from '../environment';
+
+const debug = require('debug')('Franz:contextMenu');
+
+const { Menu } = remote;
+
+// const win = remote.getCurrentWindow();
+const webContents = remote.getCurrentWebContents();
+
+function delUnusedElements(menuTpl) {
+  let notDeletedPrevEl;
+  return menuTpl.filter(el => el.visible !== false).filter((el, i, array) => {
+    const toDelete = el.type === 'separator' && (!notDeletedPrevEl || i === array.length - 1 || array[i + 1].type === 'separator');
+    notDeletedPrevEl = toDelete ? notDeletedPrevEl : el;
+    return !toDelete;
+  });
+}
+
+const buildMenuTpl = (props, suggestions) => {
+  const { editFlags } = props;
+  const hasText = props.selectionText.trim().length > 0;
+  const can = type => editFlags[`can${type}`] && hasText;
+
+  console.log(props);
+
+  let menuTpl = [
+    {
+      type: 'separator',
+    }, {
+      id: 'cut',
+      role: can('Cut') ? 'cut' : '',
+      enabled: can('Cut'),
+      visible: !!props.selectionText.trim(),
+    }, {
+      id: 'copy',
+      label: 'Copy',
+      role: can('Copy') ? 'copy' : '',
+      enabled: can('Copy'),
+      visible: props.isEditable || hasText,
+    }, {
+      id: 'paste',
+      label: 'Paste',
+      role: editFlags.canPaste ? 'paste' : '',
+      enabled: editFlags.canPaste,
+      visible: props.isEditable,
+    }, {
+      type: 'separator',
+    },
+  ];
+
+  if (props.linkURL && props.mediaType === 'none') {
+    menuTpl = [{
+      type: 'separator',
+    }, {
+      id: 'openLink',
+      label: 'Open Link in Browser',
+      click() {
+        shell.openExternal(props.linkURL);
+      },
+    }, {
+      id: 'copyLink',
+      label: 'Copy Link',
+      click() {
+        clipboard.write({
+          bookmark: props.linkText,
+          text: props.linkURL,
+        });
+      },
+    }, {
+      type: 'separator',
+    }];
+  }
+
+  if (props.mediaType === 'image') {
+    menuTpl.push({
+      type: 'separator',
+    }, {
+      id: 'openImage',
+      label: 'Open Image in Browser',
+      click() {
+        shell.openExternal(props.srcURL);
+      },
+    }, {
+      id: 'copyImageAddress',
+      label: 'Copy Image Address',
+      click() {
+        clipboard.write({
+          bookmark: props.srcURL,
+          text: props.srcURL,
+        });
+      },
+    }, {
+      type: 'separator',
+    });
+  }
+
+  if (props.mediaType === 'image') {
+    menuTpl.push({
+      id: 'saveImageAs',
+      label: 'Save Image As…',
+      async click() {
+        if (props.srcURL.startsWith('blob:')) {
+          const url = new window.URL(props.srcURL.substr(5));
+          const fileName = url.pathname.substr(1);
+          const resp = await window.fetch(props.srcURL);
+          const blob = await resp.blob();
+          const reader = new window.FileReader();
+          reader.readAsDataURL(blob);
+          reader.onloadend = () => {
+            const base64data = reader.result;
+
+            ipcRenderer.send('download-file', {
+              content: base64data,
+              fileOptions: {
+                name: fileName,
+                mime: blob.type,
+              },
+            });
+          };
+          debug('binary string', blob);
+        } else {
+          ipcRenderer.send('download-file', { url: props.srcURL });
+        }
+      },
+    }, {
+      type: 'separator',
+    });
+  }
+
+  console.log('suggestions', suggestions.length, suggestions);
+  if (suggestions.length > 0) {
+    suggestions.reverse().map(suggestion => menuTpl.unshift({
+      id: `suggestion-${suggestion}`,
+      label: suggestion,
+      click() {
+        webContents.replaceMisspelling(suggestion);
+      },
+    }));
+  }
+
+  if (isDevMode) {
+    menuTpl.push({
+      type: 'separator',
+    }, {
+      id: 'inspect',
+      label: 'Inspect Element',
+      click() {
+        webContents.inspectElement(props.x, props.y);
+      },
+    }, {
+      type: 'separator',
+    });
+  }
+
+  return delUnusedElements(menuTpl);
+};
+
+export default function contextMenu(spellcheckProvider) {
+  webContents.on('context-menu', (e, props) => {
+    e.preventDefault();
+
+    let suggestions = [];
+    if (spellcheckProvider && props.misspelledWord) {
+      suggestions = spellcheckProvider.getSuggestion(props.misspelledWord);
+
+      debug('Suggestions', suggestions);
+    }
+
+    const menu = Menu.buildFromTemplate(buildMenuTpl(props, suggestions.slice(0, 5)));
+
+    menu.popup(remote.getCurrentWindow());
+  });
+}
diff --git a/src/webview/darkmode.js b/src/webview/darkmode.js
new file mode 100644
index 000000000..9830ef33c
--- /dev/null
+++ b/src/webview/darkmode.js
@@ -0,0 +1,28 @@
+import path from 'path';
+import fs from 'fs-extra';
+
+const ID = 'franz-theme-dark-mode';
+
+export function injectDarkModeStyle(recipePath) {
+  const darkModeStyle = path.join(recipePath, 'darkmode.css');
+  if (fs.pathExistsSync(darkModeStyle)) {
+    const data = fs.readFileSync(darkModeStyle);
+    const styles = document.createElement('style');
+    styles.id = ID;
+    styles.innerHTML = data.toString();
+
+    document.querySelector('head').appendChild(styles);
+  }
+}
+
+export function removeDarkModeStyle() {
+  const style = document.querySelector(`#${ID}`);
+
+  if (style) {
+    style.remove();
+  }
+}
+
+export function isDarkModeStyleInjected() {
+  return !!document.querySelector(`#${ID}`);
+}
diff --git a/src/webview/plugin.js b/src/webview/plugin.js
index c6530fef6..72530733d 100644
--- a/src/webview/plugin.js
+++ b/src/webview/plugin.js
@@ -1,14 +1,17 @@
 import { ipcRenderer } from 'electron';
-import { ContextMenuListener, ContextMenuBuilder } from 'electron-spellchecker';
 import path from 'path';
 
-import { isDevMode } from '../environment';
 import RecipeWebview from './lib/RecipeWebview';
 
-import Spellchecker from './spellchecker';
+import spellchecker, { switchDict, disable as disableSpellchecker } from './spellchecker';
+import { injectDarkModeStyle, isDarkModeStyleInjected, removeDarkModeStyle } from './darkmode';
+import contextMenu from './contextMenu';
 import './notifications';
 
-const debug = require('debug')('Plugin');
+const debug = require('debug')('Franz:Plugin');
+
+window.franzSettings = {};
+let serviceData;
 
 ipcRenderer.on('initializeRecipe', (e, data) => {
   const modulePath = path.join(data.recipe.path, 'webview.js');
@@ -17,27 +20,58 @@ ipcRenderer.on('initializeRecipe', (e, data) => {
   try {
     // eslint-disable-next-line
     require(modulePath)(new RecipeWebview(), data);
-    debug('Initialize Recipe');
+    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);
   }
 });
 
-const spellchecker = new Spellchecker();
-spellchecker.initialize();
+// Needs to run asap to intialize dictionaries
+(async () => {
+  const spellcheckingProvider = await spellchecker();
+  contextMenu(spellcheckingProvider);
+})();
 
-const contextMenuBuilder = new ContextMenuBuilder(spellchecker.handler, null, isDevMode);
+ipcRenderer.on('settings-update', async (e, data) => {
+  debug('Settings update received', data);
 
-new ContextMenuListener((info) => { // eslint-disable-line
-  contextMenuBuilder.showPopupMenu(info);
+  if (data.enableSpellchecking) {
+    switchDict(data.spellcheckerLanguage);
+  } else {
+    disableSpellchecker();
+  }
+
+  window.franzSettings = data;
 });
 
-ipcRenderer.on('settings-update', (e, data) => {
-  spellchecker.toggleSpellchecker(data.enableSpellchecking);
-  debug('Settings update received', 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);
 });
 
-// initSpellche
 
 document.addEventListener('DOMContentLoaded', () => {
   ipcRenderer.sendToHost('hello');
@@ -47,7 +81,7 @@ document.addEventListener('DOMContentLoaded', () => {
 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 
+  // 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);
   }
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index a504a4039..b0192b7ef 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -1,63 +1,92 @@
-import { SpellCheckHandler } from 'electron-spellchecker';
+import { webFrame } from 'electron';
+import fs from 'fs';
+import path from 'path';
+import { SpellCheckerProvider } from 'electron-hunspell';
 
-import { isMac } from '../environment';
+import { DICTIONARY_PATH } from '../config';
 
-export default class Spellchecker {
-  isInitialized = false;
-  handler = null;
-  initRetries = 0;
-  DOMCheckInterval = null;
+const debug = require('debug')('Franz:spellchecker');
 
-  get inputs() {
-    return document.querySelectorAll('input[type="text"], [contenteditable="true"], textarea');
-  }
+let provider;
+let currentDict;
+let _isEnabled = false;
 
-  initialize() {
-    this.handler = new SpellCheckHandler();
+async function loadDictionaries() {
+  const rawList = fs.readdirSync(DICTIONARY_PATH);
 
-    if (!isMac) {
-      this.attach();
-    } else {
-      this.isInitialized = true;
-    }
+  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`);
   }
+}
+
+export async function switchDict(locale) {
+  try {
+    debug('Trying to load dictionary', locale);
 
-  attach() {
-    let initFailed = false;
+    if (!provider.availableDictionaries.includes(locale)) {
+      console.warn('Dict not available', locale);
 
-    if (this.initRetries > 3) {
-      console.error('Could not initialize spellchecker');
       return;
     }
 
-    try {
-      this.handler.attachToInput();
-      this.handler.switchLanguage(navigator.language);
-    } catch (err) {
-      initFailed = true;
-      this.initRetries = +1;
-      setTimeout(() => { this.attach(); console.warn('Spellchecker init failed, trying again in 5s'); }, 5000);
+    if (!provider) {
+      console.warn('SpellcheckProvider not initialized');
+
+      return;
     }
 
-    if (!initFailed) {
-      this.isInitialized = true;
+    if (locale === currentDict) {
+      console.warn('Dictionary is already used', currentDict);
+
+      return;
     }
-  }
 
-  toggleSpellchecker(enable = false) {
-    this.inputs.forEach((input) => {
-      input.setAttribute('spellcheck', enable);
-    });
+    provider.switchDictionary(locale);
 
-    this.intervalHandler(enable);
+    debug('Switched dictionary to', locale);
+
+    currentDict = locale;
+    _isEnabled = true;
+  } catch (err) {
+    console.error(err);
   }
+}
 
-  intervalHandler(enable) {
-    clearInterval(this.DOMCheckInterval);
+export default async function initialize(languageCode = 'en-us') {
+  try {
+    provider = new SpellCheckerProvider();
+    const locale = languageCode.toLowerCase();
 
-    if (enable) {
-      this.DOMCheckInterval = setInterval(() => this.toggleSpellchecker(enable), 30000);
-    }
+    debug('Init spellchecker');
+    await provider.initialize();
+    await loadDictionaries();
+
+    debug('Available spellchecker dictionaries', provider.availableDictionaries);
+
+    switchDict(locale);
+
+    return provider;
+  } catch (err) {
+    console.error(err);
+    return false;
   }
 }
 
+export function isEnabled() {
+  return _isEnabled;
+}
+
+export function disable() {
+  if (isEnabled()) {
+    webFrame.setSpellCheckProvider(currentDict, true, { spellCheck: () => true });
+    _isEnabled = false;
+    currentDict = null;
+  }
+}