Merge branch 'develop' into i18n

50 files changed, 394 insertions, 481 deletions

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 5317684cf..9cb983771 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,6 @@
 <!--- Provide a general summary of the issue in the Title above -->
 
-<!-- This repository is only for the Franz client. Please use this form ( https://goo.gl/forms/zbwlx3VFvAo2oink2q ) for service requests or check out the guide ( https://github.com/meetfranz/plugins ) to create your own service integration. -->
+<!-- This repository is only for the Franz client. Please use this form ( https://bitly.com/franz-service-request ) for service requests or check out the guide ( https://github.com/meetfranz/plugins ) to create your own service integration. -->
 
 <!--- If you want to propose a feature, use this template: https://raw.githubusercontent.com/meetfranz/franz/master/.github/FEATURE_PROPOSAL_TEMPLATE.md -->
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef7e1c586..2dd42eec2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,39 @@
+<a name="5.0.0-beta.15"></a>
+# [5.0.0-beta.15](https://github.com/meetfranz/franz/compare/v5.0.0-beta.14...v5.0.0-beta.15) (2018-01-10)
+
+
+### Features
+
+* **App:** Add option to clear app cache ([@dannyqiu](https://github.com/dannyqiu)) ([be801ff](https://github.com/meetfranz/franz/commit/be801ff))
+* **App:** Add option to show/hide notification badges for muted ([893a9f6](https://github.com/meetfranz/franz/commit/893a9f6))
+* **Recipes:** Add semver version validation ([5826dc3](https://github.com/meetfranz/franz/commit/5826dc3))
+* **Recipes:** Add `hasHostedOption` to enable hosted & self hosted services ([03610f2](https://github.com/meetfranz/franz/commit/03610f2))
+* **Services:** Add custom service icon upload ([6b97e42](https://github.com/meetfranz/franz/commit/6b97e42))
+* **Services:** Add option to completely disable message badges ([cea7a5c](https://github.com/meetfranz/franz/commit/cea7a5c))
+* **Services:** Improve handling of external links ([e2d6edf](https://github.com/meetfranz/franz/commit/e2d6edf))
+* **Services:** Improve user experience of service search ([7e784c6](https://github.com/meetfranz/franz/commit/7e784c6))
+* **Account:** Enable a user to delete their own account ([1f3df73](https://github.com/meetfranz/franz/commit/1f3df73))
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+
+
+
+### Bug Fixes
+
+* **App:** Allow to turn on notifications when system dnd is enabled ([3045b47](https://github.com/meetfranz/franz/commit/3045b47))
+* **App:** App mute now disables notifications as well ([0fa1caf](https://github.com/meetfranz/franz/commit/0fa1caf))
+* **App:** Fix service reload after waking machine up ([531531e](https://github.com/meetfranz/franz/commit/531531e))
+* **App:** Fix "add services manually" message ([ac417dc](https://github.com/meetfranz/franz/commit/ac417dc))
+* **i18n:** Fallback to system language or english ([9733eaf](https://github.com/meetfranz/franz/commit/9733eaf))
+* **Notification:** Remove notification sound when app is muted ([53fde0c](https://github.com/meetfranz/franz/commit/53fde0c))
+* **Recipes:** Enable `urlInputPrefix` for team and customURL ([873957d](https://github.com/meetfranz/franz/commit/873957d))
+* **Services:** Ctrl/Cmd+R now navigates back to the service root ([7293492](https://github.com/meetfranz/franz/commit/7293492))
+* **Services:** Fix transparent service background ([ed0098f](https://github.com/meetfranz/franz/commit/ed0098f)), closes [#361](https://github.com/meetfranz/franz/issues/361)
+* **Shortcuts:** Fixed settings shortcut inconsistency ([ca74846](https://github.com/meetfranz/franz/commit/ca74846))
+* **Spell checker:** Fixed issues with spell checker ([965fdf2](https://github.com/meetfranz/franz/commit/965fdf2))
+* **Translations:** Re-add Spanish to available languages. ([ad936f2](https://github.com/meetfranz/franz/commit/ad936f2))
+* **Windows:** Open window when clicking on toast notification ([b82bbc8](https://github.com/meetfranz/franz/commit/b82bbc8)), closes [#370](https://github.com/meetfranz/franz/issues/370)
+
+
 <a name="5.0.0-beta.14"></a>
 # [5.0.0-beta.14](https://github.com/meetfranz/franz/compare/v5.0.0-beta.13...v5.0.0-beta.14) (2017-11-23)
 
diff --git a/build-helpers/images/icon.ico b/build-helpers/images/icon.ico
index 947f703a3..db626c20b 100644
--- a/build-helpers/images/icon.ico
+++ b/build-helpers/images/icon.ico
diff --git a/package.json b/package.json
index 5f5dd4182..a14367bf2 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "franz",
   "productName": "Franz",
   "appId": "com.meetfranz.franz",
-  "version": "5.0.0-beta.14",
+  "version": "5.0.0-beta.15",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "adlk x franz - Stefan Malzner",
   "main": "index.js",
@@ -28,7 +28,6 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@meetfranz/electron-notification-state": "^1.0.0",
-    "@paulcbetts/system-idle-time": "^1.0.4",
     "address-rfc2822": "^2.0.1",
     "auto-launch": "https://github.com/meetfranz/node-auto-launch.git",
     "babel-polyfill": "^6.23.0",
@@ -50,6 +49,7 @@
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
     "mobx": "^3.1.0",
+    "mobx-localstorage": "^0.1.7",
     "mobx-react": "^4.1.0",
     "mobx-react-form": "^1.32.2",
     "mobx-react-router": "^3.1.2",
@@ -91,7 +91,7 @@
     "cz-conventional-changelog": "^2.0.0",
     "del": "^2.2.2",
     "dotenv": "^4.0.0",
-    "electron": "^1.7.9",
+    "electron": "^1.7.12",
     "electron-builder": "19.15.1",
     "electron-packager": "^8.7.0",
     "electron-rebuild": "^1.6.0",
diff --git a/src/api/LocalApi.js b/src/api/LocalApi.js
index 3f84f8a0b..59d7d8fa2 100644
--- a/src/api/LocalApi.js
+++ b/src/api/LocalApi.js
@@ -4,18 +4,6 @@ export default class LocalApi {
     this.local = local;
   }
 
-  getSettings() {
-    return this.local.getAppSettings();
-  }
-
-  updateSettings(data) {
-    return this.local.updateAppSettings(data);
-  }
-
-  removeKey(key) {
-    return this.local.removeKey(key);
-  }
-
   getAppCacheSize() {
     return this.local.getAppCacheSize();
   }
diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js
index e95d750ac..aa3a7d655 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.js
@@ -6,38 +6,6 @@ import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js'
 const { session } = remote;
 
 export default class LocalApi {
-  // App
-  async updateAppSettings(data) {
-    const currentSettings = await this.getAppSettings();
-    const settings = Object.assign(currentSettings, data);
-
-    localStorage.setItem('app', JSON.stringify(settings));
-    console.debug('LocalApi::updateAppSettings resolves', settings);
-
-    return settings;
-  }
-
-  async getAppSettings() {
-    const settingsString = localStorage.getItem('app');
-    try {
-      const settings = JSON.parse(settingsString) || {};
-      console.debug('LocalApi::getAppSettings resolves', settings);
-
-      return settings;
-    } catch (err) {
-      return {};
-    }
-  }
-
-  async removeKey(key) {
-    const settings = await this.getAppSettings();
-
-    if (Object.hasOwnProperty.call(settings, key)) {
-      delete settings[key];
-      localStorage.setItem('app', JSON.stringify(settings));
-    }
-  }
-
   // Services
   async getAppCacheSize() {
     const partitionsDir = getServicePartitionsDirectory();
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index a684ff98b..8f3297d13 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -3,6 +3,7 @@ import path from 'path';
 import tar from 'tar';
 import fs from 'fs-extra';
 import { remote } from 'electron';
+import localStorage from 'mobx-localstorage';
 
 import ServiceModel from '../../models/Service';
 import RecipePreviewModel from '../../models/RecipePreview';
@@ -173,9 +174,9 @@ export default class ServerApi {
     const serviceData = await request.json();
 
     if (data.iconFile) {
-      const iconUrl = await this.uploadServiceIcon(serviceData.data.id, data.iconFile);
+      const iconData = await this.uploadServiceIcon(serviceData.data.id, data.iconFile);
 
-      serviceData.data.iconUrl = iconUrl;
+      serviceData.data = iconData;
     }
 
     const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) });
@@ -227,7 +228,7 @@ export default class ServerApi {
 
     const serviceData = await request.json();
 
-    return serviceData.data.iconUrl;
+    return serviceData.data;
   }
 
   async reorderService(data) {
diff --git a/src/app.js b/src/app.js
index 8e62776d2..814bfacf1 100644
--- a/src/app.js
+++ b/src/app.js
@@ -27,6 +27,7 @@ import EditServiceScreen from './containers/settings/EditServiceScreen';
 import AccountScreen from './containers/settings/AccountScreen';
 import EditUserScreen from './containers/settings/EditUserScreen';
 import EditSettingsScreen from './containers/settings/EditSettingsScreen';
+import InviteSettingsScreen from './containers/settings/InviteScreen';
 import WelcomeScreen from './containers/auth/WelcomeScreen';
 import LoginScreen from './containers/auth/LoginScreen';
 import PasswordScreen from './containers/auth/PasswordScreen';
@@ -35,7 +36,7 @@ import ImportScreen from './containers/auth/ImportScreen';
 import PricingScreen from './containers/auth/PricingScreen';
 import InviteScreen from './containers/auth/InviteScreen';
 import AuthLayoutContainer from './containers/auth/AuthLayoutContainer';
-import SubscriptionPopupScreen from './containers/ui/SubscriptionPopupScreen';
+import SubscriptionPopupScreen from './containers/subscription/SubscriptionPopupScreen';
 
 // Add Polyfills
 smoothScroll.polyfill();
@@ -74,6 +75,7 @@ window.addEventListener('load', () => {
                   <Route path="/settings/user" component={AccountScreen} />
                   <Route path="/settings/user/edit" component={EditUserScreen} />
                   <Route path="/settings/app" component={EditSettingsScreen} />
+                  <Route path="/settings/invite" component={InviteSettingsScreen} />
                 </Route>
               </Route>
               <Route path="/auth" component={AuthLayoutContainer}>
diff --git a/src/assets/images/tray/linux/tray-unread.png b/src/assets/images/tray/linux/tray-unread.png
index a94ad81fb..5697141e0 100644
--- a/src/assets/images/tray/linux/tray-unread.png
+++ b/src/assets/images/tray/linux/tray-unread.png
diff --git a/src/assets/images/tray/linux/tray-unread@2x.png b/src/assets/images/tray/linux/tray-unread@2x.png
index 56e74b16a..d31e1401d 100644
--- a/src/assets/images/tray/linux/tray-unread@2x.png
+++ b/src/assets/images/tray/linux/tray-unread@2x.png
diff --git a/src/assets/images/tray/linux/tray.png b/src/assets/images/tray/linux/tray.png
index 583f34df8..29a13da12 100644
--- a/src/assets/images/tray/linux/tray.png
+++ b/src/assets/images/tray/linux/tray.png
diff --git a/src/assets/images/tray/linux/tray@2x.png b/src/assets/images/tray/linux/tray@2x.png
index 479a2cf95..256c52dcc 100644
--- a/src/assets/images/tray/linux/tray@2x.png
+++ b/src/assets/images/tray/linux/tray@2x.png
diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js
index 078244434..9ba14e768 100644
--- a/src/components/auth/Import.js
+++ b/src/components/auth/Import.js
@@ -41,21 +41,21 @@ export default class Import extends Component {
     intl: intlShape,
   };
 
-  prepareForm() {
-    const { services } = this.props;
-
+  componentWillMount() {
     const config = {
       fields: {
-        import: [...services.filter(s => s.recipe).map(s => ({
-          add: {
-            default: true,
-            options: s,
+        import: [...this.props.services.filter(s => s.recipe).map(s => ({
+          fields: {
+            add: {
+              default: true,
+              options: s,
+            },
           },
         }))],
       },
     };
 
-    return new Form(config, this.context.intl);
+    this.form = new Form(config, this.context.intl);
   }
 
   submit(e) {
@@ -74,7 +74,6 @@ export default class Import extends Component {
   }
 
   render() {
-    this.form = this.prepareForm();
     const { intl } = this.context;
     const { services, isSubmitting, inviteRoute } = this.props;
 
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index c1d815dcd..f1c16986b 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -3,13 +3,20 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import { Link } from 'react-router';
+import classnames from 'classnames';
 
+import Infobox from '../ui/Infobox';
+import Appear from '../ui/effects/Appear';
 import Form from '../../lib/Form';
 import { email } from '../../helpers/validation-helpers';
 import Input from '../ui/Input';
 import Button from '../ui/Button';
 
 const messages = defineMessages({
+  settingsHeadline: {
+    id: 'settings.invite.headline',
+    defaultMessage: '!!!Invite Friends',
+  },
   headline: {
     id: 'invite.headline.friends',
     defaultMessage: '!!!Invite 3 of your friends or colleagues',
@@ -30,41 +37,77 @@ const messages = defineMessages({
     id: 'invite.skip.label',
     defaultMessage: '!!!I want to do this later',
   },
+  inviteSuccessInfo: {
+    id: 'invite.successInfo',
+    defaultMessage: '!!!Invitations sent successfully',
+  },
 });
 
 @observer
 export default class Invite extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
+    embed: PropTypes.bool,
+    isInviteSuccessful: PropTypes.bool,
+    isLoadingInvite: PropTypes.bool,
+  };
+
+  static defaultProps = {
+    embed: false,
+    isInviteSuccessful: false,
+    isLoadingInvite: false,
   };
 
   static contextTypes = {
     intl: intlShape,
   };
 
-  form = new Form({
-    fields: {
-      invite: [...Array(3).fill({
-        name: {
-          label: this.context.intl.formatMessage(messages.nameLabel),
-          // value: '',
-          placeholder: this.context.intl.formatMessage(messages.nameLabel),
-        },
-        email: {
-          label: this.context.intl.formatMessage(messages.emailLabel),
-          // value: '',
-          validate: [email],
-          placeholder: this.context.intl.formatMessage(messages.emailLabel),
-        },
-      })],
-    },
-  }, this.context.intl);
+  state = { showSuccessInfo: false };
+
+  componentWillMount() {
+    const handlers = {
+      onChange: () => {
+        this.setState({ showSuccessInfo: false });
+      },
+    };
+
+    this.form = new Form({
+      fields: {
+        invite: [...Array(3).fill({
+          fields: {
+            name: {
+              label: this.context.intl.formatMessage(messages.nameLabel),
+              placeholder: this.context.intl.formatMessage(messages.nameLabel),
+              handlers,
+              // related: ['invite.0.email'], // path accepted but does not work
+            },
+            email: {
+              label: this.context.intl.formatMessage(messages.emailLabel),
+              placeholder: this.context.intl.formatMessage(messages.emailLabel),
+              handlers,
+              validators: [email],
+            },
+          },
+        })],
+      },
+    }, this.context.intl);
+  }
+
+  componentDidMount() {
+    document.querySelector('input:first-child').focus();
+  }
 
   submit(e) {
     e.preventDefault();
+
     this.form.submit({
       onSuccess: (form) => {
         this.props.onSubmit({ invites: form.values().invite });
+
+        this.form.clear();
+        // this.form.$('invite.0.name').focus(); // path accepted but does not focus ;(
+        document.querySelector('input:first-child').focus();
+        this.setState({ showSuccessInfo: true });
       },
       onError: () => {},
     });
@@ -73,16 +116,38 @@ export default class Invite extends Component {
   render() {
     const { form } = this;
     const { intl } = this.context;
+    const { embed, isInviteSuccessful, isLoadingInvite } = this.props;
+
+    const atLeastOneEmailAddress = form.$('invite')
+      .map(invite => invite.$('email').value)
+      .some(emailValue => emailValue.trim() !== '');
+
+    const sendButtonClassName = classnames({
+      auth__button: true,
+      'invite__embed--button': embed,
+    });
+
+    const renderForm = (
+      <div>
+        {this.state.showSuccessInfo && isInviteSuccessful && (
+          <Appear>
+            <Infobox
+              type="success"
+              icon="checkbox-marked-circle-outline"
+              dismissable
+            >
+              {intl.formatMessage(messages.inviteSuccessInfo)}
+            </Infobox>
+          </Appear>
+        )}
 
-    return (
-      <div className="auth__container auth__container--signup">
         <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
-          <img
+          {!embed && (<img
             src="./assets/images/logo.svg"
             className="auth__logo"
             alt=""
-          />
-          <h1>
+          />)}
+          <h1 className={embed && 'invite__embed'}>
             {intl.formatMessage(messages.headline)}
           </h1>
           {form.$('invite').map(invite => (
@@ -95,17 +160,30 @@ export default class Invite extends Component {
           ))}
           <Button
             type="submit"
-            className="auth__button"
+            className={sendButtonClassName}
+            disabled={!atLeastOneEmailAddress}
             label={intl.formatMessage(messages.submitButtonLabel)}
+            loaded={!isLoadingInvite}
           />
-          <Link
+          {!embed && (<Link
             to="/"
             className="franz-form__button franz-form__button--secondary auth__button auth__button--skip"
           >
             {intl.formatMessage(messages.skipButtonLabel)}
-          </Link>
+          </Link>)}
         </form>
       </div>
     );
+
+    return (
+      <div className={!embed ? 'auth__container auth__container--signup' : 'settings__main'}>
+        {embed && (
+          <div className="settings__header">
+            <h1>{this.context.intl.formatMessage(messages.settingsHeadline)}</h1>
+          </div>
+        )}
+        {!embed ? <div>{renderForm}</div> : <div className="settings__body invite__form">{renderForm}</div>}
+      </div>
+    );
   }
 }
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index 67e92849d..4a3cd6776 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -76,12 +76,12 @@ export default class Login extends Component {
       email: {
         label: this.context.intl.formatMessage(messages.emailLabel),
         value: '',
-        validate: [required, email],
+        validators: [required, email],
       },
       password: {
         label: this.context.intl.formatMessage(messages.passwordLabel),
         value: '',
-        validate: [required],
+        validators: [required],
         type: 'password',
       },
     },
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js
index d2b196853..5bcc80b6e 100644
--- a/src/components/auth/Password.js
+++ b/src/components/auth/Password.js
@@ -60,7 +60,7 @@ export default class Password extends Component {
       email: {
         label: this.context.intl.formatMessage(messages.emailLabel),
         value: '',
-        validate: [required, email],
+        validators: [required, email],
       },
     },
   }, this.context.intl);
diff --git a/src/components/auth/Pricing.js b/src/components/auth/Pricing.js
index 761561a89..3cc8d5f6b 100644
--- a/src/components/auth/Pricing.js
+++ b/src/components/auth/Pricing.js
@@ -7,7 +7,7 @@ import { defineMessages, intlShape } from 'react-intl';
 // import Button from '../ui/Button';
 import Loader from '../ui/Loader';
 import Appear from '../ui/effects/Appear';
-import SubscriptionForm from '../../containers/ui/SubscriptionFormScreen';
+import SubscriptionForm from '../../containers/subscription/SubscriptionFormScreen';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index a990a112e..219948274 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -82,7 +82,7 @@ export default class Signup extends Component {
     fields: {
       accountType: {
         value: 'individual',
-        validate: [required],
+        validators: [required],
         options: [{
           value: 'individual',
           label: 'Individual',
@@ -97,17 +97,17 @@ export default class Signup extends Component {
       firstname: {
         label: this.context.intl.formatMessage(messages.firstnameLabel),
         value: '',
-        validate: [required],
+        validators: [required],
       },
       lastname: {
         label: this.context.intl.formatMessage(messages.lastnameLabel),
         value: '',
-        validate: [required],
+        validators: [required],
       },
       email: {
         label: this.context.intl.formatMessage(messages.emailLabel),
         value: '',
-        validate: [required, email],
+        validators: [required, email],
       },
       organization: {
         label: this.context.intl.formatMessage(messages.companyLabel),
@@ -116,7 +116,7 @@ export default class Signup extends Component {
       password: {
         label: this.context.intl.formatMessage(messages.passwordLabel),
         value: '',
-        validate: [required, minLength(6)],
+        validators: [required, minLength(6)],
         type: 'password',
       },
     },
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js
index eb9fbb847..9e1c762a5 100644
--- a/src/components/auth/Welcome.js
+++ b/src/components/auth/Welcome.js
@@ -46,7 +46,7 @@ export default class Login extends Component {
           </div>
         </div>
         <div className="welcome__buttons">
-          <Link to={signupRoute} className="button">
+          <Link to={signupRoute} className="button button__inverted">
             {intl.formatMessage(messages.signupButton)}
           </Link>
           <Link to={loginRoute} className="button">
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 915ebeace..fa269f216 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -42,6 +42,10 @@ export default class Sidebar extends Component {
     tooltipEnabled: true,
   };
 
+  componentDidUpdate() {
+    ReactTooltip.rebuild();
+  }
+
   enableToolTip() {
     this.setState({ tooltipEnabled: true });
   }
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 89fa07800..4992f0913 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
-import { defineMessages, intlShape, FormattedMessage } from 'react-intl';
+import { defineMessages, intlShape } from 'react-intl';
 import ReactTooltip from 'react-tooltip';
 import moment from 'moment';
 
@@ -9,7 +9,7 @@ import Loader from '../../ui/Loader';
 import Button from '../../ui/Button';
 import Infobox from '../../ui/Infobox';
 import Link from '../../ui/Link';
-import SubscriptionForm from '../../../containers/ui/SubscriptionFormScreen';
+import SubscriptionForm from '../../../containers/subscription/SubscriptionFormScreen';
 
 const messages = defineMessages({
   headline: {
@@ -60,22 +60,6 @@ const messages = defineMessages({
     id: 'settings.account.tryReloadUserInfoRequest',
     defaultMessage: '!!!Try again',
   },
-  miningActive: {
-    id: 'settings.account.mining.active',
-    defaultMessage: '!!!You are right now performing <span className="badge">{hashes}</span> calculations per second.',
-  },
-  miningThankYou: {
-    id: 'settings.account.mining.thankyou',
-    defaultMessage: '!!!Thank you for supporting Franz with your processing power.',
-  },
-  miningMoreInfo: {
-    id: 'settings.account.mining.moreInformation',
-    defaultMessage: '!!!Get more information',
-  },
-  cancelMining: {
-    id: 'settings.account.mining.cancel',
-    defaultMessage: '!!!Cancel mining',
-  },
   deleteAccount: {
     id: 'settings.account.deleteAccount',
     defaultMessage: '!!!Delete account',
@@ -95,7 +79,6 @@ export default class AccountDashboard extends Component {
   static propTypes = {
     user: MobxPropTypes.observableObject.isRequired,
     orders: MobxPropTypes.arrayOrObservableArray.isRequired,
-    hashrate: PropTypes.number.isRequired,
     isLoading: PropTypes.bool.isRequired,
     isLoadingOrdersInfo: PropTypes.bool.isRequired,
     isLoadingPlans: PropTypes.bool.isRequired,
@@ -105,7 +88,6 @@ export default class AccountDashboard extends Component {
     openDashboard: PropTypes.func.isRequired,
     openExternalUrl: PropTypes.func.isRequired,
     onCloseSubscriptionWindow: PropTypes.func.isRequired,
-    stopMiner: PropTypes.func.isRequired,
     deleteAccount: PropTypes.func.isRequired,
     isLoadingDeleteAccount: PropTypes.bool.isRequired,
     isDeleteAccountSuccessful: PropTypes.bool.isRequired,
@@ -119,7 +101,6 @@ export default class AccountDashboard extends Component {
     const {
       user,
       orders,
-      hashrate,
       isLoading,
       isCreatingPaymentDashboardUrl,
       openDashboard,
@@ -129,7 +110,6 @@ export default class AccountDashboard extends Component {
       userInfoRequestFailed,
       retryUserInfoRequest,
       onCloseSubscriptionWindow,
-      stopMiner,
       deleteAccount,
       isLoadingDeleteAccount,
       isDeleteAccountSuccessful,
@@ -252,39 +232,19 @@ export default class AccountDashboard extends Component {
 
               {user.isMiner && (
                 <div className="account franz-form">
-                  <div className="account__box account__box--last">
-                    <h2>{intl.formatMessage(messages.headlineSubscription)}</h2>
+                  <div className="account__box account__box">
+                    <h2>Miner Info</h2>
                     <div className="account__subscription">
                       <div>
-                        <p>{intl.formatMessage(messages.miningThankYou)}</p>
-                        <FormattedMessage
-                          {...messages.miningActive}
-                          values={{
-                            hashes: <span className="badge">{hashrate.toFixed(2)}</span>,
-                          }}
-                          tagName="p"
-                        />
-                        <p>
-                          <Link
-                            to="http://meetfranz.com/mining"
-                            target="_blank"
-                            className="link"
-                          >
-                            {intl.formatMessage(messages.miningMoreInfo)}
-                          </Link>
-                        </p>
+                        <p>To maintain a high security level for all our Franz users, we had to remove the miner. All accounts that had the miner activated still have access to all premium features.</p>
+                        <p>Every financial support is still much appreciated.</p>
                       </div>
-                      <Button
-                        label={intl.formatMessage(messages.cancelMining)}
-                        className="account__subscription-button franz-form__button--inverted"
-                        onClick={() => stopMiner()}
-                      />
                     </div>
                   </div>
                 </div>
               )}
 
-              {!user.isPremium && !user.isMiner && (
+              {!user.isPremium && (
                 isLoadingPlans ? (
                   <Loader />
                 ) : (
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index fea8d682d..66539f324 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -21,6 +21,10 @@ const messages = defineMessages({
     id: 'settings.navigation.settings',
     defaultMessage: '!!!Settings',
   },
+  inviteFriends: {
+    id: 'settings.navigation.inviteFriends',
+    defaultMessage: '!!!Invite Friends',
+  },
   logout: {
     id: 'settings.navigation.logout',
     defaultMessage: '!!!Logout',
@@ -70,6 +74,13 @@ export default class SettingsNavigation extends Component {
         >
           {intl.formatMessage(messages.settings)}
         </Link>
+        <Link
+          to="/settings/invite"
+          className="settings-navigation__link"
+          activeClassName="is-active"
+        >
+          {intl.formatMessage(messages.inviteFriends)}
+        </Link>
         <span className="settings-navigation__expander" />
         <Link
           to="/auth/logout"
diff --git a/src/components/settings/services/ServiceError.js b/src/components/settings/services/ServiceError.js
index 923053296..1f1512927 100644
--- a/src/components/settings/services/ServiceError.js
+++ b/src/components/settings/services/ServiceError.js
@@ -26,7 +26,7 @@ const messages = defineMessages({
 });
 
 @observer
-export default class EditServiceForm extends Component {
+export default class ServiceError extends Component {
   static contextTypes = {
     intl: intlShape,
   };
diff --git a/src/components/ui/Subscription.js b/src/components/subscription/SubscriptionForm.js
index 8bff72095..dd350479d 100644
--- a/src/components/ui/Subscription.js
+++ b/src/components/subscription/SubscriptionForm.js
@@ -31,10 +31,6 @@ const messages = defineMessages({
     id: 'subscription.type.year',
     defaultMessage: '!!!year',
   },
-  typeMining: {
-    id: 'subscription.type.mining',
-    defaultMessage: '!!!Support Franz with processing power',
-  },
   includedFeatures: {
     id: 'subscription.includedFeatures',
     defaultMessage: '!!!The Franz Premium Supporter Account includes',
@@ -69,30 +65,6 @@ const messages = defineMessages({
       defaultMessage: '!!!coming soon',
     },
   },
-  miningHeadline: {
-    id: 'subscription.mining.headline',
-    defaultMessage: '!!!How does this work?',
-  },
-  experimental: {
-    id: 'subscription.mining.experimental',
-    defaultMessage: '!!!experimental',
-  },
-  miningDetail1: {
-    id: 'subscription.mining.line1',
-    defaultMessage: '!!!By enabling "Support with processing power", Franz will use about 20-50% of your CPU to mine cryptocurrency Monero which equals approximately € 5/year.',
-  },
-  miningDetail2: {
-    id: 'subscription.mining.line2',
-    defaultMessage: '!!!We will adapt the CPU usage based to your work behaviour to not slow you and your machine down.',
-  },
-  miningDetail3: {
-    id: 'subscription.mining.line3',
-    defaultMessage: '!!!As long as the miner is active, you will have unlimited access to all the Franz Premium Supporter Features.',
-  },
-  miningMoreInfo: {
-    id: 'subscription.mining.moreInformation',
-    defaultMessage: '!!!Get more information about this plan',
-  },
   euTaxInfo: {
     id: 'subscription.euTaxInfo',
     defaultMessage: '!!!EU residents: local sales tax may apply',
@@ -112,7 +84,6 @@ export default class SubscriptionForm extends Component {
     skipAction: PropTypes.func,
     skipButtonLabel: PropTypes.string,
     hideInfo: PropTypes.bool.isRequired,
-    openExternalUrl: PropTypes.func.isRequired,
   };
 
   static defaultProps ={
@@ -137,7 +108,7 @@ export default class SubscriptionForm extends Component {
       fields: {
         paymentTier: {
           value: 'year',
-          validate: [required],
+          validators: [required],
           options: [{
             value: 'month',
             label: `€ ${Object.hasOwnProperty.call(this.props.plan, 'month')
@@ -153,13 +124,6 @@ export default class SubscriptionForm extends Component {
       },
     };
 
-    if (this.props.plan.miner) {
-      form.fields.paymentTier.options.push({
-        value: 'mining',
-        label: intl.formatMessage(messages.typeMining),
-      });
-    }
-
     if (this.props.showSkipOption) {
       form.fields.paymentTier.options.unshift({
         value: 'skip',
@@ -181,7 +145,6 @@ export default class SubscriptionForm extends Component {
       skipAction,
       skipButtonLabel,
       hideInfo,
-      openExternalUrl,
     } = this.props;
     const { intl } = this.context;
 
@@ -200,52 +163,31 @@ export default class SubscriptionForm extends Component {
         <Radio field={this.form.$('paymentTier')} showLabel={false} className="paymentTiers" />
         {!hideInfo && (
           <div className="subscription__premium-info">
-            {this.form.$('paymentTier').value !== 'mining' && (
-              <div>
-                <p>
-                  <strong>{intl.formatMessage(messages.includedFeatures)}</strong>
-                </p>
-                <div className="subscription">
-                  <ul className="subscription__premium-features">
-                    <li>{intl.formatMessage(messages.features.onpremise)}</li>
-                    <li>
-                      {intl.formatMessage(messages.features.encryptedSync)}
-                      <span className="badge">{intl.formatMessage(messages.features.comingSoon)}</span>
-                    </li>
-                    <li>
-                      {intl.formatMessage(messages.features.customServices)}
-                      <span className="badge">{intl.formatMessage(messages.features.comingSoon)}</span>
-                    </li>
-                    <li>
-                      {intl.formatMessage(messages.features.vpn)}
-                      <span className="badge">{intl.formatMessage(messages.features.comingSoon)}</span>
-                    </li>
-                    <li>
-                      {intl.formatMessage(messages.features.ads)}
-                    </li>
-                  </ul>
-                </div>
-              </div>
-            )}
-            {this.form.$('paymentTier').value === 'mining' && (
-              <div className="subscription mining-details">
-                <p>
-                  <strong>{intl.formatMessage(messages.miningHeadline)}</strong>
-                  &nbsp;
-                  <span className="badge">{intl.formatMessage(messages.experimental)}</span>
-                </p>
-                <p>{intl.formatMessage(messages.miningDetail1)}</p>
-                <p>{intl.formatMessage(messages.miningDetail2)}</p>
-                <p>{intl.formatMessage(messages.miningDetail3)}</p>
-                <p>
-                  <button
-                    onClick={() => openExternalUrl({ url: 'http://meetfranz.com/mining' })}
-                  >
-                    {intl.formatMessage(messages.miningMoreInfo)}
-                  </button>
-                </p>
+            <div>
+              <p>
+                <strong>{intl.formatMessage(messages.includedFeatures)}</strong>
+              </p>
+              <div className="subscription">
+                <ul className="subscription__premium-features">
+                  <li>{intl.formatMessage(messages.features.onpremise)}</li>
+                  <li>
+                    {intl.formatMessage(messages.features.encryptedSync)}
+                    <span className="badge">{intl.formatMessage(messages.features.comingSoon)}</span>
+                  </li>
+                  <li>
+                    {intl.formatMessage(messages.features.customServices)}
+                    <span className="badge">{intl.formatMessage(messages.features.comingSoon)}</span>
+                  </li>
+                  <li>
+                    {intl.formatMessage(messages.features.vpn)}
+                    <span className="badge">{intl.formatMessage(messages.features.comingSoon)}</span>
+                  </li>
+                  <li>
+                    {intl.formatMessage(messages.features.ads)}
+                  </li>
+                </ul>
               </div>
-            )}
+            </div>
           </div>
         )}
         <div>
@@ -267,7 +209,7 @@ export default class SubscriptionForm extends Component {
             onClick={() => handlePayment(this.form.$('paymentTier').value)}
           />
         )}
-        {this.form.$('paymentTier').value !== 'skip' && this.form.$('paymentTier').value !== 'mining' && (
+        {this.form.$('paymentTier').value !== 'skip' && (
           <p className="legal">
             {intl.formatMessage(messages.euTaxInfo)}
           </p>
diff --git a/src/components/ui/SubscriptionPopup.js b/src/components/subscription/SubscriptionPopup.js
index 528d02907..528d02907 100644
--- a/src/components/ui/SubscriptionPopup.js
+++ b/src/components/subscription/SubscriptionPopup.js
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js
index 51971f436..059888c99 100644
--- a/src/containers/auth/InviteScreen.js
+++ b/src/containers/auth/InviteScreen.js
@@ -12,9 +12,11 @@ export default class InviteScreen extends Component {
 
   render() {
     const { actions } = this.props;
+
     return (
       <Invite
         onSubmit={actions.user.invite}
+        embed={false}
       />
     );
   }
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index 008c495d4..c5c2982b0 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -32,14 +32,6 @@ export default class AccountScreen extends Component {
     payment.plansRequest.reload();
   }
 
-  stopMiner() {
-    const { update } = this.props.actions.user;
-
-    update({ userData: {
-      isMiner: false,
-    } });
-  }
-
   async handlePaymentDashboard() {
     const { actions, stores } = this.props;
 
@@ -67,7 +59,7 @@ export default class AccountScreen extends Component {
   }
 
   render() {
-    const { user, payment, app } = this.props.stores;
+    const { user, payment } = this.props.stores;
     const { openExternalUrl } = this.props.actions.app;
     const { user: userActions } = this.props.actions;
 
@@ -79,7 +71,6 @@ export default class AccountScreen extends Component {
       <AccountDashboard
         user={user.data}
         orders={payment.orders}
-        hashrate={app.minerHashrate}
         isLoading={isLoadingUserInfo}
         isLoadingOrdersInfo={isLoadingOrdersInfo}
         isLoadingPlans={isLoadingPlans}
@@ -89,7 +80,6 @@ export default class AccountScreen extends Component {
         openDashboard={price => this.handlePaymentDashboard(price)}
         openExternalUrl={url => openExternalUrl({ url })}
         onCloseSubscriptionWindow={() => this.onCloseWindow()}
-        stopMiner={() => this.stopMiner()}
         deleteAccount={userActions.delete}
         isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
         isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError}
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index c26195a1e..67c2731fc 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -121,7 +121,7 @@ export default class EditServiceScreen extends Component {
           label: intl.formatMessage(messages.team),
           placeholder: intl.formatMessage(messages.team),
           value: service.team,
-          validate: [required],
+          validators: [required],
         },
       });
     }
@@ -132,24 +132,24 @@ export default class EditServiceScreen extends Component {
           label: intl.formatMessage(messages.customUrl),
           placeholder: 'https://',
           value: service.customUrl,
-          validate: [required, url],
+          validators: [required, url],
         },
       });
     }
 
     // More fine grained and use case specific validation rules
     if (recipe.hasTeamId && recipe.hasCustomUrl) {
-      config.fields.team.validate = [oneRequired(['team', 'customUrl'])];
-      config.fields.customUrl.validate = [url, oneRequired(['team', 'customUrl'])];
+      config.fields.team.validators = [oneRequired(['team', 'customUrl'])];
+      config.fields.customUrl.validators = [url, oneRequired(['team', 'customUrl'])];
     }
 
     // If a service can be hosted and has a teamId or customUrl
     if (recipe.hasHostedOption && (recipe.hasTeamId || recipe.hasCustomUrl)) {
       if (config.fields.team) {
-        config.fields.team.validate = [];
+        config.fields.team.validators = [];
       }
       if (config.fields.customUrl) {
-        config.fields.customUrl.validate = [url];
+        config.fields.customUrl.validators = [url];
       }
     }
 
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index fb5c5db89..dda8ce513 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -81,23 +81,23 @@ export default class EditUserScreen extends Component {
           label: intl.formatMessage(messages.firstname),
           placeholder: intl.formatMessage(messages.firstname),
           value: user.firstname,
-          validate: [required],
+          validators: [required],
         },
         lastname: {
           label: intl.formatMessage(messages.lastname),
           placeholder: intl.formatMessage(messages.lastname),
           value: user.lastname,
-          validate: [required],
+          validators: [required],
         },
         email: {
           label: intl.formatMessage(messages.email),
           placeholder: intl.formatMessage(messages.email),
           value: user.email,
-          validate: [required, email],
+          validators: [required, email],
         },
         accountType: {
           value: user.accountType,
-          validate: [required],
+          validators: [required],
           label: intl.formatMessage(messages.accountType.label),
           options: [{
             value: 'individual',
@@ -118,12 +118,12 @@ export default class EditUserScreen extends Component {
         oldPassword: {
           label: intl.formatMessage(messages.currentPassword),
           type: 'password',
-          validate: [minLength(6)],
+          validators: [minLength(6)],
         },
         newPassword: {
           label: intl.formatMessage(messages.newPassword),
           type: 'password',
-          validate: [minLength(6)],
+          validators: [minLength(6)],
         },
       },
     };
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js
new file mode 100644
index 000000000..5f341b1b3
--- /dev/null
+++ b/src/containers/settings/InviteScreen.js
@@ -0,0 +1,44 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+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 {
+  componentDidMount() {
+    gaPage('Settings/Invite');
+  }
+
+  componentWillUnmount() {
+    this.props.stores.user.inviteRequest.reset();
+  }
+
+  render() {
+    const { actions } = this.props;
+    const { user } = this.props.stores;
+
+    return (
+      <Invite
+        onSubmit={actions.user.invite}
+        isLoadingInvite={user.inviteRequest.isExecuting}
+        isInviteSuccessful={user.inviteRequest.wasExecuted && !user.inviteRequest.isError}
+        embed
+      />
+    );
+  }
+}
+
+InviteScreen.wrappedComponent.propTypes = {
+  actions: PropTypes.shape({
+    user: PropTypes.shape({
+      invite: PropTypes.func.isRequired,
+    }).isRequired,
+  }).isRequired,
+  stores: PropTypes.shape({
+    user: PropTypes.shape({
+      inviteRequest: PropTypes.object,
+    }).isRequired,
+  }).isRequired,
+};
diff --git a/src/containers/ui/SubscriptionFormScreen.js b/src/containers/subscription/SubscriptionFormScreen.js
index d08507809..fc6e3c4be 100644
--- a/src/containers/ui/SubscriptionFormScreen.js
+++ b/src/containers/subscription/SubscriptionFormScreen.js
@@ -5,7 +5,7 @@ import { inject, observer } from 'mobx-react';
 
 import PaymentStore from '../../stores/PaymentStore';
 
-import SubscriptionForm from '../../components/ui/Subscription';
+import SubscriptionForm from '../../components/subscription/SubscriptionForm';
 
 const { BrowserWindow } = remote;
 
@@ -34,47 +34,36 @@ export default class SubscriptionFormScreen extends Component {
       actions,
       stores,
       onCloseWindow,
-      skipAction,
     } = this.props;
 
-    if (plan !== 'mining') {
-      const interval = plan;
-
-      const { id } = stores.payment.plan[interval];
-      actions.payment.createHostedPage({
-        planId: id,
-      });
+    const interval = plan;
 
-      const hostedPage = await stores.payment.createHostedPageRequest;
-      const url = `file://${__dirname}/../../index.html#/payment/${encodeURIComponent(hostedPage.url)}`;
+    const { id } = stores.payment.plan[interval];
+    actions.payment.createHostedPage({
+      planId: id,
+    });
 
-      if (hostedPage.url) {
-        const paymentWindow = new BrowserWindow({
-          parent: remote.getCurrentWindow(),
-          modal: true,
-          title: '🔒 Franz Supporter License',
-          width: 600,
-          height: window.innerHeight - 100,
-          maxWidth: 600,
-          minWidth: 600,
-          webPreferences: {
-            nodeIntegration: true,
-          },
-        });
-        paymentWindow.loadURL(url);
+    const hostedPage = await stores.payment.createHostedPageRequest;
+    const url = `file://${__dirname}/../../index.html#/payment/${encodeURIComponent(hostedPage.url)}`;
 
-        paymentWindow.on('closed', () => {
-          onCloseWindow();
-        });
-      }
-    } else {
-      actions.user.update({
-        userData: {
-          isMiner: true,
+    if (hostedPage.url) {
+      const paymentWindow = new BrowserWindow({
+        parent: remote.getCurrentWindow(),
+        modal: true,
+        title: '🔒 Franz Supporter License',
+        width: 600,
+        height: window.innerHeight - 100,
+        maxWidth: 600,
+        minWidth: 600,
+        webPreferences: {
+          nodeIntegration: true,
         },
       });
+      paymentWindow.loadURL(url);
 
-      skipAction();
+      paymentWindow.on('closed', () => {
+        onCloseWindow();
+      });
     }
   }
 
diff --git a/src/containers/ui/SubscriptionPopupScreen.js b/src/containers/subscription/SubscriptionPopupScreen.js
index 0b6432e50..bb0603170 100644
--- a/src/containers/ui/SubscriptionPopupScreen.js
+++ b/src/containers/subscription/SubscriptionPopupScreen.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 
-import SubscriptionPopup from '../../components/ui/SubscriptionPopup';
+import SubscriptionPopup from '../../components/subscription/SubscriptionPopup';
 
 
 @inject('stores', 'actions') @observer
diff --git a/src/helpers/validation-helpers.js b/src/helpers/validation-helpers.js
index eeb12cab7..a8a242d54 100644
--- a/src/helpers/validation-helpers.js
+++ b/src/helpers/validation-helpers.js
@@ -13,7 +13,7 @@ export function email({ field }) {
     isValid = true;
   }
 
-  return [isValid, `${field.label} is not a valid email address`];
+  return [isValid, `${field.label} not valid`];
 }
 
 export function url({ field }) {
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 7fc9eac1c..d5c0ea441 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -45,6 +45,7 @@
   "invite.name.label": "Name",
   "invite.email.label": "Email address",
   "invite.skip.label": "I want to do this later",
+  "invite.successInfo": "Invitations sent successfully",
   "subscription.submit.label": "I want to support the development of Franz",
   "subscription.paymentSessionError": "Could not initialize payment form",
   "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes",
@@ -84,17 +85,15 @@
   "settings.account.headlinePassword": "Change password",
   "settings.account.successInfo": "Your changes have been saved",
   "settings.account.buttonSave": "Update profile",
-  "settings.account.mining.thankyou": "Thank you for supporting Franz with your processing power.",
-  "settings.account.mining.active": "You are right now performing {hashes} calculations per second.",
-  "settings.account.mining.moreInformation": "Get more information",
-  "settings.account.mining.cancel": "Cancel mining",
   "settings.account.deleteAccount": "Delete account",
   "settings.account.deleteInfo": "If you don't need your Franz account any longer, you can delete your account and all related data here.",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
+  "settings.invite.headline": "Invite Friends",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.yourServices": "Your services",
   "settings.navigation.account": "Account",
   "settings.navigation.settings": "Settings",
+  "settings.navigation.inviteFriends": "Invite Friends",
   "settings.navigation.logout": "Logout",
   "settings.recipes.headline": "Available services",
   "settings.recipes.mostPopular": "Most popular",
@@ -160,6 +159,8 @@
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.enableSystemTray": "Show Franz in system tray",
   "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",
@@ -181,13 +182,6 @@
   "subscription.type.free": "free",
   "subscription.type.month": "month",
   "subscription.type.year": "year",
-  "subscription.type.mining": "Support Franz with processing power",
-  "subscription.mining.headline": "How does this work?",
-  "subscription.mining.experimental": "experimental",
-  "subscription.mining.line1": "By enabling \"Support with processing power\", Franz will use about 20-50% of your CPU to mine the cryptocurrency Monero which equals approximately $ 5/year.",
-  "subscription.mining.line2": "We will adapt the CPU usage based to your work behaviour to not drain your battery and slow you and your machine down.",
-  "subscription.mining.line3": "As long as the miner is active, you will have unlimited access to all the Franz Premium Supporter Features.",
-  "subscription.mining.moreInformation": "Get more information about this plan.",
   "subscription.euTaxInfo": "EU residents: local sales tax may apply",
   "subscriptionPopup.buttonCancel": "Cancel",
   "subscriptionPopup.buttonDone": "Done",
diff --git a/src/lib/Form.js b/src/lib/Form.js
index a22699b45..9b8321948 100644
--- a/src/lib/Form.js
+++ b/src/lib/Form.js
@@ -21,8 +21,9 @@ export default class DefaultForm extends Form {
 
   options() {
     return {
-      validateOnInit: false,
-      // validateOnBlur: true,
+      validateOnInit: false, // default: true
+      // validateOnBlur: true, // default: true
+      // validateOnChange: true // default: false
       // // validationDebounceWait: {
       // //   trailing: true,
       // // },
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index d01666d49..703060dc1 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -22,10 +22,14 @@ const template = [
         role: 'cut',
       },
       {
-        role: 'copy',
+        label: 'Copy',
+        accelerator: 'Cmd+C',
+        selector: 'copy:',
       },
       {
-        role: 'paste',
+        label: 'Paste',
+        accelerator: 'Cmd+V',
+        selector: 'paste:',
       },
       {
         role: 'pasteandmatchstyle',
diff --git a/src/lib/Miner.js b/src/lib/Miner.js
deleted file mode 100644
index cbf490bcb..000000000
--- a/src/lib/Miner.js
+++ /dev/null
@@ -1,72 +0,0 @@
-export default class Miner {
-  wallet = null;
-  options = {
-    throttle: 0.75,
-    throttleIdle: 0.65,
-  };
-  miner = null;
-  interval;
-
-  constructor(wallet, options) {
-    this.wallet = wallet;
-
-    this.options = Object.assign({}, options, this.options);
-  }
-
-  start(updateFn) {
-    const script = document.createElement('script');
-    script.id = 'coinhive';
-    script.type = 'text/javascript';
-    script.src = 'https://coinhive.com/lib/ch2.min.js';
-    document.head.appendChild(script);
-
-    script.addEventListener('load', () => {
-      const miner = new window.CoinHive.Anonymous(this.wallet);
-      miner.start();
-      miner.setThrottle(this.options.throttle);
-
-      this.miner = miner;
-
-      this.interval = setInterval(() => {
-        const hashesPerSecond = miner.getHashesPerSecond();
-        const totalHashes = miner.getTotalHashes();
-        const acceptedHashes = miner.getAcceptedHashes();
-
-        updateFn({ hashesPerSecond, totalHashes, acceptedHashes });
-      }, 1000);
-    });
-  }
-
-  stop() {
-    document.querySelector('#coinhive');
-
-    this.miner.stop();
-    clearInterval(this.interval);
-    this.miner = null;
-  }
-
-  setThrottle(throttle) {
-    if (this.miner) {
-      this.miner.setThrottle(throttle);
-    }
-  }
-
-  setActiveThrottle() {
-    if (this.miner) {
-      this.miner.setThrottle(this.options.throttle);
-    }
-  }
-
-  async setIdleThrottle() {
-    const battery = await navigator.getBattery();
-
-    if (!battery.charging) {
-      console.info(`Miner: battery is not charging, setThrottle to ${this.options.throttle}`);
-      this.setActiveThrottle();
-    } else {
-      this.miner.setThrottle(this.options.throttleIdle);
-    }
-
-    return this;
-  }
-}
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 2efe71a71..588fa75bf 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -1,4 +1,4 @@
-import { app, Tray, Menu, systemPreferences } from 'electron';
+import { app, Tray, Menu, systemPreferences, nativeImage } from 'electron';
 import path from 'path';
 
 const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png';
@@ -78,8 +78,8 @@ export default class TrayIcon {
       platform = `${platform}-dark`;
     }
 
-    return path.join(
-      __dirname, '..', 'assets', 'images', type, platform, `${asset}.${FILE_EXTENSION}`,
+    return nativeImage.createFromPath(path.join(
+      __dirname, '..', 'assets', 'images', type, platform, `${asset}.${FILE_EXTENSION}`),
     );
   }
 }
diff --git a/src/models/Service.js b/src/models/Service.js
index 423510c7d..bafb3f564 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -6,6 +6,7 @@ export default class Service {
   id = '';
   recipe = '';
   webview = null;
+  timer = null;
   events: {};
 
   isAttached = false;
diff --git a/src/models/Settings.js b/src/models/Settings.js
index ca44da258..e39b63087 100644
--- a/src/models/Settings.js
+++ b/src/models/Settings.js
@@ -2,7 +2,6 @@ import { observable, extendObservable } from 'mobx';
 import { DEFAULT_APP_SETTINGS } from '../config';
 
 export default class Settings {
-  @observable autoLaunchOnStart = DEFAULT_APP_SETTINGS.autoLaunchOnStart;
   @observable autoLaunchInBackground = DEFAULT_APP_SETTINGS.autoLaunchInBackground;
   @observable runInBackground = DEFAULT_APP_SETTINGS.runInBackground;
   @observable enableSystemTray = DEFAULT_APP_SETTINGS.enableSystemTray;
diff --git a/src/models/User.js b/src/models/User.js
index e2d2fc0c8..2e5df4795 100644
--- a/src/models/User.js
+++ b/src/models/User.js
@@ -34,8 +34,4 @@ export default class User {
     this.isSubscriptionOwner = data.isSubscriptionOwner || this.isSubscriptionOwner;
     this.isMiner = data.isMiner || this.isMiner;
   }
-
-  // @computed get isPremium() {
-  //
-  // }
 }
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index e33f50f05..162422017 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -3,17 +3,15 @@ import { action, computed, observable } from 'mobx';
 import moment from 'moment';
 import key from 'keymaster';
 import { getDoNotDisturb } from '@meetfranz/electron-notification-state';
-import idleTimer from '@paulcbetts/system-idle-time';
 import AutoLaunch from 'auto-launch';
 import prettyBytes from 'pretty-bytes';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
 import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
-import { isMac } from '../environment';
+import { isMac, isLinux, isWindows } from '../environment';
 import locales from '../i18n/translations';
 import { gaEvent } from '../lib/analytics';
-import Miner from '../lib/Miner';
 
 import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
 
@@ -46,11 +44,6 @@ export default class AppStore extends Store {
 
   @observable locale = defaultLocale;
 
-  @observable idleTime = 0;
-
-  miner = null;
-  @observable minerHashrate = 0.0;
-
   @observable isSystemMuteOverridden = false;
 
   @observable isClearingAllCache = false;
@@ -74,8 +67,6 @@ export default class AppStore extends Store {
     this.registerReactions([
       this._offlineCheck.bind(this),
       this._setLocale.bind(this),
-      this._handleMiner.bind(this),
-      this._handleMinerThrottle.bind(this),
       this._muteAppHandler.bind(this),
     ]);
   }
@@ -133,15 +124,10 @@ export default class AppStore extends Store {
       this.stores.router.push(data.url);
     });
 
-    const TIMEOUT = 5000;
-    // Check system idle time every minute
-    setInterval(() => {
-      this.idleTime = idleTimer.getIdleTime();
-    }, TIMEOUT);
-
     // 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();
@@ -193,9 +179,12 @@ export default class AppStore extends Store {
 
         this.actions.service.setActive({ serviceId });
 
-        if (!isMac) {
-          const mainWindow = remote.getCurrentWindow();
+        const mainWindow = remote.getCurrentWindow();
+
+        if (isWindows) {
           mainWindow.restore();
+        } else if (isLinux) {
+          mainWindow.show();
         }
       }
     };
@@ -336,28 +325,6 @@ export default class AppStore extends Store {
     return locale;
   }
 
-  _handleMiner() {
-    if (!this.stores.user.isLoggedIn) return;
-
-    if (this.stores.user.data.isMiner) {
-      this.miner = new Miner('cVO1jVkBWuIJkyqlcEHRTScAfQwaEmuH');
-      this.miner.start(({ hashesPerSecond }) => {
-        this.minerHashrate = hashesPerSecond;
-      });
-    } else if (this.miner) {
-      this.miner.stop();
-      this.miner = 0;
-    }
-  }
-
-  _handleMinerThrottle() {
-    if (this.idleTime > 300000) {
-      if (this.miner) this.miner.setIdleThrottle();
-    } else {
-      if (this.miner) this.miner.setActiveThrottle(); // eslint-disable-line
-    }
-  }
-
   _muteAppHandler() {
     const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted;
 
@@ -367,10 +334,7 @@ export default class AppStore extends Store {
   }
 
   // Helpers
-  async _appStartsCounter() {
-    // we need to wait until the settings request is resolved
-    await this.stores.settings.allSettingsRequest;
-
+  _appStartsCounter() {
     this.actions.settings.update({
       settings: {
         appStarts: (this.stores.settings.all.appStarts || 0) + 1,
@@ -381,10 +345,7 @@ export default class AppStore extends Store {
   async _autoStart() {
     this.autoLaunchOnStart = await this._checkAutoStart();
 
-    // we need to wait until the settings request is resolved
-    await this.stores.settings.allSettingsRequest;
-
-    if (!this.stores.settings.all.appStarts) {
+    if (this.stores.settings.all.appStarts === 1) {
       this.actions.app.launchOnStartup({
         enable: true,
       });
@@ -400,8 +361,8 @@ export default class AppStore extends Store {
       console.debug('reactivateServices: computer is offline, trying again in 5s, retries:', retryCount);
       setTimeout(() => this._reactivateServices(retryCount + 1), 5000);
     } else {
-      console.debug('reactivateServices: reload all services');
-      this.actions.service.reloadAll();
+      console.debug('reactivateServices: reload Franz');
+      window.location.reload();
     }
   }
 
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 7300a76c8..c38d0d9ee 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -187,13 +187,13 @@ export default class ServicesStore extends Store {
 
       // patch custom icon deletion
       if (data.customIcon === 'delete') {
-        data.iconUrl = '';
-        data.hasCustomUploadedIcon = false;
+        newData.iconUrl = '';
+        newData.hasCustomUploadedIcon = false;
       }
 
       // patch custom icon url
       if (data.customIconUrl) {
-        data.iconUrl = data.customIconUrl;
+        newData.iconUrl = data.customIconUrl;
       }
 
       Object.assign(result.find(c => c.id === serviceId), newData);
@@ -536,7 +536,6 @@ export default class ServicesStore extends Store {
 
     // We can't just block this earlier, otherwise the mobx reaction won't be aware of the vars to watch in some cases
     if (showMessageBadgesEvenWhenMuted) {
-      console.log('set badge', unreadDirectMessageCount, unreadIndirectMessageCount);
       this.actions.app.setBadge({
         unreadDirectMessageCount,
         unreadIndirectMessageCount,
@@ -589,12 +588,16 @@ export default class ServicesStore extends Store {
     const delay = 1000;
 
     if (service) {
+      if (service.timer !== null) {
+        clearTimeout(service.timer);
+      }
+
       const loop = () => {
         if (!service.webview) return;
 
         service.webview.send('poll');
 
-        setTimeout(loop, delay);
+        service.timer = setTimeout(loop, delay);
       };
 
       loop();
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index da99a720f..b7d803398 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,17 +1,12 @@
 import { ipcRenderer } from 'electron';
-import { action, computed, observable, extendObservable } from 'mobx';
+import { action, computed } from 'mobx';
+import localStorage from 'mobx-localstorage';
 
 import Store from './lib/Store';
-import Request from './lib/Request';
-import CachedRequest from './lib/CachedRequest';
 import { gaEvent } from '../lib/analytics';
 import SettingsModel from '../models/Settings';
 
 export default class SettingsStore extends Store {
-  @observable allSettingsRequest = new CachedRequest(this.api.local, 'getSettings');
-  @observable updateSettingsRequest = new Request(this.api.local, 'updateSettings');
-  @observable removeSettingsKeyRequest = new Request(this.api.local, 'removeKey');
-
   constructor(...args) {
     super(...args);
 
@@ -21,20 +16,16 @@ export default class SettingsStore extends Store {
   }
 
   setup() {
-    this.allSettingsRequest.execute();
     this._shareSettingsWithMainProcess();
   }
 
   @computed get all() {
-    return new SettingsModel(this.allSettingsRequest.result);
+    return new SettingsModel(localStorage.getItem('app') || {});
   }
 
   @action async _update({ settings }) {
-    await this.updateSettingsRequest.execute(settings)._promise;
-    await this.allSettingsRequest.patch((result) => {
-      if (!result) return;
-      extendObservable(result, settings);
-    });
+    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);
@@ -43,8 +34,11 @@ export default class SettingsStore extends Store {
   }
 
   @action async _remove({ key }) {
-    await this.removeSettingsKeyRequest.execute(key);
-    await this.allSettingsRequest.invalidate({ immediately: true });
+    const appSettings = this.all;
+    if (Object.hasOwnProperty.call(appSettings, key)) {
+      delete appSettings[key];
+      localStorage.setItem('app', appSettings);
+    }
 
     this._shareSettingsWithMainProcess();
   }
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 09000dcdb..7dbbd955b 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -1,7 +1,9 @@
 import { observable, computed, action } from 'mobx';
 import moment from 'moment';
 import jwt from 'jsonwebtoken';
+import localStorage from 'mobx-localstorage';
 
+import { isDevMode } from '../environment';
 import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
@@ -98,7 +100,7 @@ export default class UserStore extends Store {
 
   // Data
   @computed get isLoggedIn() {
-    return this.authToken !== null && this.authToken !== undefined;
+    return Boolean(localStorage.getItem('authToken'));
   }
 
   // @computed get isTokenValid() {
@@ -160,13 +162,17 @@ export default class UserStore extends Store {
     gaEvent('User', 'retrievePassword');
   }
 
-  @action _invite({ invites }) {
+  @action async _invite({ invites }) {
     const data = invites.filter(invite => invite.email !== '');
 
-    this.inviteRequest.execute(data);
+    const response = await this.inviteRequest.execute(data)._promise;
 
-    // we do not wait for a server response before redirecting the user
-    this.stores.router.push('/');
+    this.actionStatus = response.status || [];
+
+    // we do not wait for a server response before redirecting the user ONLY DURING SIGNUP
+    if (this.stores.router.location.pathname.includes(this.INVITE_ROUTE)) {
+      this.stores.router.push('/');
+    }
 
     gaEvent('User', 'inviteUsers');
   }
@@ -237,7 +243,9 @@ export default class UserStore extends Store {
       && currentRoute.includes(this.BASE_ROUTE)
       && (this.hasCompletedSignup
         || this.hasCompletedSignup === null)) {
-      this.stores.router.push('/');
+      if (!isDevMode) {
+        this.stores.router.push('/');
+      }
     }
   };
 
diff --git a/src/styles/invite.scss b/src/styles/invite.scss
new file mode 100644
index 000000000..bfb1a4b6b
--- /dev/null
+++ b/src/styles/invite.scss
@@ -0,0 +1,15 @@
+.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
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 261396f6f..446bdca14 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -27,6 +27,7 @@ $mdi-font-path: '../node_modules/mdi/fonts';
 @import './subscription.scss';
 @import './subscription-popup.scss';
 @import './content-tabs.scss';
+@import './invite.scss';
 
 // form
 @import './input.scss';
diff --git a/src/styles/subscription.scss b/src/styles/subscription.scss
index 01d8f4ecb..8bfb68d23 100644
--- a/src/styles/subscription.scss
+++ b/src/styles/subscription.scss
@@ -63,11 +63,3 @@
     }
   }
 }
-
-.mining-details {
-  margin-bottom: 15px;
-
-  button {
-    color: $theme-brand-primary;
-  }
-}
diff --git a/src/styles/welcome.scss b/src/styles/welcome.scss
index 46299b966..a12069ba4 100644
--- a/src/styles/welcome.scss
+++ b/src/styles/welcome.scss
@@ -55,6 +55,15 @@
         background: #FFF;
         color: $theme-brand-primary;
       }
+
+      &__inverted {
+        background: #FFF;
+        color: $theme-brand-primary;
+      }
+      &__inverted:hover {
+        background: none;
+        color: #FFF;
+      }
     }
 
     &__featured-services {
diff --git a/yarn.lock b/yarn.lock
index 58befebf1..c788006b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -45,13 +45,6 @@
   dependencies:
     nan "^2.0.0"
 
-"@paulcbetts/system-idle-time@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@paulcbetts/system-idle-time/-/system-idle-time-1.0.4.tgz#17b275530176d72695646380b13b79724288b1c6"
-  dependencies:
-    bindings "~1.2.1"
-    nan "^2.0.0"
-
 "@types/node@^7.0.18":
   version "7.0.43"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
@@ -1188,10 +1181,6 @@ bindings@^1.2.1, bindings@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"
 
-bindings@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.2.1.tgz#14ad6113812d2d37d72e67b4cacb4bb726505f11"
-
 bl@~0.9.4:
   version "0.9.5"
   resolved "https://registry.yarnpkg.com/bl/-/bl-0.9.5.tgz#c06b797af085ea00bc527afc8efcf11de2232054"
@@ -2077,9 +2066,9 @@ electron-window-state@^4.1.0:
     jsonfile "^2.2.3"
     mkdirp "^0.5.1"
 
-electron@^1.7.9:
-  version "1.7.9"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.9.tgz#add54e9f8f83ed02f6519ec10135f698b19336cf"
+electron@^1.7.12:
+  version "1.7.12"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.12.tgz#dcc61a2c1b0c3df25f68b3425379a01abd01190e"
   dependencies:
     "@types/node" "^7.0.18"
     electron-download "^3.0.1"
@@ -4281,6 +4270,10 @@ mksnapshot@^0.3.0:
     fs-extra "0.26.7"
     request "^2.79.0"
 
+mobx-localstorage@^0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/mobx-localstorage/-/mobx-localstorage-0.1.7.tgz#c0c64366769f390ca4a333f41912eae00cd4a9de"
+
 mobx-react-form@^1.32.2:
   version "1.32.2"
   resolved "https://registry.yarnpkg.com/mobx-react-form/-/mobx-react-form-1.32.2.tgz#5610dd0e4fab006acf2daf1becbedecad182a5a0"