Merge branch 'develop' into feature/features-api

149 files changed, 3753 insertions, 1727 deletions

diff --git a/src/I18n.js b/src/I18n.js
index ae3ba2fa9..e33141576 100644
--- a/src/I18n.js
+++ b/src/I18n.js
@@ -7,13 +7,19 @@ 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();
+  }
+
   render() {
     const { stores, children } = this.props;
     const { locale } = stores.app;
     return (
-      <IntlProvider {...{ locale, key: locale, messages: translations[locale] }}>
+      <IntlProvider
+        {...{ locale, key: locale, messages: translations[locale] }}
+        ref={(intlProvider) => { window.franz.intl = intlProvider ? intlProvider.getChildContext().intl : null; }}
+      >
         {children}
       </IntlProvider>
     );
diff --git a/src/actions/settings.js b/src/actions/settings.js
index 3d53cd674..fd29b798b 100644
--- a/src/actions/settings.js
+++ b/src/actions/settings.js
@@ -2,9 +2,11 @@ import PropTypes from 'prop-types';
 
 export default {
   update: {
-    settings: PropTypes.object.isRequired,
+    type: PropTypes.string.isRequired,
+    data: PropTypes.object.isRequired,
   },
   remove: {
+    type: PropTypes.string.isRequired,
     key: PropTypes.string.isRequired,
   },
 };
diff --git a/src/api/FeaturesApi.js b/src/api/FeaturesApi.js
index 292dc80cc..c66f28f5b 100644
--- a/src/api/FeaturesApi.js
+++ b/src/api/FeaturesApi.js
@@ -3,8 +3,8 @@ export default class FeaturesApi {
     this.server = server;
   }
 
-  base() {
-    return this.server.getBaseFeatures();
+  default() {
+    return this.server.getDefaultFeatures();
   }
 
   features() {
diff --git a/src/api/LocalApi.js b/src/api/LocalApi.js
index 59d7d8fa2..741917104 100644
--- a/src/api/LocalApi.js
+++ b/src/api/LocalApi.js
@@ -4,6 +4,14 @@ export default class LocalApi {
     this.local = local;
   }
 
+  getAppSettings() {
+    return this.local.getAppSettings();
+  }
+
+  updateAppSettings(data) {
+    return this.local.updateAppSettings(data);
+  }
+
   getAppCacheSize() {
     return this.local.getAppCacheSize();
   }
diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js
index aa3a7d655..4814bba66 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.js
@@ -1,11 +1,30 @@
-import { remote } from 'electron';
+import { ipcRenderer, remote } from 'electron';
 import du from 'du';
 
 import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js';
 
+const debug = require('debug')('Franz:LocalApi');
+
 const { session } = remote;
 
 export default class LocalApi {
+  // Settings
+  getAppSettings() {
+    return new Promise((resolve) => {
+      ipcRenderer.once('appSettings', (event, data) => {
+        debug('LocalApi::getAppSettings resolves', data);
+        resolve(data);
+      });
+
+      ipcRenderer.send('getAppSettings');
+    });
+  }
+
+  async updateAppSettings(data) {
+    debug('LocalApi::updateAppSettings resolves', data);
+    ipcRenderer.send('updateAppSettings', data);
+  }
+
   // Services
   async getAppCacheSize() {
     const partitionsDir = getServicePartitionsDirectory();
@@ -13,7 +32,7 @@ export default class LocalApi {
       du(partitionsDir, (err, size) => {
         if (err) reject(err);
 
-        console.debug('LocalApi::getAppCacheSize resolves', size);
+        debug('LocalApi::getAppCacheSize resolves', size);
         resolve(size);
       });
     });
@@ -22,14 +41,14 @@ export default class LocalApi {
   async clearCache(serviceId) {
     const s = session.fromPartition(`persist:service-${serviceId}`);
 
-    console.debug('LocalApi::clearCache resolves', serviceId);
+    debug('LocalApi::clearCache resolves', serviceId);
     return new Promise(resolve => s.clearCache(resolve));
   }
 
   async clearAppCache() {
     const s = session.defaultSession;
 
-    console.debug('LocalApi::clearCache clearAppCache');
+    debug('LocalApi::clearCache clearAppCache');
     return new Promise(resolve => s.clearCache(resolve));
   }
 }
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index ad7988bb2..164419951 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -27,13 +27,15 @@ import {
   removeServicePartitionDirectory,
 } from '../../helpers/service-helpers.js';
 
+const debug = require('debug')('Franz:ServerApi');
+
 module.paths.unshift(
   getDevRecipeDirectory(),
   getRecipeDirectory(),
 );
 
 const { app } = remote;
-const fetch = remote.require('electron-fetch');
+const { default: fetch } = remote.require('electron-fetch');
 
 const SERVER_URL = API;
 const API_VERSION = 'v1';
@@ -55,7 +57,7 @@ export default class ServerApi {
     }
     const u = await request.json();
 
-    console.debug('ServerApi::login resolves', u);
+    debug('ServerApi::login resolves', u);
     return u.token;
   }
 
@@ -69,7 +71,7 @@ export default class ServerApi {
     }
     const u = await request.json();
 
-    console.debug('ServerApi::signup resolves', u);
+    debug('ServerApi::signup resolves', u);
     return u.token;
   }
 
@@ -82,7 +84,7 @@ export default class ServerApi {
       throw request;
     }
 
-    console.debug('ServerApi::inviteUser');
+    debug('ServerApi::inviteUser');
     return true;
   }
 
@@ -98,7 +100,7 @@ export default class ServerApi {
     }
     const r = await request.json();
 
-    console.debug('ServerApi::retrievePassword');
+    debug('ServerApi::retrievePassword');
     return r;
   }
 
@@ -112,7 +114,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const user = new UserModel(data);
-    console.debug('ServerApi::userInfo resolves', user);
+    debug('ServerApi::userInfo resolves', user);
 
     return user;
   }
@@ -128,7 +130,7 @@ export default class ServerApi {
     const updatedData = await request.json();
 
     const user = Object.assign(updatedData, { data: new UserModel(updatedData.data) });
-    console.debug('ServerApi::updateUserInfo resolves', user);
+    debug('ServerApi::updateUserInfo resolves', user);
     return user;
   }
 
@@ -141,7 +143,7 @@ export default class ServerApi {
     }
     const data = await request.json();
 
-    console.debug('ServerApi::deleteAccount resolves', data);
+    debug('ServerApi::deleteAccount resolves', data);
     return data;
   }
 
@@ -157,7 +159,7 @@ export default class ServerApi {
 
     let services = await this._mapServiceModels(data);
     services = services.filter(service => service !== null);
-    console.debug('ServerApi::getServices resolves', services);
+    debug('ServerApi::getServices resolves', services);
     return services;
   }
 
@@ -181,7 +183,7 @@ export default class ServerApi {
 
     const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) });
 
-    console.debug('ServerApi::createService resolves', service);
+    debug('ServerApi::createService resolves', service);
     return service;
   }
 
@@ -205,7 +207,7 @@ export default class ServerApi {
 
     const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) });
 
-    console.debug('ServerApi::updateService resolves', service);
+    debug('ServerApi::updateService resolves', service);
     return service;
   }
 
@@ -240,7 +242,7 @@ export default class ServerApi {
       throw request;
     }
     const serviceData = await request.json();
-    console.debug('ServerApi::reorderService resolves', serviceData);
+    debug('ServerApi::reorderService resolves', serviceData);
     return serviceData;
   }
 
@@ -255,13 +257,13 @@ export default class ServerApi {
 
     removeServicePartitionDirectory(id, true);
 
-    console.debug('ServerApi::deleteService resolves', data);
+    debug('ServerApi::deleteService resolves', data);
     return data;
   }
 
   // Features
-  async getBaseFeatures() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/features/base`, this._prepareAuthRequest({
+  async getDefaultFeatures() {
+    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/features/default`, this._prepareAuthRequest({
       method: 'GET',
     }));
     if (!request.ok) {
@@ -270,7 +272,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const features = data;
-    console.debug('ServerApi::getBaseFeatures resolves', features);
+    console.debug('ServerApi::getDefaultFeatures resolves', features);
     return features;
   }
 
@@ -306,7 +308,7 @@ export default class ServerApi {
 
     this.recipes = this.recipes.concat(this._getDevRecipes());
 
-    console.debug('StubServerApi::getInstalledRecipes resolves', this.recipes);
+    debug('StubServerApi::getInstalledRecipes resolves', this.recipes);
     return this.recipes;
   }
 
@@ -319,7 +321,7 @@ export default class ServerApi {
       throw request;
     }
     const recipes = await request.json();
-    console.debug('ServerApi::getRecipeUpdates resolves', recipes);
+    debug('ServerApi::getRecipeUpdates resolves', recipes);
     return recipes;
   }
 
@@ -334,7 +336,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const recipePreviews = this._mapRecipePreviewModel(data);
-    console.debug('ServerApi::getRecipes resolves', recipePreviews);
+    debug('ServerApi::getRecipes resolves', recipePreviews);
 
     return recipePreviews;
   }
@@ -351,7 +353,7 @@ export default class ServerApi {
     // data = this._addLocalRecipesToPreviews(data);
 
     const recipePreviews = this._mapRecipePreviewModel(data);
-    console.debug('ServerApi::getFeaturedRecipes resolves', recipePreviews);
+    debug('ServerApi::getFeaturedRecipes resolves', recipePreviews);
     return recipePreviews;
   }
 
@@ -365,7 +367,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const recipePreviews = this._mapRecipePreviewModel(data);
-    console.debug('ServerApi::searchRecipePreviews resolves', recipePreviews);
+    debug('ServerApi::searchRecipePreviews resolves', recipePreviews);
     return recipePreviews;
   }
 
@@ -379,7 +381,7 @@ export default class ServerApi {
 
       fs.ensureDirSync(recipeTempDirectory);
       const res = await fetch(packageUrl);
-      console.debug('Recipe downloaded', recipeId);
+      debug('Recipe downloaded', recipeId);
       const buffer = await res.buffer();
       fs.writeFileSync(archivePath, buffer);
 
@@ -421,7 +423,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const plan = new PlanModel(data);
-    console.debug('ServerApi::getPlans resolves', plan);
+    debug('ServerApi::getPlans resolves', plan);
     return plan;
   }
 
@@ -437,7 +439,7 @@ export default class ServerApi {
     }
     const data = await request.json();
 
-    console.debug('ServerApi::getHostedPage resolves', data);
+    debug('ServerApi::getHostedPage resolves', data);
     return data;
   }
 
@@ -450,7 +452,7 @@ export default class ServerApi {
     }
     const data = await request.json();
 
-    console.debug('ServerApi::getPaymentDashboardUrl resolves', data);
+    debug('ServerApi::getPaymentDashboardUrl resolves', data);
     return data;
   }
 
@@ -463,7 +465,7 @@ export default class ServerApi {
     }
     const data = await request.json();
     const orders = this._mapOrderModels(data);
-    console.debug('ServerApi::getSubscriptionOrders resolves', orders);
+    debug('ServerApi::getSubscriptionOrders resolves', orders);
     return orders;
   }
 
@@ -480,7 +482,7 @@ export default class ServerApi {
     }
     const data = await request.json();
     const news = this._mapNewsModels(data);
-    console.debug('ServerApi::getLatestNews resolves', news);
+    debug('ServerApi::getLatestNews resolves', news);
     return news;
   }
 
@@ -494,7 +496,7 @@ export default class ServerApi {
       throw request;
     }
 
-    console.debug('ServerApi::hideNews resolves', id);
+    debug('ServerApi::hideNews resolves', id);
   }
 
   // Health Check
@@ -505,7 +507,7 @@ export default class ServerApi {
     if (!request.ok) {
       throw request;
     }
-    console.debug('ServerApi::healthCheck resolves');
+    debug('ServerApi::healthCheck resolves');
   }
 
   async getLegacyServices() {
@@ -531,7 +533,7 @@ export default class ServerApi {
           return service;
         }));
 
-        console.debug('ServerApi::getLegacyServices resolves', services);
+        debug('ServerApi::getLegacyServices resolves', services);
         return services;
       }
     } catch (err) {
@@ -564,7 +566,7 @@ export default class ServerApi {
 
       return new ServiceModel(service, recipe);
     } catch (e) {
-      console.debug(e);
+      debug(e);
       return null;
     }
   }
@@ -582,7 +584,7 @@ export default class ServerApi {
 
           await this.getRecipePackage(recipeId);
 
-          console.debug('Rerun ServerAPI::getInstalledRecipes');
+          debug('Rerun ServerAPI::getInstalledRecipes');
           await this.getInstalledRecipes();
 
           recipe = this.recipes.find(r => r.id === recipeId);
@@ -682,7 +684,7 @@ export default class ServerApi {
 
       return recipes;
     } catch (err) {
-      console.debug('Could not load dev recipes');
+      debug('Could not load dev recipes');
       return false;
     }
   }
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 20dc2f764..a4003ef8e 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -2,10 +2,13 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
+import { TitleBar } from 'electron-react-titlebar';
 
 import InfoBar from '../ui/InfoBar';
 import globalMessages from '../../i18n/globalMessages';
 
+import { isWindows } from '../../environment';
+
 function createMarkup(HTMLString) {
   return { __html: HTMLString };
 }
@@ -37,9 +40,9 @@ 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,
     services: PropTypes.element.isRequired,
     children: PropTypes.element,
