15 files changed, 409 insertions, 463 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index bbb5e6305..1d706f1ef 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -1,26 +1,38 @@
 import { ipcRenderer, shell } from 'electron';
 import {
-  app, screen, powerMonitor, nativeTheme, getCurrentWindow, process as remoteProcess,
+  app,
+  screen,
+  powerMonitor,
+  nativeTheme,
+  getCurrentWindow,
+  process as remoteProcess,
 } from '@electron/remote';
 import { action, computed, observable } from 'mobx';
 import moment from 'moment';
 import AutoLaunch from 'auto-launch';
 import ms from 'ms';
 import { URL } from 'url';
-import path from 'path';
 import { readJsonSync } from 'fs-extra';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
 import { CHECK_INTERVAL } from '../config';
 import {
-  DEFAULT_APP_SETTINGS, isMac, ferdiVersion, electronVersion, osRelease,
+  DEFAULT_APP_SETTINGS,
+  isMac,
+  ferdiVersion,
+  electronVersion,
+  osRelease,
+  userDataPath,
 } from '../environment';
 import locales from '../i18n/translations';
 import { onVisibilityChange } from '../helpers/visibility-helper';
 import { getLocale } from '../helpers/i18n-helpers';
 
-import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
+import {
+  getServiceIdsFromPartitions,
+  removeServicePartitionDirectory,
+} from '../helpers/service-helpers';
 import { isValidExternalURL } from '../helpers/url-helpers';
 import { sleep } from '../helpers/async-helpers';
 