@@ -54,6 +57,7 @@ export default class AppLayout extends Component {
     areRequiredRequestsSuccessful: PropTypes.bool.isRequired,
     retryRequiredRequests: PropTypes.func.isRequired,
     areRequiredRequestsLoading: PropTypes.bool.isRequired,
+    darkMode: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {
@@ -66,6 +70,7 @@ export default class AppLayout extends Component {
 
   render() {
     const {
+      isFullScreen,
       sidebar,
       services,
       children,
@@ -80,71 +85,75 @@ export default class AppLayout extends Component {
       areRequiredRequestsSuccessful,
       retryRequiredRequests,
       areRequiredRequestsLoading,
+      darkMode,
     } = this.props;
 
     const { intl } = this.context;
 
     return (
-      <div>
+      <div className={(darkMode ? 'theme__dark' : '')}>
         <div className="app">
-          {sidebar}
-          <div className="app__service">
-            {news.length > 0 && news.map(item => (
-              <InfoBar
-                key={item.id}
-                position="top"
-                type={item.type}
-                sticky={item.sticky}
-                onHide={() => removeNewsItem({ newsId: item.id })}
-              >
-                <span dangerouslySetInnerHTML={createMarkup(item.message)} />
-              </InfoBar>
-            ))}
-            {!isOnline && (
-              <InfoBar
-                type="danger"
-              >
-                <span className="mdi mdi-flash" />
-                {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
-              </InfoBar>
-            )}
-            {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
-              <InfoBar
-                type="danger"
-                ctaLabel="Try again"
-                ctaLoading={areRequiredRequestsLoading}
-                sticky
-                onClick={retryRequiredRequests}
-              >
-                <span className="mdi mdi-flash" />
-                {intl.formatMessage(messages.requiredRequestsFailed)}
-              </InfoBar>
-            )}
-            {showServicesUpdatedInfoBar && (
-              <InfoBar
-                type="primary"
-                ctaLabel={intl.formatMessage(messages.buttonReloadServices)}
-                onClick={reloadServicesAfterUpdate}
-                sticky
-              >
-                <span className="mdi mdi-power-plug" />
-                {intl.formatMessage(messages.servicesUpdated)}
-              </InfoBar>
-            )}
-            {appUpdateIsDownloaded && (
-              <InfoBar
-                type="primary"
-                ctaLabel={intl.formatMessage(messages.buttonInstallUpdate)}
-                onClick={installAppUpdate}
-                sticky
-              >
-                <span className="mdi mdi-information" />
-                {intl.formatMessage(messages.updateAvailable)} <a href="https://meetfranz.com/changelog" target="_blank">
-                  <u>{intl.formatMessage(messages.changelog)}</u>
-                </a>
-              </InfoBar>
-            )}
-            {services}
+          {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />}
+          <div className="app__content">
+            {sidebar}
+            <div className="app__service">
+              {news.length > 0 && news.map(item => (
+                <InfoBar
+                  key={item.id}
+                  position="top"
+                  type={item.type}
+                  sticky={item.sticky}
+                  onHide={() => removeNewsItem({ newsId: item.id })}
+                >
+                  <span dangerouslySetInnerHTML={createMarkup(item.message)} />
+                </InfoBar>
+              ))}
+              {!isOnline && (
+                <InfoBar
+                  type="danger"
+                >
+                  <span className="mdi mdi-flash" />
+                  {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
+                </InfoBar>
+              )}
+              {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
+                <InfoBar
+                  type="danger"
+                  ctaLabel="Try again"
+                  ctaLoading={areRequiredRequestsLoading}
+                  sticky
+                  onClick={retryRequiredRequests}
+                >
+                  <span className="mdi mdi-flash" />
+                  {intl.formatMessage(messages.requiredRequestsFailed)}
+                </InfoBar>
+              )}
+              {showServicesUpdatedInfoBar && (
+                <InfoBar
+                  type="primary"
+                  ctaLabel={intl.formatMessage(messages.buttonReloadServices)}
+                  onClick={reloadServicesAfterUpdate}
+                  sticky
+                >
+                  <span className="mdi mdi-power-plug" />
+                  {intl.formatMessage(messages.servicesUpdated)}
+                </InfoBar>
+              )}
+              {appUpdateIsDownloaded && (
+                <InfoBar
+                  type="primary"
+                  ctaLabel={intl.formatMessage(messages.buttonInstallUpdate)}
+                  onClick={installAppUpdate}
+                  sticky
+                >
+                  <span className="mdi mdi-information" />
+                  {intl.formatMessage(messages.updateAvailable)} <a href="https://meetfranz.com/changelog" target="_blank">
+                    <u>{intl.formatMessage(messages.changelog)}</u>
+                  </a>
+                </InfoBar>
+              )}
+              {services}
+            </div>
           </div>
         </div>
         {children}
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 7aed8fda7..8de7dc438 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -7,7 +7,7 @@ import classnames from 'classnames';
 import { SortableElement } from 'react-sortable-hoc';
 
 import ServiceModel from '../../../models/Service';
-import { ctrlKey } from '../../../environment';
+import { isDevMode, ctrlKey } from '../../../environment';
 
 const { Menu } = remote;
 
@@ -119,10 +119,14 @@ class TabItem extends Component {
       click: () => (service.isEnabled ? disableService() : enableService()),
     }, {
       type: 'separator',
-    }, {
-      label: intl.formatMessage(messages.deleteService),
-      click: () => deleteService(),
     }];
+
+    if (isDevMode) {
+      menuTemplate.push({
+        label: intl.formatMessage(messages.deleteService),
+        click: () => deleteService(),
+      });
+    }
     const menu = Menu.buildFromTemplate(menuTemplate);
 
     let notificationBadge = null;
@@ -137,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 e6ccdaac7..ede519fd6 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -78,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,
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 3ffca99a7..777a95fcf 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -94,8 +94,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class EditServiceForm extends Component {
+export default @observer class EditServiceForm extends Component {
   static propTypes = {
     recipe: PropTypes.instanceOf(Recipe).isRequired,
     service(props, propName) {
@@ -204,6 +203,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">
@@ -305,6 +306,7 @@ export default class EditServiceForm extends Component {
 
                 <div className="settings__settings-group">
                   <h3>{intl.formatMessage(messages.headlineGeneral)}</h3>
+                  <Toggle field={form.$('isDarkModeEnabled')} />
                   <Toggle field={form.$('isEnabled')} />
                 </div>
               </div>
@@ -342,6 +344,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 72aa5a8af..b5c048ebd 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -76,10 +76,13 @@ const messages = defineMessages({
     id: 'settings.app.currentVersion',
     defaultMessage: '!!!Current version:',
   },
+  enableGPUAccelerationInfo: {
+    id: 'settings.app.restartRequired',
+    defaultMessage: '!!!Changes require restart',
+  },
 });
 
-@observer
-export default class EditSettingsForm extends Component {
+export default @observer class EditSettingsForm extends Component {
   static propTypes = {
     checkForUpdates: PropTypes.func.isRequired,
     installUpdate: PropTypes.func.isRequired,
@@ -157,6 +160,7 @@ 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>
@@ -172,6 +176,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>
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js
index 1ac8be80f..b825f844a 100644
--- a/src/components/settings/user/EditUserForm.js
+++ b/src/components/settings/user/EditUserForm.js
@@ -39,8 +39,7 @@ 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,
diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js
index dd350479d..5992e4204 100644
--- a/src/components/subscription/SubscriptionForm.js
+++ b/src/components/subscription/SubscriptionForm.js
@@ -71,8 +71,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,
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 69c95702b..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,
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/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..f7c2ec955 100644
--- a/src/components/ui/Toggle.js
+++ b/src/components/ui/Toggle.js
@@ -4,8 +4,7 @@ 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,
diff --git a/src/config.js b/src/config.js
index e66594c59..ce946f00a 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,11 +1,15 @@
+import electron from 'electron';
+import path from 'path';
+
+const app = process.type === 'renderer' ? electron.remote.app : electron.app;
+
 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 = {
-  autoLaunchOnStart: true,
   autoLaunchInBackground: false,
   runInBackground: true,
   enableSystemTray: true,
@@ -13,12 +17,15 @@ export const DEFAULT_APP_SETTINGS = {
   showDisabledServices: true,
   showMessageBadgeWhenMuted: true,
   enableSpellchecking: true,
-  // spellcheckingLanguage: 'auto',
+  darkMode: false,
   locale: '',
   fallbackLocale: 'en-US',
   beta: false,
   isAppMuted: false,
+  enableGPUAcceleration: true,
 };
 
-export const FRANZ_SERVICE_REQUEST = 'http://bit.ly/franz-service-request';
-export const FRANZ_TRANSLATION = 'http://bit.ly/franz-translate';
+export const FRANZ_SERVICE_REQUEST = 'https://bit.ly/franz-service-request';
+export const FRANZ_TRANSLATION = 'https://bit.ly/franz-translate';
+
+export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config', 'settings.json');
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js
index f362b1800..b73598f3d 100644
--- a/src/containers/auth/AuthLayoutContainer.js
+++ b/src/containers/auth/AuthLayoutContainer.js
@@ -9,8 +9,7 @@ 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({
@@ -20,10 +19,10 @@ export default class AuthLayoutContainer extends Component {
 
   render() {
     const { stores, actions, children, location } = this.props;
-    const { features } = stores;
+    const { app, features, globalError } = stores;
 
-    const isLoadingBaseFeatures = features.baseFeaturesRequest.isExecuting
-      && !features.baseFeaturesRequest.wasExecuted;
+    const isLoadingBaseFeatures = features.defaultFeaturesRequest.isExecuting
+      && !features.defaultFeaturesRequest.wasExecuted;
 
     if (isLoadingBaseFeatures) {
       return (
@@ -33,12 +32,14 @@ export default class AuthLayoutContainer extends Component {
 
     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 7a398ed2d..affc1a0a2 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -18,8 +18,7 @@ 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 {
+export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component {
   static defaultProps = {
     children: null,
   };
@@ -82,7 +81,7 @@ export default class AppLayoutContainer extends Component {
       <Sidebar
         services={services.allDisplayed}
         setActive={setActive}
-        isAppMuted={settings.all.isAppMuted}
+        isAppMuted={settings.all.app.isAppMuted}
         openSettings={openSettings}
         closeSettings={closeSettings}
         reorder={reorder}
@@ -92,25 +91,26 @@ export default class AppLayoutContainer extends Component {
         deleteService={deleteService}
         updateService={updateService}
         toggleMuteApp={toggleMuteApp}
-        showMessageBadgeWhenMutedSetting={settings.all.showMessageBadgeWhenMuted}
+        showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted}
         showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted}
       />
     );
 
     const servicesContainer = (
       <Services
-        services={services.allDisplayed}
+        services={services.allDisplayedUnordered}
         handleIPCMessage={handleIPCMessage}
         setWebviewReference={setWebviewReference}
         openWindow={openWindow}
         reload={reload}
-        isAppMuted={settings.all.isAppMuted}
+        isAppMuted={settings.all.app.isAppMuted}
         update={updateService}
       />
     );
 
     return (
       <AppLayout
+        isFullScreen={app.isFullScreen}
         isOnline={app.isOnline}
         showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar}
         appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED}
@@ -125,6 +125,7 @@ export default class AppLayoutContainer extends Component {
         areRequiredRequestsSuccessful={requests.areRequiredRequestsSuccessful}
         retryRequiredRequests={retryRequiredRequests}
         areRequiredRequestsLoading={requests.areRequiredRequestsLoading}
+        darkMode={settings.all.app.darkMode}
       >
         {React.Children.count(children) > 0 ? children : null}
       </AppLayout>
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 f2d5550e1..17d727642 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -7,6 +7,7 @@ import UserStore from '../../stores/UserStore';
 import RecipesStore from '../../stores/RecipesStore';
 import ServicesStore from '../../stores/ServicesStore';
 import FeaturesStore from '../../stores/FeaturesStore';
+import SettingsStore from '../../stores/SettingsStore';
 import Form from '../../lib/Form';
 import { gaPage } from '../../lib/analytics';
 
@@ -51,10 +52,13 @@ const messages = defineMessages({
     id: 'settings.service.form.icon',
     defaultMessage: '!!!Custom icon',
   },
+  enableDarkMode: {
+    id: 'settings.service.form.enableDarkMode',
+    defaultMessage: '!!!Enable Dark Mode',
+  },
 });
 
-@inject('stores', 'actions') @observer
-export default class EditServiceScreen extends Component {
+export default @inject('stores', 'actions') @observer class EditServiceScreen extends Component {
   static contextTypes = {
     intl: intlShape,
   };
@@ -113,6 +117,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,
+        },
       },
     };
 
@@ -245,6 +254,7 @@ EditServiceScreen.wrappedComponent.propTypes = {
     recipes: PropTypes.instanceOf(RecipesStore).isRequired,
     services: PropTypes.instanceOf(ServicesStore).isRequired,
     features: PropTypes.instanceOf(FeaturesStore).isRequired,
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
   router: PropTypes.shape({
     params: PropTypes.shape({
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 1fa7ce8bc..df6442eb8 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -39,6 +39,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',
@@ -51,22 +55,21 @@ const messages = defineMessages({
     id: 'settings.app.form.enableSpellchecking',
     defaultMessage: '!!!Enable spell checking',
   },
+  enableGPUAcceleration: {
+    id: 'settings.app.form.enableGPUAcceleration',
+    defaultMessage: '!!!Enable GPU Acceleration',
+  },
   spellcheckingLanguage: {
     id: 'settings.app.form.spellcheckingLanguage',
     defaultMessage: '!!!Language for spell checking',
   },
-  // spellcheckingAutomaticDetection: {
-  //   id: 'settings.app.form.spellcheckingAutomaticDetection',
-  //   defaultMessage: '!!!Detect language automatically',
-  // },
   beta: {
     id: 'settings.app.form.beta',
     defaultMessage: '!!!Include beta versions',
   },
 });
 
-@inject('stores', 'actions') @observer
-export default class EditSettingsScreen extends Component {
+export default @inject('stores', 'actions') @observer class EditSettingsScreen extends Component {
   static contextTypes = {
     intl: intlShape,
   };
@@ -84,22 +87,25 @@ export default class EditSettingsScreen extends Component {
     });
 
     settings.update({
-      settings: {
+      type: 'app',
+      data: {
         runInBackground: settingsData.runInBackground,
         enableSystemTray: settingsData.enableSystemTray,
         minimizeToSystemTray: settingsData.minimizeToSystemTray,
+        enableGPUAcceleration: settingsData.enableGPUAcceleration,
         showDisabledServices: settingsData.showDisabledServices,
+        darkMode: settingsData.darkMode,
         showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted,
         enableSpellchecking: settingsData.enableSpellchecking,
-        // spellcheckingLanguage: settingsData.spellcheckingLanguage,
-        locale: settingsData.locale,
-        beta: settingsData.beta,
+        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
       },
     });
 
     user.update({
       userData: {
         beta: settingsData.beta,
+        locale: settingsData.locale,
       },
     });
   }
@@ -116,17 +122,6 @@ export default class EditSettingsScreen extends Component {
       });
     });
 
-    // const spellcheckerLocales = [{
-    //   value: 'auto',
-    //   label: intl.formatMessage(messages.spellcheckingAutomaticDetection),
-    // }];
-    // Object.keys(SPELLCHECKER_LOCALES).forEach((key) => {
-    //   spellcheckerLocales.push({
-    //     value: key,
-    //     label: SPELLCHECKER_LOCALES[key],
-    //   });
-    // });
-
     const config = {
       fields: {
         autoLaunchOnStart: {
@@ -141,40 +136,44 @@ export default class EditSettingsScreen extends Component {
         },
         runInBackground: {
           label: intl.formatMessage(messages.runInBackground),
-          value: settings.all.runInBackground,
+          value: settings.all.app.runInBackground,
           default: DEFAULT_APP_SETTINGS.runInBackground,
         },
         enableSystemTray: {
           label: intl.formatMessage(messages.enableSystemTray),
-          value: settings.all.enableSystemTray,
+          value: settings.all.app.enableSystemTray,
           default: DEFAULT_APP_SETTINGS.enableSystemTray,
         },
         minimizeToSystemTray: {
           label: intl.formatMessage(messages.minimizeToSystemTray),
-          value: settings.all.minimizeToSystemTray,
+          value: settings.all.app.minimizeToSystemTray,
           default: DEFAULT_APP_SETTINGS.minimizeToSystemTray,
         },
         showDisabledServices: {
           label: intl.formatMessage(messages.showDisabledServices),
-          value: settings.all.showDisabledServices,
+          value: settings.all.app.showDisabledServices,
           default: DEFAULT_APP_SETTINGS.showDisabledServices,
         },
         showMessageBadgeWhenMuted: {
           label: intl.formatMessage(messages.showMessageBadgeWhenMuted),
-          value: settings.all.showMessageBadgeWhenMuted,
+          value: settings.all.app.showMessageBadgeWhenMuted,
           default: DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted,
         },
         enableSpellchecking: {
           label: intl.formatMessage(messages.enableSpellchecking),
-          value: settings.all.enableSpellchecking,
+          value: settings.all.app.enableSpellchecking,
           default: DEFAULT_APP_SETTINGS.enableSpellchecking,
         },
-        // spellcheckingLanguage: {
-        //   label: intl.formatMessage(messages.spellcheckingLanguage),
-        //   value: settings.all.spellcheckingLanguage,
-        //   options: spellcheckerLocales,
-        //   default: DEFAULT_APP_SETTINGS.spellcheckingLanguage,
-        // },
+        darkMode: {
+          label: intl.formatMessage(messages.darkMode),
+          value: settings.all.app.darkMode,
+          default: DEFAULT_APP_SETTINGS.darkMode,
+        },
+        enableGPUAcceleration: {
+          label: intl.formatMessage(messages.enableGPUAcceleration),
+          value: settings.all.app.enableGPUAcceleration,
+          default: DEFAULT_APP_SETTINGS.enableGPUAcceleration,
+        },
         locale: {
           label: intl.formatMessage(messages.language),
           value: app.locale,
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index a67fa7fb5..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,
   };
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..9f7571bda 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,
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 824b4c20c..7b04406a2 100644
--- a/src/electron/Settings.js
+++ b/src/electron/Settings.js
@@ -1,27 +1,46 @@
-import { observable } from 'mobx';
+import { observable, toJS } from 'mobx';
+import { pathExistsSync, outputJsonSync, readJsonSync } from 'fs-extra';
 
-import { DEFAULT_APP_SETTINGS } from '../config';
+import { SETTINGS_PATH, DEFAULT_APP_SETTINGS } from '../config';
+
+const debug = require('debug')('Franz:Settings');
 
 export default class Settings {
-  @observable store = {
-    autoLaunchOnStart: DEFAULT_APP_SETTINGS.autoLaunchOnStart,
-    autoLaunchInBackground: DEFAULT_APP_SETTINGS.autoLaunchInBackground,
-    runInBackground: DEFAULT_APP_SETTINGS.runInBackground,
-    enableSystemTray: DEFAULT_APP_SETTINGS.enableSystemTray,
-    minimizeToSystemTray: DEFAULT_APP_SETTINGS.minimizeToSystemTray,
-    locale: DEFAULT_APP_SETTINGS.locale,
-    beta: DEFAULT_APP_SETTINGS.beta,
-  };
+  @observable store = DEFAULT_APP_SETTINGS;
+
+  constructor() {
+    if (!pathExistsSync(SETTINGS_PATH)) {
+      this._writeFile();
+    } else {
+      this._hydrate();
+    }
+  }
 
   set(settings) {
-    this.store = Object.assign(this.store, settings);
+    this.store = this._merge(settings);
+
+    this._writeFile();
   }
 
-  all() {
+  get all() {
     return this.store;
   }
 
   get(key) {
     return this.store[key];
   }
+
+  _merge(settings) {
+    return Object.assign(DEFAULT_APP_SETTINGS, this.store, settings);
+  }
+
+  _hydrate() {
+    this.store = this._merge(readJsonSync(SETTINGS_PATH));
+    debug('Hydrate store', toJS(this.store));
+  }
+
+  _writeFile() {
+    outputJsonSync(SETTINGS_PATH, this.store);
+    debug('Write settings file', toJS(this.store));
+  }
 }
diff --git a/src/electron/ipc-api/settings.js b/src/electron/ipc-api/settings.js
index 995b28fbd..3eab68a91 100644
--- a/src/electron/ipc-api/settings.js
+++ b/src/electron/ipc-api/settings.js
@@ -1,7 +1,11 @@
 import { ipcMain } from 'electron';
 
 export default (params) => {
-  ipcMain.on('settings', (event, args) => {
+  ipcMain.on('getAppSettings', () => {
+    params.mainWindow.webContents.send('appSettings', params.settings.all);
+  });
+
+  ipcMain.on('updateAppSettings', (event, args) => {
     params.settings.set(args);
   });
 };
diff --git a/src/environment.js b/src/environment.js
index e185120c0..e1762129b 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -4,11 +4,17 @@ export const isDevMode = Boolean(process.execPath.match(/[\\/]electron/));
 export const useLiveAPI = process.env.LIVE_API;
 export const useLocalAPI = process.env.LOCAL_API;
 
-export const isMac = process.platform === 'darwin';
-export const isWindows = process.platform === 'win32';
-export const isLinux = process.platform === 'linux';
+let platform = process.platform;
+if (process.env.OS_PLATFORM) {
+  platform = process.env.OS_PLATFORM;
+}
+
+export const isMac = platform === 'darwin';
+export const isWindows = platform === 'win32';
+export const isLinux = platform === 'linux';
 
 export const ctrlKey = isMac ? '⌘' : 'Ctrl';
+export const cmdKey = isMac ? 'Cmd' : 'Ctrl';
 
 let api;
 if (!isDevMode || (isDevMode && useLiveAPI)) {
diff --git a/src/helpers/validation-helpers.js b/src/helpers/validation-helpers.js
index a8a242d54..2f762437d 100644
--- a/src/helpers/validation-helpers.js
+++ b/src/helpers/validation-helpers.js
@@ -1,6 +1,31 @@
+import { defineMessages } from 'react-intl';
+
+const messages = defineMessages({
+  required: {
+    id: 'validation.required',
+    defaultMessage: '!!!Field is required',
+  },
+  email: {
+    id: 'validation.email',
+    defaultMessage: '!!!Email not valid',
+  },
+  url: {
+    id: 'validation.url',
+    defaultMessage: '!!!Not a valid URL',
+  },
+  minLength: {
+    id: 'validation.minLength',
+    defaultMessage: '!!!Too few characters',
+  },
+  oneRequired: {
+    id: 'validation.oneRequired',
+    defaultMessage: '!!!At least one is required',
+  },
+});
+
 export function required({ field }) {
   const isValid = (field.value.trim() !== '');
-  return [isValid, `${field.label} is required`];
+  return [isValid, window.franz.intl.formatMessage(messages.required, { field: field.label })];
 }
 
 export function email({ field }) {
@@ -13,7 +38,7 @@ export function email({ field }) {
     isValid = true;
   }
 
-  return [isValid, `${field.label} not valid`];
+  return [isValid, window.franz.intl.formatMessage(messages.email, { field: field.label })];
 }
 
 export function url({ field }) {
@@ -27,7 +52,7 @@ export function url({ field }) {
     isValid = true;
   }
 
-  return [isValid, `${field.label} is not a valid url`];
+  return [isValid, window.franz.intl.formatMessage(messages.url, { field: field.label })];
 }
 
 export function minLength(length) {
@@ -36,13 +61,13 @@ export function minLength(length) {
     if (field.touched) {
       isValid = field.value.length >= length;
     }
-    return [isValid, `${field.label} should be at least ${length} characters long.`];
+    return [isValid, window.franz.intl.formatMessage(messages.minLength, { field: field.label, length })];
   };
 }
 
 export function oneRequired(targets) {
   return ({ field, form }) => {
     const invalidFields = targets.filter(target => form.$(target).value === '');
-    return [targets.length !== invalidFields.length, `${field.label} is required`];
+    return [targets.length !== invalidFields.length, window.franz.intl.formatMessage(messages.required, { field: field.label })];
   };
 }
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 524dfe0fb..4ea3eb1a7 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "La teva sessió ha caducat, torna a iniciar la sessió.",
    "login.submit.label" : "Accedir",
    "login.tokenExpired" : "La teva sessió ha caducat, torna a iniciar la sessió.",
+   "menu.app.about" : "Sobre Franz",
+   "menu.app.hide" : "Amaga",
+   "menu.app.hideOthers" : "Amaga altres",
+   "menu.app.quit" : "Surt",
+   "menu.app.settings" : "Configuració",
+   "menu.app.unhide" : "Mostra",
+   "menu.edit" : "Edita",
+   "menu.edit.copy" : "Copia",
+   "menu.edit.cut" : "Retalla",
+   "menu.edit.delete" : "Suprimeix",
+   "menu.edit.emojiSymbols" : "Emoji i Símbols",
+   "menu.edit.paste" : "Enganxa",
+   "menu.edit.pasteAndMatchStyle" : "Enganxa amb els estils",
+   "menu.edit.redo" : "Refés",
+   "menu.edit.selectAll" : "Selecciona-ho tot",
+   "menu.edit.speech" : "Pronuncia",
+   "menu.edit.startDictation" : "Inicia el dictat",
+   "menu.edit.startSpeaking" : "Inicia la parla",
+   "menu.edit.stopSpeaking" : "Atura la parla",
+   "menu.edit.undo" : "Desfés",
+   "menu.file" : "Fitxer",
+   "menu.help" : "Ajuda",
+   "menu.help.changelog" : "Registre de canvis",
+   "menu.help.learnMore" : "Conegueu-ne més detalls",
+   "menu.help.privacy" : "Declaració de privacitat",
+   "menu.help.support" : "Suport",
+   "menu.help.tos" : "Condicions del Servei",
+   "menu.services" : "Serveis",
+   "menu.services.addNewService" : "Afegeix un servei...",
+   "menu.view" : "Visualitza",
+   "menu.view.enterFullScreen" : "Inicia la pantalla completa",
+   "menu.view.exitFullScreen" : "Surt de pantalla completa",
+   "menu.view.reloadFranz" : "Torna a carregar Franz",
+   "menu.view.reloadService" : "Torna a carregar el servei",
+   "menu.view.resetZoom" : "Mida real",
+   "menu.view.toggleDevTools" : "Activa serveis per a desenvolupadors",
+   "menu.view.toggleFullScreen" : "Activa la pantalla completa",
+   "menu.view.toggleServiceDevTools" : "Habilita les eines de desenvolupador de serveis",
+   "menu.view.zoomIn" : "Amplia",
+   "menu.view.zoomOut" : "Redueix",
+   "menu.window" : "Finestra",
+   "menu.window.close" : "Tanca",
+   "menu.window.minimize" : "Minimitza",
    "password.email.label" : "Correu electrònic",
    "password.headline" : "Restablir contrasenya",
    "password.link.login" : "Inicia la sessió al teu compte",
@@ -73,6 +116,7 @@
    "settings.app.form.autoLaunchInBackground" : "Obrir en segon plà",
    "settings.app.form.autoLaunchOnStart" : "Iniciar Franz a l'inici",
    "settings.app.form.beta" : "Inclou versions beta",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
    "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",
@@ -197,6 +241,10 @@
    "tabs.item.enableNotification" : "Activa les notificacions",
    "tabs.item.enableService" : "Activa el servei",
    "tabs.item.reload" : "Recarrega",
+   "validation.email" : "{field} no es vàlid",
+   "validation.minLength" : "{field} ha de ser al menys {length} caràcters de llargada",
+   "validation.required" : "{field} es requerit",
+   "validation.url" : "{field} es una URL no vàlida",
    "welcome.loginButton" : "Inicia sessió al teu compte",
    "welcome.signupButton" : "Crea un compte gratuït",
    "welcome.slogan" : "Crea un compte gratuït"
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 62eb4a1ee..ed4c7a468 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "Sezení vypršelo, je třeba se znovu přihlásit.",
    "login.submit.label" : "Přihlásit se",
    "login.tokenExpired" : "Sezení vypršelo, prosím přihlaste se znovu",
+   "menu.app.about" : "O aplikaci",
+   "menu.app.hide" : "Skrýt",
+   "menu.app.hideOthers" : "Skryt ostatní",
+   "menu.app.quit" : "Ukon�it",
+   "menu.app.settings" : "Nastavení",
+   "menu.app.unhide" : "Odkrýt",
+   "menu.edit" : "Upravit",
+   "menu.edit.copy" : "Kopírovat",
+   "menu.edit.cut" : "Vyjmout",
+   "menu.edit.delete" : "Smazat",
+   "menu.edit.emojiSymbols" : "Emoji a znaky",
+   "menu.edit.paste" : "Vložit",
+   "menu.edit.pasteAndMatchStyle" : "Vložit v�etně formátování",
+   "menu.edit.redo" : "Vpřed",
+   "menu.edit.selectAll" : "Vybrat vše",
+   "menu.edit.speech" : "Mluvené slovo",
+   "menu.edit.startDictation" : "Za�ít diktovat",
+   "menu.edit.startSpeaking" : "Za�ít mluvit",
+   "menu.edit.stopSpeaking" : "Přestat mluvit",
+   "menu.edit.undo" : "Vrátit zpět",
+   "menu.file" : "Soubor",
+   "menu.help" : "Nápověda",
+   "menu.help.changelog" : "Seznam změn",
+   "menu.help.learnMore" : "Dozvědět se více",
+   "menu.help.privacy" : "Prohlášení o ochraně soukromí",
+   "menu.help.support" : "Podpora",
+   "menu.help.tos" : "Podmínky použití",
+   "menu.services" : "Služby",
+   "menu.services.addNewService" : "Přidat novou službu...",
+   "menu.view" : "Zobrazení",
+   "menu.view.enterFullScreen" : "Spustit režim celé obrazovky",
+   "menu.view.exitFullScreen" : "Ukon�it celoobrazovkový režim",
+   "menu.view.reloadFranz" : "Obnovit Franze",
+   "menu.view.reloadService" : "Obnovit službu",
+   "menu.view.resetZoom" : "Skute�ná velikost",
+   "menu.view.toggleDevTools" : "Zobrazit Vývojářské nástroje",
+   "menu.view.toggleFullScreen" : "Přepnout na celou obrazovku",
+   "menu.view.toggleServiceDevTools" : "Zobrazit Vývojářské nástroje pro službu",
+   "menu.view.zoomIn" : "Přiblížit",
+   "menu.view.zoomOut" : "Oddálit",
+   "menu.window" : "Okno",
+   "menu.window.close" : "Zavřít",
+   "menu.window.minimize" : "Minimalizovat",
    "password.email.label" : "E-mailová adresa",
    "password.headline" : "Obnovit heslo",
    "password.link.login" : "Přihlásit se k ú�tu",
@@ -73,6 +116,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.enableGPUAcceleration" : "Aktivovat GPU zrychlení",
    "settings.app.form.enableMenuBar" : "Zobraz Franz v Menu nabídce",
    "settings.app.form.enableSpellchecking" : "Zapnout kontrolu pravopisu",
    "settings.app.form.enableSystemTray" : "Zobrazit Franz v systémové liště",
@@ -197,6 +241,10 @@
    "tabs.item.enableNotification" : "Povolit oznamování",
    "tabs.item.enableService" : "Zapnout službu",
    "tabs.item.reload" : "Obnovit",
+   "validation.email" : "{field} není validní",
+   "validation.minLength" : "{field} musí být alespoň {length} znaků dlouhé",
+   "validation.required" : "{field} je povinné",
+   "validation.url" : "{field} není validní URL",
    "welcome.loginButton" : "Přihlášení do vašeho ú�tu",
    "welcome.signupButton" : "Vytvořit ú�et zdarma",
    "welcome.slogan" : "Zprávy, které pracují pro vás"
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 7a03cce87..fa61d26d4 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -6,7 +6,7 @@
    "import.skip.label" : "Ich möchte Dienste selbst hinzufügen",
    "import.submit.label" : "Dienste importieren",
    "infobar.buttonChangelog" : "Was gibt es neues?",
-   "infobar.buttonInstallUpdate" : "Neustarten & Update installieren",
+   "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.",
@@ -26,6 +26,49 @@
    "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.",
+   "menu.app.about" : "Ãœber Franz",
+   "menu.app.hide" : "Franz ausblenden",
+   "menu.app.hideOthers" : "Andere ausblenden",
+   "menu.app.quit" : "Franz Beenden",
+   "menu.app.settings" : "Einstellungen",
+   "menu.app.unhide" : "Alle einblenden",
+   "menu.edit" : "Bearbeiten",
+   "menu.edit.copy" : "Kopieren",
+   "menu.edit.cut" : "Ausschneiden",
+   "menu.edit.delete" : "Löschen",
+   "menu.edit.emojiSymbols" : "Emoji & Symbole",
+   "menu.edit.paste" : "Einfügen",
+   "menu.edit.pasteAndMatchStyle" : "Einfügen und Stil anpassen",
+   "menu.edit.redo" : "Wiederholen",
+   "menu.edit.selectAll" : "Alle auswählen",
+   "menu.edit.speech" : "Sprachausgabe",
+   "menu.edit.startDictation" : "Diktat starten ...",
+   "menu.edit.startSpeaking" : "Sprachausgabe starten",
+   "menu.edit.stopSpeaking" : "Sprachausgabe stoppen",
+   "menu.edit.undo" : "Widerrufen",
+   "menu.file" : "Datei",
+   "menu.help" : "Hilfe",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Mehr erfahren",
+   "menu.help.privacy" : "Datenschutzerklärung",
+   "menu.help.support" : "Hilfe",
+   "menu.help.tos" : "Nutzungsbedingungen",
+   "menu.services" : "Dienste",
+   "menu.services.addNewService" : "Dienst hinzufügen",
+   "menu.view" : "Darstellung",
+   "menu.view.enterFullScreen" : "Vollbildmodus",
+   "menu.view.exitFullScreen" : "Vollbildmodus aus",
+   "menu.view.reloadFranz" : "Franz neu laden",
+   "menu.view.reloadService" : "Dienst neu laden",
+   "menu.view.resetZoom" : "Originalgröße",
+   "menu.view.toggleDevTools" : "Entwicklertools anzeigen",
+   "menu.view.toggleFullScreen" : "Vollbildmodus umschalten",
+   "menu.view.toggleServiceDevTools" : "Entwicklertools für Dienst anzeigen",
+   "menu.view.zoomIn" : "Vergrößern",
+   "menu.view.zoomOut" : "Verkleinern",
+   "menu.window" : "Fenster",
+   "menu.window.close" : "Schließen",
+   "menu.window.minimize" : "Minimieren",
    "password.email.label" : "E-Mail Adresse",
    "password.headline" : "Passwort zurücksetzen",
    "password.link.login" : "An deinem Konto anmelden",
@@ -66,13 +109,14 @@
    "settings.account.tryReloadUserInfoRequest" : "Erneut versuchen",
    "settings.account.userInfoRequestFailed" : "Benutzerinformationen konnten nicht geladen werden",
    "settings.app.buttonClearAllCache" : "Cache leeren",
-   "settings.app.buttonInstallUpdate" : "Neustarten & Update installieren",
+   "settings.app.buttonInstallUpdate" : "Neu starten & Update installieren",
    "settings.app.buttonSearchForUpdate" : "Nach Updates suchen",
    "settings.app.cacheInfo" : "Der Franz Cache belegt derzeit {size}.",
    "settings.app.currentVersion" : "Aktuelle Version:",
    "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.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",
@@ -157,7 +201,7 @@
    "settings.user.form.firstname" : "Vorname",
    "settings.user.form.lastname" : "Nachname",
    "settings.user.form.newPassword" : "Neues Passwort",
-   "sidebar.addNewService" : "Neuem Dienst hinzufügen",
+   "sidebar.addNewService" : "Neuen Dienst hinzufügen",
    "sidebar.muteApp" : "Benachrichtigungen & Audio deaktivieren",
    "sidebar.settings" : "Einstellungen",
    "sidebar.unmuteApp" : "Benachrichtigungen & Audio aktivieren",
@@ -197,6 +241,10 @@
    "tabs.item.enableNotification" : "Benachrichtigungen aktivieren",
    "tabs.item.enableService" : "Dienst aktivieren",
    "tabs.item.reload" : "Neuladen",
+   "validation.email" : "{field} ist ungültig",
+   "validation.minLength" : "{field} muss mindestens {length} Zeichen enthalten",
+   "validation.required" : "{field} wird benötigt",
+   "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"
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index b0c465940..7361d29b7 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -26,6 +26,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.settings" : "Ρυθμίσεις",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Επεξε�γασία",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "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.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",
    "password.email.label" : "Διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου",
    "password.headline" : "Επαναφο�ά κωδικο� π�όσβασης",
    "password.link.login" : "Σ�νδεση στο λογα�ιασμό σας",
@@ -73,6 +116,7 @@
    "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.enableSpellchecking" : "Ενε�γοποίηση ο�θογ�αφικο� ελέγχου",
    "settings.app.form.enableSystemTray" : "Εμφάνιση του Franz στη γ�αμμή ειδοποιήσεων",
@@ -197,6 +241,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",
    "welcome.loginButton" : "Σ�νδεση στο λογα�ιασμό σας",
    "welcome.signupButton" : "Δημιου�γία δω�εάν λογα�ιασμο�",
    "welcome.slogan" : "Επικοινωνία που λειτου�γεί για εσάς"
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index d5c0ea441..66ec5af84 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -130,6 +130,7 @@
   "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.error.headline": "Error",
   "settings.service.error.goBack": "Back to services",
   "settings.service.error.message": "Could not load service recipe.",
@@ -158,12 +159,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.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.beta": "Include beta versions",
@@ -199,5 +202,52 @@
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.disabledHandler.headline": "{name} is disabled",
-  "service.disabledHandler.action": "Enable {name}"
+  "service.disabledHandler.action": "Enable {name}",
+  "menu.edit": "Edit",
+  "menu.edit.undo": "Undo",
+  "menu.edit.redo": "Redo",
+  "menu.edit.cut": "Cut",
+  "menu.edit.copy": "Copy",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.delete": "Delete",
+  "menu.edit.selectAll": "Select All",
+  "menu.edit.speech": "Speech",
+  "menu.edit.startSpeaking": "Start Speaking",
+  "menu.edit.stopSpeaking": "Stop Speaking",
+  "menu.edit.startDictation": "Start Dictation",
+  "menu.edit.emojiSymbols": "Emoji & Symbols",
+  "menu.view.resetZoom": "Actual Size",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.view.enterFullScreen": "Enter Full Screen",
+  "menu.view.exitFullScreen": "Exit Full Screen",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleDevTools": "Toggle Developer Tools",
+  "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
+  "menu.view.reloadService": "Reload Service",
+  "menu.view.reloadFranz": "Reload Franz",
+  "menu.window.minimize": "Minimize",
+  "menu.window.close": "Close",
+  "menu.help.learnMore": "Learn More",
+  "menu.help.changelog": "Changelog",
+  "menu.help.support": "Support",
+  "menu.help.tos": "Terms of Service",
+  "menu.help.privacy": "Privacy Statement",
+  "menu.file": "File",
+  "menu.view": "View",
+  "menu.services": "Services",
+  "menu.window": "Window",
+  "menu.help": "Help",
+  "menu.app.about": "About Franz",
+  "menu.app.settings": "Settings",
+  "menu.app.hide": "Hide",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.unhide": "Unhide",
+  "menu.app.quit": "Quit",
+  "menu.services.addNewService": "Add New Service...",
+  "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"
 }
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 407266285..75047a613 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,6 +1,6 @@
 {
-   "global.api.unhealthy" : "No se puede conectar a los servicios en línea de Franz.",
-   "global.notConnectedToTheInternet" : "No estás conectado a Internet",
+   "global.api.unhealthy" : "No se puede conectar a los servicios en línea de Franz",
+   "global.notConnectedToTheInternet" : "No está conectado a Internet.",
    "import.headline" : "Importa tus servicios de Franz 4",
    "import.notSupportedHeadline" : "Servicios no soportados aún en Franz 5",
    "import.skip.label" : "Quiero agregar servicios manualmente",
@@ -12,11 +12,11 @@
    "infobar.servicesUpdated" : "Tus servicios han sido actualizados.",
    "infobar.updateAvailable" : "Una nueva actualización de Franz está disponible",
    "invite.email.label" : "Dirección de correo electrónico",
-   "invite.headline.friends" : "Invita a 3 de tus amigos o colegas",
+   "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.submit.label" : "Enviar invitaciones",
-   "invite.successInfo" : "Invitaciones enviadas",
+   "invite.successInfo" : "Invitaciones enviadas correctamente",
    "login.email.label" : "Dirección de correo electrónico",
    "login.headline" : "Iniciar sesión",
    "login.invalidCredentials" : "Correo electrónico o contraseña no válidos ",
@@ -25,7 +25,50 @@
    "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 la inicia sesión nuevamente.",
+   "login.tokenExpired" : "Tu sesión expiró, por favor inicia sesión otra vez.",
+   "menu.app.about" : "Sobre Franz",
+   "menu.app.hide" : "Ocultar",
+   "menu.app.hideOthers" : "Ocultar otros",
+   "menu.app.quit" : "Salir",
+   "menu.app.settings" : "Configuración",
+   "menu.app.unhide" : "Mostrar",
+   "menu.edit" : "Editar",
+   "menu.edit.copy" : "Copiar",
+   "menu.edit.cut" : "Cortar",
+   "menu.edit.delete" : "Borrar",
+   "menu.edit.emojiSymbols" : "Emoji y Símbolos",
+   "menu.edit.paste" : "Pegar",
+   "menu.edit.pasteAndMatchStyle" : "Pegar con el mismo estilo",
+   "menu.edit.redo" : "Rehacer",
+   "menu.edit.selectAll" : "Seleccionar todo",
+   "menu.edit.speech" : "Leer",
+   "menu.edit.startDictation" : "Empezar dictado",
+   "menu.edit.startSpeaking" : "Empezar lectura",
+   "menu.edit.stopSpeaking" : "Detener lectura",
+   "menu.edit.undo" : "Deshacer",
+   "menu.file" : "Archivo",
+   "menu.help" : "Ayuda",
+   "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.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.exitFullScreen" : "Salir de Pantalla Completa",
+   "menu.view.reloadFranz" : "Recargar Franz",
+   "menu.view.reloadService" : "Recargar Servicio",
+   "menu.view.resetZoom" : "Tamaño Actual",
+   "menu.view.toggleDevTools" : "Activar las Herramientas para Desarrolladores",
+   "menu.view.toggleFullScreen" : "Cambiar a Pantalla Completa",
+   "menu.view.toggleServiceDevTools" : "Mostrar Herramientas de Servicios para Desarrolladores",
+   "menu.view.zoomIn" : "Ampliar",
+   "menu.view.zoomOut" : "Reducir",
+   "menu.window" : "Ventana",
+   "menu.window.close" : "Cerrar",
+   "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",
@@ -73,10 +116,11 @@
    "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.enableSpellchecking" : "Activar corrección ortográfica",
    "settings.app.form.enableSystemTray" : "Mostrar Franz en la bandeja del sistema",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
+   "settings.app.form.hideDockIcon" : "Ocultar Icono de Franz en barra de herramientas",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimizar Franz a la bandeja del sistema",
    "settings.app.form.runInBackground" : "Mantener Franz en segundo plano al cerrar la ventana",
@@ -197,6 +241,10 @@
    "tabs.item.enableNotification" : "Activar notificaciones",
    "tabs.item.enableService" : "Activar servicio",
    "tabs.item.reload" : "Recargar",
+   "validation.email" : "{field} no es válido",
+   "validation.minLength" : "{field} debería tener al menos {length} caracteres",
+   "validation.required" : "{field} es obligatorio",
+   "validation.url" : "{field} no es una URL válida",
    "welcome.loginButton" : "Accede a tu cuenta",
    "welcome.signupButton" : "Crear una cuenta gratuita",
    "welcome.slogan" : "Mensajería que funciona para ti"
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 35a55fcc2..e00a5671b 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1,6 +1,6 @@
 {
-   "global.api.unhealthy" : "Impossible de se connecter aux services en ligne de Franz.",
-   "global.notConnectedToTheInternet" : "Vous n'êtes pas connecté(e) à Internet.",
+   "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.",
    "import.notSupportedHeadline" : "Ces services ne sont pas encore supportés par Franz 5",
    "import.skip.label" : "Je veux ajouter des services manuellement",
@@ -16,7 +16,7 @@
    "invite.name.label" : "Nom",
    "invite.skip.label" : "Je veux faire cela plus tard",
    "invite.submit.label" : "Envoyer des invitations",
-   "invite.successInfo" : "Invitations envoyées.",
+   "invite.successInfo" : "Invitations envoyées",
    "login.email.label" : "Adresse e-mail",
    "login.headline" : "S'inscrire",
    "login.invalidCredentials" : "E-mail ou mot de passe invalide",
@@ -26,11 +26,54 @@
    "login.serverLogout" : "Votre session a expiré. Reconnectez-vous s'il vous plaît.",
    "login.submit.label" : "Connexion",
    "login.tokenExpired" : "Votre session a expiré, veuillez vous reconnecter.",
+   "menu.app.about" : "À propos de Franz",
+   "menu.app.hide" : "Masquer",
+   "menu.app.hideOthers" : "Masquer les autres",
+   "menu.app.quit" : "Quitter",
+   "menu.app.settings" : "Paramètres",
+   "menu.app.unhide" : "Afficher",
+   "menu.edit" : "Éditer",
+   "menu.edit.copy" : "Copier",
+   "menu.edit.cut" : "Couper",
+   "menu.edit.delete" : "Supprimer",
+   "menu.edit.emojiSymbols" : "Emoji & Symboles",
+   "menu.edit.paste" : "Coller",
+   "menu.edit.pasteAndMatchStyle" : "Coller et fusionner le style",
+   "menu.edit.redo" : "Rétablir",
+   "menu.edit.selectAll" : "Tout sélectionner",
+   "menu.edit.speech" : "Synthèse vocale",
+   "menu.edit.startDictation" : "Démarrer la synthèse vocale",
+   "menu.edit.startSpeaking" : "Démarrer la lecture",
+   "menu.edit.stopSpeaking" : "Arrêter la synthèse vocale",
+   "menu.edit.undo" : "Annuler",
+   "menu.file" : "Fichier",
+   "menu.help" : "Aide",
+   "menu.help.changelog" : "Liste des modifications",
+   "menu.help.learnMore" : "En savoir plus",
+   "menu.help.privacy" : "Déclaration de confidentialité",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Conditions d'utilisation",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Ajouter un nouveau service...",
+   "menu.view" : "Affichage",
+   "menu.view.enterFullScreen" : "Entrer en mode plein écran",
+   "menu.view.exitFullScreen" : "Sortir du mode plein écran",
+   "menu.view.reloadFranz" : "Actualiser Franz",
+   "menu.view.reloadService" : "Redémarrer le service",
+   "menu.view.resetZoom" : "Taille réelle",
+   "menu.view.toggleDevTools" : "Activer les outils développeur",
+   "menu.view.toggleFullScreen" : "Activer \/ désactiver le mode plein écran",
+   "menu.view.toggleServiceDevTools" : "Activer les outils de développement WebKit",
+   "menu.view.zoomIn" : "Zoom Avant",
+   "menu.view.zoomOut" : "Zoom Arrière",
+   "menu.window" : "Fenêtre",
+   "menu.window.close" : "Fermer",
+   "menu.window.minimize" : "Réduire",
    "password.email.label" : "Adresse e-mail",
    "password.headline" : "Réinitialiser le mot de passe",
    "password.link.login" : "Connectez-vous à votre compte",
    "password.link.signup" : "Créer un compte gratuit.",
-   "password.noUser" : "Aucun utilisateur n'a été trouvé avec cette adresse e-mail ",
+   "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",
    "pricing.headline" : "Soutenez Franz",
@@ -73,6 +116,7 @@
    "settings.app.form.autoLaunchInBackground" : "Ouvrir en arrière-plan",
    "settings.app.form.autoLaunchOnStart" : "Lancer Franz au démarrage",
    "settings.app.form.beta" : "Accepter les versions bêta",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
    "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",
@@ -94,7 +138,7 @@
    "settings.app.updateStatusAvailable" : "Mise à jour disponible, téléchargement en cours...",
    "settings.app.updateStatusSearching" : "Recherche d'une mise à jour",
    "settings.app.updateStatusUpToDate" : "Vous utilisez la dernière version de Franz",
-   "settings.invite.headline" : "Invite 3 amis",
+   "settings.invite.headline" : "Invite des amis",
    "settings.navigation.account" : "Compte",
    "settings.navigation.availableServices" : "Services disponibles",
    "settings.navigation.inviteFriends" : "Inviter des amis",
@@ -138,7 +182,7 @@
    "settings.service.form.tabHosted" : "Hébergé",
    "settings.service.form.tabOnPremise" : "Auto-hébergé ��",
    "settings.service.form.team" : "Équipe",
-   "settings.service.form.useHostedService" : "Utilisez le service hébergé {nom}.",
+   "settings.service.form.useHostedService" : "Utilisez le service hébergé {name}.",
    "settings.service.form.yourServices" : "Vos services",
    "settings.services.deletedInfo" : "Le service a été supprimé",
    "settings.services.discoverServices" : "Découvrir les services",
@@ -174,30 +218,34 @@
    "signup.password.label" : "Mot de passe",
    "signup.submit.label" : "Créer un compte",
    "subscription.euTaxInfo" : "Résidents de l'UE : une taxe locale peut s'appliquer",
-   "subscription.features.ads" : "No ads, ever!",
-   "subscription.features.comingSoon" : "coming soon",
-   "subscription.features.customServices" : "Private services for you and your team",
-   "subscription.features.encryptedSync" : "Encrypted session synchronization",
+   "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.onpremise" : "Ajouter des services locaux\/hébergés comme HipChat",
    "subscription.features.vpn" : "Support des Proxy et VPN",
    "subscription.includedFeatures" : "Le compte payant Supporter Premium Franz inclut",
-   "subscription.paymentSessionError" : "Could not initialize payment form",
-   "subscription.submit.label" : "I want to support the development of Franz",
-   "subscription.type.free" : "free",
-   "subscription.type.month" : "month",
-   "subscription.type.year" : "year",
-   "subscriptionPopup.buttonCancel" : "Cancel",
-   "subscriptionPopup.buttonDone" : "Done",
-   "tabs.item.deleteService" : "Delete service",
+   "subscription.paymentSessionError" : "Initialisation du paiement impossible",
+   "subscription.submit.label" : "Je souhaite aider au développement de Franz",
+   "subscription.type.free" : "gratuit",
+   "subscription.type.month" : "mois",
+   "subscription.type.year" : "année",
+   "subscriptionPopup.buttonCancel" : "Annuler",
+   "subscriptionPopup.buttonDone" : "Terminé",
+   "tabs.item.deleteService" : "Supprimer le service",
    "tabs.item.disableAudio" : "Désactiver l'audio",
-   "tabs.item.disableNotifications" : "Disable notifications",
-   "tabs.item.disableService" : "Disable service",
-   "tabs.item.edit" : "Edit",
+   "tabs.item.disableNotifications" : "Désactiver les notifications",
+   "tabs.item.disableService" : "Désactiver le service",
+   "tabs.item.edit" : "Éditer",
    "tabs.item.enableAudio" : "Activer l'audio",
-   "tabs.item.enableNotification" : "Enable notifications",
+   "tabs.item.enableNotification" : "Activer les notifications",
    "tabs.item.enableService" : "Activer le service",
-   "tabs.item.reload" : "Reload",
-   "welcome.loginButton" : "Login to your account",
-   "welcome.signupButton" : "Create a free account",
+   "tabs.item.reload" : "Recharger",
+   "validation.email" : "{field} n'est pas valide",
+   "validation.minLength" : "{field} doit contenir au moins {length} caractère(s)",
+   "validation.required" : "{field} est requis",
+   "validation.url" : "{field} n'est pas une URL valide",
+   "welcome.loginButton" : "Se connecter sur son compte",
+   "welcome.signupButton" : "Créer un compte gratuit",
    "welcome.slogan" : "Une messagerie qui fonctionne pour vous"
 }
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 13b251755..1c0b537b2 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "D'éag do sheisiún, logáil isteach arís le do thoil.",
    "login.submit.label" : "Logáil isteach",
    "login.tokenExpired" : "D'éag do sheisiún, logáil isteach arís le do thoil.",
+   "menu.app.about" : "Faoi Franz",
+   "menu.app.hide" : "Cuir Franz i bhfolach",
+   "menu.app.hideOthers" : "Folaigh feidhmchláir eile",
+   "menu.app.quit" : "Scoir",
+   "menu.app.settings" : "Socruithe",
+   "menu.app.unhide" : "Taispeáin",
+   "menu.edit" : "Cuir in eagar",
+   "menu.edit.copy" : "Cóipeáil",
+   "menu.edit.cut" : "Gearr",
+   "menu.edit.delete" : "Scrios",
+   "menu.edit.emojiSymbols" : "Straoiseoga � siombailí",
+   "menu.edit.paste" : "Greamaigh",
+   "menu.edit.pasteAndMatchStyle" : "Greamaigh agus cuir stíl in oiriúint",
+   "menu.edit.redo" : "Athdhéan",
+   "menu.edit.selectAll" : "Roghnaigh gach rud",
+   "menu.edit.speech" : "Caint",
+   "menu.edit.startDictation" : "Tosaigh deachtú",
+   "menu.edit.startSpeaking" : "Tosaigh ag caint",
+   "menu.edit.stopSpeaking" : "Stad ag caint",
+   "menu.edit.undo" : "Cealaigh",
+   "menu.file" : "Comhad",
+   "menu.help" : "Cabhair",
+   "menu.help.changelog" : "Athruithe",
+   "menu.help.learnMore" : "Tuilleadh eolais",
+   "menu.help.privacy" : "Ráiteas phríobháideachais",
+   "menu.help.support" : "Tacaíocht",
+   "menu.help.tos" : "Téarmaí tagartha",
+   "menu.services" : "Seirbhísí",
+   "menu.services.addNewService" : "Cuir seirbhís nua leis",
+   "menu.view" : "Amharc",
+   "menu.view.enterFullScreen" : "Cuir isteach mód lánscáileáin",
+   "menu.view.exitFullScreen" : "Scoir mód lánscáileáin",
+   "menu.view.reloadFranz" : "Athlódáil Franz",
+   "menu.view.reloadService" : "Athlódáil seirbhís",
+   "menu.view.resetZoom" : "Fíormhéid",
+   "menu.view.toggleDevTools" : "Scoránaigh uirlis forbróra",
+   "menu.view.toggleFullScreen" : "Scoránaigh mód lánscáileáin",
+   "menu.view.toggleServiceDevTools" : "Scoránaigh uirlis forbróra seirbhíse",
+   "menu.view.zoomIn" : "Zúmáil isteach",
+   "menu.view.zoomOut" : "Zúmáil amach",
+   "menu.window" : "Fuinneog",
+   "menu.window.close" : "Dún",
+   "menu.window.minimize" : "�oslaghdaigh",
    "password.email.label" : "Seoladh ríomhphoist",
    "password.headline" : "Athshocraigh pasfhocal",
    "password.link.login" : "Logáil isteach i do chuntas",
@@ -73,6 +116,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.enableGPUAcceleration" : "Cumasaigh luasghéarú APG",
    "settings.app.form.enableMenuBar" : "Taispeáin Franz sa bharra roghchláir",
    "settings.app.form.enableSpellchecking" : "Cumasaigh seiceáil litrithe",
    "settings.app.form.enableSystemTray" : "Taispeáin Franz i dtráidire an chórais",
@@ -168,7 +212,7 @@
    "signup.headline" : "Cláraigh",
    "signup.lastname.label" : "Sloinne",
    "signup.legal.info" : "Agus tú ag cruthú cuntas Franz glacann tú le",
-   "signup.legal.privacy" : "Ráiteas phríobháideachais",
+   "signup.legal.privacy" : "Polasaí príobháideachais",
    "signup.legal.terms" : "Tearmaí seirbhíse",
    "signup.link.login" : "Cuntas agat cheana féin, logáil isteach?",
    "signup.password.label" : "Pasfhocal",
@@ -197,6 +241,10 @@
    "tabs.item.enableNotification" : "Cumasaigh fógraí",
    "tabs.item.enableService" : "Cumasaigh seirbhís",
    "tabs.item.reload" : "Athlódáil",
+   "validation.email" : "Níl {field} neamhbhailí",
+   "validation.minLength" : "Ba cheart go mbeadh {field} ar a laghad {length} charactar fada",
+   "validation.required" : "Tá {field} de dhíth",
+   "validation.url" : "Ní AAA bhailí é {field}",
    "welcome.loginButton" : "Logáil isteach i do chuntas",
    "welcome.signupButton" : "Cruthaigh cuntas nua",
    "welcome.slogan" : "Teachtaireachtaí a oibríonn duitse"
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 97bfc19f4..e227c4537 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -16,7 +16,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" : "Pozivnice uspješno poslane",
    "login.email.label" : "Vaša e-adresa:",
    "login.headline" : "Prijavite se",
    "login.invalidCredentials" : "E-mail ili lozinka nisu to�ni",
@@ -26,6 +26,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.settings" : "Postavke",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Uredi",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Obriši",
+   "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.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.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" : "Vaša e-adresa",
    "password.headline" : "Stvorite novu zaporku",
    "password.link.login" : "Prijavite se na Vaš ra�un",
@@ -68,12 +111,13 @@
    "settings.app.buttonClearAllCache" : "O�isti memoriju",
    "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" : "Franz predmemorija trenutno koristi {size} prostora na disku",
    "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.enableMenuBar" : "Show Franz in Menu Bar",
+   "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",
@@ -89,15 +133,15 @@
    "settings.app.headlineLanguage" : "Jezik",
    "settings.app.headlineUpdates" : "Nadogradnje",
    "settings.app.restartRequired" : "Promjene postavki zahtijevaju ponovni zagon",
-   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.subheadlineCache" : "Predmemorija",
    "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" : "Pozovi prijatelje",
    "settings.navigation.account" : "Ra�un",
    "settings.navigation.availableServices" : "Dostupne usluge",
-   "settings.navigation.inviteFriends" : "Invite Friends",
+   "settings.navigation.inviteFriends" : "Pozovi prijatelje",
    "settings.navigation.logout" : "Odjava",
    "settings.navigation.settings" : "Postavke",
    "settings.navigation.yourServices" : "Vaše usluge",
@@ -108,7 +152,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" : "Potraži servis",
    "settings.service.error.goBack" : "Nazad do servisa",
    "settings.service.error.headline" : "Greška",
    "settings.service.error.message" : "Nemoguće u�itati sadržaj usluge. ",
@@ -126,10 +170,10 @@
    "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.headlineNotifications" : "Obavijesti",
+   "settings.service.form.icon" : "Prilagođena ikona",
+   "settings.service.form.iconDelete" : "Obriši",
+   "settings.service.form.iconUpload" : "Ispusti sliku ili klikni ovdje",
    "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. ",
@@ -197,6 +241,10 @@
    "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",
    "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/hu.json b/src/i18n/locales/hu.json
index 15bdd33f4..3571ad453 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -26,6 +26,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.settings" : "Beállítások",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Szerkesztés",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "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.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",
    "password.email.label" : "Email cím",
    "password.headline" : "Jelszó visszaállítása",
    "password.link.login" : "Jelentkezz be a fiókodba",
@@ -73,6 +116,7 @@
    "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.enableSpellchecking" : "Helyesírás-ellenőrzés engedélyezése",
    "settings.app.form.enableSystemTray" : "Franz mutatása a tálcán",
@@ -197,6 +241,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",
    "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 509c5ad9c..e6d671c1b 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -26,6 +26,49 @@
    "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",
+   "menu.app.settings" : "Pengaturan",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Edit",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "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.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",
    "password.email.label" : "Alamat email",
    "password.headline" : "Setel ulang sandi",
    "password.link.login" : "Masuk ke akun Anda",
@@ -73,6 +116,7 @@
    "settings.app.form.autoLaunchInBackground" : "Buka di latar belakang",
    "settings.app.form.autoLaunchOnStart" : "Jalankan Franz saat komputer dimulai",
    "settings.app.form.beta" : "Sertakan versi beta",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
    "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",
@@ -197,6 +241,10 @@
    "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",
    "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 a1392afba..9d23a309b 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -6,7 +6,7 @@
    "import.skip.label" : "Voglio aggiungere servizi manualmente",
    "import.submit.label" : "Importa servizi",
    "infobar.buttonChangelog" : "Cosa c'è di nuovo?",
-   "infobar.buttonInstallUpdate" : "Riavvia e installa gli aggiornamenti",
+   "infobar.buttonInstallUpdate" : "Riavvia e installa aggiornamento",
    "infobar.buttonReloadServices" : "Ricarica servizi",
    "infobar.requiredRequestsFailed" : "Impossibile caricare servizi e info utente",
    "infobar.servicesUpdated" : "I tuoi servizi sono stati aggiornati.",
@@ -26,17 +26,60 @@
    "login.serverLogout" : "La tua sessione è scaduta, accedi nuovamente.",
    "login.submit.label" : "Accedi",
    "login.tokenExpired" : "La tua sessione è scaduta, accedi nuovamente.",
+   "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.unhide" : "Mostra",
+   "menu.edit" : "Modifica",
+   "menu.edit.copy" : "Copia",
+   "menu.edit.cut" : "Taglia",
+   "menu.edit.delete" : "Elimina",
+   "menu.edit.emojiSymbols" : "Emoji e Simboli",
+   "menu.edit.paste" : "Incolla",
+   "menu.edit.pasteAndMatchStyle" : "Incolla e Mantieni Stile",
+   "menu.edit.redo" : "Ripeti",
+   "menu.edit.selectAll" : "Seleziona Tutto",
+   "menu.edit.speech" : "Sintesi Vocale",
+   "menu.edit.startDictation" : "Avvia Dettatura",
+   "menu.edit.startSpeaking" : "Avvia Pronuncia",
+   "menu.edit.stopSpeaking" : "Interrompi Pronuncia",
+   "menu.edit.undo" : "Annulla",
+   "menu.file" : "File",
+   "menu.help" : "Aiuto",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Maggiori Informazioni",
+   "menu.help.privacy" : "Informativa sulla 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.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.zoomIn" : "Aumenta Zoom",
+   "menu.view.zoomOut" : "Diminuisci Zoom",
+   "menu.window" : "Finestra",
+   "menu.window.close" : "Chiudi",
+   "menu.window.minimize" : "Minimizza",
    "password.email.label" : "Indirizzo email",
    "password.headline" : "Reimposta password",
    "password.link.login" : "Accedi al tuo account",
    "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" : "Controlla la tua email",
-   "pricing.headline" : "Supporta Franz",
-   "pricing.link.skipPayment" : "Non voglio supportare lo sviluppo di Franz",
+   "password.successInfo" : "Please check your email",
+   "pricing.headline" : "Support Franz",
+   "pricing.link.skipPayment" : "Non voglio supportare lo sviluppo di Franz.",
    "pricing.submit.label" : "Voglio supportare lo sviluppo di Franz",
-   "pricing.support.label" : "Seleziona il tuo piano di supporto",
+   "pricing.support.label" : "Select your support plan",
    "service.crashHandler.action" : "Ricarica {name}",
    "service.crashHandler.autoReload" : "Tentativo di ripristino automatico di {name} in {seconds} secondi",
    "service.crashHandler.headline" : "Oh no!",
@@ -44,7 +87,7 @@
    "service.disabledHandler.action" : "Attiva {name}",
    "service.disabledHandler.headline" : "{name} è disattivato",
    "services.getStarted" : "Iniziamo",
-   "services.welcome" : "Benvenuto in Franz",
+   "services.welcome" : "Welcome to Franz",
    "settings.account.account.editButton" : "Modifica account",
    "settings.account.accountType.basic" : "Account Basic",
    "settings.account.accountType.premium" : "Premium Supporter Account",
@@ -67,12 +110,13 @@
    "settings.account.userInfoRequestFailed" : "Impossibile caricare informazioni utente.",
    "settings.app.buttonClearAllCache" : "Svuota la cache",
    "settings.app.buttonInstallUpdate" : "Riavvia e installa l'aggiornamento",
-   "settings.app.buttonSearchForUpdate" : "Controlla gli aggiornamenti",
+   "settings.app.buttonSearchForUpdate" : "Controlla aggiornamenti",
    "settings.app.cacheInfo" : "Franz sta utilizzando {size} di spazio su disco.",
    "settings.app.currentVersion" : "Versione attuale:",
    "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.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",
@@ -158,9 +202,9 @@
    "settings.user.form.lastname" : "Cognome",
    "settings.user.form.newPassword" : "Nuova password",
    "sidebar.addNewService" : "Aggiungi un nuovo servizio",
-   "sidebar.muteApp" : "Disattiva notifiche & audio",
+   "sidebar.muteApp" : "Disattiva notifiche e audio",
    "sidebar.settings" : "Impostazioni",
-   "sidebar.unmuteApp" : "Attiva notifiche & audio",
+   "sidebar.unmuteApp" : "Attiva notifiche e audio",
    "signup.company.label" : "Società",
    "signup.email.label" : "Indirizzo email",
    "signup.emailDuplicate" : "Esiste già un utente con lo stesso indirizzo email",
@@ -197,6 +241,10 @@
    "tabs.item.enableNotification" : "Attiva notifiche",
    "tabs.item.enableService" : "Attiva servizio",
    "tabs.item.reload" : "Aggiorna",
+   "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"
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 9fc0a211b..a7af10aba 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "セッション�期��切れ���。ログイン�直��下��。",
    "login.submit.label" : "サインイン",
    "login.tokenExpired" : "セッション�期��切れ���。ログイン�直��下��。",
+   "menu.app.about" : "Franz����",
+   "menu.app.hide" : "隠�",
+   "menu.app.hideOthers" : "他を隠�",
+   "menu.app.quit" : "終了",
+   "menu.app.settings" : "設定",
+   "menu.app.unhide" : "表示�る",
+   "menu.edit" : "編集",
+   "menu.edit.copy" : "コピー",
+   "menu.edit.cut" : "切り�り",
+   "menu.edit.delete" : "削除",
+   "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" : "サ�ート",
+   "menu.help.tos" : "サービス利用�約",
+   "menu.services" : "サービス",
+   "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" : "サービス開発者ツールを切り替�",
+   "menu.view.zoomIn" : "表示を拡大�る",
+   "menu.view.zoomOut" : "表示を縮��る",
+   "menu.window" : "ウィンドウ",
+   "menu.window.close" : "閉�る",
+   "menu.window.minimize" : "最�化",
    "password.email.label" : "メールアドレス",
    "password.headline" : "パスワード�リセット",
    "password.link.login" : "サインイン",
@@ -73,6 +116,7 @@
    "settings.app.form.autoLaunchInBackground" : "�ックグラウンド�開�",
    "settings.app.form.autoLaunchOnStart" : "システム起動時�Franzを開�",
    "settings.app.form.beta" : "Beta�ージョンを��る",
+   "settings.app.form.enableGPUAcceleration" : "GPUアクセラレーションを有効��る",
    "settings.app.form.enableMenuBar" : "メニュー�ー�Franzを表示�る",
    "settings.app.form.enableSpellchecking" : "スペル�ェックを有効��る",
    "settings.app.form.enableSystemTray" : "Franzをシステムトレイ�表示�る",
@@ -197,6 +241,10 @@
    "tabs.item.enableNotification" : "通知を有効��る",
    "tabs.item.enableService" : "サービスを有効��る",
    "tabs.item.reload" : "�読�込�",
+   "validation.email" : "{field}�正���り��ん",
+   "validation.minLength" : "{field}�少���も{length}文字以上���れ��り��ん",
+   "validation.required" : "{field}�必須��",
+   "validation.url" : "{field}�正��URL���り��ん",
    "welcome.loginButton" : "アカウント�ログイン",
    "welcome.signupButton" : "無料アカウントを作�",
    "welcome.slogan" : "Messaging that works for you"
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 67e81e12b..7679bc6fc 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -26,6 +26,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.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.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.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",
    "password.email.label" : "მეილი",
    "password.headline" : "პ�რ�ლის �ღდგენ�",
    "password.link.login" : "შედით თქვენს �ნგ�რიშში",
@@ -73,6 +116,7 @@
    "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.enableSpellchecking" : "Enable spell checking",
    "settings.app.form.enableSystemTray" : "�ჩვენეთ Franz სისტემის უჯრ�ში",
@@ -197,6 +241,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",
    "welcome.loginButton" : "შედით თქვენს �ნგ�რიშში",
    "welcome.signupButton" : "შექმენი �ნგ�რიში, ეს უფ�ს��",
    "welcome.slogan" : "შეტყ�ბინების �პლიკ�ცი�, რ�მელიც მუშ��ბს შენთვის"
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index dab23f607..13dc7548e 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -26,6 +26,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.settings" : "Instellingen",
+   "menu.app.unhide" : "Unhide",
+   "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.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "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.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" : "E-mailadres",
    "password.headline" : "Wachtwoord resetten",
    "password.link.login" : "Log in op je account",
@@ -73,6 +116,7 @@
    "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.enableSystemTray" : "Toon Franz in de systeembalk",
@@ -197,6 +241,10 @@
    "tabs.item.enableNotification" : "Notificaties inschakelen",
    "tabs.item.enableService" : "Service aanzetten",
    "tabs.item.reload" : "Herladen",
+   "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" : "Inloggen op je account",
    "welcome.signupButton" : "Maak een gratis account aan",
    "welcome.slogan" : "Messaging that works for you"
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index e2b14ceab..4ff3cdd80 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -7,7 +7,7 @@
    "import.submit.label" : "Importeer services",
    "infobar.buttonChangelog" : "Wat is er nieuw?",
    "infobar.buttonInstallUpdate" : "Opnieuw opstarten & update installeren",
-   "infobar.buttonReloadServices" : "Laad services opnieuw",
+   "infobar.buttonReloadServices" : "Services opnieuw laden",
    "infobar.requiredRequestsFailed" : "Kan de services en gebruikersinformatie niet laden",
    "infobar.servicesUpdated" : "Je services zijn bijgewerkt.",
    "infobar.updateAvailable" : "Er is een nieuwe update voor Franz beschikbaar.",
@@ -26,6 +26,49 @@
    "login.serverLogout" : "De sessie is verlopen, log alsjeblieft opnieuw in.",
    "login.submit.label" : "Inloggen",
    "login.tokenExpired" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
+   "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" : "Tonen",
+   "menu.edit" : "Bewerk",
+   "menu.edit.copy" : "Kopiëren",
+   "menu.edit.cut" : "Knippen",
+   "menu.edit.delete" : "Verwijderen",
+   "menu.edit.emojiSymbols" : "Emoji's en symbolen",
+   "menu.edit.paste" : "Plakken",
+   "menu.edit.pasteAndMatchStyle" : "Plakken en stijl overeen laten komen",
+   "menu.edit.redo" : "Opnieuw doen",
+   "menu.edit.selectAll" : "Selecteer alles",
+   "menu.edit.speech" : "Spraak",
+   "menu.edit.startDictation" : "Beginnen met dicteren",
+   "menu.edit.startSpeaking" : "Beginnen met praten",
+   "menu.edit.stopSpeaking" : "Stoppen met spreken",
+   "menu.edit.undo" : "Ongedaan maken",
+   "menu.file" : "Bestand",
+   "menu.help" : "Hulp",
+   "menu.help.changelog" : "Wijzigingenlogboek",
+   "menu.help.learnMore" : "Meer informatie",
+   "menu.help.privacy" : "Privacy Voorwaarden",
+   "menu.help.support" : "Ondersteuning",
+   "menu.help.tos" : "Servicevoorwaarden",
+   "menu.services" : "Diensten",
+   "menu.services.addNewService" : "Nieuwe dienst toevoegen",
+   "menu.view" : "Weergave",
+   "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",
    "password.email.label" : "E-mailadres",
    "password.headline" : "Wachtwoord vergeten",
    "password.link.login" : "Log in op je account",
@@ -73,6 +116,7 @@
    "settings.app.form.autoLaunchInBackground" : "Open op de achtergrond",
    "settings.app.form.autoLaunchOnStart" : "Open Franz bij opstarten",
    "settings.app.form.beta" : "Inclusief bètaversies",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
    "settings.app.form.enableMenuBar" : "Toon Franz in menubalk",
    "settings.app.form.enableSpellchecking" : "Zet spellingcontrole aan",
    "settings.app.form.enableSystemTray" : "Toon Franz in de systeembalk",
@@ -197,6 +241,10 @@
    "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",
    "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 95e269ea7..9fb72b9c9 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -16,7 +16,7 @@
    "invite.name.label" : "ImiÄ™",
    "invite.skip.label" : "Chcę to zrobić później",
    "invite.submit.label" : "Wyślij zaproszenia",
-   "invite.successInfo" : "Invitations sent successfully",
+   "invite.successInfo" : "Zaproszenia zostały wysłane",
    "login.email.label" : "Adres email",
    "login.headline" : "Zaloguj siÄ™",
    "login.invalidCredentials" : "Adres email lub hasło są błędne",
@@ -26,6 +26,49 @@
    "login.serverLogout" : "Twoja sesja wygasła, zaloguj się ponownie.",
    "login.submit.label" : "Zaloguj siÄ™",
    "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.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.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.startDictation" : "Zacznij dyktować",
+   "menu.edit.startSpeaking" : "Zacznij mówić",
+   "menu.edit.stopSpeaking" : "Przestań mówić",
+   "menu.edit.undo" : "Cofnij",
+   "menu.file" : "Plik",
+   "menu.help" : "Pomoc",
+   "menu.help.changelog" : "Lista zmian",
+   "menu.help.learnMore" : "Dowiedz się więcej",
+   "menu.help.privacy" : "Polityka prywatności",
+   "menu.help.support" : "Wsparcie",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Usługi",
+   "menu.services.addNewService" : "Dodaj nową usługę...",
+   "menu.view" : "Widok",
+   "menu.view.enterFullScreen" : "Włącz tryb pełnoekranowy",
+   "menu.view.exitFullScreen" : "Zakończ tryb pełnoekranowy",
+   "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.toggleFullScreen" : "Przełącz tryb pełnoekranowy",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Powiększ",
+   "menu.view.zoomOut" : "Pomniejsz",
+   "menu.window" : "Okno",
+   "menu.window.close" : "Zamknij",
+   "menu.window.minimize" : "Zminimalizuj",
    "password.email.label" : "Adres email",
    "password.headline" : "Wyzeruj hasło",
    "password.link.login" : "Zaloguj siÄ™ na swoje konto",
@@ -41,7 +84,7 @@
    "service.crashHandler.autoReload" : "Próba automatycznego odnowienia {name} za {seconds} sekund\/y",
    "service.crashHandler.headline" : "O nie!",
    "service.crashHandler.text" : "{name} spowodował problem.",
-   "service.disabledHandler.action" : "Dostępny {name}",
+   "service.disabledHandler.action" : "WÅ‚Ä…cz {name}",
    "service.disabledHandler.headline" : "{name} jest wyłączony",
    "services.getStarted" : "Zacznij",
    "services.welcome" : "Witaj w programie Franz",
@@ -65,18 +108,19 @@
    "settings.account.successInfo" : "Twoje zmiany zostały zapisane",
    "settings.account.tryReloadUserInfoRequest" : "Spróbuj ponownie",
    "settings.account.userInfoRequestFailed" : "Nie można wczytać informacji o użytkowniku",
-   "settings.app.buttonClearAllCache" : "Clear cache",
+   "settings.app.buttonClearAllCache" : "Wyczyść pamięć podręczną (cache)",
    "settings.app.buttonInstallUpdate" : "Uruchom ponownie i zainstaluj aktualizacjÄ™",
    "settings.app.buttonSearchForUpdate" : "Sprawdź aktualizacje",
-   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
+   "settings.app.cacheInfo" : "Pamięć podręczna zajmuje obecnie {size} przestrzeni dyskowej",
    "settings.app.currentVersion" : "Aktualna wersja:",
    "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.enableMenuBar" : "Show Franz in Menu Bar",
+   "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.hideDockIcon" : "Hide Franz icon in Dock",
+   "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",
@@ -89,15 +133,15 @@
    "settings.app.headlineLanguage" : "Język",
    "settings.app.headlineUpdates" : "Aktualizacje",
    "settings.app.restartRequired" : "Zmiany. wymagajÄ… ponownego uruchomienia",
-   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.subheadlineCache" : "Pamięć podręczna",
    "settings.app.translationHelp" : "Pomóż nam tłumaczyć Franz na Twój język.",
    "settings.app.updateStatusAvailable" : "Dostępna aktualizacja, pobieram...",
    "settings.app.updateStatusSearching" : "Szukam aktualizacji",
    "settings.app.updateStatusUpToDate" : "Używasz najnowszej wersji aplikacji Franz",
-   "settings.invite.headline" : "Invite Friends",
+   "settings.invite.headline" : "ZaproÅ› znajomych",
    "settings.navigation.account" : "Konto",
    "settings.navigation.availableServices" : "Dostępne usługi",
-   "settings.navigation.inviteFriends" : "Invite Friends",
+   "settings.navigation.inviteFriends" : "ZaproÅ› znajomych",
    "settings.navigation.logout" : "Wyloguj",
    "settings.navigation.settings" : "Ustawienia",
    "settings.navigation.yourServices" : "Twoje usługi",
@@ -108,7 +152,7 @@
    "settings.recipes.mostPopular" : "Najpopularniejsze",
    "settings.recipes.nothingFound" : "Żadna usługa nie została znaleziona.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Usługa została dodana pomyślnie",
-   "settings.searchService" : "Search service",
+   "settings.searchService" : "Wyszukaj serwis",
    "settings.service.error.goBack" : "Wróć do usług",
    "settings.service.error.headline" : "BÅ‚Ä…d",
    "settings.service.error.message" : "Nie można wczytać przepisu usługi.",
@@ -121,15 +165,15 @@
    "settings.service.form.deleteButton" : "Usuń usługę",
    "settings.service.form.editServiceHeadline" : "Edytuj {name}",
    "settings.service.form.enableAudio" : "Włącz dźwięk",
-   "settings.service.form.enableBadge" : "Show unread message badges",
+   "settings.service.form.enableBadge" : "Pokaż znacznik nieprzeczytanych wiadomości",
    "settings.service.form.enableNotification" : "Aktywuj powiadomienia",
    "settings.service.form.enableService" : "Aktywuj usługę",
-   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineBadges" : "Znaczniki nieprzeczytanych wiadomości",
    "settings.service.form.headlineGeneral" : "Ogólne",
-   "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.headlineNotifications" : "Powiadomienia",
+   "settings.service.form.icon" : "WÅ‚asna ikona",
+   "settings.service.form.iconDelete" : "Usuń",
+   "settings.service.form.iconUpload" : "Przeciągnij i upuść obraz lub kliknij tutaj",
    "settings.service.form.indirectMessageInfo" : "Będziesz informowany o wszystkich nowych wiadomościach na kanale, nie tylko @username, @channel, @here, ...",
    "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",
@@ -197,6 +241,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",
    "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 dd1633a9c..ceb35ce30 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,5 +1,5 @@
 {
-   "global.api.unhealthy" : "Não foi possível conectar-se aos serviços do Franz",
+   "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",
@@ -26,6 +26,49 @@
    "login.serverLogout" : "Sua sessão expirou, faça o login novamente.",
    "login.submit.label" : "Entrar",
    "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.quit" : "Sair",
+   "menu.app.settings" : "Ajustes",
+   "menu.app.unhide" : "Exibir",
+   "menu.edit" : "Editar",
+   "menu.edit.copy" : "Copiar",
+   "menu.edit.cut" : "Cortar",
+   "menu.edit.delete" : "Excluir",
+   "menu.edit.emojiSymbols" : "Emoji & Símbolos ",
+   "menu.edit.paste" : "Colar",
+   "menu.edit.pasteAndMatchStyle" : "Colar e corresponder ao estilo",
+   "menu.edit.redo" : "Refazer",
+   "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.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.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.reloadFranz" : "Recarregar Franz",
+   "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.zoomIn" : "Ampliar",
+   "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" : "Trocar a senha",
    "password.link.login" : "Fazer login na sua conta",
@@ -73,16 +116,17 @@
    "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.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.hideDockIcon" : "Hide Franz icon in Dock",
+   "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.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.headline" : "Ajustes",
+   "settings.app.headline" : "Configurações",
    "settings.app.headlineAdvanced" : "Avançado",
    "settings.app.headlineAppearance" : "Aparência",
    "settings.app.headlineGeneral" : "Geral",
@@ -94,10 +138,10 @@
    "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" : "Invite Friends",
+   "settings.invite.headline" : "Convidar amigos",
    "settings.navigation.account" : "Conta",
    "settings.navigation.availableServices" : "Serviços disponíveis",
-   "settings.navigation.inviteFriends" : "Invite Friends",
+   "settings.navigation.inviteFriends" : "Convidar amigos",
    "settings.navigation.logout" : "Sair",
    "settings.navigation.settings" : "Ajustes",
    "settings.navigation.yourServices" : "Seus serviços",
@@ -197,7 +241,11 @@
    "tabs.item.enableNotification" : "Ativar notificações",
    "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.required" : "{campo} obrigatório",
+   "validation.url" : "{campo} essa URL não é válida",
    "welcome.loginButton" : "Entrar na sua conta",
    "welcome.signupButton" : "Criar uma conta grátis",
-   "welcome.slogan" : "Mensageria que funciona, para você"
+   "welcome.slogan" : "Mensagens que funcionam para você"
 }
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index fb08ebd2a..44048e505 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -1,112 +1,156 @@
 {
-   "global.api.unhealthy" : "Não foi possível conectar aos serviços do Franz",
-   "global.notConnectedToTheInternet" : "Não estás conectado à internet.",
-   "import.headline" : "Importar os teus serviços do Franz 4",
-   "import.notSupportedHeadline" : "Os serviços não são suportados no Franz 5",
+   "global.api.unhealthy" : "Não foi possível conetar 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.submit.label" : "Importar serviços",
    "infobar.buttonChangelog" : "Novidades?",
    "infobar.buttonInstallUpdate" : "Reiniciar & Instalar Atualizações",
    "infobar.buttonReloadServices" : "Recarregar serviços",
    "infobar.requiredRequestsFailed" : "Não foi possivel carregar os serviços e informações do utilizador",
-   "infobar.servicesUpdated" : "Os teus serviços foram atualizados",
-   "infobar.updateAvailable" : "Uma atualização está disponível",
+   "infobar.servicesUpdated" : "Os seus serviços foram atualizados.",
+   "infobar.updateAvailable" : "Está disponível uma atualização",
    "invite.email.label" : "Endereço de e-mail",
-   "invite.headline.friends" : "Manda 3 convites aos teus amigos ou colegas",
+   "invite.headline.friends" : "Convide 3 amigos ou colegas",
    "invite.name.label" : "Nome",
-   "invite.skip.label" : "Quero adicionar mais tarde",
-   "invite.submit.label" : "Mandar convites",
-   "invite.successInfo" : "Invitations sent successfully",
+   "invite.skip.label" : "Quero 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 password estão incorretos",
-   "login.link.password" : "Repor a minha password",
+   "login.invalidCredentials" : "O email ou a palavra-passe estão incorretos",
+   "login.link.password" : "Repor a minha palavra-passe",
    "login.link.signup" : "Criar uma conta gratuita",
-   "login.password.label" : "Password",
-   "login.serverLogout" : "A tua sessão expirou, por favor, volta a fazer login.",
-   "login.submit.label" : "Iniciar Sessão",
-   "login.tokenExpired" : "A tua sessão expirou, por favor, volta a fazer login.",
+   "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.hide" : "Ocultar",
+   "menu.app.hideOthers" : "Ocultar Outros",
+   "menu.app.quit" : "Sair",
+   "menu.app.settings" : "Definições",
+   "menu.app.unhide" : "Mostrar",
+   "menu.edit" : "Editar",
+   "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.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",
    "password.email.label" : "Endereço de e-mail",
-   "password.headline" : "Repor a minha password",
-   "password.link.login" : "Fazer login",
+   "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.submit.label" : "Submeter",
-   "password.successInfo" : "Por favor, revê o teu email",
-   "pricing.headline" : "Apoia o Franz",
-   "pricing.link.skipPayment" : "Não quero ajudar no desenvolvimento do Franz",
-   "pricing.submit.label" : "Quero ajudar o desenvolvimento do Franz",
-   "pricing.support.label" : "Seleciona o teu plano",
-   "service.crashHandler.action" : "Actualizar",
-   "service.crashHandler.autoReload" : "A tentar restaurar automaticamente {name} em {seconds} seconds",
+   "password.successInfo" : "Por favor reveja o seu email",
+   "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.support.label" : "Selecione o seu plano",
+   "service.crashHandler.action" : "Recarregar",
+   "service.crashHandler.autoReload" : "A tentar restaurar automaticamente {name} em {seconds} segundos",
    "service.crashHandler.headline" : "Oh não!",
    "service.crashHandler.text" : "{name} causou um erro.",
-   "service.disabledHandler.action" : "Habilitar {name}",
-   "service.disabledHandler.headline" : "{name} está desactivado",
+   "service.disabledHandler.action" : "Ativar {name}",
+   "service.disabledHandler.headline" : "{name} está desativado",
    "services.getStarted" : "Vamos começar",
    "services.welcome" : "Bem-vindo ao Franz",
    "settings.account.account.editButton" : "Editar conta",
    "settings.account.accountType.basic" : "Conta básica",
-   "settings.account.accountType.premium" : "Conta Premium, a ajudar o Franz",
+   "settings.account.accountType.premium" : "Conta Premium",
    "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 são possiveis de restaurar!",
-   "settings.account.deleteInfo" : "Se não precisa mais da sua conta Franz, pode apagar a conta e os seus dados aqui.",
+   "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.headline" : "Conta",
    "settings.account.headlineAccount" : "Informação da conta",
    "settings.account.headlineDangerZone" : "Zona de perigo",
    "settings.account.headlineInvoices" : "Faturas",
-   "settings.account.headlinePassword" : "Mudar password",
-   "settings.account.headlineProfile" : "Actualizar o perfil",
-   "settings.account.headlineSubscription" : "A tua subscrição",
-   "settings.account.headlineUpgrade" : "Atualiza a tua conta e ajuda o Franz",
-   "settings.account.invoiceDownload" : "Descarregar",
+   "settings.account.headlinePassword" : "Alterar palavra-passe",
+   "settings.account.headlineProfile" : "Atualizar perfil",
+   "settings.account.headlineSubscription" : "A sua subscrição",
+   "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 tuas mudanças foram feitas com sucesso",
+   "settings.account.successInfo" : "As suas mudanças 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 a 'cache'",
+   "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" : "O 'chache' do Franz está a usar {size} do espaço do disco.",
+   "settings.app.cacheInfo" : "A cache do Franz está a usar {size} do espaço em disco.",
    "settings.app.currentVersion" : "Versão atual",
    "settings.app.form.autoLaunchInBackground" : "Abrir em segundo plano",
-   "settings.app.form.autoLaunchOnStart" : "Inicar o Franz quando inciar o computador",
+   "settings.app.form.autoLaunchOnStart" : "Iniciar o Franz com o início de sessão",
    "settings.app.form.beta" : "Incluir versões instáveis (beta)",
-   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
+   "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 bandeja do sistema",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
+   "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.minimizeToSystemTray" : "Minimizar o Franz para a bandeja do sistema",
+   "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 desactivados",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Apresentar icon com o número de mensagens não lidas quando as notificações estão desactivadas",
+   "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.headline" : "Definições",
    "settings.app.headlineAdvanced" : "Avançado",
    "settings.app.headlineAppearance" : "Aparência",
    "settings.app.headlineGeneral" : "Geral",
    "settings.app.headlineLanguage" : "Idioma:",
    "settings.app.headlineUpdates" : "Atualizações",
-   "settings.app.restartRequired" : "Alterações requerem reiniciar",
+   "settings.app.restartRequired" : "Alterações requerem reinício",
    "settings.app.subheadlineCache" : "Cache",
-   "settings.app.translationHelp" : "Ajude a traduzir a Franz para a sua língua. ",
-   "settings.app.updateStatusAvailable" : "Atualização disponivel, a descarregar...",
-   "settings.app.updateStatusSearching" : "Está a procurar atualizações",
-   "settings.app.updateStatusUpToDate" : "Estás a usar a última versão do Franz",
-   "settings.invite.headline" : "Invite Friends",
+   "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.updateStatusUpToDate" : "Está a usar a versão mais recente do Franz",
+   "settings.invite.headline" : "Convide amigos",
    "settings.navigation.account" : "Conta",
    "settings.navigation.availableServices" : "Serviços disponíveis",
-   "settings.navigation.inviteFriends" : "Invite Friends",
-   "settings.navigation.logout" : "Terminar Sessão",
+   "settings.navigation.inviteFriends" : "Convide amigos",
+   "settings.navigation.logout" : "Terminar sessão",
    "settings.navigation.settings" : "Definições",
-   "settings.navigation.yourServices" : "Os teus serviços",
+   "settings.navigation.yourServices" : "Os seus serviços",
    "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.mostPopular" : "Os mais populares",
-   "settings.recipes.nothingFound" : "Desculpa, mas não existe nenhum serviço com este termo.",
+   "settings.recipes.nothingFound" : "Lamentamos, mas não existe 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",
@@ -115,89 +159,93 @@
    "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 de hospedagem própria, precisas de uma Conta Premium Franz.",
+   "settings.service.form.customUrlPremiumInfo" : "Para adicionar serviços com domínio próprio, é necessário uma Conta Premium.",
    "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" : "Activar áudio",
+   "settings.service.form.enableAudio" : "Ativar áudio",
    "settings.service.form.enableBadge" : "Mostrar emblema de mensagens não vistas",
    "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.headlineGeneral" : "Geral",
    "settings.service.form.headlineNotifications" : "Notificações",
-   "settings.service.form.icon" : "Icon personalizável",
+   "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ás notificado sobre todas as novas mensagens de um canal, não só @username, @channel, @here, ...",
+   "settings.service.form.indirectMessageInfo" : "Será notificado sobre todas as novas mensagens de um 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 desactivado, todo o audio das notificações estará em silêncio",
+   "settings.service.form.isMutedInfo" : "Quando desativado, todas as notificações de áudio serão silenciadas",
    "settings.service.form.name" : "Nome",
    "settings.service.form.saveButton" : "Guardar serviço",
-   "settings.service.form.tabHosted" : "Hospedado",
-   "settings.service.form.tabOnPremise" : "Hospedado por si próprio ��",
+   "settings.service.form.tabHosted" : "Com domínio",
+   "settings.service.form.tabOnPremise" : "Com domínio próprio ��",
    "settings.service.form.team" : "Equipa",
    "settings.service.form.useHostedService" : "Utilize o serviço oferecido por {name}.",
-   "settings.service.form.yourServices" : "Os teus serviços",
+   "settings.service.form.yourServices" : "Os seus serviços",
    "settings.services.deletedInfo" : "O serviço foi apagado",
    "settings.services.discoverServices" : "Descobrir serviços",
-   "settings.services.headline" : "Os teus serviços",
-   "settings.services.noServicesAdded" : "Ainda não adicionaste nenhum serviço.",
+   "settings.services.headline" : "Os seus serviços",
+   "settings.services.noServicesAdded" : "Ainda não adicionou nenhum 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 desabilitadas",
+   "settings.services.tooltip.notificationsDisabled" : "As notificações estão desativadas",
    "settings.services.updatedInfo" : "As alterações foram guardadas",
    "settings.user.form.accountType.company" : "Empresa",
-   "settings.user.form.accountType.individual" : "Individual",
+   "settings.user.form.accountType.individual" : "Indivíduo",
    "settings.user.form.accountType.label" : "Tipo de conta",
    "settings.user.form.accountType.non-profit" : "Sem fins lucrativos",
-   "settings.user.form.currentPassword" : "Password atual",
+   "settings.user.form.currentPassword" : "Palavra-passe atual",
    "settings.user.form.email" : "Email",
    "settings.user.form.firstname" : "Primeiro Nome",
    "settings.user.form.lastname" : "Último Nome",
-   "settings.user.form.newPassword" : "Nova password",
+   "settings.user.form.newPassword" : "Nova palavra-passe",
    "sidebar.addNewService" : "Adicionar um novo serviço",
-   "sidebar.muteApp" : "Desactivar notificações e audio",
+   "sidebar.muteApp" : "Desativar notificações e áudio",
    "sidebar.settings" : "Definições",
-   "sidebar.unmuteApp" : "Activar notificações e audio",
+   "sidebar.unmuteApp" : "Ativar notificações e áudio",
    "signup.company.label" : "Empresa",
    "signup.email.label" : "Endereço de e-mail",
-   "signup.emailDuplicate" : "Uma conta já tem esse email associado",
+   "signup.emailDuplicate" : "Já existe uma conta associada a este endereço",
    "signup.firstname.label" : "Primeiro Nome",
-   "signup.headline" : "Iniciar Sessão",
+   "signup.headline" : "Criar conta",
    "signup.lastname.label" : "Último Nome",
-   "signup.legal.info" : "Ao criar uma conta Franz, aceitas",
+   "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á tens uma conta?",
-   "signup.password.label" : "Password",
-   "signup.submit.label" : "Criar uma Conta",
+   "signup.link.login" : "Já tem 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 ti e para os teus amigos\/colegas",
+   "subscription.features.customServices" : "Serviços privados para si e para a sua equipa",
    "subscription.features.encryptedSync" : "Sincronização encriptada de serviços",
    "subscription.features.onpremise" : "Adicionar serviços 'on-premise'\/hosted como o HipChat",
    "subscription.features.vpn" : "Suporte para proxy\/VPN",
-   "subscription.includedFeatures" : "Ao pagares para o Franz Premium, tens acesso a",
+   "subscription.includedFeatures" : "Ao subscrever uma Conta Premium, tem acesso a",
    "subscription.paymentSessionError" : "Erro no serviço de pagamento",
-   "subscription.submit.label" : "Quero ajudar o desenvolvimento do Franz",
+   "subscription.submit.label" : "Pretendo ajudar o desenvolvimento do Franz",
    "subscription.type.free" : "Gratuito",
    "subscription.type.month" : "mês",
    "subscription.type.year" : "ano",
    "subscriptionPopup.buttonCancel" : "Cancelar",
    "subscriptionPopup.buttonDone" : "Concluído",
    "tabs.item.deleteService" : "Apagar serviço",
-   "tabs.item.disableAudio" : "Desactivar audio",
+   "tabs.item.disableAudio" : "Desativar áudio",
    "tabs.item.disableNotifications" : "Desativar notificações",
    "tabs.item.disableService" : "Desativar serviço",
    "tabs.item.edit" : "Editar",
-   "tabs.item.enableAudio" : "Activar áudio",
+   "tabs.item.enableAudio" : "Ativar áudio",
    "tabs.item.enableNotification" : "Ativar notificações",
    "tabs.item.enableService" : "Ativar serviço",
    "tabs.item.reload" : "Recarregar",
-   "welcome.loginButton" : "Fazer login",
+   "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" : "Iniciar sessão",
    "welcome.signupButton" : "Criar uma conta gratuita",
    "welcome.slogan" : "Messaging that works for you"
 }
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 65b61c1e5..ecebc46ee 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -26,13 +26,56 @@
    "login.serverLogout" : "Се��и� у�тарела, пожалуй�та, войдите �нова.",
    "login.submit.label" : "Вход",
    "login.tokenExpired" : "Се��и� у�тарела, пожалуй�та, войдите �нова.",
+   "menu.app.about" : "О Franz",
+   "menu.app.hide" : "Скрыть",
+   "menu.app.hideOthers" : "Скрыть о�тальные",
+   "menu.app.quit" : "Выйти",
+   "menu.app.settings" : "�а�тройки",
+   "menu.app.unhide" : "Показать",
+   "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.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.undo" : "Отменить",
+   "menu.file" : "Файл",
+   "menu.help" : "Справка",
+   "menu.help.changelog" : "Журнал изменений",
+   "menu.help.learnMore" : "Подробнее",
+   "menu.help.privacy" : "Политика конфиденциально�ти",
+   "menu.help.support" : "Поддержка",
+   "menu.help.tos" : "У�лови� и�пользовани�",
+   "menu.services" : "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.zoomIn" : "Увеличить ма�штаб",
+   "menu.view.zoomOut" : "Уменьшить ма�штаб",
+   "menu.window" : "Окно",
+   "menu.window.close" : "Закрыть",
+   "menu.window.minimize" : "Свернуть",
    "password.email.label" : "Email адре�",
-   "password.headline" : "Во��тановление парол�",
+   "password.headline" : "Сбро�ить пароль",
    "password.link.login" : "Вход",
-   "password.link.signup" : "Создать аккаунт",
+   "password.link.signup" : "Создать учётную запи�ь пользовател�",
    "password.noUser" : "�е найдено пользовател� � таким email",
-   "password.submit.label" : "Во��тановить",
-   "password.successInfo" : "Проверьте Ваш email",
+   "password.submit.label" : "Прин�ть",
+   "password.successInfo" : "Проверьте Вашу �лектронную почту",
    "pricing.headline" : "Поддержать Franz",
    "pricing.link.skipPayment" : "Я не хочу поддерживать разработку Franz.",
    "pricing.submit.label" : "Я хочу поддержать разработку Franz",
@@ -73,6 +116,7 @@
    "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.enableSpellchecking" : "Включить проверку правопи�ани�",
    "settings.app.form.enableSystemTray" : "Показывать Franz в �и�темном трее",
@@ -127,9 +171,9 @@
    "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.iconUpload" : "Перетащите картинку или кликните зде�ь",
    "settings.service.form.indirectMessageInfo" : "Вы будете получать уведомлени� дл� в�ех �ообщений, не только дл� @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Показывать значок уведомлений дл� в�ех новых �ообщений",
    "settings.service.form.isMutedInfo" : "Когда выключено, в�е звуковые уведомлени� будут отключены",
@@ -192,11 +236,15 @@
    "tabs.item.disableAudio" : "Отключить звук",
    "tabs.item.disableNotifications" : "Отключить уведомлени�",
    "tabs.item.disableService" : "Отключить �ерви�",
-   "tabs.item.edit" : "Редактировать",
+   "tabs.item.edit" : "Правка",
    "tabs.item.enableAudio" : "Включить аудио",
    "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",
    "welcome.loginButton" : "Вход",
    "welcome.signupButton" : "Создать аккаунт",
    "welcome.slogan" : "Общение, которое про�то работает"
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 35f06531f..c43e998a4 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "Relácia vypršala, prihláste sa prosím znova.",
    "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",
+   "menu.app.settings" : "Nastavenia",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Upraviť",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "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.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",
@@ -73,6 +116,7 @@
    "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.enableSystemTray" : "Zobrazovať Franz v systémovej lište",
@@ -197,6 +241,10 @@
    "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",
    "welcome.slogan" : "Správy, ktoré pracujú pre vás"
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 90e1a04b9..1f31bc834 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -26,6 +26,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.settings" : "Postavke",
+   "menu.app.unhide" : "Unhide",
+   "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.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.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" : "Vaša e-adresa",
    "password.headline" : "Stvorite novu zaporku",
    "password.link.login" : "Prijavite se na Vaš ra�un",
@@ -73,6 +116,7 @@
    "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.enableSpellchecking" : "Omogući provjeru pravopisa",
    "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
@@ -197,6 +241,10 @@
    "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",
    "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 bcf0dd483..d03077d8d 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -16,7 +16,7 @@
    "invite.name.label" : "Ad",
    "invite.skip.label" : "Daha sonra yapmak istiyorum",
    "invite.submit.label" : "Davetiye gönder",
-   "invite.successInfo" : "Invitations sent successfully",
+   "invite.successInfo" : "Davetiyeler başarıyla gönderildi",
    "login.email.label" : "E-posta adresi",
    "login.headline" : "Oturum Aç",
    "login.invalidCredentials" : "Yanlış parola ya da e-posta adresi",
@@ -26,6 +26,49 @@
    "login.serverLogout" : "Oturum süreniz dolmuş, lütfen tekrar giriş yapın.",
    "login.submit.label" : "Oturum Aç",
    "login.tokenExpired" : "Oturum zaman aşımına uğradı, lütfen tekrar giriş yapın.",
+   "menu.app.about" : "Franz Hakkında",
+   "menu.app.hide" : "Gizle",
+   "menu.app.hideOthers" : "DiÄŸerlerini Gizle",
+   "menu.app.quit" : "Çıkış",
+   "menu.app.settings" : "Ayarlar",
+   "menu.app.unhide" : "Göster",
+   "menu.edit" : "Düzenle",
+   "menu.edit.copy" : "Kopyala",
+   "menu.edit.cut" : "Kes",
+   "menu.edit.delete" : "Sil",
+   "menu.edit.emojiSymbols" : "Emoji & Semboller",
+   "menu.edit.paste" : "Yapıştır",
+   "menu.edit.pasteAndMatchStyle" : "Yapıştır ve Stili Eşleştir",
+   "menu.edit.redo" : "Yeniden Yap",
+   "menu.edit.selectAll" : "Hepsini Seç",
+   "menu.edit.speech" : "KonuÅŸma",
+   "menu.edit.startDictation" : "Ä°mlaya BaÅŸla",
+   "menu.edit.startSpeaking" : "KonuÅŸmaya BaÅŸla",
+   "menu.edit.stopSpeaking" : "Konuşmayı Bırak\/Durdur",
+   "menu.edit.undo" : "Geri al",
+   "menu.file" : "Dosya",
+   "menu.help" : "Yardım",
+   "menu.help.changelog" : "Değişim Günlüğü",
+   "menu.help.learnMore" : "Daha Fazlasını Öğrenin",
+   "menu.help.privacy" : "Gizlilik Sözleşmesi",
+   "menu.help.support" : "Destek",
+   "menu.help.tos" : "Kullanım Şartları",
+   "menu.services" : "Hizmetler",
+   "menu.services.addNewService" : "Yeni Servis Ekle",
+   "menu.view" : "Görünüm",
+   "menu.view.enterFullScreen" : "Tam Ekrana Geç",
+   "menu.view.exitFullScreen" : "Tam Ekrandan Çık",
+   "menu.view.reloadFranz" : "Franz'ı Yeniden Yükle",
+   "menu.view.reloadService" : "Servisi Tekrar Yükle",
+   "menu.view.resetZoom" : "Orijinal Boyut",
+   "menu.view.toggleDevTools" : "Geliştirici Araçlarına Geç",
+   "menu.view.toggleFullScreen" : "Tam Ekrana Geç",
+   "menu.view.toggleServiceDevTools" : "Hizmet Geliştirici Araçlarını Değiştir",
+   "menu.view.zoomIn" : "Yakınlaştır",
+   "menu.view.zoomOut" : "Uzaklaştır",
+   "menu.window" : "Pencere",
+   "menu.window.close" : "Kapat",
+   "menu.window.minimize" : "Simge Durumuna Küçült",
    "password.email.label" : "E-posta adresi",
    "password.headline" : "Parola sıfırla",
    "password.link.login" : "Hesabına giriş yap",
@@ -73,10 +116,11 @@
    "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.enableMenuBar" : "Show Franz in Menu Bar",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
+   "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",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
+   "settings.app.form.hideDockIcon" : "Franz Simgesini Gösterme",
    "settings.app.form.language" : "Dil",
    "settings.app.form.minimizeToSystemTray" : "Franz'ı sistem tepsisine küçült",
    "settings.app.form.runInBackground" : "Pencereyi kapatırken Franz'ı arka planda tut",
@@ -94,10 +138,10 @@
    "settings.app.updateStatusAvailable" : "Güncelleme mevcut, indiriliyor...",
    "settings.app.updateStatusSearching" : "Güncellemeleri denetliyor",
    "settings.app.updateStatusUpToDate" : "Franz'ın son versiyonunu kullanıyorsun",
-   "settings.invite.headline" : "Invite Friends",
+   "settings.invite.headline" : "Arkadaşlarını davet et",
    "settings.navigation.account" : "Hesap",
    "settings.navigation.availableServices" : "Mevcut servisler",
-   "settings.navigation.inviteFriends" : "Invite Friends",
+   "settings.navigation.inviteFriends" : "Arkadaşlarını Davet Et",
    "settings.navigation.logout" : "Çıkış",
    "settings.navigation.settings" : "Ayarlar",
    "settings.navigation.yourServices" : "Servislerin",
@@ -197,6 +241,10 @@
    "tabs.item.enableNotification" : "Bildirimleri etkinleÅŸtir",
    "tabs.item.enableService" : "Servisi etkinleÅŸtir",
    "tabs.item.reload" : "Yeniden Yükle",
+   "validation.email" : "{alan} geçerli değil",
+   "validation.minLength" : "{field} en az {length} karakter uzunluğunda olmalı",
+   "validation.required" : "{field} gereklidir",
+   "validation.url" : "{field} geçerli bir URL değil",
    "welcome.loginButton" : "Hesabına giriş yap",
    "welcome.signupButton" : "Ãœcretsiz hesap oluÅŸtur",
    "welcome.slogan" : "Sizin için çalışan mesajlaşma"
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 4baf234ac..3f732b896 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -16,7 +16,7 @@
    "invite.name.label" : "Ім'�",
    "invite.skip.label" : "Я хочу зробити це пізніше",
    "invite.submit.label" : "Відправити запрошенн�",
-   "invite.successInfo" : "Invitations sent successfully",
+   "invite.successInfo" : "Запрошенн� у�пішно відо�лані",
    "login.email.label" : "Email адре�а",
    "login.headline" : "Увійти",
    "login.invalidCredentials" : "Email або пароль некоректні",
@@ -26,6 +26,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.settings" : "�алаштуванн�",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Редагувати",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "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.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",
    "password.email.label" : "Email адре�а",
    "password.headline" : "Скинути пароль",
    "password.link.login" : "Увійти до вашого акаунту",
@@ -50,7 +93,7 @@
    "settings.account.accountType.premium" : "Преміум �каунт Прихильника",
    "settings.account.buttonSave" : "Оновити профіль",
    "settings.account.deleteAccount" : "Видалити обліковий запи�",
-   "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.deleteEmailSent" : "Ви отримали електронного ли�та з лінком, щоб підтвердити видаленн� облікового запи�у. Ваш обліковий запи� і дані не можна буде відновити!",
    "settings.account.deleteInfo" : "Якщо Вам більше не потрібний обліковий запи� Franz, Ви можете його видалити і в�і �уміжні дані.",
    "settings.account.headline" : "�каунт",
    "settings.account.headlineAccount" : "Інформаці� про акаунт",
@@ -65,22 +108,23 @@
    "settings.account.successInfo" : "Ваші зміни були збережені",
    "settings.account.tryReloadUserInfoRequest" : "Спробуйте ще раз",
    "settings.account.userInfoRequestFailed" : "�е вдало�� завантажити інформацію кори�тувача",
-   "settings.app.buttonClearAllCache" : "Clear cache",
+   "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.enableMenuBar" : "Show Franz in Menu Bar",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
+   "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.language" : "Мова",
    "settings.app.form.minimizeToSystemTray" : "Мінімізувати Franz до �и�темного лотка",
    "settings.app.form.runInBackground" : "Тримати Franz в фоні при закритті вікна",
-   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.form.showDisabledServices" : "Показати вкладку вимкнених �ерві�ів",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Показувати значок непрочитаних повідомлень коли �повіщенн� вимкнені",
    "settings.app.headline" : "�алаштуванн�",
    "settings.app.headlineAdvanced" : "Advanced",
@@ -89,15 +133,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" : "Ваші �ерві�и",
@@ -126,10 +170,10 @@
    "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.iconUpload" : "Drop your image, or click here",
+   "settings.service.form.headlineNotifications" : "Сповіщенн�",
+   "settings.service.form.icon" : "Сво� іконка",
+   "settings.service.form.iconDelete" : "Видалити",
+   "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",
@@ -197,6 +241,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",
    "welcome.loginButton" : "Увійдіть до �вого акаунту",
    "welcome.signupButton" : "Створити безплатний акаунт",
    "welcome.slogan" : "Обмін повідомленн�ми, �кий працює дл� ва�"
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index 5feef50f2..3bbcc8288 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -16,7 +16,7 @@
    "invite.name.label" : "�稱",
    "invite.skip.label" : "我想�後��",
    "invite.submit.label" : "�出邀請",
-   "invite.successInfo" : "Invitations sent successfully",
+   "invite.successInfo" : "註冊請求已�出",
    "login.email.label" : "電�郵件地�",
    "login.headline" : "登入",
    "login.invalidCredentials" : "電�郵件或密碼有誤",
@@ -26,6 +26,49 @@
    "login.serverLogout" : "您的登入期間已�期，請�新登錄",
    "login.submit.label" : "登入",
    "login.tokenExpired" : "您的登入已�期，請�新登入。",
+   "menu.app.about" : "關於Franz",
+   "menu.app.hide" : "隱�",
+   "menu.app.hideOthers" : "隱�其他",
+   "menu.app.quit" : "��",
+   "menu.app.settings" : "設定",
+   "menu.app.unhide" : "顯示",
+   "menu.edit" : "編輯",
+   "menu.edit.copy" : "拷�",
+   "menu.edit.cut" : "剪下",
+   "menu.edit.delete" : "刪除",
+   "menu.edit.emojiSymbols" : "貼紙和表情包",
+   "menu.edit.paste" : "貼上",
+   "menu.edit.pasteAndMatchStyle" : "貼上并匹�樣�",
+   "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",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "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",
    "password.email.label" : "電�郵件地�",
    "password.headline" : "�設密碼",
    "password.link.login" : "登入您的帳號",
@@ -73,6 +116,7 @@
    "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.enableSpellchecking" : "啟用拼字檢查",
    "settings.app.form.enableSystemTray" : "顯示Franz在系統列",
@@ -128,7 +172,7 @@
    "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" : "顯示所有新消�的消�標誌",
@@ -197,6 +241,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",
    "welcome.loginButton" : "登入您的帳戶",
    "welcome.signupButton" : "建立�費帳號",
    "welcome.slogan" : "為你通信"
diff --git a/src/index.html b/src/index.html
index 9e5acd705..5ce7f6a96 100644
--- a/src/index.html
+++ b/src/index.html
@@ -11,10 +11,15 @@
   <div class="dev-warning">DEV MODE</div>
   <div id="root"></div>
   <script>
-    document.querySelector('body').classList.add(process.platform);
+    document.querySelector('body').classList.add(process.env.OS_PLATFORM ? process.env.OS_PLATFORM : process.platform);
 
     const { isDevMode } = require('./environment');
     if (isDevMode) {
+      const debugging = require('debug');
+      debugging.enable(process.env.DEBUG);
+      
+      const debug = debugging('Index');
+
       document.querySelector('body').classList.add('isDevMode');
 
       (function() {
@@ -25,7 +30,7 @@
         document.body.appendChild(s);
 
         s.onload = () => {
-          console.log('livereload loaded');
+          debug('livereload loaded');
           const originalReloadBehaviour = window._onLiveReloadFileChanged;
 
           window._onLiveReloadFileChanged = (file) => {
@@ -33,10 +38,10 @@
               originalReloadBehaviour(file);
             } else {              
               if (file.path.includes('/build/webview/')) {
-                console.log('Livereload: Reloading all webvies');
+                debug('Livereload: Reloading all webvies');
                 const webviews = document.querySelectorAll('webview').forEach(webview => webview.reload());
               } else {
-                console.log('Livereload: skip reload as only main process files have changed');
+                debug('Livereload: skip reload as only main process files have changed');
               }
             }
           }
diff --git a/src/index.js b/src/index.js
index f82bb3590..7d906ad71 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,7 +4,7 @@ import path from 'path';
 
 import windowStateKeeper from 'electron-window-state';
 
-import { isDevMode, isWindows } from './environment';
+import { isDevMode, isMac, isWindows, isLinux } from './environment';
 import ipcApi from './electron/ipc-api';
 import Tray from './lib/Tray';
 import Settings from './electron/Settings';
@@ -12,14 +12,21 @@ import handleDeepLink from './electron/deepLinking';
 import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
 import './electron/exception';
 
+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.
 let mainWindow;
 let willQuitApp = false;
 
+// DEV MODE: Save user data into FranzDev
+if (isDevMode) {
+  app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev'));
+}
+
 // Ensure that the recipe directory exists
-fs.ensureDir(path.join(app.getPath('userData'), 'recipes'));
 fs.emptyDirSync(path.join(app.getPath('userData'), 'recipes', 'temp'));
+fs.ensureFileSync(path.join(app.getPath('userData'), 'window-state.json'));
 
 // Set App ID for Windows
 if (isWindows) {
@@ -48,15 +55,21 @@ if (isSecondInstance) {
   app.exit();
 }
 
-// Lets disable Hardware Acceleration until we have a better solution
-// to deal with the high-perf-gpu requirement of some services
-
-// Disabled to test tweetdeck glitches
-// app.disableHardwareAcceleration();
+// Fix Unity indicator issue
+// https://github.com/electron/electron/issues/9046
+if (isLinux && ['Pantheon', 'Unity:Unity7'].indexOf(process.env.XDG_CURRENT_DESKTOP) !== -1) {
+  process.env.XDG_CURRENT_DESKTOP = 'Unity';
+}
 
 // Initialize Settings
 const settings = new Settings();
 
+// Disable GPU acceleration
+if (!settings.get('enableGPUAcceleration')) {
+  debug('Disable GPU Acceleration');
+  app.disableHardwareAcceleration();
+}
+
 const createWindow = () => {
   // Remember window size
   const mainWindowState = windowStateKeeper({
@@ -72,9 +85,9 @@ const createWindow = () => {
     height: mainWindowState.height,
     minWidth: 600,
     minHeight: 500,
-    titleBarStyle: 'hidden',
-    backgroundColor: '#3498db',
-    autoHideMenuBar: true,
+    titleBarStyle: isMac ? 'hidden' : '',
+    frame: isLinux,
+    backgroundColor: !settings.get('darkMode') ? '#3498db' : '#1E1E1E',
   });
 
   // Initialize System Tray
@@ -107,7 +120,7 @@ const createWindow = () => {
         mainWindow.hide();
       }
 
-      if (isWindows && settings.get('minimizeToSystemTray')) {
+      if (isWindows) {
         mainWindow.setSkipTaskbar(true);
       }
     } else {
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 703060dc1..76b0f28d5 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,113 +1,477 @@
 import { remote, shell } from 'electron';
-import { autorun, computed, observable, toJS } from 'mobx';
+import { observable, autorun, computed } from 'mobx';
+import { defineMessages } from 'react-intl';
 
-import { isMac } from '../environment';
+import { isMac, ctrlKey, cmdKey } from '../environment';
 
 const { app, Menu, dialog } = remote;
 
-const template = [
+const menuItems = defineMessages({
+  edit: {
+    id: 'menu.edit',
+    defaultMessage: '!!!Edit',
+  },
+  undo: {
+    id: 'menu.edit.undo',
+    defaultMessage: '!!!Undo',
+  },
+  redo: {
+    id: 'menu.edit.redo',
+    defaultMessage: '!!!Redo',
+  },
+  cut: {
+    id: 'menu.edit.cut',
+    defaultMessage: '!!!Cut',
+  },
+  copy: {
+    id: 'menu.edit.copy',
+    defaultMessage: '!!!Copy',
+  },
+  paste: {
+    id: 'menu.edit.paste',
+    defaultMessage: '!!!Paste',
+  },
+  pasteAndMatchStyle: {
+    id: 'menu.edit.pasteAndMatchStyle',
+    defaultMessage: '!!!Paste And Match Style',
+  },
+  delete: {
+    id: 'menu.edit.delete',
+    defaultMessage: '!!!Delete',
+  },
+  selectAll: {
+    id: 'menu.edit.selectAll',
+    defaultMessage: '!!!Select All',
+  },
+  speech: {
+    id: 'menu.edit.speech',
+    defaultMessage: '!!!Speech',
+  },
+  startSpeaking: {
+    id: 'menu.edit.startSpeaking',
+    defaultMessage: '!!!Start Speaking',
+  },
+  stopSpeaking: {
+    id: 'menu.edit.stopSpeaking',
+    defaultMessage: '!!!Stop Speaking',
+  },
+  startDictation: {
+    id: 'menu.edit.startDictation',
+    defaultMessage: '!!!Start Dictation',
+  },
+  emojiSymbols: {
+    id: 'menu.edit.emojiSymbols',
+    defaultMessage: '!!!Emoji & Symbols',
+  },
+  resetZoom: {
+    id: 'menu.view.resetZoom',
+    defaultMessage: '!!!Actual Size',
+  },
+  zoomIn: {
+    id: 'menu.view.zoomIn',
+    defaultMessage: '!!!Zoom In',
+  },
+  zoomOut: {
+    id: 'menu.view.zoomOut',
+    defaultMessage: '!!!Zoom Out',
+  },
+  enterFullScreen: {
+    id: 'menu.view.enterFullScreen',
+    defaultMessage: '!!!Enter Full Screen',
+  },
+  exitFullScreen: {
+    id: 'menu.view.exitFullScreen',
+    defaultMessage: '!!!Exit Full Screen',
+  },
+  toggleFullScreen: {
+    id: 'menu.view.toggleFullScreen',
+    defaultMessage: '!!!Toggle Full Screen',
+  },
+  toggleDevTools: {
+    id: 'menu.view.toggleDevTools',
+    defaultMessage: '!!!Toggle Developer Tools',
+  },
+  toggleServiceDevTools: {
+    id: 'menu.view.toggleServiceDevTools',
+    defaultMessage: '!!!Toggle Service Developer Tools',
+  },
+  reloadService: {
+    id: 'menu.view.reloadService',
+    defaultMessage: '!!!Reload Service',
+  },
+  reloadFranz: {
+    id: 'menu.view.reloadFranz',
+    defaultMessage: '!!!Reload Franz',
+  },
+  minimize: {
+    id: 'menu.window.minimize',
+    defaultMessage: '!!!Minimize',
+  },
+  close: {
+    id: 'menu.window.close',
+    defaultMessage: '!!!Close',
+  },
+  learnMore: {
+    id: 'menu.help.learnMore',
+    defaultMessage: '!!!Learn More',
+  },
+  changelog: {
+    id: 'menu.help.changelog',
+    defaultMessage: '!!!Changelog',
+  },
+  support: {
+    id: 'menu.help.support',
+    defaultMessage: '!!!Support',
+  },
+  tos: {
+    id: 'menu.help.tos',
+    defaultMessage: '!!!Terms of Service',
+  },
+  privacy: {
+    id: 'menu.help.privacy',
+    defaultMessage: '!!!Privacy Statement',
+  },
+  file: {
+    id: 'menu.file',
+    defaultMessage: '!!!File',
+  },
+  view: {
+    id: 'menu.view',
+    defaultMessage: '!!!View',
+  },
+  services: {
+    id: 'menu.services',
+    defaultMessage: '!!!Services',
+  },
+  window: {
+    id: 'menu.window',
+    defaultMessage: '!!!Window',
+  },
+  help: {
+    id: 'menu.help',
+    defaultMessage: '!!!Help',
+  },
+  about: {
+    id: 'menu.app.about',
+    defaultMessage: '!!!About Franz',
+  },
+  settings: {
+    id: 'menu.app.settings',
+    defaultMessage: '!!!Settings',
+  },
+  hide: {
+    id: 'menu.app.hide',
+    defaultMessage: '!!!Hide',
+  },
+  hideOthers: {
+    id: 'menu.app.hideOthers',
+    defaultMessage: '!!!Hide Others',
+  },
+  unhide: {
+    id: 'menu.app.unhide',
+    defaultMessage: '!!!Unhide',
+  },
+  quit: {
+    id: 'menu.app.quit',
+    defaultMessage: '!!!Quit',
+  },
+  addNewService: {
+    id: 'menu.services.addNewService',
+    defaultMessage: '!!!Add New Service...',
+  },
+});
+
+function getActiveWebview() {
+  return window.franz.stores.services.active.webview;
+}
+
+const _templateFactory = intl => [
   {
-    label: 'Edit',
+    label: intl.formatMessage(menuItems.edit),
     submenu: [
       {
+        label: intl.formatMessage(menuItems.undo),
         role: 'undo',
       },
       {
+        label: intl.formatMessage(menuItems.redo),
         role: 'redo',
       },
       {
         type: 'separator',
       },
       {
-        role: 'cut',
+        label: intl.formatMessage(menuItems.cut),
+        accelerator: 'Cmd+X',
+        selector: 'cut:',
       },
       {
-        label: 'Copy',
+        label: intl.formatMessage(menuItems.copy),
         accelerator: 'Cmd+C',
         selector: 'copy:',
       },
       {
-        label: 'Paste',
+        label: intl.formatMessage(menuItems.paste),
         accelerator: 'Cmd+V',
         selector: 'paste:',
       },
       {
-        role: 'pasteandmatchstyle',
+        label: intl.formatMessage(menuItems.pasteAndMatchStyle),
+        accelerator: 'Cmd+Shift+V',
+        selector: 'pasteAndMatchStyle:',
       },
       {
+        label: intl.formatMessage(menuItems.delete),
         role: 'delete',
       },
       {
-        role: 'selectall',
+        label: intl.formatMessage(menuItems.selectAll),
+        accelerator: 'Cmd+A',
+        selector: 'selectAll:',
       },
     ],
   },
   {
-    label: 'View',
+    label: intl.formatMessage(menuItems.view),
     submenu: [
       {
         type: 'separator',
       },
       {
+        label: intl.formatMessage(menuItems.resetZoom),
         role: 'resetzoom',
       },
       {
+        label: intl.formatMessage(menuItems.zoomIn),
+        // accelerator: 'Cmd+=',
         role: 'zoomin',
-        accelerator: 'CommandOrControl+=',
       },
       {
+        label: intl.formatMessage(menuItems.zoomOut),
         role: 'zoomout',
       },
       {
         type: 'separator',
       },
       {
+        label: app.mainWindow.isFullScreen() // label doesn't work, gets overridden by Electron
+          ? intl.formatMessage(menuItems.exitFullScreen)
+          : intl.formatMessage(menuItems.enterFullScreen),
         role: 'togglefullscreen',
       },
     ],
   },
   {
-    label: 'Services',
+    label: intl.formatMessage(menuItems.services),
     submenu: [],
   },
   {
+    label: intl.formatMessage(menuItems.window),
     role: 'window',
     submenu: [
       {
+        label: intl.formatMessage(menuItems.minimize),
         role: 'minimize',
       },
       {
+        label: intl.formatMessage(menuItems.close),
         role: 'close',
       },
     ],
   },
   {
+    label: intl.formatMessage(menuItems.help),
     role: 'help',
     submenu: [
       {
-        label: 'Learn More',
-        click() { shell.openExternal('http://meetfranz.com'); },
+        label: intl.formatMessage(menuItems.learnMore),
+        click() { shell.openExternal('https://meetfranz.com'); },
       },
       {
-        label: 'Changelog',
+        label: intl.formatMessage(menuItems.changelog),
         click() { shell.openExternal('https://github.com/meetfranz/franz/blob/master/CHANGELOG.md'); },
       },
       {
         type: 'separator',
       },
       {
-        label: 'Support',
-        click() { shell.openExternal('http://meetfranz.com/support'); },
+        label: intl.formatMessage(menuItems.support),
+        click() { shell.openExternal('https://meetfranz.com/support'); },
       },
       {
         type: 'separator',
       },
       {
-        label: 'Terms of Service',
+        label: intl.formatMessage(menuItems.tos),
         click() { shell.openExternal('https://meetfranz.com/terms'); },
       },
       {
-        label: 'Privacy Statement',
+        label: intl.formatMessage(menuItems.privacy),
+        click() { shell.openExternal('https://meetfranz.com/privacy'); },
+      },
+    ],
+  },
+];
+
+const _titleBarTemplateFactory = intl => [
+  {
+    label: intl.formatMessage(menuItems.edit),
+    submenu: [
+      {
+        label: intl.formatMessage(menuItems.undo),
+        accelerator: `${ctrlKey}+Z`,
+        click() {
+          getActiveWebview().undo();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.redo),
+        accelerator: `${ctrlKey}+Y`,
+        click() {
+          getActiveWebview().redo();
+        },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(menuItems.cut),
+        accelerator: `${ctrlKey}+X`,
+        click() {
+          getActiveWebview().cut();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.copy),
+        accelerator: `${ctrlKey}+C`,
+        click() {
+          getActiveWebview().copy();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.paste),
+        accelerator: `${ctrlKey}+V`,
+        click() {
+          getActiveWebview().paste();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.pasteAndMatchStyle),
+        accelerator: `${ctrlKey}+Shift+V`,
+        click() {
+          getActiveWebview().pasteAndMatchStyle();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.delete),
+        click() {
+          getActiveWebview().delete();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.selectAll),
+        accelerator: `${ctrlKey}+A`,
+        click() {
+          getActiveWebview().selectAll();
+        },
+      },
+    ],
+  },
+  {
+    label: intl.formatMessage(menuItems.view),
+    submenu: [
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(menuItems.resetZoom),
+        accelerator: `${ctrlKey}+0`,
+        click() {
+          getActiveWebview().setZoomLevel(0);
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.zoomIn),
+        accelerator: `${ctrlKey}+Plus`,
+        click() {
+          getActiveWebview().getZoomLevel((zoomLevel) => {
+            getActiveWebview().setZoomLevel(zoomLevel === 5 ? zoomLevel : zoomLevel + 1);
+          });
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.zoomOut),
+        accelerator: `${ctrlKey}+-`,
+        click() {
+          getActiveWebview().getZoomLevel((zoomLevel) => {
+            getActiveWebview().setZoomLevel(zoomLevel === -5 ? zoomLevel : zoomLevel - 1);
+          });
+        },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: app.mainWindow.isFullScreen() // label doesn't work, gets overridden by Electron
+          ? intl.formatMessage(menuItems.exitFullScreen)
+          : intl.formatMessage(menuItems.enterFullScreen),
+        accelerator: 'F11',
+        click(menuItem, browserWindow) {
+          browserWindow.setFullScreen(!browserWindow.isFullScreen());
+        },
+      },
+    ],
+  },
+  {
+    label: intl.formatMessage(menuItems.services),
+    submenu: [],
+  },
+  {
+    label: intl.formatMessage(menuItems.window),
+    submenu: [
+      {
+        label: intl.formatMessage(menuItems.minimize),
+        accelerator: 'Ctrl+M',
+        click(menuItem, browserWindow) {
+          browserWindow.minimize();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.close),
+        accelerator: 'Ctrl+W',
+        click(menuItem, browserWindow) {
+          browserWindow.close();
+        },
+      },
+    ],
+  },
+  {
+    label: '?',
+    submenu: [
+      {
+        label: intl.formatMessage(menuItems.learnMore),
+        click() { shell.openExternal('https://meetfranz.com'); },
+      },
+      {
+        label: intl.formatMessage(menuItems.changelog),
+        click() { shell.openExternal('https://github.com/meetfranz/franz/blob/master/CHANGELOG.md'); },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(menuItems.support),
+        click() { shell.openExternal('https://meetfranz.com/support'); },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(menuItems.tos),
+        click() { shell.openExternal('https://meetfranz.com/terms'); },
+      },
+      {
+        label: intl.formatMessage(menuItems.privacy),
         click() { shell.openExternal('https://meetfranz.com/privacy'); },
       },
     ],
@@ -115,7 +479,7 @@ const template = [
 ];
 
 export default class FranzMenu {
-  @observable tpl = template;
+  @observable currentTemplate = [];
 
   constructor(stores, actions) {
     this.stores = stores;
@@ -124,23 +488,45 @@ export default class FranzMenu {
     autorun(this._build.bind(this));
   }
 
+  rebuild() {
+    this._build();
+  }
+
+  get template() {
+    return this.currentTemplate.toJS();
+  }
+
   _build() {
-    const tpl = toJS(this.tpl);
+    // 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) {
+      return;
+    }
+
+    const intl = window.franz.intl;
+    const tpl = isMac ? _templateFactory(intl) : _titleBarTemplateFactory(intl);
 
     tpl[1].submenu.push({
-      role: 'toggledevtools',
+      type: 'separator',
     }, {
-      label: 'Toggle Service Developer Tools',
-      accelerator: 'CmdOrCtrl+Shift+Alt+i',
+      label: intl.formatMessage(menuItems.toggleDevTools),
+      accelerator: `${cmdKey}+Alt+I`,
+      click: (menuItem, browserWindow) => {
+        browserWindow.webContents.toggleDevTools();
+      },
+    }, {
+      label: intl.formatMessage(menuItems.toggleServiceDevTools),
+      accelerator: `${cmdKey}+Shift+Alt+I`,
       click: () => {
         this.actions.service.openDevToolsForActiveService();
       },
     });
 
     tpl[1].submenu.unshift({
-      label: 'Reload Service',
-      id: 'reloadService',
-      accelerator: 'CmdOrCtrl+R',
+      label: intl.formatMessage(menuItems.reloadService),
+      id: 'reloadService', // TODO: needed?
+      accelerator: `${cmdKey}+R`,
       click: () => {
         if (this.stores.user.isLoggedIn
           && this.stores.services.enabled.length > 0) {
@@ -150,93 +536,128 @@ export default class FranzMenu {
         }
       },
     }, {
-      label: 'Reload Franz',
-      accelerator: 'CmdOrCtrl+Shift+R',
+      label: intl.formatMessage(menuItems.reloadFranz),
+      accelerator: `${cmdKey}+Shift+R`,
       click: () => {
         window.location.reload();
       },
     });
 
-    if (isMac) {
-      tpl.unshift({
-        label: app.getName(),
-        submenu: [
-          {
-            role: 'about',
-          },
-          {
-            type: 'separator',
-          },
-          {
-            label: 'Settings',
-            accelerator: 'CmdOrCtrl+,',
-            click: () => {
-              this.actions.ui.openSettings({ path: 'app' });
-            },
-          },
-          {
-            type: 'separator',
-          },
-          {
-            role: 'services',
-            submenu: [],
-          },
-          {
-            type: 'separator',
-          },
-          {
-            role: 'hide',
-          },
-          {
-            role: 'hideothers',
-          },
-          {
-            role: 'unhide',
-          },
-          {
-            type: 'separator',
+    tpl.unshift({
+      label: isMac ? app.getName() : intl.formatMessage(menuItems.file),
+      submenu: [
+        {
+          label: intl.formatMessage(menuItems.about),
+          role: 'about',
+        },
+        {
+          type: 'separator',
+        },
+        {
+          label: intl.formatMessage(menuItems.settings),
+          accelerator: 'CmdOrCtrl+,',
+          click: () => {
+            this.actions.ui.openSettings({ path: 'app' });
           },
-          {
-            role: 'quit',
+        },
+        {
+          type: 'separator',
+        },
+        {
+          label: intl.formatMessage(menuItems.services),
+          role: 'services',
+          submenu: [],
+        },
+        {
+          type: 'separator',
+        },
+        {
+          label: intl.formatMessage(menuItems.hide),
+          role: 'hide',
+        },
+        {
+          label: intl.formatMessage(menuItems.hideOthers),
+          role: 'hideothers',
+        },
+        {
+          label: intl.formatMessage(menuItems.unhide),
+          role: 'unhide',
+        },
+        {
+          type: 'separator',
+        },
+        {
+          label: intl.formatMessage(menuItems.quit),
+          role: 'quit',
+          click: () => {
+            app.quit();
           },
-        ],
-      });
+        },
+      ],
+    });
+
+    const about = {
+      label: intl.formatMessage(menuItems.about),
+      click: () => {
+        dialog.showMessageBox({
+          type: 'info',
+          title: 'Franz',
+          message: 'Franz',
+          detail: `Version: ${remote.app.getVersion()}\nRelease: ${process.versions.electron} / ${process.platform} / ${process.arch}`,
+        });
+      },
+    };
+
+    if (isMac) {
       // Edit menu.
       tpl[1].submenu.push(
         {
           type: 'separator',
         },
         {
-          label: 'Speech',
+          label: intl.formatMessage(menuItems.speech),
           submenu: [
             {
+              label: intl.formatMessage(menuItems.startSpeaking),
               role: 'startspeaking',
             },
             {
+              label: intl.formatMessage(menuItems.stopSpeaking),
               role: 'stopspeaking',
             },
           ],
         },
       );
+
+      tpl[4].submenu.unshift(about, {
+        type: 'separator',
+      });
     } else {
-      tpl[4].submenu.unshift({
-        role: 'about',
-        click: () => {
-          dialog.showMessageBox({
-            type: 'info',
-            title: 'Franz',
-            message: 'Franz',
-            detail: `Version: ${remote.app.getVersion()}\nRelease: ${process.versions.electron} / ${process.platform} / ${process.arch}`,
-          });
+      tpl[0].submenu = [
+        {
+          label: intl.formatMessage(menuItems.settings),
+          accelerator: 'Ctrl+P',
+          click: () => {
+            this.actions.ui.openSettings({ path: 'app' });
+          },
         },
-      });
-    }
+        {
+          type: 'separator',
+        },
+        {
+          label: intl.formatMessage(menuItems.quit),
+          role: 'quit',
+        },
+      ];
 
-    const serviceTpl = this.serviceTpl;
+      tpl[5].submenu.push({
+        type: 'separator',
+      }, about);
+    }
 
     serviceTpl.unshift({
-      label: 'Add new Service',
-      accelerator: 'CmdOrCtrl+N',
+      label: intl.formatMessage(menuItems.addNewService),
+      accelerator: `${cmdKey}+N`,
       click: () => {
         this.actions.ui.openSettings({ path: 'recipes' });
       },
@@ -245,9 +666,10 @@ export default class FranzMenu {
     });
 
     if (serviceTpl.length > 0) {
-      tpl[isMac ? 3 : 2].submenu = toJS(this.serviceTpl);
+      tpl[3].submenu = serviceTpl;
     }
 
+    this.currentTemplate = tpl;
     const menu = Menu.buildFromTemplate(tpl);
     Menu.setApplicationMenu(menu);
   }
@@ -258,7 +680,7 @@ export default class FranzMenu {
     if (this.stores.user.isLoggedIn) {
       return services.map((service, i) => ({
         label: this._getServiceName(service),
-        accelerator: i <= 9 ? `CmdOrCtrl+${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 b13bf8faa..8b9a44579 100644
--- a/src/lib/analytics.js
+++ b/src/lib/analytics.js
@@ -2,6 +2,8 @@ import { remote } from 'electron';
 import { GA_ID } from '../config';
 // import { isDevMode } from '../environment';
 
+const debug = require('debug')('Franz:Analytics');
+
 const { app } = remote;
 
 /* eslint-disable */
@@ -28,13 +30,13 @@ ga('send', 'App');
 export function gaPage(page) {
   ga('send', 'pageview', page);
 
-  console.debug('GA track page', page);
+  debug('GA track page', page);
 }
 
 export function gaEvent(category, action, label) {
   ga('send', 'event', category, action, label);
 
-  console.debug('GA track page', category, action);
+  debug('GA track page', category, action);
 }
 
 setTimeout(() => {
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 1fc23ac89..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 = '';
@@ -32,8 +34,12 @@ export default class Recipe {
       throw Error(`Recipe '${data.name}' requires Id`);
     }
 
-    if (!semver.valid(data.version)) {
-      throw Error(`Version ${data.version} of recipe '${data.name}' is not a valid semver version`);
+    try {
+      if (!semver.valid(data.version)) {
+        throw Error(`Version ${data.version} of recipe '${data.name}' is not a valid semver version`);
+      }
+    } catch (e) {
+      console.warn(e.message);
     }
 
     this.id = data.id || this.id;
@@ -69,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..1bab8bd68 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,6 +65,8 @@ 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.recipe = recipe;
diff --git a/src/models/Settings.js b/src/models/Settings.js
index e39b63087..0e4c59057 100644
--- a/src/models/Settings.js
+++ b/src/models/Settings.js
@@ -2,19 +2,29 @@ import { observable, extendObservable } from 'mobx';
 import { DEFAULT_APP_SETTINGS } from '../config';
 
 export default class Settings {
-  @observable autoLaunchInBackground = DEFAULT_APP_SETTINGS.autoLaunchInBackground;
-  @observable runInBackground = DEFAULT_APP_SETTINGS.runInBackground;
-  @observable enableSystemTray = DEFAULT_APP_SETTINGS.enableSystemTray;
-  @observable minimizeToSystemTray = DEFAULT_APP_SETTINGS.minimizeToSystemTray;
-  @observable showDisabledServices = DEFAULT_APP_SETTINGS.showDisabledServices;
-  @observable showMessageBadgeWhenMuted = DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted;
-  @observable enableSpellchecking = DEFAULT_APP_SETTINGS.enableSpellchecking;
-  @observable locale = DEFAULT_APP_SETTINGS.locale;
-  @observable beta = DEFAULT_APP_SETTINGS.beta;
-  @observable isAppMuted = DEFAULT_APP_SETTINGS.isAppMuted;
+  @observable app = DEFAULT_APP_SETTINGS
 
-  constructor(data) {
-    Object.assign(this, data);
+  @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) {
diff --git a/src/models/User.js b/src/models/User.js
index 6fca78f90..3e4aa187d 100644
--- a/src/models/User.js
+++ b/src/models/User.js
@@ -1,4 +1,4 @@
-import { observable, computed } from 'mobx';
+import { observable } from 'mobx';
 
 export default class User {
   id = null;
@@ -15,14 +15,7 @@ export default class User {
   @observable donor = {};
   @observable isDonor = false;
   @observable isMiner = false;
-  @observable isSSO = false;
-  @observable company = {
-    name: 'Happle Apps',
-    contact: {
-      technical: 'technical@company.com',
-      default: 'default@company.com',
-    },
-  };
+  @observable locale = false;
 
   constructor(data) {
     if (!data.id) {
@@ -41,12 +34,6 @@ export default class User {
     this.isDonor = data.isDonor || this.isDonor;
     this.isSubscriptionOwner = data.isSubscriptionOwner || this.isSubscriptionOwner;
     this.isMiner = data.isMiner || this.isMiner;
-    this.isSSO = data.isSSO || this.isSSO;
-    this.company = data.company || this.company;
-  }
-
-  @computed get isEnterprise() {
-    // return false
-    return this.company.name !== undefined;
+    this.locale = data.locale || this.locale;
   }
 }
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 162422017..9ad4cd531 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -15,7 +15,11 @@ import { gaEvent } from '../lib/analytics';
 
 import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
 
-const { app } = remote;
+const debug = require('debug')('Franz:AppStore');
+
+const { app, systemPreferences } = remote;
+
+const mainWindow = remote.getCurrentWindow();
 
 const defaultLocale = DEFAULT_APP_SETTINGS.locale;
 const autoLauncher = new AutoLaunch({
@@ -46,8 +50,12 @@ export default class AppStore extends Store {
 
   @observable isSystemMuteOverridden = false;
 
+  @observable isSystemDarkModeEnabled = false;
+
   @observable isClearingAllCache = false;
 
+  @observable isFullScreen = mainWindow.isFullScreen();
+
   constructor(...args) {
     super(...args);
 
@@ -80,6 +88,10 @@ export default class AppStore extends Store {
     window.addEventListener('online', () => { this.isOnline = true; });
     window.addEventListener('offline', () => { this.isOnline = false; });
 
+    mainWindow.on('enter-full-screen', () => { this.isFullScreen = true; });
+    mainWindow.on('leave-full-screen', () => { this.isFullScreen = false; });
+
+
     this.isOnline = navigator.onLine;
 
     // Check if Franz should launch on start
@@ -98,6 +110,10 @@ export default class AppStore extends Store {
     ipcRenderer.on('autoUpdate', (event, data) => {
       if (data.available) {
         this.updateStatus = this.updateStatusTypes.AVAILABLE;
+
+        if (isMac) {
+          app.dock.bounce();
+        }
       }
 
       if (data.available !== undefined && !data.available) {
@@ -124,19 +140,6 @@ export default class AppStore extends Store {
       this.stores.router.push(data.url);
     });
 
-    // Reload all services after a healthy nap
-    // Alternative solution for powerMonitor as the resume event is not fired
-    // More information: https://github.com/electron/electron/issues/1615
-    const TIMEOUT = 5000;
-    let lastTime = (new Date()).getTime();
-    setInterval(() => {
-      const currentTime = (new Date()).getTime();
-      if (currentTime > (lastTime + TIMEOUT + 2000)) {
-        this._reactivateServices();
-      }
-      lastTime = currentTime;
-    }, TIMEOUT);
-
     // Set active the next service
     key(
       '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => {
@@ -158,6 +161,8 @@ export default class AppStore extends Store {
     this.locale = this._getDefaultLocale();
 
     this._healthCheck();
+
+    this.isSystemDarkModeEnabled = systemPreferences.isDarkMode();
   }
 
   @computed get cacheSize() {
@@ -166,7 +171,7 @@ export default class AppStore extends Store {
 
   // Actions
   @action _notify({ title, options, notificationId, serviceId = null }) {
-    if (this.stores.settings.all.isAppMuted) return;
+    if (this.stores.settings.all.app.isAppMuted) return;
 
     const notification = new window.Notification(title, options);
     notification.onclick = (e) => {
@@ -179,8 +184,6 @@ export default class AppStore extends Store {
 
         this.actions.service.setActive({ serviceId });
 
-        const mainWindow = remote.getCurrentWindow();
-
         if (isWindows) {
           mainWindow.restore();
         } else if (isLinux) {
@@ -244,17 +247,18 @@ export default class AppStore extends Store {
   }
 
   @action _muteApp({ isMuted, overrideSystemMute = true }) {
-    this.isSystemMuteOverriden = overrideSystemMute;
+    this.isSystemMuteOverridden = overrideSystemMute;
 
     this.actions.settings.update({
-      settings: {
+      type: 'app',
+      data: {
         isAppMuted: isMuted,
       },
     });
   }
 
   @action _toggleMuteApp() {
-    this._muteApp({ isMuted: !this.stores.settings.all.isAppMuted });
+    this._muteApp({ isMuted: !this.stores.settings.all.app.isAppMuted });
   }
 
   @action async _clearAllCache() {
@@ -288,13 +292,19 @@ export default class AppStore extends Store {
   }
 
   _setLocale() {
-    const locale = this.stores.settings.all.locale;
+    let locale;
+    if (this.stores.user.isLoggedIn) {
+      locale = this.stores.user.data.locale;
+    }
+
 
     if (locale && Object.prototype.hasOwnProperty.call(locales, locale) && locale !== this.locale) {
       this.locale = locale;
     } else if (!locale) {
       this.locale = this._getDefaultLocale();
     }
+
+    debug(`Set locale to "${this.locale}"`);
   }
 
   _getDefaultLocale() {
@@ -336,8 +346,9 @@ export default class AppStore extends Store {
   // Helpers
   _appStartsCounter() {
     this.actions.settings.update({
-      settings: {
-        appStarts: (this.stores.settings.all.appStarts || 0) + 1,
+      type: 'stats',
+      data: {
+        appStarts: (this.stores.settings.all.stats.appStarts || 0) + 1,
       },
     });
   }
@@ -345,7 +356,8 @@ export default class AppStore extends Store {
   async _autoStart() {
     this.autoLaunchOnStart = await this._checkAutoStart();
 
-    if (this.stores.settings.all.appStarts === 1) {
+    if (this.stores.settings.all.stats.appStarts === 1) {
+      debug('Set app to launch on start');
       this.actions.app.launchOnStartup({
         enable: true,
       });
@@ -356,19 +368,9 @@ export default class AppStore extends Store {
     return autoLauncher.isEnabled() || false;
   }
 
-  _reactivateServices(retryCount = 0) {
-    if (!this.isOnline) {
-      console.debug('reactivateServices: computer is offline, trying again in 5s, retries:', retryCount);
-      setTimeout(() => this._reactivateServices(retryCount + 1), 5000);
-    } else {
-      console.debug('reactivateServices: reload Franz');
-      window.location.reload();
-    }
-  }
-
   _systemDND() {
     const dnd = getDoNotDisturb();
-    if (dnd === this.stores.settings.all.isAppMuted || !this.isSystemMuteOverriden) {
+    if (dnd !== this.stores.settings.all.app.isAppMuted && !this.isSystemMuteOverridden) {
       this.actions.app.muteApp({
         isMuted: dnd,
         overrideSystemMute: false,
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index a315d3b46..f788c347d 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -4,7 +4,7 @@ import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
 
 export default class FeaturesStore extends Store {
-  @observable baseFeaturesRequest = new CachedRequest(this.api.features, 'base');
+  @observable defaultFeaturesRequest = new CachedRequest(this.api.features, 'default');
   @observable featuresRequest = new CachedRequest(this.api.features, 'features');
 
   setup() {
@@ -19,7 +19,7 @@ export default class FeaturesStore extends Store {
       return this.featuresRequest.execute().result || {};
     }
 
-    return this.baseFeaturesRequest.execute().result || {};
+    return this.defaultFeaturesRequest.execute().result || {};
   }
 
   _debugFeatures() {
@@ -30,7 +30,7 @@ export default class FeaturesStore extends Store {
     if (this.stores.user.isLoggedIn) {
       this.featuresRequest.invalidate({ immediately: true });
     } else {
-      this.baseFeaturesRequest.invalidate({ immediately: true });
+      this.defaultFeaturesRequest.invalidate({ immediately: true });
     }
   }
 }
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index 67fee1d50..f2480bc8e 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -5,6 +5,8 @@ import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 import { matchRoute } from '../helpers/routing-helpers';
 
+const debug = require('debug')('Franz:RecipeStore');
+
 export default class RecipesStore extends Store {
   @observable allRecipesRequest = new CachedRequest(this.api.recipes, 'all');
   @observable installRecipeRequest = new Request(this.api.recipes, 'install');
@@ -34,7 +36,7 @@ export default class RecipesStore extends Store {
         return activeRecipe;
       }
 
-      console.warn('Recipe not installed');
+      debug(`Recipe ${match.id} not installed`);
     }
 
     return null;
@@ -54,10 +56,8 @@ export default class RecipesStore extends Store {
 
   // Actions
   @action async _install({ recipeId }) {
-    // console.log(this.installRecipeRequest._promise);
     const recipe = await this.installRecipeRequest.execute(recipeId)._promise;
     await this.allRecipesRequest.invalidate({ immediately: true })._promise;
-    // console.log(this.installRecipeRequest._promise);
 
     return recipe;
   }
@@ -67,7 +67,7 @@ export default class RecipesStore extends Store {
     const recipes = {};
 
     // Hackfix, reference this.all to fetch services
-    console.debug(`Check Recipe updates for ${this.all.map(recipe => recipe.id)}`);
+    debug(`Check Recipe updates for ${this.all.map(recipe => recipe.id)}`);
 
     recipeIds.forEach((r) => {
       const recipe = this.one(r);
diff --git a/src/stores/RequestStore.js b/src/stores/RequestStore.js
index 4140ca362..bbfe6f6df 100644
--- a/src/stores/RequestStore.js
+++ b/src/stores/RequestStore.js
@@ -2,6 +2,8 @@ import { action, computed, observable } from 'mobx';
 
 import Store from './lib/Store';
 
+const debug = require('debug')('Franz:RequestsStore');
+
 export default class RequestStore extends Store {
   @observable userInfoRequest;
   @observable servicesRequest;
@@ -52,7 +54,7 @@ export default class RequestStore extends Store {
         }
 
         this._autoRetry();
-        console.debug(`Retry required requests delayed in ${(delay) / 1000}s`);
+        debug(`Retry required requests delayed in ${(delay) / 1000}s`);
       }, delay);
     }
   }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index c38d0d9ee..cdb2db142 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -1,8 +1,5 @@
-// import { remote } from 'electron';
-import { action, computed, observable } from 'mobx';
+import { action, reaction, computed, observable } from 'mobx';
 import { debounce, remove } from 'lodash';
-// import path from 'path';
-// import fs from 'fs-extra';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
@@ -10,6 +7,8 @@ import CachedRequest from './lib/CachedRequest';
 import { matchRoute } from '../helpers/routing-helpers';
 import { gaEvent } from '../lib/analytics';
 
+const debug = require('debug')('Franz:ServiceStore');
+
 export default class ServicesStore extends Store {
   @observable allServicesRequest = new CachedRequest(this.api.services, 'all');
   @observable createServiceRequest = new Request(this.api.services, 'create');
@@ -61,13 +60,20 @@ export default class ServicesStore extends Store {
       this._mapActiveServiceToServiceModelReaction.bind(this),
       this._saveActiveService.bind(this),
       this._logoutReaction.bind(this),
-      this._shareSettingsWithServiceProcess.bind(this),
     ]);
 
     // Just bind this
     this._initializeServiceRecipeInWebview.bind(this);
   }
 
+  setup() {
+    // Single key reactions
+    reaction(
+      () => this.stores.settings.all.app.enableSpellchecking,
+      () => this._shareSettingsWithServiceProcess(),
+    );
+  }
+
   @computed get all() {
     if (this.stores.user.isLoggedIn) {
       const services = this.allServicesRequest.execute().result;
@@ -84,7 +90,13 @@ export default class ServicesStore extends Store {
   }
 
   @computed get allDisplayed() {
-    return this.stores.settings.all.showDisabledServices ? this.all : this.enabled;
+    return this.stores.settings.all.app.showDisabledServices ? this.all : this.enabled;
+  }
+
+  // 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);
   }
 
   @computed get filtered() {
@@ -103,7 +115,7 @@ export default class ServicesStore extends Store {
         return activeService;
       }
 
-      console.warn('Service not available');
+      debug('Service not available');
     }
 
     return null;
@@ -117,10 +129,10 @@ export default class ServicesStore extends Store {
     const recipesStore = this.stores.recipes;
 
     if (recipesStore.isInstalled(recipeId)) {
-      console.debug('Recipe is installed');
+      debug(`Recipe ${recipeId} is installed`);
       this._redirectToAddServiceRoute(recipeId);
     } else {
-      console.warn('Recipe is not installed');
+      debug(`Recipe ${recipeId} is not installed`);
       // We access the RecipeStore action directly
       // returns Promise instead of action
       await this.stores.recipes._install({ recipeId });
@@ -202,6 +214,14 @@ 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,
+      });
+    }
+
     if (redirect) {
       this.stores.router.push('/settings/services');
       gaEvent('Service', 'update', service.recipe.id);
@@ -326,7 +346,7 @@ export default class ServicesStore extends Store {
       });
     } else if (channel === 'notification') {
       const options = args[0].options;
-      if (service.recipe.hasNotificationSound || service.isMuted || this.stores.settings.all.isAppMuted) {
+      if (service.recipe.hasNotificationSound || service.isMuted || this.stores.settings.all.app.isAppMuted) {
         Object.assign(options, {
           silent: true,
         });
@@ -426,7 +446,7 @@ export default class ServicesStore extends Store {
   }
 
   @action _reorder({ oldIndex, newIndex }) {
-    const showDisabledServices = this.stores.settings.all.showDisabledServices;
+    const showDisabledServices = this.stores.settings.all.app.showDisabledServices;
     const oldEnabledSortIndex = showDisabledServices ? oldIndex : this.all.indexOf(this.enabled[oldIndex]);
     const newEnabledSortIndex = showDisabledServices ? newIndex : this.all.indexOf(this.enabled[newIndex]);
 
@@ -487,7 +507,7 @@ export default class ServicesStore extends Store {
     if (service) {
       service.webview.openDevTools();
     } else {
-      console.warn('No service is active');
+      debug('No service is active');
     }
   }
 
@@ -504,7 +524,8 @@ export default class ServicesStore extends Store {
 
     if (service) {
       this.actions.settings.update({
-        settings: {
+        type: 'service',
+        data: {
           activeService: service.id,
         },
       });
@@ -512,7 +533,7 @@ export default class ServicesStore extends Store {
   }
 
   _mapActiveServiceToServiceModelReaction() {
-    const { activeService } = this.stores.settings.all;
+    const { activeService } = this.stores.settings.all.service;
     if (this.allDisplayed.length) {
       this.allDisplayed.map(service => Object.assign(service, {
         isActive: activeService ? activeService === service.id : this.allDisplayed[0].id === service.id,
@@ -521,7 +542,7 @@ export default class ServicesStore extends Store {
   }
 
   _getUnreadMessageCountReaction() {
-    const showMessageBadgeWhenMuted = this.stores.settings.all.showMessageBadgeWhenMuted;
+    const showMessageBadgeWhenMuted = this.stores.settings.all.app.showMessageBadgeWhenMuted;
     const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted;
 
     const unreadDirectMessageCount = this.allDisplayed
@@ -545,7 +566,10 @@ export default class ServicesStore extends Store {
 
   _logoutReaction() {
     if (!this.stores.user.isLoggedIn) {
-      this.actions.settings.remove({ key: 'activeService' });
+      this.actions.settings.remove({
+        type: 'service',
+        key: 'activeService',
+      });
       this.allServicesRequest.invalidate().reset();
     }
   }
@@ -553,7 +577,7 @@ export default class ServicesStore extends Store {
   _shareSettingsWithServiceProcess() {
     this.actions.service.sendIPCMessageToAllServices({
       channel: 'settings-update',
-      args: this.stores.settings.all,
+      args: this.stores.settings.all.app,
     });
   }
 
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index b7d803398..f1b067115 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,12 +1,19 @@
-import { ipcRenderer } from 'electron';
-import { action, computed } from 'mobx';
+import { remote } from 'electron';
+import { action, computed, observable } from 'mobx';
 import localStorage from 'mobx-localstorage';
 
 import Store from './lib/Store';
-import { gaEvent } from '../lib/analytics';
 import SettingsModel from '../models/Settings';
+import Request from './lib/Request';
+import CachedRequest from './lib/CachedRequest';
+
+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');
+
   constructor(...args) {
     super(...args);
 
@@ -15,36 +22,110 @@ export default class SettingsStore extends Store {
     this.actions.settings.remove.listen(this._remove.bind(this));
   }
 
-  setup() {
-    this._shareSettingsWithMainProcess();
+  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;
+    await this._migrate();
   }
 
   @computed get all() {
-    return new SettingsModel(localStorage.getItem('app') || {});
+    return new SettingsModel({
+      app: this.appSettingsRequest.execute().result || {},
+      service: localStorage.getItem('service') || {},
+      group: localStorage.getItem('group') || {},
+      stats: localStorage.getItem('stats') || {},
+      migration: localStorage.getItem('migration') || {},
+    });
   }
 
-  @action async _update({ settings }) {
+  @action async _update({ type, data }) {
     const appSettings = this.all;
-    localStorage.setItem('app', Object.assign(appSettings, settings));
-
-    // We need a little hack to wait until everything is patched
-    setTimeout(() => this._shareSettingsWithMainProcess(), 0);
+    if (type !== 'app') {
+      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);
 
-    gaEvent('Settings', 'update');
+      this.appSettingsRequest.patch((result) => {
+        if (!result) return;
+        Object.assign(result, data);
+      });
+    }
   }
 
-  @action async _remove({ key }) {
-    const appSettings = this.all;
+  @action async _remove({ type, key }) {
+    if (type === 'app') return; // app keys can't be deleted
+
+    const appSettings = this.all[type];
     if (Object.hasOwnProperty.call(appSettings, key)) {
       delete appSettings[key];
-      localStorage.setItem('app', appSettings);
-    }
 
-    this._shareSettingsWithMainProcess();
+      this.actions.settings.update({
+        type,
+        data: appSettings,
+      });
+    }
   }
 
-  // Reactions
-  _shareSettingsWithMainProcess() {
-    ipcRenderer.send('settings', this.all);
+  // Helper
+  async _migrate() {
+    const legacySettings = localStorage.getItem('app') || {};
+
+    if (!this.all.migration['5.0.0-beta.17-settings']) {
+      this.actions.settings.update({
+        type: 'app',
+        data: {
+          autoLaunchInBackground: legacySettings.autoLaunchInBackground,
+          runInBackground: legacySettings.runInBackground,
+          enableSystemTray: legacySettings.enableSystemTray,
+          minimizeToSystemTray: legacySettings.minimizeToSystemTray,
+          isAppMuted: legacySettings.isAppMuted,
+          enableGPUAcceleration: legacySettings.enableGPUAcceleration,
+          showMessageBadgeWhenMuted: legacySettings.showMessageBadgeWhenMuted,
+          showDisabledServices: legacySettings.showDisabledServices,
+          enableSpellchecking: legacySettings.enableSpellchecking,
+        },
+      });
+
+      this.actions.settings.update({
+        type: 'service',
+        data: {
+          activeService: legacySettings.activeService,
+        },
+      });
+
+      this.actions.settings.update({
+        type: 'migration',
+        data: {
+          '5.0.0-beta.17-settings': true,
+        },
+      });
+
+      localStorage.removeItem('app');
+
+      debug('Migrated settings to split stores');
+    }
+
+    // Enable dark mode once
+    if (!this.all.migration['5.0.0-beta.19-settings']) {
+      this.actions.settings.update({
+        type: 'app',
+        data: {
+          darkMode: systemPreferences.isDarkMode(),
+        },
+      });
+
+      this.actions.settings.update({
+        type: 'migration',
+        data: {
+          '5.0.0-beta.19-settings': true,
+        },
+      });
+
+      localStorage.removeItem('app');
+
+      debug('Set up dark mode');
+    }
   }
 }
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index 5e9cc9ba7..bee6c8bcf 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -17,7 +17,7 @@ export default class UIStore extends Store {
   @computed get showMessageBadgesEvenWhenMuted() {
     const settings = this.stores.settings.all;
 
-    return (settings.isAppMuted && settings.showMessageBadgeWhenMuted) || !settings.isAppMuted;
+    return (settings.app.isAppMuted && settings.app.showMessageBadgeWhenMuted) || !settings.isAppMuted;
   }
 
   // Actions
@@ -26,7 +26,7 @@ export default class UIStore extends Store {
     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 7dbbd955b..9d8ac5657 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -9,6 +9,8 @@ import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { gaEvent } from '../lib/analytics';
 
+const debug = require('debug')('Franz:UserStore');
+
 // TODO: split stores into UserStore and AuthStore
 export default class UserStore extends Store {
   BASE_ROUTE = '/auth';
@@ -69,6 +71,11 @@ export default class UserStore extends Store {
     ]);
   }
 
+  setup() {
+    // Data migration
+    this._migrateUserLocale();
+  }
+
   // Routes
   get loginRoute() {
     return this.LOGIN_ROUTE;
@@ -256,8 +263,10 @@ export default class UserStore extends Store {
 
       // We need to set the beta flag for the SettingsStore
       this.actions.settings.update({
-        settings: {
+        type: 'app',
+        data: {
           beta: data.beta,
+          locale: data.locale,
         },
       });
     }
@@ -292,4 +301,17 @@ export default class UserStore extends Store {
       this.id = null;
     }
   }
+
+  async _migrateUserLocale() {
+    await this.getUserInfoRequest._promise;
+
+    if (!this.data.locale) {
+      debug('Migrate "locale" to user data');
+      this.actions.user.update({
+        userData: {
+          locale: this.stores.app.locale,
+        },
+      });
+    }
+  }
 }
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 18a653118..f9fac039a 100644
--- a/src/styles/badge.scss
+++ b/src/styles/badge.scss
@@ -1,11 +1,24 @@
 @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 {
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..4411a0e81 100644
--- a/src/styles/colors.scss
+++ b/src/styles/colors.scss
@@ -1,22 +1,38 @@
-$theme-brand-primary: #3498db;
-$theme-brand-success: #5cb85c;
-$theme-brand-info: #5bc0de;
-$theme-brand-warning: #FF9F00;
-$theme-brand-danger: #d9534f;
+$theme-brand-primary:        #3498db;
+$theme-brand-success:        #5cb85c;
+$theme-brand-info:           #5bc0de;
+$theme-brand-warning:        #FF9F00;
+$theme-brand-danger:         #d9534f;
 
-$theme-gray-dark: #373a3c;
-$theme-gray: #55595c;
-$theme-gray-light: #818a91;
-$theme-gray-lighter: #eceeef;
-$theme-gray-lightest: #f7f7f9;
+$theme-gray-dark:            #373a3c;
+$theme-gray:                 #55595c;
+$theme-gray-light:           #818a91;
+$theme-gray-lighter:         #eceeef;
+$theme-gray-lightest:        #f7f7f9;
 
-$theme-border-radius: 6px;
-$theme-border-radius-small: 3px;
+$theme-border-radius:        6px;
+$theme-border-radius-small:  3px;
 
-$theme-sidebar-width: 68px;
+$theme-sidebar-width:        68px;
 
-$theme-text-color: $theme-gray-dark;
+$theme-text-color:           $theme-gray-dark;
 
-$theme-transition-time: 0.5s;
+$theme-transition-time:      .5s;
 
-$theme-inset-shadow: inset 0 2px 5px rgba(0,0,0,0.03);
+$theme-inset-shadow:         inset 0 2px 5px rgba(0, 0, 0, .03);
+
+// Dark Theme
+$dark-theme-black:           #1A1A1A;
+
+$dark-theme-gray-darkest:    #1E1E1E;
+$dark-theme-gray-darker:     #2D2F31;
+$dark-theme-gray-dark:       #383A3B;
+
+$dark-theme-gray:            #47494B;
+
+$dark-theme-gray-light:      #515355;
+$dark-theme-gray-lighter:    #8a8b8b;
+$dark-theme-gray-lightest:   #FFF;
+
+$dark-theme-gray-smoke:      #CED0D1;
+$dark-theme-text-color:      #FFF;
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 afdd7dec7..ebf468cf0 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -1,12 +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: row;
+  flex-direction: column;
+
+  .app__content { display: flex; }
 
   .app__service {
     display: flex;
@@ -15,130 +39,100 @@ html {
   }
 }
 
+.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/main.scss b/src/styles/main.scss
index 446bdca14..784a04d3d 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -4,6 +4,7 @@ $mdi-font-path: '../node_modules/mdi/fonts';
 }
 
 @import './node_modules/mdi/scss/materialdesignicons.scss';
+@import './node_modules/electron-react-titlebar/assets/style';
 
 // modules
 @import './reset.scss';
@@ -28,6 +29,7 @@ $mdi-font-path: '../node_modules/mdi/fonts';
 @import './subscription-popup.scss';
 @import './content-tabs.scss';
 @import './invite.scss';
+@import './title-bar.scss';
 
 // form
 @import './input.scss';
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..5e7e35fd8 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,45 @@
   }
 
   .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; }
     }
   }
 
   .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 +267,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 +321,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 +365,7 @@
       .invoices__action {
         text-align: right;
 
-        button {
-          color: $theme-brand-primary;
-        }
+        button { color: $theme-brand-primary; }
       }
     }
   }
@@ -331,15 +375,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 +390,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 +430,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
new file mode 100644
index 000000000..885eb94c4
--- /dev/null
+++ b/src/styles/title-bar.scss
@@ -0,0 +1,80 @@
+@import './config.scss';
+
+.theme__dark #electron-app-title-bar {
+  background: $dark-theme-gray-darker;
+
+  .toolbar-dropdown {
+    &.open > .toolbar-button > button { 
+      background: $dark-theme-gray-light;
+      color: $dark-theme-gray-lightest;
+    }
+
+    &:not(.open) {
+      .menu-item .menu-label { opacity: 1; }
+      > .toolbar-button > button:hover { 
+        background: $dark-theme-gray-darkest; 
+      }
+    }
+  }
+
+  #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 {
+      border-radius: $theme-border-radius-small;
+      margin: 4px;
+    }
+
+    &.selected,
+    &.selected:focus {
+      background: none;
+
+      .menu-item { background: $theme-brand-primary; }
+    }
+  }
+
+  .menu-pane {
+    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.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/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 d9e021e6d..e6fdc4efd 100644
--- a/src/webview/plugin.js
+++ b/src/webview/plugin.js
@@ -6,8 +6,14 @@ import { isDevMode } from '../environment';
 import RecipeWebview from './lib/RecipeWebview';
 
 import Spellchecker from './spellchecker';
+import { injectDarkModeStyle, isDarkModeStyleInjected, removeDarkModeStyle } from './darkmode';
 import './notifications';
 
+const debug = require('debug')('Franz:Plugin');
+
+window.franzSettings = {};
+let serviceData;
+
 ipcRenderer.on('initializeRecipe', (e, data) => {
   const modulePath = path.join(data.recipe.path, 'webview.js');
   // Delete module from cache
@@ -15,8 +21,16 @@ ipcRenderer.on('initializeRecipe', (e, data) => {
   try {
     // eslint-disable-next-line
     require(modulePath)(new RecipeWebview(), data);
+    debug('Initialize Recipe', data);
+
+    serviceData = data;
+
+    if (data.isDarkModeEnabled) {
+      injectDarkModeStyle(data.recipe.path);
+      debug('Add dark theme styles');
+    }
   } catch (err) {
-    console.error(err);
+    debug('Recipe initialization failed', err);
   }
 });
 
@@ -30,11 +44,27 @@ new ContextMenuListener((info) => { // eslint-disable-line
 });
 
 ipcRenderer.on('settings-update', (e, data) => {
-  console.log('settings-update', data);
+  debug('Settings update received', data);
+
   spellchecker.toggleSpellchecker(data.enableSpellchecking);
+  window.franzSettings = data;
+});
+
+ipcRenderer.on('service-settings-update', (e, data) => {
+  debug('Service settings update received', data);
+
+  if (data.isDarkModeEnabled && !isDarkModeStyleInjected()) {
+    injectDarkModeStyle(serviceData.recipe.path);
+
+    debug('Enable service dark mode');
+  } else if (!data.isDarkModeEnabled && isDarkModeStyleInjected()) {
+    removeDarkModeStyle();
+
+    debug('Disable service dark mode');
+  }
 });
 
-// initSpellche
+// initSpellchecker
 
 document.addEventListener('DOMContentLoaded', () => {
   ipcRenderer.sendToHost('hello');
@@ -44,7 +74,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);
   }