@@ -49,7 +61,10 @@ export default class AppStore extends Store {
 
   @observable healthCheckRequest = new Request(this.api.app, 'health');
 
-  @observable getAppCacheSizeRequest = new Request(this.api.local, 'getAppCacheSize');
+  @observable getAppCacheSizeRequest = new Request(
+    this.api.local,
+    'getAppCacheSize',
+  );
 
   @observable clearAppCacheRequest = new Request(this.api.local, 'clearCache');
 
@@ -93,7 +108,9 @@ export default class AppStore extends Store {
     this.actions.app.openExternalUrl.listen(this._openExternalUrl.bind(this));
     this.actions.app.checkForUpdates.listen(this._checkForUpdates.bind(this));
     this.actions.app.installUpdate.listen(this._installUpdate.bind(this));
-    this.actions.app.resetUpdateStatus.listen(this._resetUpdateStatus.bind(this));
+    this.actions.app.resetUpdateStatus.listen(
+      this._resetUpdateStatus.bind(this),
+    );
     this.actions.app.healthCheck.listen(this._healthCheck.bind(this));
     this.actions.app.muteApp.listen(this._muteApp.bind(this));
     this.actions.app.toggleMuteApp.listen(this._toggleMuteApp.bind(this));
@@ -183,9 +200,7 @@ export default class AppStore extends Store {
     // Handle deep linking (ferdi://)
     ipcRenderer.on('navigateFromDeepLink', (event, data) => {
       debug('Navigate from deep link', data);
-      let {
-        url,
-      } = data;
+      let { url } = data;
       if (!url) return;
 
       url = url.replace(/\/$/, '');
@@ -221,7 +236,10 @@ export default class AppStore extends Store {
       debug('System resumed, last suspended on', this.timeSuspensionStart);
       this.actions.service.resetLastPollTimer();
 
-      if (this.timeSuspensionStart.add(10, 'm').isBefore(moment()) && this.stores.settings.app.get('reloadAfterResume')) {
+      if (
+        this.timeSuspensionStart.add(10, 'm').isBefore(moment())
+        && this.stores.settings.app.get('reloadAfterResume')
+      ) {
         debug('Reloading services, user info and features');
 
         setInterval(() => {
@@ -266,15 +284,15 @@ export default class AppStore extends Store {
       ferdi: {
         version: ferdiVersion,
         electron: electronVersion,
-        installedRecipes: this.stores.recipes.all.map(recipe => ({
+        installedRecipes: this.stores.recipes.all.map((recipe) => ({
           id: recipe.id,
           version: recipe.version,
         })),
-        devRecipes: this.stores.recipePreviews.dev.map(recipe => ({
+        devRecipes: this.stores.recipePreviews.dev.map((recipe) => ({
           id: recipe.id,
           version: recipe.version,
         })),
-        services: this.stores.services.all.map(service => ({
+        services: this.stores.services.all.map((service) => ({
           id: service.id,
           recipe: service.recipe.id,
           isAttached: service.isAttached,
@@ -285,11 +303,11 @@ export default class AppStore extends Store {
           isDarkModeEnabled: service.isDarkModeEnabled,
         })),
         messages: this.stores.globalError.messages,
-        workspaces: this.stores.workspaces.workspaces.map(workspace => ({
+        workspaces: this.stores.workspaces.workspaces.map((workspace) => ({
           id: workspace.id,
           services: workspace.services,
         })),
-        windowSettings: readJsonSync(path.join(app.getPath('userData'), 'window-state.json')),
+        windowSettings: readJsonSync(userDataPath('window-state.json')),
         settings,
         features: this.stores.features.features,
         user: this.stores.user.data.id,
@@ -299,10 +317,7 @@ export default class AppStore extends Store {
 
   // Actions
   @action _notify({
-    title,
-    options,
-    notificationId,
-    serviceId = null,
+    title, options, notificationId, serviceId = null,
   }) {
     if (this.stores.settings.all.app.isAppMuted) return;
 
@@ -339,15 +354,15 @@ export default class AppStore extends Store {
     };
   }
 
-  @action _setBadge({
-    unreadDirectMessageCount,
-    unreadIndirectMessageCount,
-  }) {
+  @action _setBadge({ unreadDirectMessageCount, unreadIndirectMessageCount }) {
     let indicator = unreadDirectMessageCount;
 
     if (indicator === 0 && unreadIndirectMessageCount !== 0) {
       indicator = '•';
-    } else if (unreadDirectMessageCount === 0 && unreadIndirectMessageCount === 0) {
+    } else if (
+      unreadDirectMessageCount === 0
+      && unreadIndirectMessageCount === 0
+    ) {
       indicator = 0;
     } else {
       indicator = parseInt(indicator, 10);
@@ -358,9 +373,7 @@ export default class AppStore extends Store {
     });
   }
 
-  @action _launchOnStartup({
-    enable,
-  }) {
+  @action _launchOnStartup({ enable }) {
     this.autoLaunchOnStart = enable;
 
     try {
@@ -376,9 +389,7 @@ export default class AppStore extends Store {
     }
   }
 
-  @action _openExternalUrl({
-    url,
-  }) {
+  @action _openExternalUrl({ url }) {
     const parsedUrl = new URL(url);
     debug('open external url', parsedUrl);
 
@@ -414,10 +425,7 @@ export default class AppStore extends Store {
     this.healthCheckRequest.execute();
   }
 
-  @action _muteApp({
-    isMuted,
-    overrideSystemMute = true,
-  }) {
+  @action _muteApp({ isMuted, overrideSystemMute = true }) {
     this.isSystemMuteOverridden = overrideSystemMute;
     this.actions.settings.update({
       type: 'app',
@@ -437,16 +445,24 @@ export default class AppStore extends Store {
     this.isClearingAllCache = true;
     const clearAppCache = this.clearAppCacheRequest.execute();
     const allServiceIds = await getServiceIdsFromPartitions();
-    const allOrphanedServiceIds = allServiceIds.filter(id => !this.stores.services.all.find(s => id.replace('service-', '') === s.id));
+    const allOrphanedServiceIds = allServiceIds.filter(
+      (id) => !this.stores.services.all.find(
+        (s) => id.replace('service-', '') === s.id,
+      ),
+    );
 
     try {
-      await Promise.all(allOrphanedServiceIds.map(id => removeServicePartitionDirectory(id)));
+      await Promise.all(
+        allOrphanedServiceIds.map((id) => removeServicePartitionDirectory(id)),
+      );
     } catch (ex) {
       console.log('Error while deleting service partition directory - ', ex);
     }
-    await Promise.all(this.stores.services.all.map(s => this.actions.service.clearCache({
-      serviceId: s.id,
-    })));
+    await Promise.all(
+      this.stores.services.all.map((s) => this.actions.service.clearCache({
+        serviceId: s.id,
+      })),
+    );
 
     await clearAppCache._promise;
 
@@ -476,7 +492,11 @@ export default class AppStore extends Store {
       locale = this.stores.user.data.locale;
     }
 
-    if (locale && Object.prototype.hasOwnProperty.call(locales, locale) && locale !== this.locale) {
+    if (
+      locale
+      && Object.prototype.hasOwnProperty.call(locales, locale)
+      && locale !== this.locale
+    ) {
       this.locale = locale;
     } else if (!locale) {
       this.locale = this._getDefaultLocale();
@@ -553,7 +573,10 @@ export default class AppStore extends Store {
     const dnd = await ipcRenderer.invoke('get-dnd');
     debug('Do not disturb mode is', dnd);
     // ipcRenderer.on('autoUpdate', (event, data) => {
-    if (dnd !== this.stores.settings.all.app.isAppMuted && !this.isSystemMuteOverridden) {
+    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 2fee9bdda..ac623c258 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -1,15 +1,12 @@
 import {
   computed,
   observable,
-  reaction,
   runInAction,
 } from 'mobx';
 
 import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
 
-import delayApp from '../features/delayApp';
-import spellchecker from '../features/spellchecker';
 import serviceProxy from '../features/serviceProxy';
 import basicAuth from '../features/basicAuth';
 import workspaces from '../features/workspaces';
@@ -19,12 +16,9 @@ import publishDebugInfo from '../features/publishDebugInfo';
 import shareFranz from '../features/shareFranz';
 import announcements from '../features/announcements';
 import settingsWS from '../features/settingsWS';
-import serviceLimit from '../features/serviceLimit';
 import communityRecipes from '../features/communityRecipes';
 import todos from '../features/todos';
 import appearance from '../features/appearance';
-import planSelection from '../features/planSelection';
-import trialStatusBar from '../features/trialStatusBar';
 
 import { DEFAULT_FEATURES_CONFIG } from '../config';
 
@@ -43,13 +37,6 @@ export default class FeaturesStore extends Store {
 
     await this.featuresRequest._promise;
     setTimeout(this._setupFeatures.bind(this), 1);
-
-    // single key reaction
-    reaction(() => this.stores.user.data.isPremium, () => {
-      if (this.stores.user.isLoggedIn) {
-        this.featuresRequest.invalidate({ immediately: true });
-      }
-    });
   }
 
   @computed get anonymousFeatures() {
@@ -80,8 +67,6 @@ export default class FeaturesStore extends Store {
   }
 
   _setupFeatures() {
-    delayApp(this.stores, this.actions);
-    spellchecker(this.stores, this.actions);
     serviceProxy(this.stores, this.actions);
     basicAuth(this.stores, this.actions);
     workspaces(this.stores, this.actions);
@@ -91,11 +76,8 @@ export default class FeaturesStore extends Store {
     shareFranz(this.stores, this.actions);
     announcements(this.stores, this.actions);
     settingsWS(this.stores, this.actions);
-    serviceLimit(this.stores, this.actions);
     communityRecipes(this.stores, this.actions);
     todos(this.stores, this.actions);
     appearance(this.stores, this.actions);
-    planSelection(this.stores, this.actions);
-    trialStatusBar(this.stores, this.actions);
   }
 }
diff --git a/src/stores/NewsStore.js b/src/stores/NewsStore.js
index 86e092592..66a17cb29 100644
--- a/src/stores/NewsStore.js
+++ b/src/stores/NewsStore.js
@@ -38,7 +38,7 @@ export default class NewsStore extends Store {
 
     this.latestNewsRequest.invalidate().patch((result) => {
       // TODO: check if we can use mobx.array remove
-      remove(result, n => n.id === newsId);
+      remove(result, (n) => n.id === newsId);
     });
   }
 
diff --git a/src/stores/PaymentStore.js b/src/stores/PaymentStore.js
deleted file mode 100644
index 05bb5b3d0..000000000
--- a/src/stores/PaymentStore.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import { action, observable, computed } from 'mobx';
-import { BrowserWindow, getCurrentWindow } from '@electron/remote';
-
-import Store from './lib/Store';
-import CachedRequest from './lib/CachedRequest';
-import Request from './lib/Request';
-
-export default class PaymentStore extends Store {
-  @observable plansRequest = new CachedRequest(this.api.payment, 'plans');
-
-  @observable createHostedPageRequest = new Request(this.api.payment, 'getHostedPage');
-
-  constructor(...args) {
-    super(...args);
-
-    this.actions.payment.createHostedPage.listen(this._createHostedPage.bind(this));
-    this.actions.payment.upgradeAccount.listen(this._upgradeAccount.bind(this));
-  }
-
-  @computed get plan() {
-    if (this.plansRequest.isError) {
-      return {};
-    }
-    return this.plansRequest.execute().result || {};
-  }
-
-  @action _createHostedPage({ planId }) {
-    const request = this.createHostedPageRequest.execute(planId);
-
-    return request;
-  }
-
-  @action _upgradeAccount({ planId, onCloseWindow = () => null }) {
-    let hostedPageURL = this.stores.features.features.subscribeURL;
-
-    const parsedUrl = new URL(hostedPageURL);
-    const params = new URLSearchParams(parsedUrl.search.slice(1));
-
-    params.set('plan', planId);
-
-    hostedPageURL = this.stores.user.getAuthURL(`${parsedUrl.origin}${parsedUrl.pathname}?${params.toString()}`);
-
-    const win = new BrowserWindow({
-      parent: getCurrentWindow(),
-      modal: true,
-      title: '🔒 Upgrade Your Franz Account',
-      width: 800,
-      height: window.innerHeight - 100,
-      maxWidth: 800,
-      minWidth: 600,
-      autoHideMenuBar: true,
-      webPreferences: {
-        nodeIntegration: true,
-        webviewTag: true,
-        enableRemoteModule: true,
-        contextIsolation: false,
-      },
-    });
-    win.loadURL(`file://${__dirname}/../index.html#/payment/${encodeURIComponent(hostedPageURL)}`);
-
-    win.on('closed', () => {
-      this.stores.user.getUserInfoRequest.invalidate({ immediately: true });
-      this.stores.features.featuresRequest.invalidate({ immediately: true });
-
-      onCloseWindow();
-    });
-  }
-}
diff --git a/src/stores/RecipePreviewsStore.js b/src/stores/RecipePreviewsStore.js
index 989e1124a..f4e39306c 100644
--- a/src/stores/RecipePreviewsStore.js
+++ b/src/stores/RecipePreviewsStore.js
@@ -7,8 +7,6 @@ import Request from './lib/Request';
 export default class RecipePreviewsStore extends Store {
   @observable allRecipePreviewsRequest = new CachedRequest(this.api.recipePreviews, 'all');
 
-  @observable featuredRecipePreviewsRequest = new CachedRequest(this.api.recipePreviews, 'featured');
-
   @observable searchRecipePreviewsRequest = new Request(this.api.recipePreviews, 'search');
 
   constructor(...args) {
@@ -22,16 +20,12 @@ export default class RecipePreviewsStore extends Store {
     return this.allRecipePreviewsRequest.execute().result || [];
   }
 
-  @computed get featured() {
-    return this.featuredRecipePreviewsRequest.execute().result || [];
-  }
-
   @computed get searchResults() {
     return this.searchRecipePreviewsRequest.result || [];
   }
 
   @computed get dev() {
-    return this.stores.recipes.all.filter(r => r.local);
+    return this.stores.recipes.all.filter((r) => r.local);
   }
 
   // Actions
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index b49fb72d9..d2acebb75 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -1,13 +1,12 @@
 import { action, computed, observable } from 'mobx';
-import fs from 'fs-extra';
-import path from 'path';
+import { readJSONSync } from 'fs-extra';
 import semver from 'semver';
 
 import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 import { matchRoute } from '../helpers/routing-helpers';
-import { RECIPES_PATH } from '../environment';
+import { asarRecipesPath } from '../environment';
 
 const debug = require('debug')('Ferdi:RecipeStore');
 
@@ -54,11 +53,11 @@ export default class RecipesStore extends Store {
   }
 
   @computed get recipeIdForServices() {
-    return this.stores.services.all.map(s => s.recipe.id);
+    return this.stores.services.all.map((s) => s.recipe.id);
   }
 
   one(id) {
-    return this.all.find(recipe => recipe.id === id);
+    return this.all.find((recipe) => recipe.id === id);
   }
 
   isInstalled(id) {
@@ -78,7 +77,7 @@ export default class RecipesStore extends Store {
     const recipes = {};
 
     // Hackfix, reference this.all to fetch services
-    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);
@@ -90,15 +89,15 @@ export default class RecipesStore extends Store {
     const remoteUpdates = await this.getRecipeUpdatesRequest.execute(recipes)._promise;
 
     // Check for local updates
-    const allJsonFile = path.join(RECIPES_PATH, 'all.json');
-    const allJson = await fs.readJSON(allJsonFile);
+    const allJsonFile = asarRecipesPath('all.json');
+    const allJson = readJSONSync(allJsonFile);
     const localUpdates = [];
 
     Object.keys(recipes).forEach((recipe) => {
       const version = recipes[recipe];
 
       // Find recipe in local recipe repository
-      const localRecipe = allJson.find(r => r.id === recipe);
+      const localRecipe = allJson.find((r) => r.id === recipe);
 
       if (localRecipe && semver.lt(version, localRecipe.version)) {
         localUpdates.push(recipe);
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 9b69cb7c6..4ccb995ae 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -1,25 +1,21 @@
 import { shell } from 'electron';
-import {
-  action,
-  reaction,
-  computed,
-  observable,
-} from 'mobx';
+import { action, reaction, computed, observable } from 'mobx';
 import { debounce, remove } from 'lodash';
 import ms from 'ms';
 import { app } from '@electron/remote';
-import fs from 'fs-extra';
-import path from 'path';
+import { ensureFileSync, pathExistsSync, writeFileSync } from 'fs-extra';
+import { join } from 'path';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { matchRoute } from '../helpers/routing-helpers';
 import { isInTimeframe } from '../helpers/schedule-helpers';
-import { getRecipeDirectory, getDevRecipeDirectory } from '../helpers/recipe-helpers';
+import {
+  getRecipeDirectory,
+  getDevRecipeDirectory,
+} from '../helpers/recipe-helpers';
 import { workspaceStore } from '../features/workspaces';
-import { serviceLimitStore } from '../features/serviceLimit';
-import { RESTRICTION_TYPES } from '../models/Service';
 import { KEEP_WS_LOADED_USID } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 
@@ -32,7 +28,10 @@ export default class ServicesStore extends Store {
 
   @observable updateServiceRequest = new Request(this.api.services, 'update');
 
-  @observable reorderServicesRequest = new Request(this.api.services, 'reorder');
+  @observable reorderServicesRequest = new Request(
+    this.api.services,
+    'reorder',
+  );
 
   @observable deleteServiceRequest = new Request(this.api.services, 'delete');
 
@@ -53,22 +52,36 @@ export default class ServicesStore extends Store {
     this.actions.service.blurActive.listen(this._blurActive.bind(this));
     this.actions.service.setActiveNext.listen(this._setActiveNext.bind(this));
     this.actions.service.setActivePrev.listen(this._setActivePrev.bind(this));
-    this.actions.service.showAddServiceInterface.listen(this._showAddServiceInterface.bind(this));
+    this.actions.service.showAddServiceInterface.listen(
+      this._showAddServiceInterface.bind(this),
+    );
     this.actions.service.createService.listen(this._createService.bind(this));
-    this.actions.service.createFromLegacyService.listen(this._createFromLegacyService.bind(this));
+    this.actions.service.createFromLegacyService.listen(
+      this._createFromLegacyService.bind(this),
+    );
     this.actions.service.updateService.listen(this._updateService.bind(this));
     this.actions.service.deleteService.listen(this._deleteService.bind(this));
     this.actions.service.openRecipeFile.listen(this._openRecipeFile.bind(this));
     this.actions.service.clearCache.listen(this._clearCache.bind(this));
-    this.actions.service.setWebviewReference.listen(this._setWebviewReference.bind(this));
+    this.actions.service.setWebviewReference.listen(
+      this._setWebviewReference.bind(this),
+    );
     this.actions.service.detachService.listen(this._detachService.bind(this));
     this.actions.service.focusService.listen(this._focusService.bind(this));
-    this.actions.service.focusActiveService.listen(this._focusActiveService.bind(this));
+    this.actions.service.focusActiveService.listen(
+      this._focusActiveService.bind(this),
+    );
     this.actions.service.toggleService.listen(this._toggleService.bind(this));
-    this.actions.service.handleIPCMessage.listen(this._handleIPCMessage.bind(this));
+    this.actions.service.handleIPCMessage.listen(
+      this._handleIPCMessage.bind(this),
+    );
     this.actions.service.sendIPCMessage.listen(this._sendIPCMessage.bind(this));
-    this.actions.service.sendIPCMessageToAllServices.listen(this._sendIPCMessageToAllServices.bind(this));
-    this.actions.service.setUnreadMessageCount.listen(this._setUnreadMessageCount.bind(this));
+    this.actions.service.sendIPCMessageToAllServices.listen(
+      this._sendIPCMessageToAllServices.bind(this),
+    );
+    this.actions.service.setUnreadMessageCount.listen(
+      this._setUnreadMessageCount.bind(this),
+    );
     this.actions.service.openWindow.listen(this._openWindow.bind(this));
     this.actions.service.filter.listen(this._filter.bind(this));
     this.actions.service.resetFilter.listen(this._resetFilter.bind(this));
@@ -76,16 +89,27 @@ export default class ServicesStore extends Store {
     this.actions.service.reload.listen(this._reload.bind(this));
     this.actions.service.reloadActive.listen(this._reloadActive.bind(this));
     this.actions.service.reloadAll.listen(this._reloadAll.bind(this));
-    this.actions.service.reloadUpdatedServices.listen(this._reloadUpdatedServices.bind(this));
+    this.actions.service.reloadUpdatedServices.listen(
+      this._reloadUpdatedServices.bind(this),
+    );
     this.actions.service.reorder.listen(this._reorder.bind(this));
-    this.actions.service.toggleNotifications.listen(this._toggleNotifications.bind(this));
+    this.actions.service.toggleNotifications.listen(
+      this._toggleNotifications.bind(this),
+    );
     this.actions.service.toggleAudio.listen(this._toggleAudio.bind(this));
+    this.actions.service.toggleDarkMode.listen(this._toggleDarkMode.bind(this));
     this.actions.service.openDevTools.listen(this._openDevTools.bind(this));
-    this.actions.service.openDevToolsForActiveService.listen(this._openDevToolsForActiveService.bind(this));
+    this.actions.service.openDevToolsForActiveService.listen(
+      this._openDevToolsForActiveService.bind(this),
+    );
     this.actions.service.hibernate.listen(this._hibernate.bind(this));
     this.actions.service.awake.listen(this._awake.bind(this));
-    this.actions.service.resetLastPollTimer.listen(this._resetLastPollTimer.bind(this));
-    this.actions.service.shareSettingsWithServiceProcess.listen(this._shareSettingsWithServiceProcess.bind(this));
+    this.actions.service.resetLastPollTimer.listen(
+      this._resetLastPollTimer.bind(this),
+    );
+    this.actions.service.shareSettingsWithServiceProcess.listen(
+      this._shareSettingsWithServiceProcess.bind(this),
+    );
 
     this.registerReactions([
       this._focusServiceReaction.bind(this),
@@ -94,7 +118,6 @@ export default class ServicesStore extends Store {
       this._saveActiveService.bind(this),
       this._logoutReaction.bind(this),
       this._handleMuteSettings.bind(this),
-      this._restrictServiceAccess.bind(this),
       this._checkForActiveService.bind(this),
     ]);
 
@@ -167,18 +190,42 @@ export default class ServicesStore extends Store {
    * Run various maintenance tasks on services
    */
   _serviceMaintenance() {
-    this.all.forEach((service) => {
-      // Defines which services should be hibernated.
-      if (!service.isActive && (Date.now() - service.lastUsed > ms('5m'))) {
-        // If service is stale for 5 min, hibernate it.
-        this._hibernate({ serviceId: service.id });
+    this.all.forEach(service => {
+      // Defines which services should be hibernated or woken up
+      if (!service.isActive) {
+        if (
+          !service.lastHibernated &&
+          Date.now() - service.lastUsed >
+            ms(`${this.stores.settings.all.app.hibernationStrategy}s`)
+        ) {
+          // If service is stale, hibernate it.
+          this._hibernate({ serviceId: service.id });
+        }
+
+        if (
+          service.lastHibernated &&
+          Number(this.stores.settings.all.app.wakeUpStrategy) > 0
+        ) {
+          // If service is in hibernation and the wakeup time has elapsed, wake it.
+          if (
+            Date.now() - service.lastHibernated >
+            ms(`${this.stores.settings.all.app.wakeUpStrategy}s`)
+          ) {
+            this._awake({ serviceId: service.id });
+          }
+        }
       }
 
-      if (service.lastPoll && (service.lastPoll - service.lastPollAnswer > ms('1m'))) {
+      if (
+        service.lastPoll &&
+        service.lastPoll - service.lastPollAnswer > ms('1m')
+      ) {
         // If service did not reply for more than 1m try to reload.
         if (!service.isActive) {
           if (this.stores.app.isOnline && service.lostRecipeReloadAttempt < 3) {
-            debug(`Reloading service: ${service.name} (${service.id}). Attempt: ${service.lostRecipeReloadAttempt}`);
+            debug(
+              `Reloading service: ${service.name} (${service.id}). Attempt: ${service.lostRecipeReloadAttempt}`,
+            );
             // service.webview.reload();
             service.lostRecipeReloadAttempt += 1;
 
@@ -200,10 +247,16 @@ export default class ServicesStore extends Store {
     if (this.stores.user.isLoggedIn) {
       const services = this.allServicesRequest.execute().result;
       if (services) {
-        return observable(services.slice().slice().sort((a, b) => a.order - b.order).map((s, index) => {
-          s.index = index;
-          return s;
-        }));
+        return observable(
+          services
+            .slice()
+            .slice()
+            .sort((a, b) => a.order - b.order)
+            .map((s, index) => {
+              s.index = index;
+              return s;
+            }),
+        );
       }
     }
     return [];
@@ -214,7 +267,9 @@ export default class ServicesStore extends Store {
   }
 
   @computed get allDisplayed() {
-    const services = this.stores.settings.all.app.showDisabledServices ? this.all : this.enabled;
+    const services = this.stores.settings.all.app.showDisabledServices
+      ? this.all
+      : this.enabled;
     return workspaceStore.filterServicesByActiveWorkspace(services);
   }
 
@@ -223,7 +278,9 @@ export default class ServicesStore extends Store {
     const { showDisabledServices } = this.stores.settings.all.app;
     const { keepAllWorkspacesLoaded } = this.stores.workspaces.settings;
     const services = this.allServicesRequest.execute().result || [];
-    const filteredServices = showDisabledServices ? services : services.filter(service => service.isEnabled);
+    const filteredServices = showDisabledServices
+      ? services
+      : services.filter(service => service.isEnabled);
 
     let displayedServices;
     if (keepAllWorkspacesLoaded) {
@@ -231,32 +288,38 @@ export default class ServicesStore extends Store {
       displayedServices = filteredServices;
     } else {
       // Keep all services in current workspace loaded
-      displayedServices = workspaceStore.filterServicesByActiveWorkspace(filteredServices);
+      displayedServices =
+        workspaceStore.filterServicesByActiveWorkspace(filteredServices);
 
       // Keep all services active in workspaces that should be kept loaded
       for (const workspace of this.stores.workspaces.workspaces) {
         // Check if workspace needs to be kept loaded
         if (workspace.services.includes(KEEP_WS_LOADED_USID)) {
           // Get services for workspace
-          const serviceIDs = workspace.services.filter(i => i !== KEEP_WS_LOADED_USID);
-          const wsServices = filteredServices.filter(service => serviceIDs.includes(service.id));
-
-          displayedServices = [
-            ...displayedServices,
-            ...wsServices,
-          ];
+          const serviceIDs = workspace.services.filter(
+            i => i !== KEEP_WS_LOADED_USID,
+          );
+          const wsServices = filteredServices.filter(service =>
+            serviceIDs.includes(service.id),
+          );
+
+          displayedServices = [...displayedServices, ...wsServices];
         }
       }
 
       // Make sure every service is in the list only once
-      displayedServices = displayedServices.filter((v, i, a) => a.indexOf(v) === i);
+      displayedServices = displayedServices.filter(
+        (v, i, a) => a.indexOf(v) === i,
+      );
     }
 
     return displayedServices;
   }
 
   @computed get filtered() {
-    return this.all.filter(service => service.name.toLowerCase().includes(this.filterNeedle.toLowerCase()));
+    return this.all.filter(service =>
+      service.name.toLowerCase().includes(this.filterNeedle.toLowerCase()),
+    );
   }
 
   @computed get active() {
@@ -264,7 +327,10 @@ export default class ServicesStore extends Store {
   }
 
   @computed get activeSettings() {
-    const match = matchRoute('/settings/services/edit/:id', this.stores.router.location.pathname);
+    const match = matchRoute(
+      '/settings/services/edit/:id',
+      this.stores.router.location.pathname,
+    );
     if (match) {
       const activeService = this.one(match.id);
       if (activeService) {
@@ -278,7 +344,11 @@ export default class ServicesStore extends Store {
   }
 
   @computed get isTodosServiceAdded() {
-    return this.allDisplayed.find(service => service.isTodosService && service.isEnabled) || false;
+    return (
+      this.allDisplayed.find(
+        service => service.isTodosService && service.isEnabled,
+      ) || false
+    );
   }
 
   @computed get isTodosServiceActive() {
@@ -295,10 +365,11 @@ export default class ServicesStore extends Store {
 
   // Actions
   async _createService({
-    recipeId, serviceData, redirect = true, skipCleanup = false,
+    recipeId,
+    serviceData,
+    redirect = true,
+    skipCleanup = false,
   }) {
-    if (serviceLimitStore.userHasReachedServiceLimit) return;
-
     if (!this.stores.recipes.isInstalled(recipeId)) {
       debug(`Recipe "${recipeId}" is not installed, installing recipe`);
       await this.stores.recipes._install({ recipeId });
@@ -307,17 +378,21 @@ export default class ServicesStore extends Store {
 
     // set default values for serviceData
     // eslint-disable-next-line prefer-object-spread
-    Object.assign({
-      isEnabled: true,
-      isHibernationEnabled: false,
-      isNotificationEnabled: true,
-      isBadgeEnabled: true,
-      isMuted: false,
-      customIcon: false,
-      isDarkModeEnabled: false,
-      spellcheckerLanguage: SPELLCHECKER_LOCALES[this.stores.settings.app.spellcheckerLanguage],
-      userAgentPref: '',
-    }, serviceData);
+    Object.assign(
+      {
+        isEnabled: true,
+        isHibernationEnabled: false,
+        isNotificationEnabled: true,
+        isBadgeEnabled: true,
+        isMuted: false,
+        customIcon: false,
+        isDarkModeEnabled: false,
+        spellcheckerLanguage:
+          SPELLCHECKER_LOCALES[this.stores.settings.app.spellcheckerLanguage],
+        userAgentPref: '',
+      },
+      serviceData,
+    );
 
     let data = serviceData;
 
@@ -325,9 +400,10 @@ export default class ServicesStore extends Store {
       data = this._cleanUpTeamIdAndCustomUrl(recipeId, serviceData);
     }
 
-    const response = await this.createServiceRequest.execute(recipeId, data)._promise;
+    const response = await this.createServiceRequest.execute(recipeId, data)
+      ._promise;
 
-    this.allServicesRequest.patch((result) => {
+    this.allServicesRequest.patch(result => {
       if (!result) return;
       result.push(response.data);
     });
@@ -371,7 +447,10 @@ export default class ServicesStore extends Store {
 
   @action async _updateService({ serviceId, serviceData, redirect = true }) {
     const service = this.one(serviceId);
-    const data = this._cleanUpTeamIdAndCustomUrl(service.recipe.id, serviceData);
+    const data = this._cleanUpTeamIdAndCustomUrl(
+      service.recipe.id,
+      serviceData,
+    );
     const request = this.updateServiceRequest.execute(serviceId, data);
 
     const newData = serviceData;
@@ -382,7 +461,7 @@ export default class ServicesStore extends Store {
       newData.hasCustomUploadedIcon = true;
     }
 
-    this.allServicesRequest.patch((result) => {
+    this.allServicesRequest.patch(result => {
       if (!result) return;
 
       // patch custom icon deletion
@@ -396,7 +475,10 @@ export default class ServicesStore extends Store {
         newData.iconUrl = data.customIconUrl;
       }
 
-      Object.assign(result.find(c => c.id === serviceId), newData);
+      Object.assign(
+        result.find(c => c.id === serviceId),
+        newData,
+      );
     });
 
     await request._promise;
@@ -429,7 +511,7 @@ export default class ServicesStore extends Store {
       this.stores.router.push(redirect);
     }
 
-    this.allServicesRequest.patch((result) => {
+    this.allServicesRequest.patch(result => {
       remove(result, c => c.id === serviceId);
     });
 
@@ -443,9 +525,9 @@ export default class ServicesStore extends Store {
     const devDirectory = getDevRecipeDirectory(recipe);
     let directory;
 
-    if (await fs.pathExists(normalDirectory)) {
+    if (pathExistsSync(normalDirectory)) {
       directory = normalDirectory;
-    } else if (await fs.pathExists(devDirectory)) {
+    } else if (pathExistsSync(devDirectory)) {
       directory = devDirectory;
     } else {
       // Recipe cannot be found on drive
@@ -453,17 +535,19 @@ export default class ServicesStore extends Store {
     }
 
     // Create and open file
-    const filePath = path.join(directory, file);
+    const filePath = join(directory, file);
     if (file === 'user.js') {
-      if (!await fs.exists(filePath)) {
-        await fs.writeFile(filePath, `module.exports = (config, Ferdi) => {
+      if (!pathExistsSync(filePath)) {
+        writeFileSync(
+          filePath,
+          `module.exports = (config, Ferdi) => {
   // Write your scripts here
   console.log("Hello, World!", config);
-}
+};
 `);
       }
     } else {
-      await fs.ensureFile(filePath);
+      ensureFileSync(filePath);
     }
     shell.showItemInFolder(filePath);
   }
@@ -474,23 +558,27 @@ export default class ServicesStore extends Store {
     await request._promise;
   }
 
-  @action _setActive({ serviceId, keepActiveRoute }) {
+  @action _setActive({ serviceId, keepActiveRoute = null }) {
     if (!keepActiveRoute) this.stores.router.push('/');
     const service = this.one(serviceId);
 
-    this.all.forEach((s, index) => {
-      this.all[index].isActive = false;
+    this.all.forEach(s => {
+      s.isActive = false;
     });
     service.isActive = true;
     this._awake({ serviceId: service.id });
-    service.lastUsed = Date.now();
 
-    if (this.isTodosServiceActive && !this.stores.todos.settings.isFeatureEnabledByUser) {
+    if (
+      this.isTodosServiceActive &&
+      !this.stores.todos.settings.isFeatureEnabledByUser
+    ) {
       this.actions.todos.toggleTodosFeatureVisibility();
     }
 
     // Update list of last used services
-    this.lastUsedServices = this.lastUsedServices.filter(id => id !== serviceId);
+    this.lastUsedServices = this.lastUsedServices.filter(
+      id => id !== serviceId,
+    );
     this.lastUsedServices.unshift(serviceId);
 
     this._focusActiveService();
@@ -502,7 +590,11 @@ export default class ServicesStore extends Store {
   }
 
   @action _setActiveNext() {
-    const nextIndex = this._wrapIndex(this.allDisplayed.findIndex(service => service.isActive), 1, this.allDisplayed.length);
+    const nextIndex = this._wrapIndex(
+      this.allDisplayed.findIndex(service => service.isActive),
+      1,
+      this.allDisplayed.length,
+    );
 
     // TODO: simplify this;
     this.all.forEach((s, index) => {
@@ -512,7 +604,11 @@ export default class ServicesStore extends Store {
   }
 
   @action _setActivePrev() {
-    const prevIndex = this._wrapIndex(this.allDisplayed.findIndex(service => service.isActive), -1, this.allDisplayed.length);
+    const prevIndex = this._wrapIndex(
+      this.allDisplayed.findIndex(service => service.isActive),
+      -1,
+      this.allDisplayed.length,
+    );
 
     // TODO: simplify this;
     this.all.forEach((s, index) => {
@@ -603,17 +699,21 @@ export default class ServicesStore extends Store {
       const { options } = args[0];
 
       // Check if we are in scheduled Do-not-Disturb time
-      const {
-        scheduledDNDEnabled,
-        scheduledDNDStart,
-        scheduledDNDEnd,
-      } = this.stores.settings.all.app;
+      const { scheduledDNDEnabled, scheduledDNDStart, scheduledDNDEnd } =
+        this.stores.settings.all.app;
 
-      if (scheduledDNDEnabled && isInTimeframe(scheduledDNDStart, scheduledDNDEnd)) {
+      if (
+        scheduledDNDEnabled &&
+        isInTimeframe(scheduledDNDStart, scheduledDNDEnd)
+      ) {
         return;
       }
 
-      if (service.recipe.hasNotificationSound || service.isMuted || this.stores.settings.all.app.isAppMuted) {
+      if (
+        service.recipe.hasNotificationSound ||
+        service.isMuted ||
+        this.stores.settings.all.app.isAppMuted
+      ) {
         Object.assign(options, {
           silent: true,
         });
@@ -623,7 +723,8 @@ export default class ServicesStore extends Store {
         let title = `Notification from ${service.name}`;
         if (!this.stores.settings.all.app.privateNotifications) {
           options.body = typeof options.body === 'string' ? options.body : '';
-          title = typeof args[0].title === 'string' ? args[0].title : service.name;
+          title =
+            typeof args[0].title === 'string' ? args[0].title : service.name;
         } else {
           // Remove message data from notification in private mode
           options.body = '';
@@ -686,11 +787,13 @@ export default class ServicesStore extends Store {
   }
 
   @action _sendIPCMessageToAllServices({ channel, args }) {
-    this.all.forEach(s => this.actions.service.sendIPCMessage({
-      serviceId: s.id,
-      channel,
-      args,
-    }));
+    this.all.forEach(s =>
+      this.actions.service.sendIPCMessage({
+        serviceId: s.id,
+        channel,
+        args,
+      }),
+    );
   }
 
   @action _openWindow({ event }) {
@@ -737,9 +840,11 @@ export default class ServicesStore extends Store {
   }
 
   @action _reloadAll() {
-    this.enabled.forEach(s => this._reload({
-      serviceId: s.id,
-    }));
+    this.enabled.forEach(s =>
+      this._reload({
+        serviceId: s.id,
+      }),
+    );
   }
 
   @action _reloadUpdatedServices() {
@@ -758,10 +863,18 @@ export default class ServicesStore extends Store {
 
   @action _reorderService({ oldIndex, newIndex }) {
     const { showDisabledServices } = this.stores.settings.all.app;
-    const oldEnabledSortIndex = showDisabledServices ? oldIndex : this.all.indexOf(this.enabled[oldIndex]);
-    const newEnabledSortIndex = showDisabledServices ? newIndex : this.all.indexOf(this.enabled[newIndex]);
-
-    this.all.splice(newEnabledSortIndex, 0, this.all.splice(oldEnabledSortIndex, 1)[0]);
+    const oldEnabledSortIndex = showDisabledServices
+      ? oldIndex
+      : this.all.indexOf(this.enabled[oldIndex]);
+    const newEnabledSortIndex = showDisabledServices
+      ? newIndex
+      : this.all.indexOf(this.enabled[newIndex]);
+
+    this.all.splice(
+      newEnabledSortIndex,
+      0,
+      this.all.splice(oldEnabledSortIndex, 1)[0],
+    );
 
     const services = {};
     this.all.forEach((s, index) => {
@@ -769,8 +882,8 @@ export default class ServicesStore extends Store {
     });
 
     this.reorderServicesRequest.execute(services);
-    this.allServicesRequest.patch((data) => {
-      data.forEach((s) => {
+    this.allServicesRequest.patch(data => {
+      data.forEach(s => {
         const service = s;
 
         service.order = services[s.id];
@@ -804,6 +917,18 @@ export default class ServicesStore extends Store {
     });
   }
 
+  @action _toggleDarkMode({ serviceId }) {
+    const service = this.one(serviceId);
+
+    this.actions.service.updateService({
+      serviceId,
+      serviceData: {
+        isDarkModeEnabled: !service.isDarkModeEnabled,
+      },
+      redirect: false,
+    });
+  }
+
   @action _openDevTools({ serviceId }) {
     const service = this.one(serviceId);
     if (service.isTodosService) {
@@ -825,26 +950,36 @@ export default class ServicesStore extends Store {
 
   @action _hibernate({ serviceId }) {
     const service = this.one(serviceId);
-    if (service.isActive || !service.isHibernationEnabled) {
-      debug('Skipping service hibernation');
+    if (!service.canHibernate) {
+      return;
+    }
+    if (service.isActive) {
+      debug(`Skipping service hibernation for ${service.name}`);
       return;
     }
 
     debug(`Hibernate ${service.name}`);
 
-    service.isHibernating = true;
+    service.isHibernationRequested = true;
+    service.lastHibernated = Date.now();
   }
 
   @action _awake({ serviceId }) {
     const service = this.one(serviceId);
-    service.isHibernating = false;
-    service.liveFrom = Date.now();
+    debug(`Waking up from service hibernation for ${service.name}`);
+    service.isHibernationRequested = false;
+    service.lastUsed = Date.now();
+    service.lastHibernated = null;
   }
 
   @action _resetLastPollTimer({ serviceId = null }) {
-    debug(`Reset last poll timer for ${serviceId ? `service: "${serviceId}"` : 'all services'}`);
+    debug(
+      `Reset last poll timer for ${
+        serviceId ? `service: "${serviceId}"` : 'all services'
+      }`,
+    );
 
-    const resetTimer = (service) => {
+    const resetTimer = service => {
       service.lastPollAnswer = Date.now();
       service.lastPoll = Date.now();
     };
@@ -884,9 +1019,13 @@ export default class ServicesStore extends Store {
   _mapActiveServiceToServiceModelReaction() {
     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,
-      }));
+      this.allDisplayed.map(service =>
+        Object.assign(service, {
+          isActive: activeService
+            ? activeService === service.id
+            : this.allDisplayed[0].id === service.id,
+        }),
+      );
     }
   }
 
@@ -895,12 +1034,23 @@ export default class ServicesStore extends Store {
     const { showMessageBadgesEvenWhenMuted } = this.stores.ui;
 
     const unreadDirectMessageCount = this.allDisplayed
-      .filter(s => (showMessageBadgeWhenMuted || s.isNotificationEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled)
+      .filter(
+        s =>
+          (showMessageBadgeWhenMuted || s.isNotificationEnabled) &&
+          showMessageBadgesEvenWhenMuted &&
+          s.isBadgeEnabled,
+      )
       .map(s => s.unreadDirectMessageCount)
       .reduce((a, b) => a + b, 0);
 
     const unreadIndirectMessageCount = this.allDisplayed
-      .filter(s => (showMessageBadgeWhenMuted && showMessageBadgesEvenWhenMuted) && (s.isBadgeEnabled && s.isIndirectMessageBadgeEnabled))
+      .filter(
+        s =>
+          showMessageBadgeWhenMuted &&
+          showMessageBadgesEvenWhenMuted &&
+          s.isBadgeEnabled &&
+          s.isIndirectMessageBadgeEnabled,
+      )
       .map(s => s.unreadIndirectMessageCount)
       .reduce((a, b) => a + b, 0);
 
@@ -927,7 +1077,7 @@ export default class ServicesStore extends Store {
     const { enabled } = this;
     const { isAppMuted } = this.stores.settings.app;
 
-    enabled.forEach((service) => {
+    enabled.forEach(service => {
       const { isAttached } = service;
       const isMuted = isAppMuted || service.isMuted;
 
@@ -954,48 +1104,30 @@ export default class ServicesStore extends Store {
 
     if (!recipe) return;
 
-    if (recipe.hasTeamId && recipe.hasCustomUrl && data.team && data.customUrl) {
+    if (
+      recipe.hasTeamId &&
+      recipe.hasCustomUrl &&
+      data.team &&
+      data.customUrl
+    ) {
       delete serviceData.team;
     }
 
     return serviceData;
   }
 
-  _restrictServiceAccess() {
-    const { features } = this.stores.features;
-    const { userHasReachedServiceLimit, serviceLimit } = this.stores.serviceLimit;
-
-    this.all.map((service, index) => {
-      if (userHasReachedServiceLimit) {
-        service.isServiceAccessRestricted = index >= serviceLimit;
-
-        if (service.isServiceAccessRestricted) {
-          service.restrictionType = RESTRICTION_TYPES.SERVICE_LIMIT;
-
-          debug('Restricting access to server due to service limit');
-        }
-      }
-
-      if (service.isUsingCustomUrl) {
-        service.isServiceAccessRestricted = !features.isCustomUrlIncludedInCurrentPlan;
-
-        if (service.isServiceAccessRestricted) {
-          service.restrictionType = RESTRICTION_TYPES.CUSTOM_URL;
-
-          debug('Restricting access to server due to custom url');
-        }
-      }
-
-      return service;
-    });
-  }
-
   _checkForActiveService() {
-    if (!this.stores.router.location || this.stores.router.location.pathname.includes('auth/signup')) {
+    if (
+      !this.stores.router.location ||
+      this.stores.router.location.pathname.includes('auth/signup')
+    ) {
       return;
     }
 
-    if (this.allDisplayed.findIndex(service => service.isActive) === -1 && this.allDisplayed.length !== 0) {
+    if (
+      this.allDisplayed.findIndex(service => service.isActive) === -1 &&
+      this.allDisplayed.length !== 0
+    ) {
       debug('No active service found, setting active service to index 0');
 
       this._setActive({ serviceId: this.allDisplayed[0].id });
@@ -1008,13 +1140,19 @@ export default class ServicesStore extends Store {
 
     if (service.webview) {
       // We need to completely clone the object, otherwise Electron won't be able to send the object via IPC
-      const shareWithWebview = JSON.parse(JSON.stringify(service.shareWithWebview));
+      const shareWithWebview = JSON.parse(
+        JSON.stringify(service.shareWithWebview),
+      );
 
       debug('Initialize recipe', service.recipe.id, service.name);
-      service.webview.send('initialize-recipe', {
-        ...shareWithWebview,
-        franzVersion: app.getVersion(),
-      }, service.recipe);
+      service.webview.send(
+        'initialize-recipe',
+        {
+          ...shareWithWebview,
+          franzVersion: app.getVersion(),
+        },
+        service.recipe,
+      );
     }
   }
 
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 292242552..cd627c2b8 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -164,11 +164,24 @@ export default class SettingsStore extends Store {
     }
   }
 
+  _ensureMigrationAndMarkDone(migrationName, callback) {
+    if (!this.all.migration[migrationName]) {
+      callback();
+
+      const data = {};
+      data[migrationName] = true;
+      this.actions.settings.update({
+        type: 'migration',
+        data,
+      });
+    }
+  }
+
   // Helper
   async _migrate() {
     const legacySettings = localStorage.getItem('app') || {};
 
-    if (!this.all.migration['5.0.0-beta.17-settings']) {
+    this._ensureMigrationAndMarkDone('5.0.0-beta.17-settings', () => {
       this.actions.settings.update({
         type: 'app',
         data: {
@@ -193,19 +206,12 @@ export default class SettingsStore extends Store {
         },
       });
 
-      this.actions.settings.update({
-        type: 'migration',
-        data: {
-          '5.0.0-beta.17-settings': true,
-        },
-      });
-
       localStorage.removeItem('app');
 
       debug('Migrated settings to split stores');
-    }
+    });
 
-    if (!this.all.migration['5.0.0-beta.19-settings']) {
+    this._ensureMigrationAndMarkDone('5.0.0-beta.19-settings', () => {
       const spellcheckerLanguage = getLocale({
         locale: this.stores.settings.app.locale,
         locales: SPELLCHECKER_LOCALES,
@@ -219,16 +225,9 @@ export default class SettingsStore extends Store {
           spellcheckerLanguage,
         },
       });
+    });
 
-      this.actions.settings.update({
-        type: 'migration',
-        data: {
-          '5.0.0-beta.19-settings': true,
-        },
-      });
-    }
-
-    if (!this.all.migration['5.4.4-beta.2-settings']) {
+    this._ensureMigrationAndMarkDone('5.4.4-beta.2-settings', () => {
       const {
         showServiceNavigationBar,
       } = this.all.app;
@@ -239,53 +238,22 @@ export default class SettingsStore extends Store {
           navigationBarBehaviour: showServiceNavigationBar ? 'custom' : 'never',
         },
       });
+    });
 
-      this.actions.settings.update({
-        type: 'migration',
-        data: {
-          '5.4.4-beta.2-settings': true,
-        },
-      });
-    }
-
-    if (!this.all.migration['5.4.4-beta.4-settings']) {
+    this._ensureMigrationAndMarkDone('5.4.4-beta.4-settings', () => {
       this.actions.settings.update({
         type: 'app',
         data: {
           todoServer: 'isUsingCustomTodoService',
           customTodoServer: legacySettings.todoServer,
-        },
-      });
-
-      this.actions.settings.update({
-        type: 'migration',
-        data: {
-          '5.4.4-beta.4-settings': true,
-        },
-      });
-
-      debug('Migrated old todo setting to new custom todo setting');
-    }
-
-    if (!this.all.migration['5.4.4-beta.4-settings']) {
-      this.actions.settings.update({
-        type: 'app',
-        data: {
           automaticUpdates: !(legacySettings.noUpdates),
         },
       });
 
-      this.actions.settings.update({
-        type: 'migration',
-        data: {
-          '5.4.4-beta.4-settings': true,
-        },
-      });
-
-      debug('Migrated updates settings');
-    }
+      debug('Migrated old todo setting to new custom todo setting');
+    });
 
-    if (!this.all.migration['password-hashing']) {
+    this._ensureMigrationAndMarkDone('password-hashing', () => {
       if (this.stores.settings.app.lockedPassword !== '') {
         this.actions.settings.update({
           type: 'app',
@@ -295,46 +263,25 @@ export default class SettingsStore extends Store {
         });
       }
 
-      this.actions.settings.update({
-        type: 'migration',
-        data: {
-          'password-hashing': true,
-        },
-      });
-
       debug('Migrated updates settings');
-    }
+    });
 
-    if (!this.all.migration['5.6.0-beta.6-settings']) {
+    this._ensureMigrationAndMarkDone('5.6.0-beta.6-settings', () => {
       this.actions.settings.update({
         type: 'app',
         data: {
           searchEngine: SEARCH_ENGINE_DDG,
         },
       });
+    });
 
-      this.actions.settings.update({
-        type: 'migration',
-        data: {
-          '5.6.0-beta.6-settings': true,
-        },
-      });
-    }
-
-    if (!this.all.migration['user-agent-settings']) {
+    this._ensureMigrationAndMarkDone('user-agent-settings', () => {
       this.actions.settings.update({
         type: 'app',
         data: {
           userAgentPref: DEFAULT_APP_SETTINGS.userAgentPref,
         },
       });
-
-      this.actions.settings.update({
-        type: 'migration',
-        data: {
-          'user-agent-settings': true,
-        },
-      });
-    }
+    });
   }
 }
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index 0ca61046a..adcd776c1 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -71,7 +71,7 @@ export default class UIStore extends Store {
 
   @computed get theme() {
     const themeId = (this.isDarkThemeActive || this.stores.settings.app.darkMode) ? 'dark' : 'default';
-    const accentColor = this.stores.settings.app.accentColor;
+    const { accentColor } = this.stores.settings.app;
     return theme(themeId, accentColor);
   }
 
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 7947e5a27..2e009893a 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -2,16 +2,13 @@ import { observable, computed, action } from 'mobx';
 import moment from 'moment';
 import jwt from 'jsonwebtoken';
 import localStorage from 'mobx-localstorage';
-import ms from 'ms';
 import { session } from '@electron/remote';
 
 import { isDevMode } from '../environment';
 import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
-import { sleep } from '../helpers/async-helpers';
-import { getPlan } from '../helpers/plan-helpers';
-import { PLANS, TODOS_PARTITION_ID } from '../config';
+import { TODOS_PARTITION_ID } from '../config';
 
 const debug = require('debug')('Ferdi:UserStore');
 
@@ -27,8 +24,6 @@ export default class UserStore extends Store {
 
   SIGNUP_ROUTE = `${this.BASE_ROUTE}/signup`;
 
-  PRICING_ROUTE = `${this.BASE_ROUTE}/signup/pricing`;
-
   SETUP_ROUTE = `${this.BASE_ROUTE}/signup/setup`;
 
   IMPORT_ROUTE = `${this.BASE_ROUTE}/signup/import`;
@@ -45,8 +40,6 @@ export default class UserStore extends Store {
 
   @observable passwordRequest = new Request(this.api.user, 'password');
 
-  @observable activateTrialRequest = new Request(this.api.user, 'activateTrial');
-
   @observable inviteRequest = new Request(this.api.user, 'invite');
 
   @observable getUserInfoRequest = new CachedRequest(this.api.user, 'getInfo');
@@ -71,8 +64,6 @@ export default class UserStore extends Store {
 
   @observable hasCompletedSignup = false;
 
-  @observable hasActivatedTrial = false;
-
   @observable userData = {};
 
   @observable actionStatus = [];
@@ -93,7 +84,6 @@ export default class UserStore extends Store {
     this.actions.user.retrievePassword.listen(this._retrievePassword.bind(this));
     this.actions.user.logout.listen(this._logout.bind(this));
     this.actions.user.signup.listen(this._signup.bind(this));
-    this.actions.user.activateTrial.listen(this._activateTrial.bind(this));
     this.actions.user.invite.listen(this._invite.bind(this));
     this.actions.user.update.listen(this._update.bind(this));
     this.actions.user.resetStatus.listen(this._resetStatus.bind(this));
@@ -104,7 +94,6 @@ export default class UserStore extends Store {
     this.registerReactions([
       this._requireAuthenticatedUser.bind(this),
       this._getUserData.bind(this),
-      this._resetTrialActivationState.bind(this),
     ]);
   }
 
@@ -126,10 +115,6 @@ export default class UserStore extends Store {
     return this.SIGNUP_ROUTE;
   }
 
-  get pricingRoute() {
-    return this.PRICING_ROUTE;
-  }
-
   get setupRoute() {
     return this.SETUP_ROUTE;
   }
@@ -172,31 +157,6 @@ export default class UserStore extends Store {
     return this.data.team || null;
   }
 
-  @computed get isPremium() {
-    return true;
-  }
-
-  @computed get isPremiumOverride() {
-    return ((!this.team || !this.team.plan) && this.isPremium) || (this.team && this.team.state === 'expired' && this.isPremium);
-  }
-
-  @computed get isPersonal() {
-    if (!this.team || !this.team.plan) return false;
-    const plan = getPlan(this.team.plan);
-
-    return plan === PLANS.PERSONAL;
-  }
-
-  @computed get isPro() {
-    return true;
-    // if (this.isPremiumOverride) return true;
-
-    // if (!this.team || (!this.team.plan || this.team.state === 'expired')) return false;
-    // const plan = getPlan(this.team.plan);
-
-    // return plan === PLANS.PRO || plan === PLANS.LEGACY;
-  }
-
   @computed get legacyServices() {
     return this.getLegacyServicesRequest.execute() || {};
   }
@@ -244,23 +204,8 @@ export default class UserStore extends Store {
     this.actionStatus = request.result.status || [];
   }
 
-  @action async _activateTrial({ planId }) {
-    debug('activate trial', planId);
-
-    this.activateTrialRequest.execute({
-      plan: planId,
-    });
-
-    await this.activateTrialRequest._promise;
-
-    this.hasActivatedTrial = true;
-
-    this.stores.features.featuresRequest.invalidate({ immediately: true });
-    this.stores.user.getUserInfoRequest.invalidate({ immediately: true });
-  }
-
   @action async _invite({ invites }) {
-    const data = invites.filter(invite => invite.email !== '');
+    const data = invites.filter((invite) => invite.email !== '');
 
     const response = await this.inviteRequest.execute(data)._promise;
 
@@ -305,7 +250,7 @@ export default class UserStore extends Store {
     this.isImportLegacyServicesExecuting = true;
 
     // Reduces recipe duplicates
-    const recipes = services.filter((obj, pos, arr) => arr.map(mapObj => mapObj.recipe.id).indexOf(obj.recipe.id) === pos).map(s => s.recipe.id);
+    const recipes = services.filter((obj, pos, arr) => arr.map((mapObj) => mapObj.recipe.id).indexOf(obj.recipe.id) === pos).map((s) => s.recipe.id);
 
     // Install recipes
     for (const recipe of recipes) { // eslint-disable-line no-unused-vars
@@ -386,14 +331,6 @@ export default class UserStore extends Store {
     }
   }
 
-  async _resetTrialActivationState() {
-    if (this.hasActivatedTrial) {
-      await sleep(ms('12s'));
-
-      this.hasActivatedTrial = false;
-    }
-  }
-
   // Helpers
   _parseToken(authToken) {
     try {
diff --git a/src/stores/index.js b/src/stores/index.js
index 4eeef7982..b6e481e8a 100644
--- a/src/stores/index.js
+++ b/src/stores/index.js
@@ -6,16 +6,13 @@ import ServicesStore from './ServicesStore';
 import RecipesStore from './RecipesStore';
 import RecipePreviewsStore from './RecipePreviewsStore';
 import UIStore from './UIStore';
-import PaymentStore from './PaymentStore';
 import NewsStore from './NewsStore';
 import RequestStore from './RequestStore';
 import GlobalErrorStore from './GlobalErrorStore';
 import { workspaceStore } from '../features/workspaces';
 import { announcementsStore } from '../features/announcements';
-import { serviceLimitStore } from '../features/serviceLimit';
 import { communityRecipesStore } from '../features/communityRecipes';
 import { todosStore } from '../features/todos';
-import { planSelectionStore } from '../features/planSelection';
 
 export default (api, actions, router) => {
   const stores = {};
@@ -29,16 +26,13 @@ export default (api, actions, router) => {
     recipes: new RecipesStore(stores, api, actions),
     recipePreviews: new RecipePreviewsStore(stores, api, actions),
     ui: new UIStore(stores, api, actions),
-    payment: new PaymentStore(stores, api, actions),
     news: new NewsStore(stores, api, actions),
     requests: new RequestStore(stores, api, actions),
     globalError: new GlobalErrorStore(stores, api, actions),
     workspaces: workspaceStore,
     announcements: announcementsStore,
-    serviceLimit: serviceLimitStore,
     communityRecipes: communityRecipesStore,
     todos: todosStore,
-    planSelection: planSelectionStore,
   });
   // Initialize all stores
   Object.keys(stores).forEach((name) => {
diff --git a/src/stores/lib/CachedRequest.js b/src/stores/lib/CachedRequest.js
index 31c7ce241..94f615144 100644
--- a/src/stores/lib/CachedRequest.js
+++ b/src/stores/lib/CachedRequest.js
@@ -92,7 +92,7 @@ export default class CachedRequest extends Request {
   }
 
   removeCacheForCallWith(...args) {
-    remove(this._apiCalls, c => isEqual(c.args, args));
+    remove(this._apiCalls, (c) => isEqual(c.args, args));
   }
 
   _addApiCall(args) {
@@ -102,6 +102,6 @@ export default class CachedRequest extends Request {
   }
 
   _findApiCall(args) {
-    return this._apiCalls.find(c => isEqual(c.args, args));
+    return this._apiCalls.find((c) => isEqual(c.args, args));
   }
 }
diff --git a/src/stores/lib/Reaction.js b/src/stores/lib/Reaction.js
index f8009b7f6..7e1bc685e 100644
--- a/src/stores/lib/Reaction.js
+++ b/src/stores/lib/Reaction.js
@@ -26,6 +26,6 @@ export default class Reaction {
   }
 }
 
-export const createReactions = reactions => (
-  reactions.map(r => new Reaction(r))
+export const createReactions = (reactions) => (
+  reactions.map((r) => new Reaction(r))
 );
diff --git a/src/stores/lib/Request.js b/src/stores/lib/Request.js
index cfc857c2e..32ffe4367 100644
--- a/src/stores/lib/Request.js
+++ b/src/stores/lib/Request.js
@@ -107,7 +107,7 @@ export default class Request {
   }
 
   _triggerHooks() {
-    Request._hooks.forEach(hook => hook(this));
+    Request._hooks.forEach((hook) => hook(this));
   }
 
   reset = () => {
diff --git a/src/stores/lib/Store.js b/src/stores/lib/Store.js
index 8d2fb4066..b03a7e725 100644
--- a/src/stores/lib/Store.js
+++ b/src/stores/lib/Store.js
@@ -28,18 +28,18 @@ export default class Store {
   }
 
   registerReactions(reactions) {
-    reactions.forEach(reaction => this._reactions.push(new Reaction(reaction)));
+    reactions.forEach((reaction) => this._reactions.push(new Reaction(reaction)));
   }
 
   setup() {}
 
   initialize() {
     this.setup();
-    this._reactions.forEach(reaction => reaction.start());
+    this._reactions.forEach((reaction) => reaction.start());
   }
 
   teardown() {
-    this._reactions.forEach(reaction => reaction.stop());
+    this._reactions.forEach((reaction) => reaction.stop());
   }
 
   resetStatus() {